From 2c564f1e07985f7d8d252ba69241e9f883e22507 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:35 -0400 Subject: [PATCH 01/10] gegl: update to 0.4.50. --- srcpkgs/gegl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 5d4b070cd703ee..b116a6726036a3 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,7 +1,7 @@ # Template file for 'gegl' pkgname=gegl -version=0.4.46 -revision=2 +version=0.4.50 +revision=1 build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dintrospection=true -Dvapigen=enabled @@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only" homepage="https://gegl.org/" changelog="https://gitlab.gnome.org/GNOME/gegl/-/raw/master/docs/NEWS.adoc" distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz" -checksum=d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892 +checksum=6084969b06ee86ca71142133773f27e13f02e5a6a22c2cfce452ecaaddb790c1 case "$XBPS_TARGET_MACHINE" in arm*) configure_args+=" -Db_lto=false" From c98a9dbe77ff00d79c213f4d321ce3881fe5267d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 6 Nov 2024 12:41:45 -0500 Subject: [PATCH 02/10] babl: update to 0.1.110. --- srcpkgs/babl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index a635b6b485feca..a4c0df506a804f 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,6 +1,6 @@ # Template file for 'babl' pkgname=babl -version=0.1.106 +version=0.1.110 revision=1 build_style=meson build_helper=gir @@ -13,7 +13,7 @@ license="LGPL-3.0-only" homepage="https://gegl.org/babl/" changelog="https://gitlab.gnome.org/GNOME/babl/-/raw/master/NEWS" distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz" -checksum=d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f +checksum=bf47be7540d6275389f66431ef03064df5376315e243d0bab448c6aa713f5743 case "$XBPS_TARGET_MACHINE" in arm*) configure_args+=" -Db_lto=false" From 26313e64cd8da33cfe54b0a5866bfff0dfc4ea6f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:29 -0400 Subject: [PATCH 03/10] gimp: update to 3.0.0+rc1. --- common/shlibs | 36 +++- srcpkgs/gimp-python | 1 - srcpkgs/gimp/INSTALL | 2 +- srcpkgs/gimp/INSTALL.msg | 2 + srcpkgs/gimp/patches/atol.patch | 21 +++ srcpkgs/gimp/patches/brushes.patch | 15 ++ srcpkgs/gimp/patches/fix-cross.patch | 18 -- srcpkgs/gimp/patches/fix-segfault.patch | 169 ------------------ srcpkgs/gimp/patches/gcc14.patch | 63 ------- .../gimp/patches/libheif-1.18-compat.patch | 20 --- srcpkgs/gimp/template | 55 +++--- 11 files changed, 96 insertions(+), 306 deletions(-) delete mode 120000 srcpkgs/gimp-python create mode 100644 srcpkgs/gimp/INSTALL.msg create mode 100644 srcpkgs/gimp/patches/atol.patch create mode 100644 srcpkgs/gimp/patches/brushes.patch delete mode 100644 srcpkgs/gimp/patches/fix-cross.patch delete mode 100644 srcpkgs/gimp/patches/fix-segfault.patch delete mode 100644 srcpkgs/gimp/patches/gcc14.patch delete mode 100644 srcpkgs/gimp/patches/libheif-1.18-compat.patch diff --git a/common/shlibs b/common/shlibs index e2742f96a693e0..56eb1a2f9ebee1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -560,15 +560,33 @@ libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1 libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.0_1 -libgimp-2.0.so.0 libgimp-2.10.0_1 -libgimpwidgets-2.0.so.0 libgimp-2.10.0_1 -libgimpui-2.0.so.0 libgimp-2.10.0_1 -libgimpbase-2.0.so.0 libgimp-2.10.0_1 -libgimpthumb-2.0.so.0 libgimp-2.10.0_1 -libgimpconfig-2.0.so.0 libgimp-2.10.0_1 -libgimpmath-2.0.so.0 libgimp-2.10.0_1 -libgimpcolor-2.0.so.0 libgimp-2.10.0_1 -libgimpmodule-2.0.so.0 libgimp-2.10.0_1 +libgimp-3.0.so.0 libgimp-2.99.18_1 +libgimpwidgets-3.0.so.0 libgimp-2.99.18_1 +libgimpui-3.0.so.0 libgimp-2.99.18_1 +libgimpbase-3.0.so.0 libgimp-2.99.18_1 +libgimpthumb-3.0.so.0 libgimp-2.99.18_1 +libgimpconfig-3.0.so.0 libgimp-2.99.18_1 +libgimpmath-3.0.so.0 libgimp-2.99.18_1 +libgimpcolor-3.0.so.0 libgimp-2.99.18_1 +libgimpmodule-3.0.so.0 libgimp-2.99.18_1 +libgimp-2.0.so.0 libgimp2-2.10.38_1 +libgimpwidgets-2.0.so.0 libgimp2-2.10.38_1 +libgimpui-2.0.so.0 libgimp2-2.10.38_1 +libgimpbase-2.0.so.0 libgimp2-2.10.38_1 +libgimpthumb-2.0.so.0 libgimp2-2.10.38_1 +libgimpconfig-2.0.so.0 libgimp2-2.10.38_1 +libgimpmath-2.0.so.0 libgimp2-2.10.38_1 +libgimpcolor-2.0.so.0 libgimp2-2.10.38_1 +libgimpmodule-2.0.so.0 libgimp2-2.10.38_1 +libgimp-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpwidgets-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpui-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpbase-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpthumb-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpconfig-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpmath-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpcolor-3.0.so.0 libgimp-3.0.0+rc1_1 +libgimpmodule-3.0.so.0 libgimp-3.0.0+rc1_1 libgmic.so.3 gmic-3.1.6_1 libcgmic.so.3 gmic-3.1.6_1 libexiv2.so.28 exiv2-0.28.1_1 diff --git a/srcpkgs/gimp-python b/srcpkgs/gimp-python deleted file mode 120000 index 92344a4bb4a963..00000000000000 --- a/srcpkgs/gimp-python +++ /dev/null @@ -1 +0,0 @@ -gimp \ No newline at end of file diff --git a/srcpkgs/gimp/INSTALL b/srcpkgs/gimp/INSTALL index 87064d64438f00..daeff6b33cec0f 100644 --- a/srcpkgs/gimp/INSTALL +++ b/srcpkgs/gimp/INSTALL @@ -2,7 +2,7 @@ case "${ACTION}" in pre) if [ "$UPDATE" = "yes" ]; then - xbps-query -f gimp | grep "usr/lib/gimp/2.0/plug-ins" | sed -e 's|/||' | xargs rm + xbps-query -f gimp | grep "usr/lib/gimp/2.0/plug-ins" | sed -e 's|/||' | xargs rm -f fi ;; esac diff --git a/srcpkgs/gimp/INSTALL.msg b/srcpkgs/gimp/INSTALL.msg new file mode 100644 index 00000000000000..24e3bddd8303ba --- /dev/null +++ b/srcpkgs/gimp/INSTALL.msg @@ -0,0 +1,2 @@ +GIMP 3 breaks compatibility with many plugins. If you wish to continue +using GIMP 2.x plugins, install gimp2. diff --git a/srcpkgs/gimp/patches/atol.patch b/srcpkgs/gimp/patches/atol.patch new file mode 100644 index 00000000000000..3d660783db053b --- /dev/null +++ b/srcpkgs/gimp/patches/atol.patch @@ -0,0 +1,21 @@ +source: https://github.com/chimera-linux/cports/blob/master/main/gimp/patches/atol.patch + +commit f3237e747d854967a5333b5870dc7aae5cd19431 +Author: q66 +Date: Fri May 12 02:52:40 2023 +0200 + + don't use unsafe atol + +diff --git a/plug-ins/script-fu/libscriptfu/tinyscheme/scheme.c b/plug-ins/script-fu/libscriptfu/tinyscheme/scheme.c +index 5a3b68e..81e8b0d 100644 +--- a/plug-ins/script-fu/libscriptfu/tinyscheme/scheme.c ++++ b/plug-ins/script-fu/libscriptfu/tinyscheme/scheme.c +@@ -1256,7 +1256,7 @@ static pointer mk_atom(scheme *sc, char *q) { + if(has_dec_point) { + return mk_real(sc,g_ascii_strtod(q,NULL)); + } +- return (mk_integer(sc, atol(q))); ++ return (mk_integer(sc, strtol(q, NULL, 10))); + } + + /* make atom from sharp expr representing constant. diff --git a/srcpkgs/gimp/patches/brushes.patch b/srcpkgs/gimp/patches/brushes.patch new file mode 100644 index 00000000000000..47a7c225dd38ea --- /dev/null +++ b/srcpkgs/gimp/patches/brushes.patch @@ -0,0 +1,15 @@ +source: https://github.com/chimera-linux/cports/blob/master/main/gimp/patches/brushes.patch + +diff --git a/meson.build b/meson.build +index daae225..7744671 100644 +--- a/meson.build ++++ b/meson.build +@@ -378,7 +378,7 @@ lcms_minver = '2.8' + lcms = dependency('lcms2', version: '>='+lcms_minver) + libmypaint_minver = '1.3.0' + libmypaint = dependency('libmypaint', version: '>='+libmypaint_minver) +-mypaint_brushes = dependency('mypaint-brushes-1.0',version: '>='+libmypaint_minver) ++mypaint_brushes = dependency('mypaint-brushes-2.0',version: '>='+libmypaint_minver) + if not libmypaint.version().version_compare('>=1.4.0') + libmypaint_warning=''' + diff --git a/srcpkgs/gimp/patches/fix-cross.patch b/srcpkgs/gimp/patches/fix-cross.patch deleted file mode 100644 index 0ffcf9b650b987..00000000000000 --- a/srcpkgs/gimp/patches/fix-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/plug-ins/script-fu/Makefile.am 2018-05-18 00:03:53.095184079 +0200 -+++ b/plug-ins/script-fu/Makefile.am 2018-05-18 00:04:50.184762769 +0200 -@@ -14,6 +14,7 @@ else - libm = -lm - endif - -+libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la - libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la - libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la - libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la -@@ -85,6 +86,7 @@ script_fu_SOURCES = \ - scheme-wrapper.h - - LDADD = \ -+ $(libgimpmodule) \ - $(libgimpui) \ - $(libgimpwidgets) \ - $(libgimpconfig) \ diff --git a/srcpkgs/gimp/patches/fix-segfault.patch b/srcpkgs/gimp/patches/fix-segfault.patch deleted file mode 100644 index 5f1a6a6d3fe977..00000000000000 --- a/srcpkgs/gimp/patches/fix-segfault.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff --git app/dialogs/dialogs.c app/dialogs/dialogs.c -index 064f2c4..b17d82f 100644 ---- a/app/dialogs/dialogs.c -+++ b/app/dialogs/dialogs.c -@@ -534,11 +534,15 @@ dialogs_init (Gimp *gimp, - menu_factory); - gimp_dialog_factory_set_singleton (factory); - -- for (i = 0; i < G_N_ELEMENTS (entries); i++) -+ for (i = 0; i < G_N_ELEMENTS (entries); i++) { -+ char *name, *blurb; -+ name = entries[i].name ? gettext(entries[i].name) : NULL; -+ blurb = entries[i].blurb ? gettext(entries[i].blurb) : NULL; -+ - gimp_dialog_factory_register_entry (factory, - entries[i].identifier, -- gettext (entries[i].name), -- gettext (entries[i].blurb), -+ name, -+ blurb, - entries[i].icon_name, - entries[i].help_id, - entries[i].new_func, -@@ -551,6 +555,7 @@ dialogs_init (Gimp *gimp, - entries[i].hideable, - entries[i].image_window, - entries[i].dockable); -+ } - - global_recent_docks = gimp_list_new (GIMP_TYPE_SESSION_INFO, FALSE); - } -diff --git app/widgets/gimpactiongroup.c app/widgets/gimpactiongroup.c -index 04bd1b6..12eff51 100644 ---- a/app/widgets/gimpactiongroup.c -+++ b/app/widgets/gimpactiongroup.c -@@ -393,7 +393,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, - for (i = 0; i < n_entries; i++) - { - GimpAction *action; -- const gchar *label; -+ const gchar *label = NULL; - const gchar *tooltip = NULL; - - if (! gimp_action_group_check_unique_action (group, entries[i].name)) -@@ -401,15 +401,18 @@ gimp_action_group_add_actions (GimpActionGroup *group, - - if (msg_context) - { -- label = g_dpgettext2 (NULL, msg_context, entries[i].label); -+ if (entries[i].label) -+ label = g_dpgettext2 (NULL, msg_context, entries[i].label); - - if (entries[i].tooltip) - tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); - } - else - { -- label = gettext (entries[i].label); -- tooltip = gettext (entries[i].tooltip); -+ if (entries[i].label) -+ label = gettext (entries[i].label); -+ if (entries[i].tooltip) -+ tooltip = gettext (entries[i].tooltip); - } - - action = gimp_action_impl_new (entries[i].name, label, tooltip, -@@ -450,15 +453,18 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, - - if (msg_context) - { -- label = g_dpgettext2 (NULL, msg_context, entries[i].label); -+ if (entries[i].label) -+ label = g_dpgettext2 (NULL, msg_context, entries[i].label); - - if (entries[i].tooltip) - tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); - } - else - { -- label = gettext (entries[i].label); -- tooltip = gettext (entries[i].tooltip); -+ if (entries[i].label) -+ label = gettext (entries[i].label); -+ if (entries[i].tooltip) -+ tooltip = gettext (entries[i].tooltip); - } - - action = gimp_toggle_action_new (entries[i].name, label, tooltip, -@@ -504,17 +510,20 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, - if (! gimp_action_group_check_unique_action (group, entries[i].name)) - continue; - -- if (msg_context) -+ if (msg_context) - { -- label = g_dpgettext2 (NULL, msg_context, entries[i].label); -+ if (entries[i].label) -+ label = g_dpgettext2 (NULL, msg_context, entries[i].label); - - if (entries[i].tooltip) - tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); - } - else - { -- label = gettext (entries[i].label); -- tooltip = gettext (entries[i].tooltip); -+ if (entries[i].label) -+ label = gettext (entries[i].label); -+ if (entries[i].tooltip) -+ tooltip = gettext (entries[i].tooltip); - } - - action = gimp_radio_action_new (entries[i].name, label, tooltip, -@@ -560,7 +569,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, - for (i = 0; i < n_entries; i++) - { - GimpEnumAction *action; -- const gchar *label; -+ const gchar *label = NULL; - const gchar *tooltip = NULL; - - if (! gimp_action_group_check_unique_action (group, entries[i].name)) -@@ -568,15 +577,18 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, - - if (msg_context) - { -- label = g_dpgettext2 (NULL, msg_context, entries[i].label); -+ if (entries[i].label) -+ label = g_dpgettext2 (NULL, msg_context, entries[i].label); - - if (entries[i].tooltip) - tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); - } - else - { -- label = gettext (entries[i].label); -- tooltip = gettext (entries[i].tooltip); -+ if (entries[i].label) -+ label = gettext (entries[i].label); -+ if (entries[i].tooltip) -+ tooltip = gettext (entries[i].tooltip); - } - - action = gimp_enum_action_new (entries[i].name, label, tooltip, -@@ -618,17 +630,20 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, - if (! gimp_action_group_check_unique_action (group, entries[i].name)) - continue; - -- if (msg_context) -+ if (msg_context) - { -- label = g_dpgettext2 (NULL, msg_context, entries[i].label); -+ if (entries[i].label) -+ label = g_dpgettext2 (NULL, msg_context, entries[i].label); - - if (entries[i].tooltip) - tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); - } - else - { -- label = gettext (entries[i].label); -- tooltip = gettext (entries[i].tooltip); -+ if (entries[i].label) -+ label = gettext (entries[i].label); -+ if (entries[i].tooltip) -+ tooltip = gettext (entries[i].tooltip); - } - - action = gimp_string_action_new (entries[i].name, label, tooltip, diff --git a/srcpkgs/gimp/patches/gcc14.patch b/srcpkgs/gimp/patches/gcc14.patch deleted file mode 100644 index ceae92fa154c82..00000000000000 --- a/srcpkgs/gimp/patches/gcc14.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 99531e73e95bf6de4aed9bf64ac3f306e6dfb490 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Fri, 13 Jan 2023 13:29:07 +0100 -Subject: [PATCH] configure.ac: Improve C99 compatibility of IPC_RMID check - -Do not call the undeclared exit function. Implicit function -declarations are likely not going to be supported by future compilers -by default, changing the outcome of this configure probe with -such compilers. ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 03047899841..b8718955471 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1254,17 +1254,17 @@ elif test "x$shmtype" = "xsysv"; then - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); - if (id == -1) -- exit (2); -+ return 2; - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); -- exit (1); -+ return 1; - } - shmdt (shmaddr); - shmdt (shmaddr); -- exit (0); -+ return 0; - } - ]])], - [AC_DEFINE([IPC_RMID_DEFERRED_RELEASE],[1], -diff --git a/configure b/configure -index 6e62da8e3c164f82..f1c447baf7ff68f7 100755 ---- a/configure -+++ b/configure -@@ -28898,17 +28898,17 @@ else $as_nop - char *shmaddr; - id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); - if (id == -1) -- exit (2); -+ return 2; - shmaddr = shmat (id, 0, 0); - shmctl (id, IPC_RMID, 0); - if ((char*) shmat (id, 0, 0) == (char*) -1) - { - shmdt (shmaddr); -- exit (1); -+ return 1; - } - shmdt (shmaddr); - shmdt (shmaddr); -- exit (0); -+ return 0; - } - - _ACEOF diff --git a/srcpkgs/gimp/patches/libheif-1.18-compat.patch b/srcpkgs/gimp/patches/libheif-1.18-compat.patch deleted file mode 100644 index e714d25f2bab6b..00000000000000 --- a/srcpkgs/gimp/patches/libheif-1.18-compat.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac 2024-08-29 18:28:19.457012043 -0500 -+++ b/configure.ac 2024-08-29 18:28:29.154953488 -0500 -@@ -1843,13 +1843,13 @@ - can_import_avif=no - can_export_avif=no - if test "x$have_libheif" = xyes; then -- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` -- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` -+ can_import_heic=yes -+ can_export_heic=yes - if test "x$can_import_heic" = xyes; then - MIME_TYPES="$MIME_TYPES;image/heif;image/heic" - fi -- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` -- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` -+ can_import_avif=yes -+ can_export_avif=yes - if test "x$can_import_avif" = xyes; then - MIME_TYPES="$MIME_TYPES;image/avif" - fi diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index a50409d5ce5af1..e124731dac642e 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,34 +1,36 @@ # Template file for 'gimp' pkgname=gimp -version=2.10.38 -revision=3 -build_style=gnu-configure -configure_args="--disable-check-update --datadir=/usr/share --disable-python" -hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool - 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 glib-networking libwebp-devel - libheif-devel libopenjpeg2-devel x265-devel gtk+-devel" -depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1" +version=3.0.0+rc1 +revision=1 +build_style=meson +build_helper="gir qemu" +configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled + -Dbug-report-url=https://github.com/void-linux/void-packages/issues/new/choose" +hostmakedepends="pkg-config xdg-utils perl libxslt gjs LuaJIT desktop-file-utils + AppStream gettext gi-docgen gobject-introspection + yelp-tools librsvg-devel glib-devel" +makedepends="babl-devel gtk+3-devel gegl-devel libgexiv2-devel libgirepository-devel + libmypaint-devel mypaint-brushes librsvg-devel glib-networking appstream-glib-devel + libXmu-devel ghostscript-devel libmng-devel aalib-devel libXpm-devel libopenexr-devel + libwebp-devel libheif-devel poppler-glib-devel libwmf-devel libopenjpeg2-devel + libjxl-devel alsa-lib-devel cfitsio-devel python3-gobject-devel libgomp-devel + libunwind-devel lua51-lgi" +depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes python3-gobject" +checkdepends="xvfb-run dbus" short_desc="GNU image manipulation program" conf_files="/etc/gimp/${version%%.*}.0/*" maintainer="fosslinux " license="GPL-3.0-only" homepage="https://www.gimp.org" -changelog="https://gitlab.gnome.org/GNOME/gimp/-/raw/gimp-2-10/NEWS" -distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2" -checksum=50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e +distfiles="https://download.gimp.org/gimp/v${version%.*}/gimp-${version/+rc/-RC}.tar.xz" +checksum=b3d0b264c5e38e789faaf3417003397f3240014c59c7f417f9ca3bd39c5ffb66 lib32disabled=yes -no_generic_pkgconfig_link=yes -pre_configure() { - NOCONFIGURE=1 autoreconf -fi - # don't allow configure to set DATADIRNAME=lib - vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure -} +if [ -n "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -Dheadless-tests=enabled" +else + configure_args+=" -Dheadless-tests=disabled" +fi libgimp_package() { short_desc+=" - runtime libraries" @@ -38,13 +40,16 @@ libgimp_package() { } gimp-devel_package() { - depends="gegl-devel gtk+-devel lcms2-devel libgimp>=${version}_${revision}" + depends="libgimp>=${version}_${revision} gegl-devel gtk+3-devel libgexiv2-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc - vmove usr/share/aclocal vmove "usr/lib/*.so" + if [ -z "$CROSS_BUILD" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/vala + vmove usr/share/doc + fi } } From cae0e9de76e466eb2bcd57a2be93741b22573ed9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 11 Jun 2024 21:46:37 -0400 Subject: [PATCH 04/10] New package: gimp2-2.10.38 --- common/shlibs | 9 ++ srcpkgs/gimp2-devel | 1 + srcpkgs/gimp2/INSTALL | 8 ++ srcpkgs/gimp2/patches/fix-cross.patch | 18 +++ srcpkgs/gimp2/patches/fix-segfault.patch | 169 +++++++++++++++++++++++ srcpkgs/gimp2/patches/gcc14.patch | 63 +++++++++ srcpkgs/gimp2/template | 59 ++++++++ srcpkgs/gimp2/update | 2 + srcpkgs/libgimp2 | 1 + 9 files changed, 330 insertions(+) create mode 120000 srcpkgs/gimp2-devel create mode 100644 srcpkgs/gimp2/INSTALL create mode 100644 srcpkgs/gimp2/patches/fix-cross.patch create mode 100644 srcpkgs/gimp2/patches/fix-segfault.patch create mode 100644 srcpkgs/gimp2/patches/gcc14.patch create mode 100644 srcpkgs/gimp2/template create mode 100644 srcpkgs/gimp2/update create mode 120000 srcpkgs/libgimp2 diff --git a/common/shlibs b/common/shlibs index 56eb1a2f9ebee1..166b3c61f91706 100644 --- a/common/shlibs +++ b/common/shlibs @@ -560,6 +560,15 @@ libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1 libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.0_1 +libgimp-2.0.so.0 libgimp2-2.10.38_1 +libgimpwidgets-2.0.so.0 libgimp2-2.10.38_1 +libgimpui-2.0.so.0 libgimp2-2.10.38_1 +libgimpbase-2.0.so.0 libgimp2-2.10.38_1 +libgimpthumb-2.0.so.0 libgimp2-2.10.38_1 +libgimpconfig-2.0.so.0 libgimp2-2.10.38_1 +libgimpmath-2.0.so.0 libgimp2-2.10.38_1 +libgimpcolor-2.0.so.0 libgimp2-2.10.38_1 +libgimpmodule-2.0.so.0 libgimp2-2.10.38_1 libgimp-3.0.so.0 libgimp-2.99.18_1 libgimpwidgets-3.0.so.0 libgimp-2.99.18_1 libgimpui-3.0.so.0 libgimp-2.99.18_1 diff --git a/srcpkgs/gimp2-devel b/srcpkgs/gimp2-devel new file mode 120000 index 00000000000000..cae4fa79d617de --- /dev/null +++ b/srcpkgs/gimp2-devel @@ -0,0 +1 @@ +gimp2 \ No newline at end of file diff --git a/srcpkgs/gimp2/INSTALL b/srcpkgs/gimp2/INSTALL new file mode 100644 index 00000000000000..87064d64438f00 --- /dev/null +++ b/srcpkgs/gimp2/INSTALL @@ -0,0 +1,8 @@ +# workaround for https://github.com/void-linux/xbps/issues/14 +case "${ACTION}" in +pre) + if [ "$UPDATE" = "yes" ]; then + xbps-query -f gimp | grep "usr/lib/gimp/2.0/plug-ins" | sed -e 's|/||' | xargs rm + fi + ;; +esac diff --git a/srcpkgs/gimp2/patches/fix-cross.patch b/srcpkgs/gimp2/patches/fix-cross.patch new file mode 100644 index 00000000000000..0ffcf9b650b987 --- /dev/null +++ b/srcpkgs/gimp2/patches/fix-cross.patch @@ -0,0 +1,18 @@ +--- a/plug-ins/script-fu/Makefile.am 2018-05-18 00:03:53.095184079 +0200 ++++ b/plug-ins/script-fu/Makefile.am 2018-05-18 00:04:50.184762769 +0200 +@@ -14,6 +14,7 @@ else + libm = -lm + endif + ++libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la + libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la + libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la + libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la +@@ -85,6 +86,7 @@ script_fu_SOURCES = \ + scheme-wrapper.h + + LDADD = \ ++ $(libgimpmodule) \ + $(libgimpui) \ + $(libgimpwidgets) \ + $(libgimpconfig) \ diff --git a/srcpkgs/gimp2/patches/fix-segfault.patch b/srcpkgs/gimp2/patches/fix-segfault.patch new file mode 100644 index 00000000000000..5f1a6a6d3fe977 --- /dev/null +++ b/srcpkgs/gimp2/patches/fix-segfault.patch @@ -0,0 +1,169 @@ +diff --git app/dialogs/dialogs.c app/dialogs/dialogs.c +index 064f2c4..b17d82f 100644 +--- a/app/dialogs/dialogs.c ++++ b/app/dialogs/dialogs.c +@@ -534,11 +534,15 @@ dialogs_init (Gimp *gimp, + menu_factory); + gimp_dialog_factory_set_singleton (factory); + +- for (i = 0; i < G_N_ELEMENTS (entries); i++) ++ for (i = 0; i < G_N_ELEMENTS (entries); i++) { ++ char *name, *blurb; ++ name = entries[i].name ? gettext(entries[i].name) : NULL; ++ blurb = entries[i].blurb ? gettext(entries[i].blurb) : NULL; ++ + gimp_dialog_factory_register_entry (factory, + entries[i].identifier, +- gettext (entries[i].name), +- gettext (entries[i].blurb), ++ name, ++ blurb, + entries[i].icon_name, + entries[i].help_id, + entries[i].new_func, +@@ -551,6 +555,7 @@ dialogs_init (Gimp *gimp, + entries[i].hideable, + entries[i].image_window, + entries[i].dockable); ++ } + + global_recent_docks = gimp_list_new (GIMP_TYPE_SESSION_INFO, FALSE); + } +diff --git app/widgets/gimpactiongroup.c app/widgets/gimpactiongroup.c +index 04bd1b6..12eff51 100644 +--- a/app/widgets/gimpactiongroup.c ++++ b/app/widgets/gimpactiongroup.c +@@ -393,7 +393,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, + for (i = 0; i < n_entries; i++) + { + GimpAction *action; +- const gchar *label; ++ const gchar *label = NULL; + const gchar *tooltip = NULL; + + if (! gimp_action_group_check_unique_action (group, entries[i].name)) +@@ -401,15 +401,18 @@ gimp_action_group_add_actions (GimpActionGroup *group, + + if (msg_context) + { +- label = g_dpgettext2 (NULL, msg_context, entries[i].label); ++ if (entries[i].label) ++ label = g_dpgettext2 (NULL, msg_context, entries[i].label); + + if (entries[i].tooltip) + tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); + } + else + { +- label = gettext (entries[i].label); +- tooltip = gettext (entries[i].tooltip); ++ if (entries[i].label) ++ label = gettext (entries[i].label); ++ if (entries[i].tooltip) ++ tooltip = gettext (entries[i].tooltip); + } + + action = gimp_action_impl_new (entries[i].name, label, tooltip, +@@ -450,15 +453,18 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, + + if (msg_context) + { +- label = g_dpgettext2 (NULL, msg_context, entries[i].label); ++ if (entries[i].label) ++ label = g_dpgettext2 (NULL, msg_context, entries[i].label); + + if (entries[i].tooltip) + tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); + } + else + { +- label = gettext (entries[i].label); +- tooltip = gettext (entries[i].tooltip); ++ if (entries[i].label) ++ label = gettext (entries[i].label); ++ if (entries[i].tooltip) ++ tooltip = gettext (entries[i].tooltip); + } + + action = gimp_toggle_action_new (entries[i].name, label, tooltip, +@@ -504,17 +510,20 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, + if (! gimp_action_group_check_unique_action (group, entries[i].name)) + continue; + +- if (msg_context) ++ if (msg_context) + { +- label = g_dpgettext2 (NULL, msg_context, entries[i].label); ++ if (entries[i].label) ++ label = g_dpgettext2 (NULL, msg_context, entries[i].label); + + if (entries[i].tooltip) + tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); + } + else + { +- label = gettext (entries[i].label); +- tooltip = gettext (entries[i].tooltip); ++ if (entries[i].label) ++ label = gettext (entries[i].label); ++ if (entries[i].tooltip) ++ tooltip = gettext (entries[i].tooltip); + } + + action = gimp_radio_action_new (entries[i].name, label, tooltip, +@@ -560,7 +569,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, + for (i = 0; i < n_entries; i++) + { + GimpEnumAction *action; +- const gchar *label; ++ const gchar *label = NULL; + const gchar *tooltip = NULL; + + if (! gimp_action_group_check_unique_action (group, entries[i].name)) +@@ -568,15 +577,18 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, + + if (msg_context) + { +- label = g_dpgettext2 (NULL, msg_context, entries[i].label); ++ if (entries[i].label) ++ label = g_dpgettext2 (NULL, msg_context, entries[i].label); + + if (entries[i].tooltip) + tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); + } + else + { +- label = gettext (entries[i].label); +- tooltip = gettext (entries[i].tooltip); ++ if (entries[i].label) ++ label = gettext (entries[i].label); ++ if (entries[i].tooltip) ++ tooltip = gettext (entries[i].tooltip); + } + + action = gimp_enum_action_new (entries[i].name, label, tooltip, +@@ -618,17 +630,20 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, + if (! gimp_action_group_check_unique_action (group, entries[i].name)) + continue; + +- if (msg_context) ++ if (msg_context) + { +- label = g_dpgettext2 (NULL, msg_context, entries[i].label); ++ if (entries[i].label) ++ label = g_dpgettext2 (NULL, msg_context, entries[i].label); + + if (entries[i].tooltip) + tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); + } + else + { +- label = gettext (entries[i].label); +- tooltip = gettext (entries[i].tooltip); ++ if (entries[i].label) ++ label = gettext (entries[i].label); ++ if (entries[i].tooltip) ++ tooltip = gettext (entries[i].tooltip); + } + + action = gimp_string_action_new (entries[i].name, label, tooltip, diff --git a/srcpkgs/gimp2/patches/gcc14.patch b/srcpkgs/gimp2/patches/gcc14.patch new file mode 100644 index 00000000000000..ceae92fa154c82 --- /dev/null +++ b/srcpkgs/gimp2/patches/gcc14.patch @@ -0,0 +1,63 @@ +From 99531e73e95bf6de4aed9bf64ac3f306e6dfb490 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 13 Jan 2023 13:29:07 +0100 +Subject: [PATCH] configure.ac: Improve C99 compatibility of IPC_RMID check + +Do not call the undeclared exit function. Implicit function +declarations are likely not going to be supported by future compilers +by default, changing the outcome of this configure probe with +such compilers. +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 03047899841..b8718955471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1254,17 +1254,17 @@ elif test "x$shmtype" = "xsysv"; then + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); + if (id == -1) +- exit (2); ++ return 2; + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); +- exit (1); ++ return 1; + } + shmdt (shmaddr); + shmdt (shmaddr); +- exit (0); ++ return 0; + } + ]])], + [AC_DEFINE([IPC_RMID_DEFERRED_RELEASE],[1], +diff --git a/configure b/configure +index 6e62da8e3c164f82..f1c447baf7ff68f7 100755 +--- a/configure ++++ b/configure +@@ -28898,17 +28898,17 @@ else $as_nop + char *shmaddr; + id = shmget (IPC_PRIVATE, 4, IPC_CREAT | 0600); + if (id == -1) +- exit (2); ++ return 2; + shmaddr = shmat (id, 0, 0); + shmctl (id, IPC_RMID, 0); + if ((char*) shmat (id, 0, 0) == (char*) -1) + { + shmdt (shmaddr); +- exit (1); ++ return 1; + } + shmdt (shmaddr); + shmdt (shmaddr); +- exit (0); ++ return 0; + } + + _ACEOF diff --git a/srcpkgs/gimp2/template b/srcpkgs/gimp2/template new file mode 100644 index 00000000000000..6e4cd9a04cd410 --- /dev/null +++ b/srcpkgs/gimp2/template @@ -0,0 +1,59 @@ +# Template file for 'gimp2' +pkgname=gimp2 +version=2.10.38 +revision=1 +build_style=gnu-configure +configure_args="--disable-check-update --datadir=/usr/share --disable-python + --disable-default-binary" +hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool + 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 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 (version 2.x)" +conf_files="/etc/gimp/${version%%.*}.0/*" +maintainer="fosslinux " +license="GPL-3.0-only" +homepage="https://www.gimp.org" +changelog="https://gitlab.gnome.org/GNOME/gimp/-/raw/gimp-2-10/NEWS" +distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2" +checksum=50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e +lib32disabled=yes +no_generic_pkgconfig_link=yes + +pre_configure() { + NOCONFIGURE=1 autoreconf -fi + # don't allow configure to set DATADIRNAME=lib + vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + +post_install() { + vsed -i -e "s/^Name.*$/& ${version%.*}/" -e "s/^Icon.*$/&-${version%.*}/" "${DESTDIR}/usr/share/applications/gimp.desktop" + mv "${DESTDIR}/usr/share/applications/gimp.desktop" "${DESTDIR}/usr/share/applications/gimp-${version%.*}.desktop" + find "${DESTDIR}/usr/share/icons/hicolor" -name gimp.png -execdir mv {} "gimp-${version%.*}.png" \; + vsed -i -e "s/org.gimp.GIMP/&${version%%.*}/" "${DESTDIR}/usr/share/metainfo/org.gimp.GIMP.appdata.xml" + mv "${DESTDIR}/usr/share/metainfo/org.gimp.GIMP.appdata.xml" "${DESTDIR}/usr/share/metainfo/org.gimp.GIMP${version%%.*}.appdata.xml" +} + +libgimp2_package() { + short_desc+=" - runtime libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +gimp2-devel_package() { + depends="gegl-devel gtk+-devel lcms2-devel libgimp2>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + vmove usr/share/aclocal + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/gimp2/update b/srcpkgs/gimp2/update new file mode 100644 index 00000000000000..0e2a52581a8290 --- /dev/null +++ b/srcpkgs/gimp2/update @@ -0,0 +1,2 @@ +pkgname=gimp +ignore="*.99.*" diff --git a/srcpkgs/libgimp2 b/srcpkgs/libgimp2 new file mode 120000 index 00000000000000..cae4fa79d617de --- /dev/null +++ b/srcpkgs/libgimp2 @@ -0,0 +1 @@ +gimp2 \ No newline at end of file From 05b49495c17da17d8212424ff14ce657680b102e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:08 -0400 Subject: [PATCH 05/10] libjxl: rebuild against libgimp2 gimp 3 supports jxl now, and this would cause a dependency loop --- srcpkgs/libjxl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template index bdf38b2432761f..3d054b570a7662 100644 --- a/srcpkgs/libjxl/template +++ b/srcpkgs/libjxl/template @@ -1,7 +1,7 @@ # Template file for 'libjxl' pkgname=libjxl version=0.10.3 -revision=2 +revision=3 _testdata_hash=ff8d743aaba05b3014f17e5475e576242fa979fc build_style=cmake configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF @@ -9,7 +9,7 @@ configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_SKCMS=OFF" hostmakedepends="tar pkg-config asciidoc" makedepends="brotli-devel highway-devel libpng-devel giflib-devel libjpeg-turbo-devel - libopenexr-devel libwebp-devel gdk-pixbuf-devel gimp-devel lcms2-devel" + libopenexr-devel libwebp-devel gdk-pixbuf-devel gimp2-devel lcms2-devel" checkdepends="gtest-devel xdg-utils" short_desc="JPEG XL image format reference implementation" maintainer="Joshua Krämer " From 5fe4e8076f9d0cdc226421f92c058aefd3fe6a7b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:09 -0400 Subject: [PATCH 06/10] gmic: rebuild for gimp-3.0.0 --- .../patches/03-plugindir-and-no-wget.patch | 20 +++++++-------- srcpkgs/gmic/patches/gimp3.patch | 25 +++++++++++++++++++ srcpkgs/gmic/template | 25 ++++++++++--------- 3 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 srcpkgs/gmic/patches/gimp3.patch diff --git a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch index 5b403240efc919..9aa4d7a4c4bbd6 100644 --- a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch +++ b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch @@ -1,15 +1,13 @@ -Index: gmic-2.9.9/src/Makefile -=================================================================== ---- gmic-2.9.9.orig/src/Makefile -+++ gmic-2.9.9/src/Makefile -@@ -67,8 +67,8 @@ INCLUDE = include - SO = .so +--- a/src/Makefile ++++ b/src/Makefile +@@ -86,8 +86,8 @@ + INCLUDE ?= include PIC = -fPIC EXE = -WGET = wget --no-check-certificate --quiet -O --PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins +-PLUGIN = $(shell gimptool-2.0 --gimpplugindir)/plug-ins +WGET = false -+PLUGINDIR = /usr/lib/gimp/2.0/plug-ins - VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3) - VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1) - VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1) ++PLUGIN = $(shell gimptool-3.0 --gimpplugindir)/plug-ins + SHARE = $(PREFIX)/share + BASH_COMPLETIONSDIR = $(shell pkg-config --variable completionsdir bash-completion || echo $(SHARE)/bash-completion/completions) + VERSION = $(shell grep -F 'gmic_version ' gmic.h | tail -c4 | head -c3) diff --git a/srcpkgs/gmic/patches/gimp3.patch b/srcpkgs/gmic/patches/gimp3.patch new file mode 100644 index 00000000000000..471866c5e97d33 --- /dev/null +++ b/srcpkgs/gmic/patches/gimp3.patch @@ -0,0 +1,25 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -577,11 +577,11 @@ + # G'MIC-Qt. + #---------- + gimp: gmic_qt_files CImg.h gmic_stdlib_community.h +- cd ../gmic-qt && $(QMAKE) CONFIG+=release GMIC_PATH=$(SRC_PATH) PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=off HOST=gimp gmic_qt.pro && $(MAKE) ++ cd ../gmic-qt && $(QMAKE) CONFIG+=release GMIC_PATH=$(SRC_PATH) PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=off HOST=gimp3 gmic_qt.pro && $(MAKE) + @echo "Executable 'gmic_gimp_qt' has been successfully compiled in '../gmic-qt/'." + + gimp_debug : gmic_qt_files CImg.h gmic_stdlib_community.h +- cd ../gmic-qt && $(QMAKE) CONFIG+=debug GMIC_PATH=$(SRC_PATH) ASAN=on PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=off HOST=gimp gmic_qt.pro && $(MAKE) ++ cd ../gmic-qt && $(QMAKE) CONFIG+=debug GMIC_PATH=$(SRC_PATH) ASAN=on PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=off HOST=gimp3 gmic_qt.pro && $(MAKE) + @echo "Executable 'gmic_gimp_qt' has been successfully compiled in '../gmic-qt/'." + + gmic_qt: gmic_qt_files CImg.h gmic_stdlib_community.h +@@ -619,7 +619,7 @@ + # G'MIC-Qt (shared). + #------------------- + gimp_shared: gmic_qt_files CImg.h gmic_stdlib_community.h +- cd ../gmic-qt && $(QMAKE) CONFIG+=release GMIC_PATH=$(SRC_PATH) PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=on HOST=gimp gmic_qt.pro && $(MAKE) ++ cd ../gmic-qt && $(QMAKE) CONFIG+=release GMIC_PATH=$(SRC_PATH) PRERELEASE=$(PRERELEASE) GMIC_DYNAMIC_LINKING=on HOST=gimp3 gmic_qt.pro && $(MAKE) + @echo "Executable 'gmic_gimp_qt' has been successfully compiled in '../gmic-qt/'." + + gmic_qt_shared: gmic_qt_files CImg.h gmic_stdlib_community.h diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 24d10147e3abad..14ecc2c7150dd6 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,31 +1,32 @@ # Template file for 'gmic' pkgname=gmic -version=3.1.6 -revision=6 -_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0 -create_wrksrc=yes +version=3.4.3 +revision=1 +_zart_hash=d014169343f835381ad232ee11e077326561c9eb build_wrksrc="src" build_style=gnu-makefile -build_helper=qmake +build_helper=qmake6 make_build_args="NOSTRIP=yes" make_use_env=yes -hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake" +hostmakedepends="pkg-config gimp qt6-tools qt6-base" makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel - gtk+-devel gimp-devel qt5-devel" + gtk+3-devel gimp-devel qt6-base-devel libwebp-devel" short_desc="GREYC's Magic for Image Computing (image processing framework)" maintainer="Orphaned " license="CECILL-2.1, CECILL-C" homepage="https://gmic.eu/" distfiles="https://gmic.eu/files/source/gmic_${version}.tar.gz - https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz" -checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4 - 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8" + https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz>zart-${_zart_hash}.tar.gz" +checksum="79951d06db2928c68bad1d352e536af3f454e9a3c09beefc2c1049d8b4084507 + baebe339566993194f98a71895bff09520b08f38e66eae215758aaa260557bcf" disable_parallel_build="yes" +skip_extraction="zart-${_zart_hash}.tar.gz" + +broken="https://github.com/c-koi/gmic-qt/issues/213" post_extract() { - mv gmic-${version}/* . - mv zart-${_zart_hash} zart + vsrcextract -C zart zart-${_zart_hash}.tar.gz } post_install() { From 11dcdeb63d229b53a5213f3f4a10328272c2be4a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:10 -0400 Subject: [PATCH 07/10] nufraw: rebuild against libgimp2 --- srcpkgs/nufraw/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nufraw/template b/srcpkgs/nufraw/template index 551f263df96d38..1acceb721d13ed 100644 --- a/srcpkgs/nufraw/template +++ b/srcpkgs/nufraw/template @@ -1,15 +1,13 @@ # Template file for 'nufraw' pkgname=nufraw version=0.43.3 -revision=1 +revision=2 _ver="${version%.*}-${version##*.}" build_style=gnu-configure configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp --enable-extras" hostmakedepends="pkg-config automake libtool glib-devel" -# libgexiv2-devel is only here to fix build order, remove on next template -# change -makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel +makedepends="gimp2-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel jasper-devel libgexiv2-devel" depends="desktop-file-utils" short_desc="Utility to read and manipulate raw images from digital cameras" @@ -18,6 +16,7 @@ license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/nufraw/" distfiles="${SOURCEFORGE_SITE}/nufraw/nufraw-${_ver}.tar.gz" checksum=2c7dcc1590993ec267b3112562b2433010d6f94f6acc6506c76aa29cf8c6c32c +conflicts="dcraw>=0" case "$XBPS_TARGET_MACHINE" in armv[67]l* | aarch64* | riscv64*) @@ -36,8 +35,8 @@ pre_build() { } nufraw-gimp_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - gimp plugin" + depends="gimp2 ${sourcepkg}>=${version}_${revision}" + short_desc+=" - GIMP 2 plugin" pkg_install() { vmove usr/lib/gimp } From b14dd2d1fe57e54f8e3c36d0e9bc00b194d71c8e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:11 -0400 Subject: [PATCH 08/10] xsane: rebuild against libgimp2 https://gitlab.com/sane-project/frontend/xsane/-/issues/66 --- srcpkgs/xsane/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template index 7dde32af2b674c..67c53e94489fab 100644 --- a/srcpkgs/xsane/template +++ b/srcpkgs/xsane/template @@ -1,9 +1,9 @@ # Template file for 'xsane' pkgname=xsane version=0.999 -revision=5 +revision=6 hostmakedepends="pkg-config sane-devel gettext" -makedepends="gtk+-devel lcms-devel sane-devel gimp-devel" +makedepends="gtk+-devel lcms-devel sane-devel gimp2-devel" depends="sane" short_desc="GTK-based X11 frontend for SANE" maintainer="Orphaned " @@ -36,8 +36,8 @@ do_install() { } xsane-gimp_package() { - short_desc+=" - plugin for GIMP" - depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - plugin for GIMP 2" + depends="gimp2 ${sourcepkg}>=${version}_${revision}" pkg_install() { vbin src/xsane-gimp vmkdir usr/lib/gimp/2.0/plug-ins From f4b489ab196e8a21062328b028dbd5275fb55efb Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 02:44:11 -0400 Subject: [PATCH 09/10] gimp-lqr-plugin: rebuild against libgimp2 https://github.com/carlobaldassi/gimp-lqr-plugin/issues/17 --- srcpkgs/gimp-lqr-plugin/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template index 7878f6cb795d24..33a395c67a8583 100644 --- a/srcpkgs/gimp-lqr-plugin/template +++ b/srcpkgs/gimp-lqr-plugin/template @@ -1,11 +1,12 @@ # Template file for 'gimp-lqr-plugin' pkgname=gimp-lqr-plugin version=0.7.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake intltool pkg-config" -makedepends="gimp-devel glib-devel gettext-devel liblqr-devel" -short_desc="Gimp plugins for image resizing through seam carving" +makedepends="gimp2-devel glib-devel gettext-devel liblqr-devel" +depends="gimp2" +short_desc="GIMP 2 plugins for image resizing through seam carving" maintainer="CoolOhm " license="GPL-2.0-or-later" homepage="http://liquidrescale.wikidot.com/" From f9cabe8bb6bbb62bffe69b8a3395d0d31753c2f6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 18 Apr 2024 03:22:14 -0400 Subject: [PATCH 10/10] resynthesizer: update to 2.0.3+3. WIP gimp 3 port: https://github.com/bootchk/resynthesizer/issues/135 --- srcpkgs/resynthesizer/template | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/srcpkgs/resynthesizer/template b/srcpkgs/resynthesizer/template index a58b0eec995854..271cc419fd005a 100644 --- a/srcpkgs/resynthesizer/template +++ b/srcpkgs/resynthesizer/template @@ -1,26 +1,15 @@ # Template file for 'resynthesizer' pkgname=resynthesizer -version=2.0.3+1 +version=2.0.3+3 revision=1 -_commit=701e890d1d456e215e05daa7b4a88f5d9c6c03b3 -build_style=gnu-configure -hostmakedepends="automake intltool pkg-config" +_commit=12a967da9d723321b06e37c2b601cb77c320aedd +build_style=meson +hostmakedepends="pkg-config" makedepends="gimp-devel glib-devel gettext-devel" -short_desc="Suite of gimp plugins for texture healing and synthesis" +depends="gimp" +short_desc="Suite of GIMP plugins for texture healing and synthesis" maintainer="CoolOhm " license="GPL-2.0-or-later" -# FIXME: when gimp 3 is available, switch back to bootchk upstream -#homepage="https://github.com/bootchk/resynthesizer" -#distfiles="https://github.com/bootchk/resynthesizer/archive/refs/tags/v${version}.tar.gz" -homepage="https://github.com/itr-tert/gimp-resynthesizer-scm" -distfiles="https://github.com/itr-tert/gimp-resynthesizer-scm/archive/${_commit}.tar.gz" -checksum=298286386466fbd6d2da06f8a920c6e6e313db7ca0a094a36a355978a64cefc0 - -if [ "$CROSS_BUILD" ];then - hostmakedepends+=" glib-devel gettext-devel" - AUTOGEN_CONFIGURE_ARGS+=" --host=${XBPS_MACHINE%-musl} --build=${XBPS_CROSS_TRIPLET}" -fi - -pre_configure() { - ./autogen.sh ${AUTOGEN_CONFIGURE_ARGS} -} +homepage="https://github.com/bootchk/resynthesizer" +distfiles="https://github.com/bootchk/resynthesizer/archive/${_commit}.tar.gz" +checksum=de92e808b7415e44c8b6305f2e2e7985269dfc774d00ad06ee323d243f51bef8