* [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify
@ 2022-07-24 5:00 classabbyamp
2022-07-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-24 5:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/python3-rdflib
https://github.com/void-linux/void-packages/pull/38232
python3-rdflib: update, remove python-rdflib; remove python-notify
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/38232.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/python3-rdflib-38232.patch --]
[-- Type: text/x-diff, Size: 10159 bytes --]
From dca9bf426602dad321cd8dab97fc5af98dd949db Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:32:47 -0400
Subject: [PATCH 1/2] python3-rdflib: update to 6.2.0, remove python-rdflib.
---
srcpkgs/python-rdflib/template | 43 -------------------
srcpkgs/python3-rdflib | 1 -
srcpkgs/python3-rdflib/patches/setup.patch | 9 ++++
srcpkgs/python3-rdflib/template | 27 ++++++++++++
.../{python-rdflib => python3-rdflib}/update | 0
srcpkgs/removed-packages/template | 1 +
6 files changed, 37 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/python-rdflib/template
delete mode 120000 srcpkgs/python3-rdflib
create mode 100644 srcpkgs/python3-rdflib/patches/setup.patch
create mode 100644 srcpkgs/python3-rdflib/template
rename srcpkgs/{python-rdflib => python3-rdflib}/update (100%)
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
deleted file mode 100644
index 889ffcb7fa53..000000000000
--- a/srcpkgs/python-rdflib/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-rdflib'
-pkgname=python-rdflib
-version=4.2.2
-revision=6
-wrksrc="rdflib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-isodate python-parsing"
-pycompile_module="rdflib"
-short_desc="Python2 library for working with RDF"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/RDFLib/rdflib"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/r/rdflib/rdflib-${version}.tar.gz"
-checksum=da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
-
-alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf2
- rdflib:rdf2dot:/usr/bin/rdf2dot2
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism2
- rdflib:rdfpipe:/usr/bin/rdfpipe2
- rdflib:rdfs2dot:/usr/bin/rdfs2dot2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-rdflib_package() {
- alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf3
- rdflib:rdf2dot:/usr/bin/rdf2dot3
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism3
- rdflib:rdfpipe:/usr/bin/rdfpipe3
- rdflib:rdfs2dot:/usr/bin/rdfs2dot3"
- depends="python3-setuptools python3-isodate python3-parsing"
- pycompile_module="rdflib"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-rdflib b/srcpkgs/python3-rdflib
deleted file mode 120000
index 22f10c1cbefa..000000000000
--- a/srcpkgs/python3-rdflib
+++ /dev/null
@@ -1 +0,0 @@
-python-rdflib
\ No newline at end of file
diff --git a/srcpkgs/python3-rdflib/patches/setup.patch b/srcpkgs/python3-rdflib/patches/setup.patch
new file mode 100644
index 000000000000..c7c6f1b06e6f
--- /dev/null
+++ b/srcpkgs/python3-rdflib/patches/setup.patch
@@ -0,0 +1,9 @@
+--- a/setup.py
++++ b/setup.py
+@@ -88,5 +88,5 @@
+ "rdfgraphisomorphism = rdflib.tools.graphisomorphism:main",
+ ],
+ },
+- **kwargs,
++ **kwargs
+ )
diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template
new file mode 100644
index 000000000000..6b18abc022d5
--- /dev/null
+++ b/srcpkgs/python3-rdflib/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-rdflib'
+pkgname=python3-rdflib
+version=6.2.0
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools python3-isodate python3-parsing"
+depends="${makedepends}"
+checkdepends="python3-pytest-cov python3-html5lib"
+short_desc="Python3 library for working with RDF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/RDFLib/rdflib"
+changelog="https://raw.githubusercontent.com/RDFLib/rdflib/master/CHANGELOG.md"
+distfiles="https://github.com/RDFLib/rdflib/archive/refs/tags/${version}.tar.gz"
+checksum=d4b920f44ad0f7bc4977d0163840bb2c4d9b8ec2d1dae92b0974d0d3d8b5a126
+
+post_install() {
+ vlicense LICENSE
+ # for compatibility
+ ln -s csv2rdf "${DESTDIR}/usr/bin/csv2rdf3"
+ ln -s rdf2dot "${DESTDIR}/usr/bin/rdf2dot3"
+ ln -s rdfgraphisomorphism "${DESTDIR}/usr/bin/rdfgraphisomorphism3"
+ ln -s rdfpipe "${DESTDIR}/usr/bin/rdfpipe3"
+ ln -s rdfs2dot "${DESTDIR}/usr/bin/rdfs2dot3"
+}
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python3-rdflib/update
similarity index 100%
rename from srcpkgs/python-rdflib/update
rename to srcpkgs/python3-rdflib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8456cb959d35..ba34f0e244d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,7 @@ replaces="
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
python-pytz<=2021.3_2
+ python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
From 75115d0a57c91ddeb370bd26f3617baa3f382da2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:51:45 -0400
Subject: [PATCH 2/2] python-notify: remove package
---
.../python-notify/patches/libnotify07.patch | 36 -------------------
.../notify-python-0.1.1-fix-GTK-symbols.patch | 25 -------------
srcpkgs/python-notify/template | 26 --------------
srcpkgs/python-notify/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 srcpkgs/python-notify/patches/libnotify07.patch
delete mode 100644 srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
delete mode 100644 srcpkgs/python-notify/template
delete mode 100644 srcpkgs/python-notify/update
diff --git a/srcpkgs/python-notify/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch
deleted file mode 100644
index 289573d50ae4..000000000000
--- a/srcpkgs/python-notify/patches/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "message" (null-ok) (default "NULL"))
- '("const-gchar*" "icon" (null-ok) (default "NULL"))
-- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
- )
- )
-
-@@ -53,24 +52,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "attach")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
diff --git a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c01363a0..000000000000
--- a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template
deleted file mode 100644
index 9bc07c76324e..000000000000
--- a/srcpkgs/python-notify/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-notify'
-pkgname=python-notify
-version=0.1.1
-revision=13
-wrksrc="notify-python-${version}"
-build_style=gnu-configure
-pycompile_module="gtk-2.0/pynotify"
-hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel"
-makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
-depends="pygtk"
-short_desc="Python2 bindings for libnotify"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="http://www.galago-project.org/"
-distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz"
-checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-replaces="notify-python>=0"
-lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/python-notify/update b/srcpkgs/python-notify/update
deleted file mode 100644
index bd14e9008e0b..000000000000
--- a/srcpkgs/python-notify/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="notify-python"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ba34f0e244d0..1dd47a33213b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -311,6 +311,7 @@ replaces="
python-matplotlib<=2.2.4_2
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
+ python-notify<=0.1.1_13
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
@ 2022-07-24 5:07 ` classabbyamp
2022-07-25 14:28 ` [PR REVIEW] " ahesford
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-24 5:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/python3-rdflib
https://github.com/void-linux/void-packages/pull/38232
python3-rdflib: update, remove python-rdflib; remove python-notify
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/38232.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/python3-rdflib-38232.patch --]
[-- Type: text/x-diff, Size: 10154 bytes --]
From 2959ea3a672873abc1f43c98688c921cf080af93 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:32:47 -0400
Subject: [PATCH 1/2] python3-rdflib: update to 6.2.0, remove python-rdflib.
---
srcpkgs/python-rdflib/template | 43 -------------------
srcpkgs/python3-rdflib | 1 -
srcpkgs/python3-rdflib/patches/setup.patch | 9 ++++
srcpkgs/python3-rdflib/template | 28 ++++++++++++
.../{python-rdflib => python3-rdflib}/update | 0
srcpkgs/removed-packages/template | 1 +
6 files changed, 38 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/python-rdflib/template
delete mode 120000 srcpkgs/python3-rdflib
create mode 100644 srcpkgs/python3-rdflib/patches/setup.patch
create mode 100644 srcpkgs/python3-rdflib/template
rename srcpkgs/{python-rdflib => python3-rdflib}/update (100%)
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
deleted file mode 100644
index 889ffcb7fa53..000000000000
--- a/srcpkgs/python-rdflib/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-rdflib'
-pkgname=python-rdflib
-version=4.2.2
-revision=6
-wrksrc="rdflib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-isodate python-parsing"
-pycompile_module="rdflib"
-short_desc="Python2 library for working with RDF"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/RDFLib/rdflib"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/r/rdflib/rdflib-${version}.tar.gz"
-checksum=da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
-
-alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf2
- rdflib:rdf2dot:/usr/bin/rdf2dot2
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism2
- rdflib:rdfpipe:/usr/bin/rdfpipe2
- rdflib:rdfs2dot:/usr/bin/rdfs2dot2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-rdflib_package() {
- alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf3
- rdflib:rdf2dot:/usr/bin/rdf2dot3
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism3
- rdflib:rdfpipe:/usr/bin/rdfpipe3
- rdflib:rdfs2dot:/usr/bin/rdfs2dot3"
- depends="python3-setuptools python3-isodate python3-parsing"
- pycompile_module="rdflib"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-rdflib b/srcpkgs/python3-rdflib
deleted file mode 120000
index 22f10c1cbefa..000000000000
--- a/srcpkgs/python3-rdflib
+++ /dev/null
@@ -1 +0,0 @@
-python-rdflib
\ No newline at end of file
diff --git a/srcpkgs/python3-rdflib/patches/setup.patch b/srcpkgs/python3-rdflib/patches/setup.patch
new file mode 100644
index 000000000000..c7c6f1b06e6f
--- /dev/null
+++ b/srcpkgs/python3-rdflib/patches/setup.patch
@@ -0,0 +1,9 @@
+--- a/setup.py
++++ b/setup.py
+@@ -88,5 +88,5 @@
+ "rdfgraphisomorphism = rdflib.tools.graphisomorphism:main",
+ ],
+ },
+- **kwargs,
++ **kwargs
+ )
diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template
new file mode 100644
index 000000000000..d91fc64d1491
--- /dev/null
+++ b/srcpkgs/python3-rdflib/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-rdflib'
+pkgname=python3-rdflib
+version=6.2.0
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools python3-isodate python3-parsing"
+depends="${makedepends}"
+short_desc="Python3 library for working with RDF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/RDFLib/rdflib"
+changelog="https://raw.githubusercontent.com/RDFLib/rdflib/master/CHANGELOG.md"
+distfiles="https://github.com/RDFLib/rdflib/archive/refs/tags/${version}.tar.gz"
+checksum=d4b920f44ad0f7bc4977d0163840bb2c4d9b8ec2d1dae92b0974d0d3d8b5a126
+# pytest test collection fails
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+ # for compatibility
+ ln -s csv2rdf "${DESTDIR}/usr/bin/csv2rdf3"
+ ln -s rdf2dot "${DESTDIR}/usr/bin/rdf2dot3"
+ ln -s rdfgraphisomorphism "${DESTDIR}/usr/bin/rdfgraphisomorphism3"
+ ln -s rdfpipe "${DESTDIR}/usr/bin/rdfpipe3"
+ ln -s rdfs2dot "${DESTDIR}/usr/bin/rdfs2dot3"
+}
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python3-rdflib/update
similarity index 100%
rename from srcpkgs/python-rdflib/update
rename to srcpkgs/python3-rdflib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8456cb959d35..ba34f0e244d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,7 @@ replaces="
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
python-pytz<=2021.3_2
+ python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
From e62d9d28bc19ba9038b54a396f30180ae471bb6e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:51:45 -0400
Subject: [PATCH 2/2] python-notify: remove package
---
.../python-notify/patches/libnotify07.patch | 36 -------------------
.../notify-python-0.1.1-fix-GTK-symbols.patch | 25 -------------
srcpkgs/python-notify/template | 26 --------------
srcpkgs/python-notify/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 srcpkgs/python-notify/patches/libnotify07.patch
delete mode 100644 srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
delete mode 100644 srcpkgs/python-notify/template
delete mode 100644 srcpkgs/python-notify/update
diff --git a/srcpkgs/python-notify/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch
deleted file mode 100644
index 289573d50ae4..000000000000
--- a/srcpkgs/python-notify/patches/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "message" (null-ok) (default "NULL"))
- '("const-gchar*" "icon" (null-ok) (default "NULL"))
-- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
- )
- )
-
-@@ -53,24 +52,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "attach")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
diff --git a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c01363a0..000000000000
--- a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template
deleted file mode 100644
index 9bc07c76324e..000000000000
--- a/srcpkgs/python-notify/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-notify'
-pkgname=python-notify
-version=0.1.1
-revision=13
-wrksrc="notify-python-${version}"
-build_style=gnu-configure
-pycompile_module="gtk-2.0/pynotify"
-hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel"
-makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
-depends="pygtk"
-short_desc="Python2 bindings for libnotify"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="http://www.galago-project.org/"
-distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz"
-checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-replaces="notify-python>=0"
-lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/python-notify/update b/srcpkgs/python-notify/update
deleted file mode 100644
index bd14e9008e0b..000000000000
--- a/srcpkgs/python-notify/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="notify-python"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ba34f0e244d0..1dd47a33213b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -311,6 +311,7 @@ replaces="
python-matplotlib<=2.2.4_2
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
+ python-notify<=0.1.1_13
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
2022-07-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-07-25 14:28 ` ahesford
2022-07-25 14:37 ` classabbyamp
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2022-07-25 14:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/38232#discussion_r928952191
Comment:
Why is this change necessary? The interpreter should have no problem with `**kwargs,` here.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
2022-07-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
2022-07-25 14:28 ` [PR REVIEW] " ahesford
@ 2022-07-25 14:37 ` classabbyamp
2022-07-25 14:42 ` ahesford
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-25 14:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38232#discussion_r928962041
Comment:
not sure, it `SyntaxError`s
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (2 preceding siblings ...)
2022-07-25 14:37 ` classabbyamp
@ 2022-07-25 14:42 ` ahesford
2022-07-25 14:50 ` classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2022-07-25 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/38232#discussion_r928967712
Comment:
Not for me...
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (3 preceding siblings ...)
2022-07-25 14:42 ` ahesford
@ 2022-07-25 14:50 ` classabbyamp
2022-07-25 14:51 ` [PR PATCH] [Updated] " classabbyamp
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-25 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38232#discussion_r928976464
Comment:
weird, it was happening for me on multiple versions when I made that.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (4 preceding siblings ...)
2022-07-25 14:50 ` classabbyamp
@ 2022-07-25 14:51 ` classabbyamp
2022-07-26 3:15 ` classabbyamp
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-25 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/python3-rdflib
https://github.com/void-linux/void-packages/pull/38232
python3-rdflib: update, remove python-rdflib; remove python-notify
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/38232.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/python3-rdflib-38232.patch --]
[-- Type: text/x-diff, Size: 9618 bytes --]
From 5a3d27146a86c130b4a18f68644853177794c064 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:32:47 -0400
Subject: [PATCH 1/2] python3-rdflib: update to 6.2.0, remove python-rdflib.
---
srcpkgs/python-rdflib/template | 43 -------------------
srcpkgs/python3-rdflib | 1 -
srcpkgs/python3-rdflib/template | 28 ++++++++++++
.../{python-rdflib => python3-rdflib}/update | 0
srcpkgs/removed-packages/template | 1 +
5 files changed, 29 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/python-rdflib/template
delete mode 120000 srcpkgs/python3-rdflib
create mode 100644 srcpkgs/python3-rdflib/template
rename srcpkgs/{python-rdflib => python3-rdflib}/update (100%)
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
deleted file mode 100644
index 889ffcb7fa53..000000000000
--- a/srcpkgs/python-rdflib/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-rdflib'
-pkgname=python-rdflib
-version=4.2.2
-revision=6
-wrksrc="rdflib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-isodate python-parsing"
-pycompile_module="rdflib"
-short_desc="Python2 library for working with RDF"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/RDFLib/rdflib"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/r/rdflib/rdflib-${version}.tar.gz"
-checksum=da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
-
-alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf2
- rdflib:rdf2dot:/usr/bin/rdf2dot2
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism2
- rdflib:rdfpipe:/usr/bin/rdfpipe2
- rdflib:rdfs2dot:/usr/bin/rdfs2dot2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-rdflib_package() {
- alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf3
- rdflib:rdf2dot:/usr/bin/rdf2dot3
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism3
- rdflib:rdfpipe:/usr/bin/rdfpipe3
- rdflib:rdfs2dot:/usr/bin/rdfs2dot3"
- depends="python3-setuptools python3-isodate python3-parsing"
- pycompile_module="rdflib"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-rdflib b/srcpkgs/python3-rdflib
deleted file mode 120000
index 22f10c1cbefa..000000000000
--- a/srcpkgs/python3-rdflib
+++ /dev/null
@@ -1 +0,0 @@
-python-rdflib
\ No newline at end of file
diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template
new file mode 100644
index 000000000000..d91fc64d1491
--- /dev/null
+++ b/srcpkgs/python3-rdflib/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-rdflib'
+pkgname=python3-rdflib
+version=6.2.0
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools python3-isodate python3-parsing"
+depends="${makedepends}"
+short_desc="Python3 library for working with RDF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/RDFLib/rdflib"
+changelog="https://raw.githubusercontent.com/RDFLib/rdflib/master/CHANGELOG.md"
+distfiles="https://github.com/RDFLib/rdflib/archive/refs/tags/${version}.tar.gz"
+checksum=d4b920f44ad0f7bc4977d0163840bb2c4d9b8ec2d1dae92b0974d0d3d8b5a126
+# pytest test collection fails
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+ # for compatibility
+ ln -s csv2rdf "${DESTDIR}/usr/bin/csv2rdf3"
+ ln -s rdf2dot "${DESTDIR}/usr/bin/rdf2dot3"
+ ln -s rdfgraphisomorphism "${DESTDIR}/usr/bin/rdfgraphisomorphism3"
+ ln -s rdfpipe "${DESTDIR}/usr/bin/rdfpipe3"
+ ln -s rdfs2dot "${DESTDIR}/usr/bin/rdfs2dot3"
+}
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python3-rdflib/update
similarity index 100%
rename from srcpkgs/python-rdflib/update
rename to srcpkgs/python3-rdflib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8456cb959d35..ba34f0e244d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,7 @@ replaces="
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
python-pytz<=2021.3_2
+ python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
From 0445d1fc2cfc76f95c2b2b9e52608c73edfedb7f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:51:45 -0400
Subject: [PATCH 2/2] python-notify: remove package
---
.../python-notify/patches/libnotify07.patch | 36 -------------------
.../notify-python-0.1.1-fix-GTK-symbols.patch | 25 -------------
srcpkgs/python-notify/template | 26 --------------
srcpkgs/python-notify/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 srcpkgs/python-notify/patches/libnotify07.patch
delete mode 100644 srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
delete mode 100644 srcpkgs/python-notify/template
delete mode 100644 srcpkgs/python-notify/update
diff --git a/srcpkgs/python-notify/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch
deleted file mode 100644
index 289573d50ae4..000000000000
--- a/srcpkgs/python-notify/patches/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "message" (null-ok) (default "NULL"))
- '("const-gchar*" "icon" (null-ok) (default "NULL"))
-- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
- )
- )
-
-@@ -53,24 +52,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "attach")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
diff --git a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c01363a0..000000000000
--- a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template
deleted file mode 100644
index 9bc07c76324e..000000000000
--- a/srcpkgs/python-notify/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-notify'
-pkgname=python-notify
-version=0.1.1
-revision=13
-wrksrc="notify-python-${version}"
-build_style=gnu-configure
-pycompile_module="gtk-2.0/pynotify"
-hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel"
-makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
-depends="pygtk"
-short_desc="Python2 bindings for libnotify"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="http://www.galago-project.org/"
-distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz"
-checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-replaces="notify-python>=0"
-lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/python-notify/update b/srcpkgs/python-notify/update
deleted file mode 100644
index bd14e9008e0b..000000000000
--- a/srcpkgs/python-notify/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="notify-python"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ba34f0e244d0..1dd47a33213b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -311,6 +311,7 @@ replaces="
python-matplotlib<=2.2.4_2
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
+ python-notify<=0.1.1_13
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (5 preceding siblings ...)
2022-07-25 14:51 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-07-26 3:15 ` classabbyamp
2022-07-26 3:17 ` [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; " classabbyamp
2022-07-31 7:18 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-26 3:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/python3-rdflib
https://github.com/void-linux/void-packages/pull/38232
python3-rdflib: update, remove python-rdflib; remove python-notify
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/38232.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/python3-rdflib-38232.patch --]
[-- Type: text/x-diff, Size: 13360 bytes --]
From a0310cefb0520f36b92118fb34bc4b38b5765243 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:32:47 -0400
Subject: [PATCH 1/3] python3-rdflib: update to 6.2.0, remove python-rdflib.
---
srcpkgs/python-rdflib/template | 43 -------------------
srcpkgs/python3-rdflib | 1 -
srcpkgs/python3-rdflib/template | 28 ++++++++++++
.../{python-rdflib => python3-rdflib}/update | 0
srcpkgs/removed-packages/template | 1 +
5 files changed, 29 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/python-rdflib/template
delete mode 120000 srcpkgs/python3-rdflib
create mode 100644 srcpkgs/python3-rdflib/template
rename srcpkgs/{python-rdflib => python3-rdflib}/update (100%)
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
deleted file mode 100644
index 889ffcb7fa53..000000000000
--- a/srcpkgs/python-rdflib/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-rdflib'
-pkgname=python-rdflib
-version=4.2.2
-revision=6
-wrksrc="rdflib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-isodate python-parsing"
-pycompile_module="rdflib"
-short_desc="Python2 library for working with RDF"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/RDFLib/rdflib"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/r/rdflib/rdflib-${version}.tar.gz"
-checksum=da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
-
-alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf2
- rdflib:rdf2dot:/usr/bin/rdf2dot2
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism2
- rdflib:rdfpipe:/usr/bin/rdfpipe2
- rdflib:rdfs2dot:/usr/bin/rdfs2dot2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-rdflib_package() {
- alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf3
- rdflib:rdf2dot:/usr/bin/rdf2dot3
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism3
- rdflib:rdfpipe:/usr/bin/rdfpipe3
- rdflib:rdfs2dot:/usr/bin/rdfs2dot3"
- depends="python3-setuptools python3-isodate python3-parsing"
- pycompile_module="rdflib"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-rdflib b/srcpkgs/python3-rdflib
deleted file mode 120000
index 22f10c1cbefa..000000000000
--- a/srcpkgs/python3-rdflib
+++ /dev/null
@@ -1 +0,0 @@
-python-rdflib
\ No newline at end of file
diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template
new file mode 100644
index 000000000000..d91fc64d1491
--- /dev/null
+++ b/srcpkgs/python3-rdflib/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-rdflib'
+pkgname=python3-rdflib
+version=6.2.0
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools python3-isodate python3-parsing"
+depends="${makedepends}"
+short_desc="Python3 library for working with RDF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/RDFLib/rdflib"
+changelog="https://raw.githubusercontent.com/RDFLib/rdflib/master/CHANGELOG.md"
+distfiles="https://github.com/RDFLib/rdflib/archive/refs/tags/${version}.tar.gz"
+checksum=d4b920f44ad0f7bc4977d0163840bb2c4d9b8ec2d1dae92b0974d0d3d8b5a126
+# pytest test collection fails
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+ # for compatibility
+ ln -s csv2rdf "${DESTDIR}/usr/bin/csv2rdf3"
+ ln -s rdf2dot "${DESTDIR}/usr/bin/rdf2dot3"
+ ln -s rdfgraphisomorphism "${DESTDIR}/usr/bin/rdfgraphisomorphism3"
+ ln -s rdfpipe "${DESTDIR}/usr/bin/rdfpipe3"
+ ln -s rdfs2dot "${DESTDIR}/usr/bin/rdfs2dot3"
+}
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python3-rdflib/update
similarity index 100%
rename from srcpkgs/python-rdflib/update
rename to srcpkgs/python3-rdflib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8456cb959d35..ba34f0e244d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,7 @@ replaces="
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
python-pytz<=2021.3_2
+ python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
From 4357010b5ff471d4117f74b8ab75c3daf7c5de0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:51:45 -0400
Subject: [PATCH 2/3] python-notify: remove package
---
.../python-notify/patches/libnotify07.patch | 36 -------------------
.../notify-python-0.1.1-fix-GTK-symbols.patch | 25 -------------
srcpkgs/python-notify/template | 26 --------------
srcpkgs/python-notify/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 srcpkgs/python-notify/patches/libnotify07.patch
delete mode 100644 srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
delete mode 100644 srcpkgs/python-notify/template
delete mode 100644 srcpkgs/python-notify/update
diff --git a/srcpkgs/python-notify/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch
deleted file mode 100644
index 289573d50ae4..000000000000
--- a/srcpkgs/python-notify/patches/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "message" (null-ok) (default "NULL"))
- '("const-gchar*" "icon" (null-ok) (default "NULL"))
-- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
- )
- )
-
-@@ -53,24 +52,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "attach")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
diff --git a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c01363a0..000000000000
--- a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template
deleted file mode 100644
index 9bc07c76324e..000000000000
--- a/srcpkgs/python-notify/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-notify'
-pkgname=python-notify
-version=0.1.1
-revision=13
-wrksrc="notify-python-${version}"
-build_style=gnu-configure
-pycompile_module="gtk-2.0/pynotify"
-hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel"
-makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
-depends="pygtk"
-short_desc="Python2 bindings for libnotify"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="http://www.galago-project.org/"
-distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz"
-checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-replaces="notify-python>=0"
-lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/python-notify/update b/srcpkgs/python-notify/update
deleted file mode 100644
index bd14e9008e0b..000000000000
--- a/srcpkgs/python-notify/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="notify-python"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ba34f0e244d0..1dd47a33213b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -311,6 +311,7 @@ replaces="
python-matplotlib<=2.2.4_2
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
+ python-notify<=0.1.1_13
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
From 3a0013a755245e17f8c67997afad5c756d656ef0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 25 Jul 2022 23:14:19 -0400
Subject: [PATCH 3/3] python3-isodate: update to 0.6.1, remove python2 package.
python-isodate was only needed by python-rdflib.
---
srcpkgs/python-isodate/template | 30 ------------------------------
srcpkgs/python3-isodate | 1 -
srcpkgs/python3-isodate/template | 23 +++++++++++++++++++++++
srcpkgs/removed-packages/template | 3 ++-
4 files changed, 25 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-isodate/template
delete mode 120000 srcpkgs/python3-isodate
create mode 100644 srcpkgs/python3-isodate/template
diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template
deleted file mode 100644
index 430cb3cfbe1a..000000000000
--- a/srcpkgs/python-isodate/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-isodate'
-pkgname=python-isodate
-version=0.6.0
-revision=5
-wrksrc="isodate-${version}"
-build_style=python-module
-pycompile_module="isodate"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="ISO 8601 date/time/duration parser and formatter (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/gweis/isodate"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/i/isodate/isodate-${version}.tar.gz"
-checksum=2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8
-
-post_install() {
- sed -n '/Copyright/,/CONTRACT/p' src/isodate/__init__.py >LICENSE
- vlicense LICENSE
-}
-
-python3-isodate_package() {
- depends="python3-six"
- pycompile_module="isodate"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-isodate b/srcpkgs/python3-isodate
deleted file mode 120000
index e821ac8eb648..000000000000
--- a/srcpkgs/python3-isodate
+++ /dev/null
@@ -1 +0,0 @@
-python-isodate
\ No newline at end of file
diff --git a/srcpkgs/python3-isodate/template b/srcpkgs/python3-isodate/template
new file mode 100644
index 000000000000..29f2160953fd
--- /dev/null
+++ b/srcpkgs/python3-isodate/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-isodate'
+pkgname=python3-isodate
+version=0.6.1
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="${depends}"
+short_desc="ISO 8601 date/time/duration parser and formatter (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/gweis/isodate"
+distfiles="${PYPI_SITE}/i/isodate/isodate-${version}.tar.gz"
+checksum=48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9
+
+post_install() {
+ # licence is in a separate file at HEAD of master, but not released
+ sed -n '/Copyright/,/CONTRACT/p' src/isodate/__init__.py >LICENSE
+ vlicense LICENSE
+ # remove tests from installed package
+ rm -r ${DESTDIR}/${py3_sitelib}/${pkgname#*-}/tests
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1dd47a33213b..bd079be17aef 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=70
+revision=71
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -303,6 +303,7 @@ replaces="
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-isodate<=0.6.0_5
python-iso8601<=0.1.16_2
python-jellyfish<=0.6.1_2
python-lockfile<=0.12.2_7
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (6 preceding siblings ...)
2022-07-26 3:15 ` classabbyamp
@ 2022-07-26 3:17 ` classabbyamp
2022-07-31 7:18 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-26 3:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 669 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/python3-rdflib
https://github.com/void-linux/void-packages/pull/38232
python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; remove python-notify
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/38232.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/python3-rdflib-38232.patch --]
[-- Type: text/x-diff, Size: 13359 bytes --]
From a0310cefb0520f36b92118fb34bc4b38b5765243 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:32:47 -0400
Subject: [PATCH 1/3] python3-rdflib: update to 6.2.0, remove python-rdflib.
---
srcpkgs/python-rdflib/template | 43 -------------------
srcpkgs/python3-rdflib | 1 -
srcpkgs/python3-rdflib/template | 28 ++++++++++++
.../{python-rdflib => python3-rdflib}/update | 0
srcpkgs/removed-packages/template | 1 +
5 files changed, 29 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/python-rdflib/template
delete mode 120000 srcpkgs/python3-rdflib
create mode 100644 srcpkgs/python3-rdflib/template
rename srcpkgs/{python-rdflib => python3-rdflib}/update (100%)
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
deleted file mode 100644
index 889ffcb7fa53..000000000000
--- a/srcpkgs/python-rdflib/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-rdflib'
-pkgname=python-rdflib
-version=4.2.2
-revision=6
-wrksrc="rdflib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-isodate python-parsing"
-pycompile_module="rdflib"
-short_desc="Python2 library for working with RDF"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/RDFLib/rdflib"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/r/rdflib/rdflib-${version}.tar.gz"
-checksum=da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
-
-alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf2
- rdflib:rdf2dot:/usr/bin/rdf2dot2
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism2
- rdflib:rdfpipe:/usr/bin/rdfpipe2
- rdflib:rdfs2dot:/usr/bin/rdfs2dot2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-rdflib_package() {
- alternatives="
- rdflib:csv2rdf:/usr/bin/csv2rdf3
- rdflib:rdf2dot:/usr/bin/rdf2dot3
- rdflib:rdfgraphisomorphism:/usr/bin/rdfgraphisomorphism3
- rdflib:rdfpipe:/usr/bin/rdfpipe3
- rdflib:rdfs2dot:/usr/bin/rdfs2dot3"
- depends="python3-setuptools python3-isodate python3-parsing"
- pycompile_module="rdflib"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-rdflib b/srcpkgs/python3-rdflib
deleted file mode 120000
index 22f10c1cbefa..000000000000
--- a/srcpkgs/python3-rdflib
+++ /dev/null
@@ -1 +0,0 @@
-python-rdflib
\ No newline at end of file
diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template
new file mode 100644
index 000000000000..d91fc64d1491
--- /dev/null
+++ b/srcpkgs/python3-rdflib/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-rdflib'
+pkgname=python3-rdflib
+version=6.2.0
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-setuptools python3-isodate python3-parsing"
+depends="${makedepends}"
+short_desc="Python3 library for working with RDF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/RDFLib/rdflib"
+changelog="https://raw.githubusercontent.com/RDFLib/rdflib/master/CHANGELOG.md"
+distfiles="https://github.com/RDFLib/rdflib/archive/refs/tags/${version}.tar.gz"
+checksum=d4b920f44ad0f7bc4977d0163840bb2c4d9b8ec2d1dae92b0974d0d3d8b5a126
+# pytest test collection fails
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+ # for compatibility
+ ln -s csv2rdf "${DESTDIR}/usr/bin/csv2rdf3"
+ ln -s rdf2dot "${DESTDIR}/usr/bin/rdf2dot3"
+ ln -s rdfgraphisomorphism "${DESTDIR}/usr/bin/rdfgraphisomorphism3"
+ ln -s rdfpipe "${DESTDIR}/usr/bin/rdfpipe3"
+ ln -s rdfs2dot "${DESTDIR}/usr/bin/rdfs2dot3"
+}
diff --git a/srcpkgs/python-rdflib/update b/srcpkgs/python3-rdflib/update
similarity index 100%
rename from srcpkgs/python-rdflib/update
rename to srcpkgs/python3-rdflib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8456cb959d35..ba34f0e244d0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -322,6 +322,7 @@ replaces="
python-pystache<=0.5.4_6
python-pytest-relaxed<=1.1.2_2
python-pytz<=2021.3_2
+ python-rdflib<=4.2.2_6
python-reportlab<=3.5.42_3
python-requests<=2.26.0_2
python-spambayes<=1.1b3_3
From 4357010b5ff471d4117f74b8ab75c3daf7c5de0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 24 Jul 2022 00:51:45 -0400
Subject: [PATCH 2/3] python-notify: remove package
---
.../python-notify/patches/libnotify07.patch | 36 -------------------
.../notify-python-0.1.1-fix-GTK-symbols.patch | 25 -------------
srcpkgs/python-notify/template | 26 --------------
srcpkgs/python-notify/update | 1 -
srcpkgs/removed-packages/template | 1 +
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 srcpkgs/python-notify/patches/libnotify07.patch
delete mode 100644 srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
delete mode 100644 srcpkgs/python-notify/template
delete mode 100644 srcpkgs/python-notify/update
diff --git a/srcpkgs/python-notify/patches/libnotify07.patch b/srcpkgs/python-notify/patches/libnotify07.patch
deleted file mode 100644
index 289573d50ae4..000000000000
--- a/srcpkgs/python-notify/patches/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
- '("const-gchar*" "summary")
- '("const-gchar*" "message" (null-ok) (default "NULL"))
- '("const-gchar*" "icon" (null-ok) (default "NULL"))
-- '("GtkWidget*" "attach" (null-ok) (default "NULL"))
- )
- )
-
-@@ -53,24 +52,6 @@
- )
- )
-
--(define-method attach_to_widget
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_widget")
-- (return-type "none")
-- (parameters
-- '("GtkWidget*" "attach")
-- )
--)
--
--(define-method attach_to_status_icon
-- (of-object "NotifyNotification")
-- (c-name "notify_notification_attach_to_status_icon")
-- (return-type "none")
-- (parameters
-- '("GtkStatusIcon*" "attach")
-- )
--)
--
- (define-method show
- (of-object "NotifyNotification")
- (c-name "notify_notification_show")
diff --git a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch b/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c01363a0..000000000000
--- a/srcpkgs/python-notify/patches/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/srcpkgs/python-notify/template b/srcpkgs/python-notify/template
deleted file mode 100644
index 9bc07c76324e..000000000000
--- a/srcpkgs/python-notify/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-notify'
-pkgname=python-notify
-version=0.1.1
-revision=13
-wrksrc="notify-python-${version}"
-build_style=gnu-configure
-pycompile_module="gtk-2.0/pynotify"
-hostmakedepends="pkg-config python-devel python-gobject2-devel pygtk-devel"
-makedepends="libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
-depends="pygtk"
-short_desc="Python2 bindings for libnotify"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="http://www.galago-project.org/"
-distfiles="http://www.galago-project.org/files/releases/source/notify-python/notify-python-${version}.tar.gz"
-checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
-replaces="notify-python>=0"
-lib32disabled=yes
-
-CFLAGS="-fcommon"
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
diff --git a/srcpkgs/python-notify/update b/srcpkgs/python-notify/update
deleted file mode 100644
index bd14e9008e0b..000000000000
--- a/srcpkgs/python-notify/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="notify-python"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ba34f0e244d0..1dd47a33213b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -311,6 +311,7 @@ replaces="
python-matplotlib<=2.2.4_2
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
+ python-notify<=0.1.1_13
python-pgpdump<=1.5_10
python-pivy<=0.6.4_2
python-pretend<=1.0.9_5
From 0634269fbe5491f18d46349da384b3ab9fbaba3f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 25 Jul 2022 23:14:19 -0400
Subject: [PATCH 3/3] python3-isodate: update to 0.6.1, remove python-isodate.
python-isodate was only needed by python-rdflib.
---
srcpkgs/python-isodate/template | 30 ------------------------------
srcpkgs/python3-isodate | 1 -
srcpkgs/python3-isodate/template | 23 +++++++++++++++++++++++
srcpkgs/removed-packages/template | 3 ++-
4 files changed, 25 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-isodate/template
delete mode 120000 srcpkgs/python3-isodate
create mode 100644 srcpkgs/python3-isodate/template
diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template
deleted file mode 100644
index 430cb3cfbe1a..000000000000
--- a/srcpkgs/python-isodate/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-isodate'
-pkgname=python-isodate
-version=0.6.0
-revision=5
-wrksrc="isodate-${version}"
-build_style=python-module
-pycompile_module="isodate"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="ISO 8601 date/time/duration parser and formatter (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/gweis/isodate"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/i/isodate/isodate-${version}.tar.gz"
-checksum=2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8
-
-post_install() {
- sed -n '/Copyright/,/CONTRACT/p' src/isodate/__init__.py >LICENSE
- vlicense LICENSE
-}
-
-python3-isodate_package() {
- depends="python3-six"
- pycompile_module="isodate"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-isodate b/srcpkgs/python3-isodate
deleted file mode 120000
index e821ac8eb648..000000000000
--- a/srcpkgs/python3-isodate
+++ /dev/null
@@ -1 +0,0 @@
-python-isodate
\ No newline at end of file
diff --git a/srcpkgs/python3-isodate/template b/srcpkgs/python3-isodate/template
new file mode 100644
index 000000000000..29f2160953fd
--- /dev/null
+++ b/srcpkgs/python3-isodate/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-isodate'
+pkgname=python3-isodate
+version=0.6.1
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="${depends}"
+short_desc="ISO 8601 date/time/duration parser and formatter (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/gweis/isodate"
+distfiles="${PYPI_SITE}/i/isodate/isodate-${version}.tar.gz"
+checksum=48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9
+
+post_install() {
+ # licence is in a separate file at HEAD of master, but not released
+ sed -n '/Copyright/,/CONTRACT/p' src/isodate/__init__.py >LICENSE
+ vlicense LICENSE
+ # remove tests from installed package
+ rm -r ${DESTDIR}/${py3_sitelib}/${pkgname#*-}/tests
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1dd47a33213b..bd079be17aef 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=70
+revision=71
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -303,6 +303,7 @@ replaces="
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
python-gobject<=3.36.1_2
+ python-isodate<=0.6.0_5
python-iso8601<=0.1.16_2
python-jellyfish<=0.6.1_2
python-lockfile<=0.12.2_7
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; remove python-notify
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
` (7 preceding siblings ...)
2022-07-26 3:17 ` [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; " classabbyamp
@ 2022-07-31 7:18 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2022-07-31 7:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There's a merged pull request on the void-packages repository
python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; remove python-notify
https://github.com/void-linux/void-packages/pull/38232
Description:
- python3-rdflib: update to 6.2.0, remove python-rdflib.
- python-notify: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-07-31 7:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-24 5:00 [PR PATCH] python3-rdflib: update, remove python-rdflib; remove python-notify classabbyamp
2022-07-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
2022-07-25 14:28 ` [PR REVIEW] " ahesford
2022-07-25 14:37 ` classabbyamp
2022-07-25 14:42 ` ahesford
2022-07-25 14:50 ` classabbyamp
2022-07-25 14:51 ` [PR PATCH] [Updated] " classabbyamp
2022-07-26 3:15 ` classabbyamp
2022-07-26 3:17 ` [PR PATCH] [Updated] python3-rdflib: update, remove python-rdflib; python3-isodate: update, remove python-isodate; " classabbyamp
2022-07-31 7:18 ` [PR PATCH] [Merged]: " classabbyamp
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).