Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gimp: disable python 2 support
@ 2023-05-15 16:26 classabbyamp
  2023-05-15 16:42 ` [PR PATCH] [Updated] " classabbyamp
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-15 16:26 UTC (permalink / raw)
  To: ml

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

There is a new 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
- resynthesizer: remove package
    - depends on gimp-python
- gimp: disable python 2 support
    - maybe it can be re-enabled in gimp 3 (with python 3)

<!-- 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: 4863 bytes --]

From f8f62a38204074ca942897de459c1e26f6442a43 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:22:43 -0400
Subject: [PATCH 1/2] 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 9d87a81fde56..9919b5c5c20a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -496,6 +496,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 d0c717f8b579..000000000000
--- 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 ae348660980e0138ea5d9f0f8a7e832bb31b7e77 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 15 May 2023 12:24:30 -0400
Subject: [PATCH 2/2] gimp: disable python 2 support

python 2. maybe it can be re-enabled in gimp 3 (which will use python 3)
---
 srcpkgs/gimp/template             | 25 ++++---------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 8e68f2403d8f..1f4215b6842a 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,16 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.32
-revision=4
+revision=5
 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
+ poppler-glib-devel glib-networking libwebp-devel
  libheif-devel libopenjpeg2-devel x265-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
 short_desc="GNU image manipulation program"
@@ -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=3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25
-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=`:py_prefix='"$XBPS_CROSS_BASE"'`:' 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 9919b5c5c20a..d947e06a5640 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -122,6 +122,7 @@ replaces="
  gespeaker<=0.8.6_3
  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

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-09-27 19:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2023-09-27 19:05 ` [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).