From e7ccbf6d4b9c70d1e962b3757e7cf052d5df3204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Sep 2020 19:41:25 +0700 Subject: [PATCH 1/4] python-PyQt5-webengine: drop package Last user: calibre moved to Python 3 --- srcpkgs/python-PyQt5-webengine/template | 44 ------------------------- srcpkgs/python-PyQt5-webengine/update | 1 - 2 files changed, 45 deletions(-) delete mode 100644 srcpkgs/python-PyQt5-webengine/template delete mode 100644 srcpkgs/python-PyQt5-webengine/update diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template deleted file mode 100644 index 257a9e1387b..00000000000 --- a/srcpkgs/python-PyQt5-webengine/template +++ /dev/null @@ -1,44 +0,0 @@ -# Template file for 'python-PyQt5-webengine' -pkgname=python-PyQt5-webengine -version=5.15.0 -revision=1 -wrksrc="PyQtWebEngine-${version}" -hostmakedepends="pkg-config qt5-qmake python python-PyQt5" -makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel - qt5-webengine-devel python-devel python-PyQt5-devel" -depends="python-PyQt5>=${version}_1 python-PyQt5-webchannel>=${version}_1" -short_desc="Python2 bindings for the Qt5 toolkit - webengine module" -maintainer="Orphaned " -license="GPL-3.0-only" -homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" -distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz" -checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75 -lib32disabled=yes -nocross="configure script is broken for cross builds" - -case "$XBPS_TARGET_MACHINE" in - ppc64le*) ;; - ppc*) broken="no webengine for big endian ppc";; - arm*) broken="depends on qt5-webengine";; -esac - -post_extract() { - rm -rf pyuic/uic/port_v3 -} - -do_configure() { - python2 configure.py \ - QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" - QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP="" -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install - rm -rf ${DESTDIR}/usr/share -} diff --git a/srcpkgs/python-PyQt5-webengine/update b/srcpkgs/python-PyQt5-webengine/update deleted file mode 100644 index 4e03873e2a7..00000000000 --- a/srcpkgs/python-PyQt5-webengine/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="PyQtWebEngine_gpl" From 8a1ebd1b48e4e788fbf31ebfba6ff4db28cca2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Sep 2020 20:02:01 +0700 Subject: [PATCH 2/4] krita: build with python3-PyQt5-devel --- srcpkgs/krita/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index a3f5f8fbe16..df43b5b37b5 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=4.3.0 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 @@ -12,7 +12,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5 - python-PyQt5-devel quazip-devel libheif-devel" + python3-PyQt5-devel quazip-devel libheif-devel" short_desc="Painting and image editing program" maintainer="John " license="GPL-3.0-only" From 605a4603cc9970f8ceeb95308ac6bfcdaac9bf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Sep 2020 20:03:47 +0700 Subject: [PATCH 3/4] python-Pillow: depends on python-tkinter Since we're going to drop python-PyQt5 --- srcpkgs/python-Pillow/INSTALL.msg | 2 -- srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg | 2 -- srcpkgs/python-Pillow/template | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 srcpkgs/python-Pillow/INSTALL.msg delete mode 100644 srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg diff --git a/srcpkgs/python-Pillow/INSTALL.msg b/srcpkgs/python-Pillow/INSTALL.msg deleted file mode 100644 index 256e374e98e..00000000000 --- a/srcpkgs/python-Pillow/INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -To use the Tk image interface install python-tkinter. -To use the Qt image interface install python-PyQt5. diff --git a/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg b/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg deleted file mode 100644 index 8ce8ed66afd..00000000000 --- a/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg +++ /dev/null @@ -1,2 +0,0 @@ -To use the Tk image interface install python3-tkinter. -To use the Qt image interface install python3-PyQt5. diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template index 1e36fc16e19..072f37b611b 100644 --- a/srcpkgs/python-Pillow/template +++ b/srcpkgs/python-Pillow/template @@ -1,13 +1,13 @@ # Template file for 'python-Pillow' pkgname=python-Pillow version=6.2.2 -revision=2 +revision=3 wrksrc="Pillow-${version}" build_style=python2-module hostmakedepends="python-setuptools" makedepends="python-devel libjpeg-turbo-devel libopenjpeg2-devel tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel" -depends="python" +depends="python python-tkinter" short_desc="Python Imaging Library (PIL) fork for Python2" maintainer="Alessio Sergi " license="custom:PIL" From 3b2cbf626a3095953aced024a7ba787316ec717f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 28 Sep 2020 20:05:40 +0700 Subject: [PATCH 4/4] python-PyQt5: drop package --- srcpkgs/python-PyQt5-connectivity | 1 - srcpkgs/python-PyQt5-dbus | 1 - srcpkgs/python-PyQt5-devel | 1 - srcpkgs/python-PyQt5-devel-tools | 1 - srcpkgs/python-PyQt5-location | 1 - srcpkgs/python-PyQt5-multimedia | 1 - srcpkgs/python-PyQt5-networkauth | 1 - srcpkgs/python-PyQt5-opengl | 1 - srcpkgs/python-PyQt5-quick | 1 - srcpkgs/python-PyQt5-sensors | 1 - srcpkgs/python-PyQt5-serialport | 1 - srcpkgs/python-PyQt5-sql | 1 - srcpkgs/python-PyQt5-svg | 1 - srcpkgs/python-PyQt5-tools | 1 - srcpkgs/python-PyQt5-webchannel | 1 - srcpkgs/python-PyQt5-webkit | 1 - srcpkgs/python-PyQt5-websockets | 1 - srcpkgs/python-PyQt5-x11extras | 1 - srcpkgs/python-PyQt5-xmlpatterns | 1 - srcpkgs/python-PyQt5/template | 250 ------------------------------ srcpkgs/python-PyQt5/update | 1 - 21 files changed, 270 deletions(-) delete mode 120000 srcpkgs/python-PyQt5-connectivity delete mode 120000 srcpkgs/python-PyQt5-dbus delete mode 120000 srcpkgs/python-PyQt5-devel delete mode 120000 srcpkgs/python-PyQt5-devel-tools delete mode 120000 srcpkgs/python-PyQt5-location delete mode 120000 srcpkgs/python-PyQt5-multimedia delete mode 120000 srcpkgs/python-PyQt5-networkauth delete mode 120000 srcpkgs/python-PyQt5-opengl delete mode 120000 srcpkgs/python-PyQt5-quick delete mode 120000 srcpkgs/python-PyQt5-sensors delete mode 120000 srcpkgs/python-PyQt5-serialport delete mode 120000 srcpkgs/python-PyQt5-sql delete mode 120000 srcpkgs/python-PyQt5-svg delete mode 120000 srcpkgs/python-PyQt5-tools delete mode 120000 srcpkgs/python-PyQt5-webchannel delete mode 120000 srcpkgs/python-PyQt5-webkit delete mode 120000 srcpkgs/python-PyQt5-websockets delete mode 120000 srcpkgs/python-PyQt5-x11extras delete mode 120000 srcpkgs/python-PyQt5-xmlpatterns delete mode 100644 srcpkgs/python-PyQt5/template delete mode 100644 srcpkgs/python-PyQt5/update diff --git a/srcpkgs/python-PyQt5-connectivity b/srcpkgs/python-PyQt5-connectivity deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-connectivity +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-dbus b/srcpkgs/python-PyQt5-dbus deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-dbus +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-devel b/srcpkgs/python-PyQt5-devel deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-devel +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-devel-tools b/srcpkgs/python-PyQt5-devel-tools deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-devel-tools +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-location b/srcpkgs/python-PyQt5-location deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-location +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-multimedia b/srcpkgs/python-PyQt5-multimedia deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-multimedia +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-networkauth b/srcpkgs/python-PyQt5-networkauth deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-networkauth +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-opengl b/srcpkgs/python-PyQt5-opengl deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-opengl +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-quick b/srcpkgs/python-PyQt5-quick deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-quick +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-sensors b/srcpkgs/python-PyQt5-sensors deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-sensors +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-serialport b/srcpkgs/python-PyQt5-serialport deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-serialport +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-sql b/srcpkgs/python-PyQt5-sql deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-sql +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-svg b/srcpkgs/python-PyQt5-svg deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-svg +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-tools b/srcpkgs/python-PyQt5-tools deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-tools +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-webchannel b/srcpkgs/python-PyQt5-webchannel deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-webchannel +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-webkit b/srcpkgs/python-PyQt5-webkit deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-webkit +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-websockets b/srcpkgs/python-PyQt5-websockets deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-websockets +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-x11extras b/srcpkgs/python-PyQt5-x11extras deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-x11extras +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5-xmlpatterns b/srcpkgs/python-PyQt5-xmlpatterns deleted file mode 120000 index 7e24798936c..00000000000 --- a/srcpkgs/python-PyQt5-xmlpatterns +++ /dev/null @@ -1 +0,0 @@ -python-PyQt5 \ No newline at end of file diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template deleted file mode 100644 index 3848b368a05..00000000000 --- a/srcpkgs/python-PyQt5/template +++ /dev/null @@ -1,250 +0,0 @@ -# Template file for 'python-PyQt5' -pkgname=python-PyQt5 -version=5.15.0 -revision=1 -_sipver=4.19.23 -wrksrc="PyQt5-${version}" -hostmakedepends="pkg-config - python-devel python-sip-devel python-dbus-devel qt5 - qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel - qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel - qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel - qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel - python-enum34" -makedepends="${hostmakedepends/pkg-config/}" -depends="python-sip-PyQt5>=${_sipver} python-enum34" -short_desc="Python 2 bindings for the Qt5 toolkit" -maintainer="Orphaned " -license="GPL-3.0-only" -homepage="https://riverbankcomputing.com/software/pyqt/intro" -distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz" -checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9 -lib32disabled=yes - -post_extract() { - rm -rf pyuic/uic/port_v3 -} - -do_configure() { - local _sysroot= _configuration= qt_version - if [ "$CROSS_BUILD" ]; then - qt_version=$(qmake -query QT_VERSION) - _sysroot="--sysroot $XBPS_CROSS_BASE" - _configuration="--configuration $wrksrc/pyqt5_${XBPS_CROSS_TRIPLET}.cfg" - cat >pyqt5_${XBPS_CROSS_TRIPLET}.cfg <