From 5a3d27146a86c130b4a18f68644853177794c064 Mon Sep 17 00:00:00 2001 From: classabbyamp 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 " -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 " +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 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 " -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