Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] remove packages: laditools, python-{xdg,distutils-extra,gobject}
@ 2022-03-03 20:58 paper42
  2022-03-03 21:00 ` [PR PATCH] [Updated] " paper42
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: paper42 @ 2022-03-03 20:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages laditools
https://github.com/void-linux/void-packages/pull/35953

remove packages: laditools, python-{xdg,distutils-extra,gobject}
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

@CameronNemo 
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35953.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-laditools-35953.patch --]
[-- Type: text/x-diff, Size: 13814 bytes --]

From 99f0e61e0b3c6d4f35aef6a16078e302cec0e676 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <rossgammon@mail.dk>
-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 <cnemo@tutanota.com>"
-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 c9114fc0458e..30228322bfe4 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 f38e1d322683e861fd5c710c07752a0585da5ff3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
-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 <orphan@voidlinux.org>"
+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 30228322bfe4..d879ba61da83 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -294,6 +294,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 06579c9a7a2978acf0676ece6d8f5edb62e30ad4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 13 +++++++++++++
 srcpkgs/removed-packages/template        |  1 +
 4 files changed, 14 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 <orphan@voidlinux.org>"
-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..565e602f8066
--- /dev/null
+++ b/srcpkgs/python3-distutils-extra/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-distutils-extra'
+pkgname=python3-distutils-extra
+version=2.39
+revision=8
+build_style=python3-module
+hostmakedepends="intltool python3-setuptools"
+depends="python3"
+short_desc="Enhancements to the Python3 build system"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d879ba61da83..bef0217b4a92 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -269,6 +269,7 @@ replaces="
  python-audit<=2.8.5_2
  python-chardet<=4.0.0_3
  python-crypto<=3.9.7_3
+ python-distutils-extra<=2.39_8
  python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-evdev<=1.2.0_5

From 3c4cafaafcbddb5d22b0412686f35161c4030d59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
-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 bef0217b4a92..1a792afe79e2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -274,6 +274,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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-03-05 22:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-03 20:58 [PR PATCH] remove packages: laditools, python-{xdg,distutils-extra,gobject} paper42
2022-03-03 21:00 ` [PR PATCH] [Updated] " paper42
2022-03-03 21:26 ` paper42
2022-03-05 21:40 ` CameronNemo
2022-03-05 22:29 ` [PR PATCH] [Updated] " paper42
2022-03-05 22:32 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).