From 941bf0367cf7c7a069c72bd24d29d7b6a71d060e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 30 May 2020 12:57:22 +0200
Subject: [PATCH] =?UTF-8?q?[wip/py-{qt-=20=E2=86=92=20}pythonqt]=20Rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As pythonqt v3.2 is not compatible with Qt4 anymore
---
Makefile | 2 +-
{py-qt-pythonqt => py-pythonqt}/DESCR | 0
{py-qt-pythonqt => py-pythonqt}/Makefile | 5 ++--
{py-qt-pythonqt => py-pythonqt}/PLIST | 0
py-pythonqt/depend.mk | 29 ++++++++++++++++++
{py-qt-pythonqt => py-pythonqt}/distinfo | 0
.../patches/patch-aa | 0
py-qt-pythonqt/depend.mk | 30 -------------------
8 files changed, 32 insertions(+), 34 deletions(-)
rename {py-qt-pythonqt => py-pythonqt}/DESCR (100%)
rename {py-qt-pythonqt => py-pythonqt}/Makefile (91%)
rename {py-qt-pythonqt => py-pythonqt}/PLIST (100%)
create mode 100644 py-pythonqt/depend.mk
rename {py-qt-pythonqt => py-pythonqt}/distinfo (100%)
rename {py-qt-pythonqt => py-pythonqt}/patches/patch-aa (100%)
delete mode 100644 py-qt-pythonqt/depend.mk
diff --git a/Makefile b/Makefile
index 1b5c4a00..3eb9aa06 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ SUBDIR+= py-prf-ros-controllers
SUBDIR+= py-pycddlib
SUBDIR+= py-qpoases
SUBDIR+= py-qt-gepetto-pythonqt
-SUBDIR+= py-qt-pythonqt
+SUBDIR+= py-pythonqt
SUBDIR+= py-ros-baxter-common
SUBDIR+= py-roscontrol-sot
SUBDIR+= py-scs
diff --git a/py-qt-pythonqt/DESCR b/py-pythonqt/DESCR
similarity index 100%
rename from py-qt-pythonqt/DESCR
rename to py-pythonqt/DESCR
diff --git a/py-qt-pythonqt/Makefile b/py-pythonqt/Makefile
similarity index 91%
rename from py-qt-pythonqt/Makefile
rename to py-pythonqt/Makefile
index 8d7a4e99..3394f9d0 100644
--- a/py-qt-pythonqt/Makefile
+++ b/py-pythonqt/Makefile
@@ -1,4 +1,4 @@
-# robotpkg Makefile for: wip/py38-qt5-PythonQt
+# robotpkg Makefile for: wip/py38-PythonQt
# Created: Guilhem Saurel on Wed, 27 May 2020
#
@@ -7,7 +7,7 @@ NAME= PythonQt
VERSION= 3.2
DISTNAME= ${NAME}${VERSION}
-PKGNAME= ${PKGTAG.python-}${PKGTAG.qt-}${NAME}-${VERSION}
+PKGNAME= ${PKGTAG.python-}${NAME}-${VERSION}
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
@@ -19,7 +19,6 @@ COMMENT= Dynamic Python binding for Qt Applications
LICENSE= gnu-lgpl-v2.1
MAINTAINER= guilhem.saurel@laas.fr
-QMAKE_ARGS+= QT_MAJOR_VERSION=${QT_SELECT}
QMAKE_ARGS+= CONFIG+=release
SUBST_CLASSES+= py-ver
diff --git a/py-qt-pythonqt/PLIST b/py-pythonqt/PLIST
similarity index 100%
rename from py-qt-pythonqt/PLIST
rename to py-pythonqt/PLIST
diff --git a/py-pythonqt/depend.mk b/py-pythonqt/depend.mk
new file mode 100644
index 00000000..e79aa9fd
--- /dev/null
+++ b/py-pythonqt/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for: wip/py38-PythonQt
+# Created: Guilhem Saurel on Wed, 27 May 2020
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+PY_PYTHONQT_DEPEND_MK:= ${PY_PYTHONQT_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= py-pythonqt
+endif
+
+ifeq (+,$(PY_PYTHONQT_DEPEND_MK)) # ------------------------------------------
+
+PREFER.py-pythonqt?= robotpkg
+
+SYSTEM_SEARCH.py-pythonqt= \
+ 'include/PythonQt/PythonQt.h' \
+ 'lib/libPythonQt-Qt5-Python${PYTHON_VERSION}.so'
+
+DEPEND_USE+= py-pythonqt
+
+DEPEND_ABI.py-pythonqt?= ${PKGTAG.python}-PythonQt>=3.2
+DEPEND_DIR.py-pythonqt?= ../../wip/py-pythonqt
+
+include ../../mk/sysdep/python.mk
+
+endif # PY_PYTHONQT_DEPEND_MK ------------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/py-qt-pythonqt/distinfo b/py-pythonqt/distinfo
similarity index 100%
rename from py-qt-pythonqt/distinfo
rename to py-pythonqt/distinfo
diff --git a/py-qt-pythonqt/patches/patch-aa b/py-pythonqt/patches/patch-aa
similarity index 100%
rename from py-qt-pythonqt/patches/patch-aa
rename to py-pythonqt/patches/patch-aa
diff --git a/py-qt-pythonqt/depend.mk b/py-qt-pythonqt/depend.mk
deleted file mode 100644
index c1d3c5bc..00000000
--- a/py-qt-pythonqt/depend.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg depend.mk for: wip/py38-qt5-PythonQt
-# Created: Guilhem Saurel on Wed, 27 May 2020
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-PY_QT_PYTHONQT_DEPEND_MK:= ${PY_QT_PYTHONQT_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= py-qt-pythonqt
-endif
-
-ifeq (+,$(PY_QT_PYTHONQT_DEPEND_MK)) # ------------------------------------------
-
-PREFER.py-qt-pythonqt?= robotpkg
-
-SYSTEM_SEARCH.py-qt-pythonqt= \
- 'include/PythonQt/PythonQt.h' \
- 'lib/libPythonQt-Qt5-Python${PYTHON_VERSION}.so'
-
-DEPEND_USE+= py-qt-pythonqt
-
-DEPEND_ABI.py-qt-pythonqt?= ${PKGTAG.python}-${PKGTAG.qt}-PythonQt>=3.2
-DEPEND_DIR.py-qt-pythonqt?= ../../wip/py-qt-pythonqt
-
-include ../../mk/sysdep/python.mk
-include ../../mk/sysdep/qt.mk
-
-endif # PY_QT_PYTHONQT_DEPEND_MK ------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
--
GitLab