On Wed, Nov 03, 2021 at 02:49:29PM +0100, Landry Breuil wrote:
> Hi,
>
> here's a very wip port for gimp 3 latest beta (cf
> https://www.gimp.org/news/2021/10/20/gimp-2-99-8-released/), builds and
> packages fine here - untested at runtime, but that's one less py-gtk2
> consumer. Seems it detects vala, gjs and lua for plugins, but fails for
> pygobject and luajit:
>
> WARNING: PyGObject 3.0 not found
> Python plug-ins will be installed anyway but you should make
> sure that a compatible Python interpreter and PyGObject are
> available at installation, otherwise installed plug-ins won't
> be usable.
> WARNING: luajit not found.
> Lua plug-ins will be installed anyway but you should make
> sure that luajit and LGI are available at installation,
> otherwise installed plug-ins won't be usable.
>
> Sending this just so that people relying on arcane plugins for their
> workflow can start looking at upgrading them to gtk3/gimp3 versions, or
> find a replacement if their plugin is dead upstream ;)
>
> Landry
I have been using this beta on and off for several weeks without
any issues. I'm the occasional graphics/gmic-qt consumer, and found I needed
the attached diff to integrate its plugin. The patch for CMakeLists.txt is
a temporary circumvention for the Gimp beta.
diff --git a/graphics/gmic-qt/gimp/Makefile b/graphics/gmic-qt/gimp/Makefile
index 66f1cc837fe..510d931c0fc 100644
--- a/graphics/gmic-qt/gimp/Makefile
+++ b/graphics/gmic-qt/gimp/Makefile
@@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
QT_HOST = gimp
+REVISION = 0
-WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 gimpmath-2.0
+WANTLIB += gimp-3.0 gimpbase-3.0 gimpcolor-3.0 gimpconfig-3.0 gimpmath-3.0
WANTLIB += gegl-0.4 babl-0.1 cairo json-glib-1.0 intl
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
diff --git a/graphics/gmic-qt/gimp/pkg/PLIST b/graphics/gmic-qt/gimp/pkg/PLIST
index 15b99f6fea2..42334bcb488 100644
--- a/graphics/gmic-qt/gimp/pkg/PLIST
+++ b/graphics/gmic-qt/gimp/pkg/PLIST
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
-lib/gimp/2.0/plug-ins/gmic_gimp_qt/
-@bin lib/gimp/2.0/plug-ins/gmic_gimp_qt/gmic_gimp_qt
+lib/gimp/2.99/plug-ins/gmic_gimp_qt/
+@bin lib/gimp/2.99/plug-ins/gmic_gimp_qt/gmic_gimp_qt
diff --git a/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt
b/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt
new file mode 100644
index 00000000000..46a4fea5d51
--- /dev/null
+++ b/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: gmic-qt/CMakeLists.txt
+--- gmic-qt/CMakeLists.txt.orig
++++ gmic-qt/CMakeLists.txt
+@@ -517,11 +517,7 @@ set(gmic_qt_QRC
+ )
+
+ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3")
+- if (${GMIC_QT_HOST} STREQUAL "gimp3")
+ set(TARGET_GIMP_VERSION 3)
+- else()
+- set(TARGET_GIMP_VERSION 2)
+- endif()
+
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(GIMP REQUIRED gimp-${TARGET_GIMP_VERSION}.0
IMPORTED_TARGET)
