From b5e400eb8ec5cd4e512643ad01b5e46be0a39bc9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 3 Mar 2022 21:32:55 +0100 Subject: [PATCH 1/4] laditools: remove package --- srcpkgs/laditools/patches/enum34.patch | 26 -------------------------- srcpkgs/laditools/patches/vte3.patch | 21 --------------------- srcpkgs/laditools/template | 18 ------------------ srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 srcpkgs/laditools/patches/enum34.patch delete mode 100644 srcpkgs/laditools/patches/vte3.patch delete mode 100644 srcpkgs/laditools/template diff --git a/srcpkgs/laditools/patches/enum34.patch b/srcpkgs/laditools/patches/enum34.patch deleted file mode 100644 index ade42e4fc335..000000000000 --- a/srcpkgs/laditools/patches/enum34.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 97b8cf3d7abb33aa664cf09aae826362730eef87 -Author: Ross Gammon -Date: Tue Mar 8 00:02:09 2016 +0100 - - Port from python-enum to python-enum34 - - Fixes Debian Bug #800805 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800805 - -diff --git laditools/ladish.py laditools/ladish.py -index 3613149..21fc53b 100644 ---- a/laditools/ladish.py -+++ b/laditools/ladish.py -@@ -28,10 +28,8 @@ control_obj_path = "/org/ladish/Control" - studio_obj_path = "/org/ladish/Studio" - service_name = name_base - --LadishStatusType = Enum("STUDIO_STOPPED", -- "NOT_AVAILABLE", -- "NO_STUDIO_LOADED", -- "STUDIO_RUNNING") -+LadishStatusType = Enum("LadishStatusType", -+ "STUDIO_STOPPED NOT_AVAILABLE NO_STUDIO_LOADED STUDIO_RUNNING") - - class LadishProxyError(Exception): pass - class LadishStudioException(Exception): pass diff --git a/srcpkgs/laditools/patches/vte3.patch b/srcpkgs/laditools/patches/vte3.patch deleted file mode 100644 index c84cca1dc0e6..000000000000 --- a/srcpkgs/laditools/patches/vte3.patch +++ /dev/null @@ -1,21 +0,0 @@ -Support for vte >= 0.52. -See https://bugs.launchpad.net/ubuntu/+source/laditools/+bug/1669111. - ---- a/ladi-system-log 2015-09-13 23:38:51.000000000 +0200 -+++ b/ladi-system-log 2018-10-17 18:04:59.687899590 +0200 -@@ -190,13 +190,13 @@ - - def on_clear_text (self, data=None): - current_view = self.logview_notebook.get_current_page () -- self.log_files[current_view]["term"].feed ("\033[2J\033[;f", -1) -+ self.log_files[current_view]["term"].feed ("\033[2J\033[;f") - - def on_purge (self, data=None): - current_view = self.logview_notebook.get_current_page () - # Opens the file in write anew mode thus clearing the file and close it right away - open (self.log_files[current_view]['logfile_path'], "w+") -- self.log_files[current_view]["term"].feed ("\033[2J\033[;f", -1) -+ self.log_files[current_view]["term"].feed ("\033[2J\033[;f") - - def run (self): - self.ui.show_all() diff --git a/srcpkgs/laditools/template b/srcpkgs/laditools/template deleted file mode 100644 index 596f955b9d0c..000000000000 --- a/srcpkgs/laditools/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'laditools' -pkgname=laditools -version=1.1.0 -revision=3 -build_style=python2-module -hostmakedepends="python-distutils-extra intltool librsvg-utils" -depends="ladish jack gtk+3 python-gobject python-dbus python-enum34 python-xdg vte3" -short_desc="Linux Audio Desktop Integration Tools" -maintainer="Cameron Nemo " -license="GPL-3.0-or-later" -homepage="https://github.com/alessio/laditools" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=ca99f4b6e17b7333ed87dd12a2d91da4d486e53d89dd2677edfa29170ec6efe5 - -post_install() { - # remove wmladi, we do not have wmdocklib. - rm -f ${DESTDIR}/usr/bin/wmladi -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8aef3321c955..c290f8db8061 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -196,6 +196,7 @@ replaces=" keepassx2<=2.0.3_2 keepassx<=0.4.4_2 key-mon<=1.17_5 + laditools<=1.1.0_3 libapp<=20140527_2 libco-devel<=20_1 libco<=20_1 From d70f4603a0352f672b719b20f7933ef0eb56618a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 3 Mar 2022 21:35:30 +0100 Subject: [PATCH 2/4] python-xdg: remove package --- srcpkgs/python-xdg/template | 24 ---------------------- srcpkgs/python3-xdg | 1 - srcpkgs/python3-xdg/template | 14 +++++++++++++ srcpkgs/{python-xdg => python3-xdg}/update | 0 srcpkgs/removed-packages/template | 1 + 5 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/python-xdg/template delete mode 120000 srcpkgs/python3-xdg create mode 100644 srcpkgs/python3-xdg/template rename srcpkgs/{python-xdg => python3-xdg}/update (100%) diff --git a/srcpkgs/python-xdg/template b/srcpkgs/python-xdg/template deleted file mode 100644 index 09f1dc1ce2c0..000000000000 --- a/srcpkgs/python-xdg/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python-xdg' -pkgname=python-xdg -version=0.27 -revision=2 -wrksrc="pyxdg-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python" -pycompile_module="xdg" -short_desc="Python2 library to access freedesktop.org standards" -maintainer="Orphaned " -license="LGPL-2.0-only" -homepage="https://freedesktop.org/Software/pyxdg" -distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz" -checksum=80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5 - -python3-xdg_package() { - depends="python3" - pycompile_module="xdg" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-xdg b/srcpkgs/python3-xdg deleted file mode 120000 index 9d570c8450d5..000000000000 --- a/srcpkgs/python3-xdg +++ /dev/null @@ -1 +0,0 @@ -python-xdg \ No newline at end of file diff --git a/srcpkgs/python3-xdg/template b/srcpkgs/python3-xdg/template new file mode 100644 index 000000000000..a206480fd45d --- /dev/null +++ b/srcpkgs/python3-xdg/template @@ -0,0 +1,14 @@ +# Template file for 'python3-xdg' +pkgname=python3-xdg +version=0.27 +revision=2 +wrksrc="pyxdg-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +short_desc="Python3 library to access freedesktop.org standards" +maintainer="Orphaned " +license="LGPL-2.0-only" +homepage="https://freedesktop.org/Software/pyxdg" +distfiles="${PYPI_SITE}/p/pyxdg/pyxdg-${version}.tar.gz" +checksum=80bd93aae5ed82435f20462ea0208fb198d8eec262e831ee06ce9ddb6b91c5a5 diff --git a/srcpkgs/python-xdg/update b/srcpkgs/python3-xdg/update similarity index 100% rename from srcpkgs/python-xdg/update rename to srcpkgs/python3-xdg/update diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index c290f8db8061..4e7e6de1cbc6 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -301,6 +301,7 @@ replaces=" python-sqlite<=2.8.3_1 python-unicorn>=0 python-urllib3<=1.26.6_2 + python-xdg<=0.27_2 python-xlib<0.29_1 python3-Django<=3.0.7_2 python3-SPARQLWrapper<=1.8.4_4 From 8f02a86c51ece562524d3b60024df459deba3ff8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 3 Mar 2022 21:39:19 +0100 Subject: [PATCH 3/4] python-distutils-extra: remove package --- srcpkgs/python-distutils-extra/template | 21 --------------------- srcpkgs/python3-distutils-extra | 1 - srcpkgs/python3-distutils-extra/template | 14 ++++++++++++++ srcpkgs/removed-packages/template | 1 + 4 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/python-distutils-extra/template delete mode 120000 srcpkgs/python3-distutils-extra create mode 100644 srcpkgs/python3-distutils-extra/template diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template deleted file mode 100644 index ca6940049ad0..000000000000 --- a/srcpkgs/python-distutils-extra/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'python-distutils-extra' -pkgname=python-distutils-extra -version=2.39 -revision=8 -build_style=python-module -hostmakedepends="intltool python-setuptools python3-setuptools" -depends="python" -short_desc="Enhancements to the Python2 build system" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="https://launchpad.net/python-distutils-extra" -distfiles="http://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.gz" -checksum=723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af - -python3-distutils-extra_package() { - depends="python3" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-distutils-extra b/srcpkgs/python3-distutils-extra deleted file mode 120000 index bc37f604bbcf..000000000000 --- a/srcpkgs/python3-distutils-extra +++ /dev/null @@ -1 +0,0 @@ -python-distutils-extra \ No newline at end of file diff --git a/srcpkgs/python3-distutils-extra/template b/srcpkgs/python3-distutils-extra/template new file mode 100644 index 000000000000..fbdcf97f8527 --- /dev/null +++ b/srcpkgs/python3-distutils-extra/template @@ -0,0 +1,14 @@ +# Template file for 'python3-distutils-extra' +pkgname=python3-distutils-extra +version=2.39 +revision=8 +wrksrc="python-distutils-extra-$version" +build_style=python3-module +hostmakedepends="intltool python3-setuptools" +depends="python3" +short_desc="Enhancements to the Python3 build system" +maintainer="Orphaned " +license="GPL-2.0-or-later" +homepage="https://launchpad.net/python-distutils-extra" +distfiles="http://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-distutils-extra-${version}.tar.gz" +checksum=723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 4e7e6de1cbc6..19fda67bd024 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -273,6 +273,7 @@ replaces=" python-configobj<=5.0.6_9 python-crypto<=3.9.7_3 python-cryptography_vectors<=3.3.2_1 + python-distutils-extra<=2.39_8 python-docutils<=0.16_3 python-enchant<=2.0.0_4 python-evdev<=1.2.0_5 From b2879f0d3eb4b800b177b4a4a7ae2ab56e80fa1a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 3 Mar 2022 21:41:44 +0100 Subject: [PATCH 4/4] python-gobject: remove package --- common/build-helper/gir.sh | 2 +- srcpkgs/python-gobject-devel | 1 - srcpkgs/python-gobject/template | 29 ----------------------------- srcpkgs/python-gobject/update | 1 - srcpkgs/removed-packages/template | 2 ++ 5 files changed, 3 insertions(+), 32 deletions(-) delete mode 120000 srcpkgs/python-gobject-devel delete mode 100644 srcpkgs/python-gobject/template delete mode 100644 srcpkgs/python-gobject/update diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh index a9e63621320d..0091fb31ad93 100644 --- a/common/build-helper/gir.sh +++ b/common/build-helper/gir.sh @@ -32,7 +32,7 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then export VAPIGEN_GIRDIRS=${XBPS_CROSS_BASE}/usr/share/gir-1.0 # Provide some packages in hostmakedepends if they are in makedepends - for f in gtk+3-devel python-gobject-devel python3-gobject-devel; do + for f in gtk+3-devel python3-gobject-devel; do if [[ $makedepends == *"${f}"* ]]; then hostmakedepends+=" ${f}" fi diff --git a/srcpkgs/python-gobject-devel b/srcpkgs/python-gobject-devel deleted file mode 120000 index 4af4eca59087..000000000000 --- a/srcpkgs/python-gobject-devel +++ /dev/null @@ -1 +0,0 @@ -python-gobject \ No newline at end of file diff --git a/srcpkgs/python-gobject/template b/srcpkgs/python-gobject/template deleted file mode 100644 index 0ea5cc9361ee..000000000000 --- a/srcpkgs/python-gobject/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'python-gobject' -pkgname=python-gobject -version=3.36.1 -revision=2 -wrksrc="pygobject-${version}" -build_style=meson -build_helper="gir" -configure_args="-Dpython=python2.7" -hostmakedepends="pkg-config python" -makedepends="libglib-devel python-cairo-devel python-devel" -depends="gir-freedesktop python-cairo" -short_desc="Python2 bindings for GObject" -maintainer="Enno Boland " -license="LGPL-2.1-or-later" -homepage="https://pygobject.readthedocs.io/" -distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" -checksum=d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f - -python-gobject-devel_package() { - depends="libgirepository-devel python-cairo-devel - libglib-devel libffi-devel - python-gobject>=${version}_${revision}" - conflicts="python3-gobject-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/python-gobject/update b/srcpkgs/python-gobject/update deleted file mode 100644 index 46e4c1470741..000000000000 --- a/srcpkgs/python-gobject/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="pygobject" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 19fda67bd024..91cf9a4dd924 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,8 @@ replaces=" python-enchant<=2.0.0_4 python-evdev<=1.2.0_5 python-gntp<=1.0.3_7 + python-gobject-devel<=3.36.1_2 + python-gobject<=3.36.1_2 python-iso8601<=0.1.16_2 python-jellyfish<=0.6.1_2 python-lockfile<=0.12.2_7