From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gimp: disable python 2 support, remove now-unnecessary py2 packages
Date: Wed, 27 Sep 2023 08:58:49 +0200 [thread overview]
Message-ID: <20230927065849.C-aKWH2zjRASZAKteBkMYYtc3yZxrl9snKeRkyCLKLk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43881@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages gimp-py
https://github.com/void-linux/void-packages/pull/43881
gimp: disable python 2 support, remove now-unnecessary py2 packages
**one downside:** most built-in filters get disabled by this
for #38229
<!-- 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/43881.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-py-43881.patch --]
[-- Type: text/x-diff, Size: 27746 bytes --]
From 756fd384ad569a3795bdde1bc9400e4186e97ee5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:22:43 -0400
Subject: [PATCH 01/10] resynthesizer: remove package
depends on gimp-python, which is being removed
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/resynthesizer/template | 25 -------------------------
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 srcpkgs/resynthesizer/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a7db0c7e0d1bc..e98ce1ad1ca59 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -604,6 +604,7 @@ replaces="
raul<=0.8.0_6
redkite<=1.3.1_1
reminiscence<=0.4.6_1
+ resynthesizer<=2.0.3_1
rkt-stage1-coreos<=1.30.0_3
rkt-stage1-fly<=1.30.0_3
rkt<=1.30.0_3
diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template
deleted file mode 100644
index d0c717f8b5799..0000000000000
--- a/srcpkgs/resynthesizer/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'resynthesizer'
-pkgname=resynthesizer
-version=2.0.3
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake intltool pkg-config"
-makedepends="gimp-devel glib-devel gettext-devel"
-depends="gimp-python"
-short_desc="Suite of gimp plugins for texture healing and synthesis"
-maintainer="CoolOhm <micvlas@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/bootchk/resynthesizer"
-distfiles="https://github.com/bootchk/resynthesizer/archive/v${version}.tar.gz"
-checksum=798678095c34b101c880eb350b31e9a6ff9748707d6ad9063cdee26c38016450
-python_version=2 #unverified
-
-if [ "$CROSS_BUILD" ];then
- hostmakedepends+=" glib-devel gettext-devel"
- AUTOGEN_CONFIGURE_ARGS+=" --host=${XBPS_MACHINE} --build=${XBPS_CROSS_TRIPLET}"
-fi
-
-
-pre_configure() {
- ./autogen.sh ${AUTOGEN_CONFIGURE_ARGS}
-}
From 3ba3850f790cd3887b607a42a1e8bd41f29f6ff7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:24:30 -0400
Subject: [PATCH 02/10] gimp: disable python 2 support
python 2. maybe it can be re-enabled in gimp 3 (which will use python 3)
---
srcpkgs/gimp/template | 27 +++++----------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 336e33ae83cce..cdaa6ded089bb 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,17 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.34
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-check-update --datadir=/usr/share"
+configure_args="--disable-check-update --datadir=/usr/share --disable-python"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
- libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
+ libtool pkg-config perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel
- libheif-devel libopenjpeg2-devel x265-devel"
+ poppler-glib-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel gtk+-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -20,15 +20,11 @@ license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
checksum=84004642d351b398a4293cd7fd3592044a944f05bb52850ee6068f247c657aa3
-python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
pre_configure() {
NOCONFIGURE=1 autoreconf -fi
- if [ "$CROSS_BUILD" ]; then
- vsed -i 's:^py_prefix=\x60:py_prefix='"$XBPS_CROSS_BASE"'\x60:' configure
- fi
# don't allow configure to set DATADIRNAME=lib
vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
@@ -51,16 +47,3 @@ gimp-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gimp-python_package() {
- lib32disabled=yes
- depends="pygtk"
- pycompile_dirs="usr/lib/gimp/2.0"
- short_desc+=" - Python2 bindings"
- pkg_install() {
- vmove usr/lib/gimp/2.0/python
- for file in $(find ${DESTDIR}/usr/lib/gimp/2.0/plug-ins -name *.py); do
- vmove ${file/$DESTDIR/}
- done
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e98ce1ad1ca59..e47f7aae7688b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -134,6 +134,7 @@ replaces="
geth<=1.10.1_2
getmail<=5.14_2
gfbgraph<=0.2.5_1
+ gimp-python<=2.10.32_4
giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
From 8f356af9fae9c888835acbd17776f6e45ee5d018 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:13 -0400
Subject: [PATCH 03/10] pygtk: remove
python2
---
srcpkgs/pygtk-devel | 1 -
srcpkgs/pygtk/patches/pango-1.44.6.patch | 41 ------------------
srcpkgs/pygtk/template | 53 ------------------------
3 files changed, 95 deletions(-)
delete mode 120000 srcpkgs/pygtk-devel
delete mode 100644 srcpkgs/pygtk/patches/pango-1.44.6.patch
delete mode 100644 srcpkgs/pygtk/template
diff --git a/srcpkgs/pygtk-devel b/srcpkgs/pygtk-devel
deleted file mode 120000
index 8f91ed0696d92..0000000000000
--- a/srcpkgs/pygtk-devel
+++ /dev/null
@@ -1 +0,0 @@
-pygtk
\ No newline at end of file
diff --git a/srcpkgs/pygtk/patches/pango-1.44.6.patch b/srcpkgs/pygtk/patches/pango-1.44.6.patch
deleted file mode 100644
index 708b41348aa24..0000000000000
--- a/srcpkgs/pygtk/patches/pango-1.44.6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001
-From: Jordan Petridis <jpetridis@gnome.org>
-Date: Thu, 24 Oct 2019 22:58:36 +0200
-Subject: [PATCH] Drop the PangoFont find_shaper virtual method
-
-This API has been removed from Pango 1.44.6, because it was completely
-unused by anything.
-
-However, PyGTK tries to bind everything, even unused API.
-
-Removing this from PyGTK means we can build it against the latest Pango
-again.
-
-https://gitlab.gnome.org/GNOME/pango/issues/417
----
- pango.defs | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git pango.defs pango.defs
-index 6935c964..da968f58 100644
---- a/pango.defs
-+++ b/pango.defs
-@@ -1391,15 +1391,6 @@
- )
- )
-
--(define-virtual find_shaper
-- (of-object "PangoFont")
-- (return-type "PangoEngineShape*")
-- (parameters
-- '("PangoLanguage*" "lang")
-- '("guint32" "ch")
-- )
--)
--
- (define-virtual get_glyph_extents
- (of-object "PangoFont")
- (return-type "none")
---
-2.24.2
-
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
deleted file mode 100644
index 41554b81763af..0000000000000
--- a/srcpkgs/pygtk/template
+++ /dev/null
@@ -1,53 +0,0 @@
-# Template file for 'pygtk'
-pkgname=pygtk
-version=2.24.0
-revision=14
-build_style=gnu-configure
-configure_args="PYTHON=python2"
-# This is required to avoid compiling all of gtk-2.0
-# Ignore xlint on this one
-pycompile_module="gtk-2.0/gtk"
-hostmakedepends="pkg-config python-gobject2-devel python-numpy"
-makedepends="python-devel gtk+-devel libxml2-devel libglade-devel
- python-gobject2-devel"
-depends="python python-cairo python-gobject2"
-checkdepends="xvfb-run nemo"
-short_desc="Python bindings for the GTK+ toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.pygtk.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
-lib32disabled=yes
-python_version=2
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
-
-do_check() {
- export HOME="$(mktemp -d)"
- mkdir -p "$HOME/.local/share"
- xvfb-run make check
- rm -r "$HOME"
-}
-
-post_install() {
- vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
-}
-
-pygtk-devel_package() {
- lib32disabled=yes
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pycompile_dirs="usr/lib/pygtk"
- pkg_install() {
- vmove usr/include
- vmove usr/share
- vmove usr/bin
- vmove usr/lib/pkgconfig
- vmove usr/lib/pygtk
- }
-}
From b1f641cf0a895c4d95194694e0076bc5863796e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:15 -0400
Subject: [PATCH 04/10] python-numpy: remove
python2
---
srcpkgs/python-numpy/files/fenv-constants.h | 10 -----
.../python-numpy/files/fenv-constants.patch | 11 ------
srcpkgs/python-numpy/template | 39 -------------------
srcpkgs/python-numpy/update | 1 -
4 files changed, 61 deletions(-)
delete mode 100644 srcpkgs/python-numpy/files/fenv-constants.h
delete mode 100644 srcpkgs/python-numpy/files/fenv-constants.patch
delete mode 100644 srcpkgs/python-numpy/template
delete mode 100644 srcpkgs/python-numpy/update
diff --git a/srcpkgs/python-numpy/files/fenv-constants.h b/srcpkgs/python-numpy/files/fenv-constants.h
deleted file mode 100644
index c2c21d2bb23b3..0000000000000
--- a/srcpkgs/python-numpy/files/fenv-constants.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define FE_INVALID 1
-#define FE_DIVBYZERO 2
-#define FE_OVERFLOW 4
-#define FE_UNDERFLOW 8
-#define FE_INEXACT 16
-#define FE_ALL_EXCEPT 31
-#define FE_TONEAREST 0
-#define FE_DOWNWARD 0x800000
-#define FE_UPWARD 0x400000
-#define FE_TOWARDZERO 0xc00000
diff --git a/srcpkgs/python-numpy/files/fenv-constants.patch b/srcpkgs/python-numpy/files/fenv-constants.patch
deleted file mode 100644
index 987ad4e346ffa..0000000000000
--- a/srcpkgs/python-numpy/files/fenv-constants.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/core/src/npymath/ieee754.c.src 2020-09-20 14:53:51.998825328 +1000
-+++ numpy/core/src/npymath/ieee754.c.src 2020-09-20 14:54:03.611889518 +1000
-@@ -8,6 +8,8 @@
- #include "npy_math_private.h"
- #include "numpy/utils.h"
-
-+#include "fenv-constants.h"
-+
- #ifndef HAVE_COPYSIGN
- double npy_copysign(double x, double y)
- {
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
deleted file mode 100644
index 17cce0e73be7f..0000000000000
--- a/srcpkgs/python-numpy/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-numpy'
-pkgname=python-numpy
-version=1.16.5
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools python-Cython gcc-fortran"
-makedepends="python-devel lapack-devel cblas-devel"
-short_desc="Fast and sophisticated array facility to Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.numpy.org/"
-distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3c82a9b8616e3096a79a2af9c288d8ed4013a10fc7baf3eaf54655309734dadd
-alternatives="numpy:f2py:/usr/bin/f2py2"
-
-post_patch() {
- case "${XBPS_TARGET_MACHINE}" in
- armv5tel-musl)
- cp "${FILESDIR}/fenv-constants.h" numpy/core/src/npymath/
- patch -Np0 -i "${FILESDIR}/fenv-constants.patch"
- ;;
- esac
-}
-
-pre_build() {
- make_build_args+=" ${makejobs}"
-}
-
-post_install() {
- # create compat symlinks for .h files
- vmkdir ${py2_inc}
- ln -sfr ${DESTDIR}/${py2_sitelib}/numpy/core/include/numpy \
- ${DESTDIR}/${py2_inc}
-
- rm -f ${DESTDIR}/usr/bin/f2py
-
- rm -f ${DESTDIR}/usr/lib/python*/site-packages/numpy/LICENSE.txt
- vlicense LICENSE.txt LICENSE
-}
diff --git a/srcpkgs/python-numpy/update b/srcpkgs/python-numpy/update
deleted file mode 100644
index 8b7d6d06863e1..0000000000000
--- a/srcpkgs/python-numpy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a* *b* *rc* *post*"
From 5febfb21a7c8fd9984d868f334c76826689e6982 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:16 -0400
Subject: [PATCH 05/10] python-Cython: remove
python2
---
srcpkgs/python-Cython/template | 28 ----------------------------
srcpkgs/python-Cython/update | 1 -
2 files changed, 29 deletions(-)
delete mode 100644 srcpkgs/python-Cython/template
delete mode 100644 srcpkgs/python-Cython/update
diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
deleted file mode 100644
index fc29bfb4f8b85..0000000000000
--- a/srcpkgs/python-Cython/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-Cython'
-pkgname=python-Cython
-version=0.29.36
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="C-Extensions for Python"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://cython.org/"
-changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f
-# Tests are flaky
-make_check=no
-
-alternatives="
- cython:cygdb:/usr/bin/cygdb2
- cython:cython:/usr/bin/cython2
- cython:cythonize:/usr/bin/cythonize2"
-
-post_install() {
- mv ${DESTDIR}/usr/bin/cygdb{,2}
- mv ${DESTDIR}/usr/bin/cython{,2}
- mv ${DESTDIR}/usr/bin/cythonize{,2}
-}
diff --git a/srcpkgs/python-Cython/update b/srcpkgs/python-Cython/update
deleted file mode 100644
index 6267ade562c31..0000000000000
--- a/srcpkgs/python-Cython/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*[A-Za-z]*"
From 510d8882b6a1540602d4523d7f073576b14921e2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:17 -0400
Subject: [PATCH 06/10] python-gobject2: remove
python2
---
common/shlibs | 1 -
srcpkgs/python-gobject2-devel | 1 -
srcpkgs/python-gobject2/template | 36 --------------------------------
srcpkgs/python-gobject2/update | 2 --
4 files changed, 40 deletions(-)
delete mode 120000 srcpkgs/python-gobject2-devel
delete mode 100644 srcpkgs/python-gobject2/template
delete mode 100644 srcpkgs/python-gobject2/update
diff --git a/common/shlibs b/common/shlibs
index 85ead20844ecc..6d9e6e11c1131 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1728,7 +1728,6 @@ libdar64.so.6000 libdar-2.6.6_1
libpython3.so python3-3.9.2_2
libpython3.11.so.1.0 python3-3.11.0_1
libbrscandec2.so.1 brother-brscan3-0.2.11_2
-libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
diff --git a/srcpkgs/python-gobject2-devel b/srcpkgs/python-gobject2-devel
deleted file mode 120000
index e996bbede67c1..0000000000000
--- a/srcpkgs/python-gobject2-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-gobject2
\ No newline at end of file
diff --git a/srcpkgs/python-gobject2/template b/srcpkgs/python-gobject2/template
deleted file mode 100644
index 8586c911f1e58..0000000000000
--- a/srcpkgs/python-gobject2/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'python-gobject2'
-pkgname=python-gobject2
-version=2.28.7
-revision=2
-lib32disabled=yes
-build_style=gnu-configure
-configure_args="--disable-introspection PYTHON=/usr/bin/python2"
-hostmakedepends="automake libtool pkg-config python-devel glib-devel"
-makedepends="libffi-devel libglib-devel cairo-devel python-devel python-cairo-devel"
-depends="cairo python python-cairo"
-short_desc="Python2 bindings for GObject (GLib 2.x)"
-homepage="http://www.pygtk.org/"
-license="LGPL-2.1"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a
-python_version=2 #unverified
-
-pre_configure() {
- NOCONFIGURE=1 autoreconf -fi
- if [ "$CROSS_BUILD" ]; then
- sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
-
-python-gobject2-devel_package() {
- lib32disabled=yes
- depends="libffi-devel libglib-devel python-cairo-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pycompile_module="usr/share/pygobject/2.0/codegen"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove usr/share
- }
-}
diff --git a/srcpkgs/python-gobject2/update b/srcpkgs/python-gobject2/update
deleted file mode 100644
index 77c1350f402e8..0000000000000
--- a/srcpkgs/python-gobject2/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="pygobject"
-ignore="[!2].* *.90.*"
From f857ce1a9ed5c87c8df7394818dd2cd636438617 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:18 -0400
Subject: [PATCH 07/10] python-cairo: remove
python2
---
srcpkgs/python-cairo-devel | 1 -
srcpkgs/python-cairo/template | 23 -----------------------
2 files changed, 24 deletions(-)
delete mode 120000 srcpkgs/python-cairo-devel
delete mode 100644 srcpkgs/python-cairo/template
diff --git a/srcpkgs/python-cairo-devel b/srcpkgs/python-cairo-devel
deleted file mode 120000
index ec8e8d1f18b03..0000000000000
--- a/srcpkgs/python-cairo-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-cairo
\ No newline at end of file
diff --git a/srcpkgs/python-cairo/template b/srcpkgs/python-cairo/template
deleted file mode 100644
index b041da9d61b12..0000000000000
--- a/srcpkgs/python-cairo/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cairo'
-pkgname=python-cairo
-version=1.18.2
-revision=2
-build_style=python2-module
-hostmakedepends="pkg-config python"
-makedepends="cairo-devel python-devel"
-short_desc="Python2 bindings for the cairo graphics library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later, MPL-1.1"
-homepage="https://pycairo.readthedocs.io/"
-distfiles="https://github.com/pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz"
-checksum=dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531
-
-python-cairo-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- lib32disabled= # override build style
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- }
-}
From f026adba6de9d6620a7b9b5bf98f3fd62e494b95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 13:11:05 -0400
Subject: [PATCH 08/10] gfm: remove
python2, gtk2
---
srcpkgs/gfm/patches/no-kde.patch | 66 --------------------------------
srcpkgs/gfm/template | 23 -----------
2 files changed, 89 deletions(-)
delete mode 100644 srcpkgs/gfm/patches/no-kde.patch
delete mode 100644 srcpkgs/gfm/template
diff --git a/srcpkgs/gfm/patches/no-kde.patch b/srcpkgs/gfm/patches/no-kde.patch
deleted file mode 100644
index 3a53028bbc811..0000000000000
--- a/srcpkgs/gfm/patches/no-kde.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,18 +8,18 @@
- # build instructions
- gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \
- @GLIB_CFLAGS@ @GTK_CFLAGS@ @GLADE_CFLAGS@ \
-- @KDE_INCLUDES@ @QT_INCLUDES@ \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
- -DLOCALEDIR=\"$(datadir)/locale\"
-+# @KDE_INCLUDES@ @QT_INCLUDES@
-
- gfm_LDFLAGS = -export-dynamic
-
- gfm_LDADD = \
- @TIFILES_LIBS@ @TICONV_LIBS@ @TICALCS_LIBS@ \
- @GLIB_LIBS@ @GTK_LIBS@ @GLADE_LIBS@ \
-- @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
-- @QT_LDFLAGS@ @X_LDFLAGS@ \
- @LTLIBINTL@
-+# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
-+# @QT_LDFLAGS@ @X_LDFLAGS@
-
- # automake wants all .c files listed explicitly. This sucks. qmake does the
- # right thing with just "*.c".
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,22 +90,23 @@
- AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr])
-
- # KDE dialogs support
--AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
--if test "x$kde" = "xdefault"; then
-- case $host_os in
-- *mingw*)
-- kde=no
-- ;;
-- *)
-- kde=yes
-- ;;
-- esac
--fi
--if test "x$kde" = "xyes"; then
-- AC_PROG_CXX
-- AC_PATH_KDE
-- AC_DEFINE(WITH_KDE, 1, [Use KDE support])
--fi
-+#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
-+#if test "x$kde" = "xdefault"; then
-+# case $host_os in
-+# *mingw*)
-+# kde=no
-+# ;;
-+# *)
-+# kde=yes
-+# ;;
-+# esac
-+#fi
-+#if test "x$kde" = "xyes"; then
-+# AC_PROG_CXX
-+# AC_PATH_KDE
-+# AC_DEFINE(WITH_KDE, 1, [Use KDE support])
-+#fi
-+kde=no
- AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
- AC_SUBST(kde)
-
diff --git a/srcpkgs/gfm/template b/srcpkgs/gfm/template
deleted file mode 100644
index a216610537403..0000000000000
--- a/srcpkgs/gfm/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gfm'
-pkgname=gfm
-version=1.08
-revision=1
-_tilpver=1.18
-build_style=gnu-configure
-hostmakedepends="automake bison groff intltool libtool pkg-config"
-makedepends="libticalcs2-devel libglade-devel"
-short_desc="TIgroup files manipulator for TiLP2"
-maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://www.ticalc.org"
-distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2"
-checksum=09031ac0abf686b6a8bc9935f331ef460415783a1057f11b0af993526b52017f
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" gettext-devel"
-fi
-
-pre_configure() {
- mkdir -p m4
- autoreconf -i -v -f
-}
From 9bff41213353b1de98741e09ddef4e60608d1a5e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 13:21:58 -0400
Subject: [PATCH 09/10] libglade: remove
python2, gtk2
---
common/shlibs | 1 -
srcpkgs/libglade-devel | 1 -
.../libglade/patches/libglade-gmodule.patch | 12 -------
srcpkgs/libglade/template | 35 -------------------
4 files changed, 49 deletions(-)
delete mode 120000 srcpkgs/libglade-devel
delete mode 100644 srcpkgs/libglade/patches/libglade-gmodule.patch
delete mode 100644 srcpkgs/libglade/template
diff --git a/common/shlibs b/common/shlibs
index 6d9e6e11c1131..d8469d9238bdc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -319,7 +319,6 @@ libtiffxx.so.6 tiff-4.5.0_1
libnotify.so.4 libnotify-0.7_1
libexo-1.so.0 exo-0.7.3_1
libexo-2.so.0 exo-0.12.0_1
-libglade-2.0.so.0 libglade-2.6.4_1
libthunarx-3.so.0 Thunar-1.8.1_1
libexif.so.12 libexif-0.6.17_1
liboil-0.3.so.0 liboil-0.3.16_1
diff --git a/srcpkgs/libglade-devel b/srcpkgs/libglade-devel
deleted file mode 120000
index 5fa046e2db75f..0000000000000
--- a/srcpkgs/libglade-devel
+++ /dev/null
@@ -1 +0,0 @@
-libglade
\ No newline at end of file
diff --git a/srcpkgs/libglade/patches/libglade-gmodule.patch b/srcpkgs/libglade/patches/libglade-gmodule.patch
deleted file mode 100644
index f4dbd5ceef4e6..0000000000000
--- a/srcpkgs/libglade/patches/libglade-gmodule.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl
- libxml-2.0 >= required_libxml_version dnl
- atk >= required_atk_version dnl
- gtk+-2.0 >= required_gtk_version dnl
-- glib-2.0 >= required_glib_version])
-+ glib-2.0 >= required_glib_version dnl
-+ gmodule-no-export-2.0 >= required_glib_version])
-
- AC_MSG_CHECKING([for native Win32])
- case "$host" in
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
deleted file mode 100644
index e72c1b8989392..0000000000000
--- a/srcpkgs/libglade/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'libglade'
-pkgname=libglade
-version=2.6.4
-revision=12
-build_style=gnu-configure
-configure_args="--disable-static --without-xml-catalog"
-hostmakedepends="automake pkg-config libtool python glib-devel gtk+-devel gtk-doc"
-makedepends="libxml2-devel gtk+-devel xmlcatmgr"
-depends="xmlcatmgr"
-short_desc="Runtime interpreter for GLADE GUI files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2"
-homepage="http://www.jamesh.id.au/software/libglade/"
-distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
-checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
-python_version=2 #unverified
-
-# Register DTDs with xmlcatmgr.
-xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
-
-pre_configure() {
- autoreconf -fi
-}
-
-libglade-devel_package() {
- depends="libxml2-devel gtk+-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" -- development files"
- pkg_install() {
- vmove usr/bin
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/share/gtk-doc
- }
-}
From c25bb6584725ba81f7a89c230a0c87915f0d41d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 12:59:59 -0400
Subject: [PATCH 10/10] removed-packages: add now-unused python2 packages
---
srcpkgs/removed-packages/template | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e47f7aae7688b..f65c5b4e6fb91 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.20230926
-revision=2
+revision=3
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -134,6 +134,7 @@ replaces="
geth<=1.10.1_2
getmail<=5.14_2
gfbgraph<=0.2.5_1
+ gfm<=1.08_1
gimp-python<=2.10.32_4
giti<=1.0.0_1
gksu<=2.0.2_4
@@ -319,6 +320,8 @@ replaces="
libfcitx-qt-devel<=4.2.9.8_1
libfcitx-qt<=4.2.9.8_1
libgksu<=2.0.12_5
+ libglade-devel<=2.6.4_12
+ libglade<=2.6.4_12
libglademm-devel<=2.6.7_6
libglademm<=2.6.7_6
libglib-static<=2.58.3_5
@@ -438,11 +441,11 @@ replaces="
orage<=4.12.1_7
parallel-rust<=0.11.3_2
paraview<=5.8.1_3
+ pcsx2<=1.6.0_2
perl-Alien-wxWidgets<=0.69_3
perl-Gtk2-Ex-Simple-List<=0.50_4
perl-Gtk2-ImageView<=0.05_8
perl-Gtk2-Notify<=0.05_8
- pcsx2<=1.6.0_2
pgadmin3<=1.22.2_14
phonon-backend-gstreamer<=4.9.0_2
phonon-backend-vlc<=0.9.1_3
@@ -481,10 +484,13 @@ replaces="
profont<=1.0_2
psiconv<=0.9.9_9
ptii<=0.4_2
+ pygtk-devel<=2.24.0_14
+ pygtk<=2.24.0_14
pygtksourceview<=2.10.1_5
pyside-tools<=0.2.15_2
pystopwatch<=2019_2
python-Babel<=2.8.0_4
+ python-Cython<=0.29.36_1
python-M2Crypto<=0.35.2_7
python-Pillow<=6.2.2_3
python-PyQt4<=4.12.1_4
@@ -496,6 +502,8 @@ replaces="
python-backports.functools_lru_cache<=1.5_2
python-backports<=1.0_5
python-boto<=2.49.0_5
+ python-cairo-devel<=1.18.2_2
+ python-cairo<=1.18.2_2
python-chardet<=4.0.0_3
python-configobj<=5.0.6_9
python-contextlib2<=0.6.0.post1_1
@@ -510,6 +518,8 @@ replaces="
python-funcsigs<=1.0.2_2
python-gntp<=1.0.3_7
python-gobject-devel<=3.36.1_2
+ python-gobject2-devel<=2.28.7_2
+ python-gobject2<=2.28.7_2
python-gobject<=3.36.1_2
python-hypothesis<=4.38.2_5
python-importlib_metadata<=2.1.1_1
@@ -525,6 +535,7 @@ replaces="
python-netifaces<=0.10.9_3
python-nose<=1.3.7_7
python-notify<=0.1.1_13
+ python-numpy<=1.16.5_1
python-packaging<=20.4_2
python-parsing<=2.4.7_2
python-pathlib2<=2.3.4_6
next prev parent reply other threads:[~2023-09-27 6:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 16:26 [PR PATCH] gimp: disable python 2 support classabbyamp
2023-05-15 16:42 ` [PR PATCH] [Updated] " classabbyamp
2023-06-27 11:18 ` classabbyamp
2023-06-27 11:18 ` [PR PATCH] [Closed]: " classabbyamp
2023-09-26 16:34 ` [PR PATCH] [Updated] " classabbyamp
2023-09-26 17:01 ` classabbyamp
2023-09-26 17:26 ` [PR PATCH] [Updated] gimp: disable python 2 support, remove now-unnecessary py2 packages classabbyamp
2023-09-27 2:23 ` classabbyamp
2023-09-27 6:58 ` classabbyamp [this message]
2023-09-27 19:05 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927065849.C-aKWH2zjRASZAKteBkMYYtc3yZxrl9snKeRkyCLKLk@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).