From 2cc0552fe3be8861e889150725f39ca915fe59e4 Mon Sep 17 00:00:00 2001
From: Yasushi SHOJI <yasushi.shoji@gmail.com>
Date: Tue, 17 Oct 2023 22:51:35 +0900
Subject: [PATCH 1/5] Fix to allow ninja to use make for generators (#123)
 (#128)

[ Upstream commit ade88c56e27bcb74732e8bd8475fbda00d722355 ]

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Michael Carroll <carroll.michael@gmail.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
---
 cmake/sip_helper.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake
index c589899..41aec4b 100644
--- a/cmake/sip_helper.cmake
+++ b/cmake/sip_helper.cmake
@@ -93,7 +93,9 @@ function(build_sip_binding PROJECT_NAME SIP_FILE)
     if(WIN32)
       set(MAKE_EXECUTABLE NMake.exe)
     else()
-      set(MAKE_EXECUTABLE "\$(MAKE)")
+      find_program(MAKE_PROGRAM NAMES make)
+      message(STATUS "Found required make: ${MAKE_PROGRAM}")
+      set(MAKE_EXECUTABLE ${MAKE_PROGRAM})
     endif()
 
     add_custom_command(

From 968b0c2abbc185d83d134035ee465d20e48e738e Mon Sep 17 00:00:00 2001
From: Audrow Nash <audrow@intrinsic.ai>
Date: Mon, 13 Nov 2023 21:50:25 +0000
Subject: [PATCH 2/5] 1.1.2

Signed-off-by: Audrow Nash <audrow@intrinsic.ai>
---
 CHANGELOG.rst | 5 +++++
 package.xml   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ac82810..975d666 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package python_qt_binding
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.2 (2023-11-13)
+------------------
+* Fix to allow ninja to use make for generators (`#123 <https://github.com/ros-visualization/python_qt_binding/issues/123>`_) (`#128 <https://github.com/ros-visualization/python_qt_binding/issues/128>`_)
+* Contributors: Yasushi SHOJI
+
 1.1.1 (2021-12-06)
 ------------------
 * Replace PythonInterp to Python3 COMPONENTS (`#108 <https://github.com/ros-visualization/python_qt_binding/issues/108>`_)
diff --git a/package.xml b/package.xml
index ac11bb1..0881b1d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>python_qt_binding</name>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <description>
     This stack provides Python bindings for Qt.
     There are two providers: pyside and pyqt.  PySide2 is available under

From 5d1a591f48d45fbb1e6fbaab2d9f7445a6d99859 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 16:05:58 +0200
Subject: [PATCH 3/5] fix setuptools deprecation (#151) (#155)

(cherry picked from commit 7a013569b355b4b4e04c138dedb075ce4b7bcab1)

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Co-authored-by: mosfet80 <10235105+mosfet80@users.noreply.github.com>
Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
---
 setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 5fd3c3b..0a9e28b 100755
--- a/setup.py
+++ b/setup.py
@@ -38,10 +38,8 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'License :: OSI Approved :: BSD License',
-        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
     ],
+    license: ['BSD'],
 })
 
 setup(**d)

From 6da8eb76b0cdb26ab40ad0b91c78cbeca1564d40 Mon Sep 17 00:00:00 2001
From: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Date: Wed, 8 Oct 2025 16:10:45 +0200
Subject: [PATCH 4/5] Changelog

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
---
 CHANGELOG.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 975d666..4be4ebf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package python_qt_binding
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.3 (2025-10-08)
+------------------
+* fix setuptools deprecation (`#151 <https://github.com/ros-visualization/python_qt_binding/issues/151>`_) (`#155 <https://github.com/ros-visualization/python_qt_binding/issues/155>`_)
+* Contributors: mergify[bot]
+
 1.1.2 (2023-11-13)
 ------------------
 * Fix to allow ninja to use make for generators (`#123 <https://github.com/ros-visualization/python_qt_binding/issues/123>`_) (`#128 <https://github.com/ros-visualization/python_qt_binding/issues/128>`_)

From 3ef972ed8ddd495bb5ddbb0d7fc3e9cc6056d640 Mon Sep 17 00:00:00 2001
From: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Date: Wed, 8 Oct 2025 16:10:51 +0200
Subject: [PATCH 5/5] 1.1.3

---
 package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.xml b/package.xml
index 0881b1d..69cd730 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>python_qt_binding</name>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <description>
     This stack provides Python bindings for Qt.
     There are two providers: pyside and pyqt.  PySide2 is available under