From 6ff0ac09e662b8d9c806e29dafa82230c647d5fa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 18 Apr 2024 02:44:35 -0400
Subject: [PATCH 01/10] gegl: update to 0.4.52.

---
 common/shlibs         | 6 +++---
 srcpkgs/gegl/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d402931a0fe9a4..7e034b09e162a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2406,9 +2406,9 @@ libopenrawgnome.so.7 libopenraw-0.1.0_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
 libproc2.so.0 procps-ng-4.0.3_1
-libgegl-0.4.so.0 gegl-0.4.16_1
-libgegl-npd-0.4.so gegl-0.4.16_1
-libgegl-sc-0.4.so gegl-0.4.16_1
+libgegl-0.4.so.0 gegl-0.4.52_1
+libgegl-npd-0.4.so gegl-0.4.52_1
+libgegl-sc-0.4.so gegl-0.4.52_1
 libgnunettransportmonitor.so.0 gnunet-0.12.2_1
 libgnunettransporttesting.so.0 gnunet-0.12.2_1
 libgnunettransporttesting2.so.0 gnunet-0.12.2_1
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index d8fe9c9c5964b3..b3a0dc44c1695d 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,7 +1,7 @@
 # Template file for 'gegl'
 pkgname=gegl
-version=0.4.46
-revision=3
+version=0.4.52
+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=ca212a0fc3e0448c5058c51ca6a0d30fdfb02971f21f28820da2b4901396000a
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Db_lto=false"

From 4e098eda9e8e0b6786f037f8cca18f4cde95c09f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 6 Nov 2024 12:41:45 -0500
Subject: [PATCH 02/10] babl: update to 0.1.110.

---
 common/shlibs         | 2 +-
 srcpkgs/babl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7e034b09e162a1..ba8b336fd22562 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -532,7 +532,7 @@ libkImageAnnotator.so.0 kImageAnnotator-0.7.1_1
 libkImageAnnotator-Qt5.so.0 kImageAnnotator-qt5-0.7.1_1
 libkColorPicker.so.0 kColorPicker-0.3.1_1
 libkColorPicker-Qt5.so.0 kColorPicker-qt5-0.3.1_1
-libbabl-0.1.so.0 babl-0.1.16_1
+libbabl-0.1.so.0 babl-0.1.106_1
 libbamf3.so.2 bamf-0.5.1_1
 libicuio.so.73 icu-libs-73.2_1
 libicui18n.so.73 icu-libs-73.2_1
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 5b7bc24c131cdf8e92b08574817be9bfc462c542 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 18 Apr 2024 02:44:29 -0400
Subject: [PATCH 03/10] gimp: update to 3.0.0+rc2.

---
 common/shlibs                                 |  47 ++++-
 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                         |  59 +++---
 11 files changed, 111 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 ba8b336fd22562..da2072fc82dbaa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,17 +556,46 @@ 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
+libgimp-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpwidgets-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpui-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpbase-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpthumb-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpconfig-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpmath-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpcolor-3.0.so.0 libgimp-3.0.0+rc2_1
+libgimpmodule-3.0.so.0 libgimp-3.0.0+rc2_1
+libgmic.so.3 libgmic-3.5.2_1
+libcgmic.so.3 libgmic-3.5.2_1
 libexiv2.so.28 exiv2-0.28.1_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_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 <q66@chimera-linux.org>
+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 <fweimer@redhat.com>
-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..d0180ad325c927 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,34 +1,40 @@
 # 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+rc2
+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 <fosslinux@aussies.space>"
 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=f4d2f96df180ce5543f8b2b35707b9bf11459f00f726ca73da2f406d686d9db7
 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 [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" gimp"
+fi
+
+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 +44,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 742f83d214e74b5bf9963fedcfad570ef23227e1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 18 Apr 2024 02:44:09 -0400
Subject: [PATCH 04/10] gmic: update to 3.5.2.

---
 .../patches/03-plugindir-and-no-wget.patch    | 20 +++++------
 srcpkgs/gmic/template                         | 35 +++++++++++--------
 srcpkgs/libgmic                               |  1 +
 3 files changed, 30 insertions(+), 26 deletions(-)
 create mode 120000 srcpkgs/libgmic

diff --git a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch
index 5b403240efc919..6317fd24592c50 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/gmic_gimp_qt
+ 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/template b/srcpkgs/gmic/template
index 24d10147e3abad..89146bf42d375d 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -1,48 +1,53 @@
 # Template file for 'gmic'
 pkgname=gmic
-version=3.1.6
-revision=6
-_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0
-create_wrksrc=yes
+version=3.5.2
+revision=1
+_zart_hash=d014169343f835381ad232ee11e077326561c9eb
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
-make_build_args="NOSTRIP=yes"
+make_build_args="NOSTRIP=yes lib libc cli gmic_qt gimp_shared zart"
 make_use_env=yes
 hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake"
 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"
+ gimp-devel qt5-devel libwebp-devel"
 short_desc="GREYC's Magic for Image Computing (image processing framework)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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"
-disable_parallel_build="yes"
+ https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz>zart-${_zart_hash}.tar.gz"
+checksum="5893b6e87a52792e12af2b51121465d6202a2310c2a751c5c9785910ff55dc14
+ baebe339566993194f98a71895bff09520b08f38e66eae215758aaa260557bcf"
+disable_parallel_build=yes
+skip_extraction="zart-${_zart_hash}.tar.gz"
 
 post_extract() {
-	mv gmic-${version}/* .
-	mv zart-${_zart_hash} zart
+	vsrcextract -C zart zart-${_zart_hash}.tar.gz
 }
 
 post_install() {
 	vlicense ../COPYING
 }
 
+libgmic_package() {
+	short_desc+=" - libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
 gmic-gimp_package() {
 	short_desc+=" - GIMP plugin"
-	depends="gimp ${sourcepkg}>=${version}_${revision}"
+	depends="gimp"
 	pkg_install() {
-		vmove usr/lib/gimp
+		vmove "usr/lib/gimp"
 	}
 }
 
 gmic-zart_package() {
 	short_desc+=" - ZArt tool"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/zart
 		vmove usr/share/applications/zart.desktop
diff --git a/srcpkgs/libgmic b/srcpkgs/libgmic
new file mode 120000
index 00000000000000..433883885ce6f3
--- /dev/null
+++ b/srcpkgs/libgmic
@@ -0,0 +1 @@
+gmic
\ No newline at end of file

From af60e61f6b9b025450127d737037adf2264364e2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 18 Apr 2024 03:22:14 -0400
Subject: [PATCH 05/10] resynthesizer: update to 2.0.3+4.

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..69ed889aa12e31 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+4
 revision=1
-_commit=701e890d1d456e215e05daa7b4a88f5d9c6c03b3
-build_style=gnu-configure
-hostmakedepends="automake intltool pkg-config"
+_commit=eed3bf8f0414d088b7401becf5f04a9a82d79b45
+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 <micvlas@gmail.com>"
 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=c0d2a2af2ddbae5c54ac3f686d0422e9aec7931c5482a8783bdd38f98a1e8211

From 1ae004d3b34dff82536ee951165fcc0893e6f760 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Feb 2025 17:47:53 -0500
Subject: [PATCH 06/10] libjxl: disable gimp plugin

no longer needed, gimp 3 has native support
---
 srcpkgs/libjxl/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index bdf38b2432761f..8159c04a1f4025 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 lcms2-devel"
 checkdepends="gtest-devel xdg-utils"
 short_desc="JPEG XL image format reference implementation"
 maintainer="Joshua Krämer <joshua@kraemer.link>"
@@ -64,7 +64,6 @@ libjxl-plugins_package() {
 	depends="desktop-file-utils"
 	pkg_install() {
 		vmove usr/lib/gdk-pixbuf-2.0
-		vmove usr/lib/gimp
 		vmove usr/share/mime
 		vmove usr/share/thumbnailers
 	}

From 84685d60907257295ba2ad5231700e98d264b4a8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Feb 2025 17:54:42 -0500
Subject: [PATCH 07/10] nufraw: remove gimp plugin

does not support gimp 3, no installs found in popcorn, upstream seems dead
---
 srcpkgs/nufraw-gimp               |  1 -
 srcpkgs/nufraw/template           | 25 ++++---------------------
 srcpkgs/removed-packages/template | 18 ++++++++++--------
 srcpkgs/ufraw-gimp                |  1 -
 4 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 120000 srcpkgs/nufraw-gimp
 delete mode 120000 srcpkgs/ufraw-gimp

diff --git a/srcpkgs/nufraw-gimp b/srcpkgs/nufraw-gimp
deleted file mode 120000
index 0bd1459b2a16f5..00000000000000
--- a/srcpkgs/nufraw-gimp
+++ /dev/null
@@ -1 +0,0 @@
-nufraw
\ No newline at end of file
diff --git a/srcpkgs/nufraw/template b/srcpkgs/nufraw/template
index 89f197cffc4b1a..a82d28818d02e7 100644
--- a/srcpkgs/nufraw/template
+++ b/srcpkgs/nufraw/template
@@ -1,16 +1,13 @@
 # Template file for 'nufraw'
 pkgname=nufraw
 version=0.43.3
-revision=2
+revision=3
 _ver="${version%.*}-${version##*.}"
 build_style=gnu-configure
-configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
- --enable-extras"
+configure_args="--enable-contrast --enable-mime --enable-openmp --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
- lensfun-devel jasper-devel libgexiv2-devel"
+makedepends="exiv2-devel glib-devel gtkimageview-devel lcms2-devel
+ lensfun-devel jasper-devel"
 depends="desktop-file-utils"
 short_desc="Utility to read and manipulate raw images from digital cameras"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -35,22 +32,8 @@ pre_build() {
 	chmod +x generate_schemas.sh
 }
 
-nufraw-gimp_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - gimp plugin"
-	pkg_install() {
-		vmove usr/lib/gimp
-	}
-}
-
 ufraw_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	build_style=meta
 	short_desc+=" (transitional dummy package)"
 }
-
-ufraw-gimp_package() {
-	depends="nufraw-gimp>=${version}_${revision}"
-	build_style=meta
-	short_desc+=" - gimp plugin (transitional dummy package)"
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a5ca51952f9741..f06f44dfb6c808 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -23,6 +23,7 @@ replaces="
  PolyMC<=7.2_1
  PrusaSlicer<=2.5.2_5
  Pyrex<=0.9.9_5
+ Rocket.Chat-Desktop<=3.8.7_3
  SMC<=1.9_9
  Slic3rPE<=2.5.2_5
  Twisted<=17.9.0_2
@@ -335,11 +336,9 @@ replaces="
  kmediaplayer<=5.115.0_1
  kmime<=23.08.5_1
  kpty<=5.115.0_1
- ksanecore<=24.08.3_1
- ksanecore-devel<=24.08.3_1
- libksane<=24.08.3_1
- libksane-devel<=24.08.3_1
  kquickcharts<=5.115.0_1
+ ksanecore-devel<=24.08.3_1
+ ksanecore<=24.08.3_1
  kxmlrpcclient<5.115.0_1
  ladish-devel<=1_11
  ladish<=1_11
@@ -405,6 +404,8 @@ replaces="
  libgnome-keyring<=3.12.0_5
  libgroff<=1.22.4_3
  libgtkhtml<=4.10.0_1
+ libksane-devel<=24.08.3_1
+ libksane<=24.08.3_1
  libkscreen<=5.27.11_3
  libllvm10<=10.0.0_8
  libllvm11<=11.0.0_2
@@ -530,6 +531,7 @@ replaces="
  neofetch<=7.1.0_2
  newt-python<=0.52.21_5
  nodejs-lts-10<=10.24.0_2
+ nufraw-gimp<=0.43.3_2
  nvidia340-dkms<=340.108_4
  nvidia340-libs<=340.108_4
  nvidia340-opencl<=340.108_4
@@ -736,8 +738,8 @@ replaces="
  python3-jsonrpc-server<=0.4.0_2
  python3-keepalive<=0.5_6
  python3-lockfile<=0.12.2_7
- python3-nose<=1.3.7_10
  python3-nose-random<=1.0.0_6
+ python3-nose<=1.3.7_10
  python3-pgpdump<=1.5_10
  python3-pyPEG2<=2.15.2_7
  python3-pyenet<=5.15.0_2
@@ -783,9 +785,9 @@ replaces="
  qucs<=0.0.19_2
  qupzilla1<=1.8.9_16
  qupzilla<=3.0.1_1
- rand48_r<=0.2_1
- rand48_r-devel<=0.2_1
  r2-bindings<=1.0.1_2
+ rand48_r-devel<=0.2_1
+ rand48_r<=0.2_1
  raul-devel<=0.8.0_6
  raul<=0.8.0_6
  redkite<=1.3.1_1
@@ -798,7 +800,6 @@ replaces="
  rkt-stage1-fly<=1.30.0_3
  rkt<=1.30.0_3
  rmapi<=0.0.25_4
- Rocket.Chat-Desktop<=3.8.7_3
  rpi-userland-devel<=20230920_1
  rundird<=0.2.0_1
  scantailor<=0.9.12.1_2
@@ -839,6 +840,7 @@ replaces="
  traverso<=0.49.6_2
  ttyload-git<=20141117_4
  tuxc<=1.1_3
+ ufraw-gimp<=0.43.3_2
  ulozto-downloader<=3.5.2_2
  unicorn-python<=1.0.2_2
  upwork<=5.6.10.0_1
diff --git a/srcpkgs/ufraw-gimp b/srcpkgs/ufraw-gimp
deleted file mode 120000
index 0bd1459b2a16f5..00000000000000
--- a/srcpkgs/ufraw-gimp
+++ /dev/null
@@ -1 +0,0 @@
-nufraw
\ No newline at end of file

From c0ca3e4e294090b6e66b960d8254682361b0e235 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Feb 2025 18:00:27 -0500
Subject: [PATCH 08/10] xsane: remove gimp plugin, clean up template

does not support gimp 3 (yet?)

https://gitlab.com/sane-project/frontend/xsane/-/issues/66
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/xsane-gimp                |  1 -
 srcpkgs/xsane/template            | 33 ++++---------------------------
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 120000 srcpkgs/xsane-gimp

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f06f44dfb6c808..5d2376b0e79ba4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -878,6 +878,7 @@ replaces="
  xnoise-devel<=0.2.21_4
  xnoise<=0.2.21_4
  xnp2<=0.86_2
+ xsane-gimp<=0.999_5
  xsetmode<=1.0.0_5
  xsetpointer<=1.0.1_4
  yabause-gtk<=0.9.15_2
diff --git a/srcpkgs/xsane-gimp b/srcpkgs/xsane-gimp
deleted file mode 120000
index aec7cacadda279..00000000000000
--- a/srcpkgs/xsane-gimp
+++ /dev/null
@@ -1 +0,0 @@
-xsane
\ No newline at end of file
diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 7dde32af2b674c..f75bd7888b15fa 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,9 +1,11 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=5
+revision=6
+build_style="gnu-configure"
+configure_args="--disable-gimp"
 hostmakedepends="pkg-config sane-devel gettext"
-makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
+makedepends="gtk+-devel lcms-devel sane-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,30 +19,3 @@ post_patch() {
 		-e 's,/usr/local/include,/usr/include,' \
 		configure
 }
-
-do_build() {
-	local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
-	 --target=${XBPS_CROSS_TRIPLET} --host=${XBPS_CROSS_TRIPLET}
-	 --build=${XBPS_TRIPLET}"
-	./configure ${_args} --enable-gimp
-	make ${makejobs}
-	mv src/xsane{,-gimp}
-	make clean
-	echo "=== ./configure ${_args} --disable-gimp"
-	./configure ${_args} --disable-gimp
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR="${DESTDIR}" install
-}
-
-xsane-gimp_package() {
-	short_desc+=" - plugin for GIMP"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vbin src/xsane-gimp
-		vmkdir usr/lib/gimp/2.0/plug-ins
-		ln -s /usr/bin/xsane-gimp ${PKGDESTDIR}/usr/lib/gimp/2.0/plug-ins/xsane
-	}
-}

From c22f084750915ad80d10985fda62a49f0c0da6ee Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Feb 2025 18:06:52 -0500
Subject: [PATCH 09/10] gimp-lqr-plugin: remove

does not support gimp 3, project seems mostly dead

https://github.com/carlobaldassi/gimp-lqr-plugin/issues/17
---
 srcpkgs/gimp-lqr-plugin/template  | 19 -------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 srcpkgs/gimp-lqr-plugin/template

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
deleted file mode 100644
index 7878f6cb795d24..00000000000000
--- a/srcpkgs/gimp-lqr-plugin/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gimp-lqr-plugin'
-pkgname=gimp-lqr-plugin
-version=0.7.2
-revision=2
-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"
-maintainer="CoolOhm <micvlas@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="http://liquidrescale.wikidot.com/"
-distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-sources/gimp-lqr-plugin-${version}.tar.bz2"
-checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
-
-CFLAGS="-fcommon"
-
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d2376b0e79ba4..d977238575b937 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -166,6 +166,7 @@ replaces="
  getmail<=5.14_2
  gfbgraph<=0.2.5_1
  gfm<=1.08_1
+ gimp-lqr-plugin<=0.7.2_2
  gimp-python<=2.10.32_4
  giti<=1.0.0_1
  gksu<=2.0.2_4

From c2ee8c36f81a291c9e12a59fa13f57c327db010b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Feb 2025 18:08:35 -0500
Subject: [PATCH 10/10] removed-packages: update to 0.1.20250209.

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d977238575b937..cde760d79b6d73 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20250110
+version=0.1.20250209
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"