From 18c651518f1313d0881e7cdd4e5fdb3283477420 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Thu, 30 Nov 2023 20:35:07 +0100
Subject: [PATCH] gthumb - rebuild with clutter and libchamplain integration
---
components/image/gthumb/manifests/sample-manifest.p5m | 2 ++
components/image/gthumb/Makefile | 10 ++++++++--
components/image/gthumb/gthumb.p5m | 2 ++
components/image/gthumb/pkg5 | 3 +++
components/image/gthumb/test/results-all.master | 14 ++++++++++++++
components/image/gthumb/patches/enable_libchamplain.patch | 11 +++++++++++
6 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/components/image/gthumb/Makefile b/components/image/gthumb/Makefile
index aaa0baa..19b9629 100644
--- a/components/image/gthumb/Makefile
+++ b/components/image/gthumb/Makefile
@@ -20,6 +20,7 @@
COMPONENT_NAME= gthumb
COMPONENT_VERSION= 3.12.4
+COMPONENT_REVISION= 1
COMPONENT_SUMMARY= GNOME image organizer (gthumb)
COMPONENT_PROJECT_URL= https://wiki.gnome.org/Apps/gthumb
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -30,8 +31,6 @@
COMPONENT_CLASSIFICATION=Applications/Graphics and Imaging
COMPONENT_LICENSE= GPLv2
COMPONENT_LICENSE_FILE= COPYING
-
-TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
@@ -48,6 +47,10 @@
CONFIGURE_OPTIONS += --libexecdir=/usr/lib
CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
+
+COMPONENT_TEST_TRANSFORMS = \
+ '-e "s/OK.*$$/OK/" ' \
+ '-e "/^Full log written to/d" '
# Build dependencies
REQUIRED_PACKAGES += library/gnome/yelp-tools
@@ -66,8 +69,11 @@
REQUIRED_PACKAGES += library/audio/gstreamer1
REQUIRED_PACKAGES += library/audio/gstreamer1/plugin/base
REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/clutter
+REQUIRED_PACKAGES += library/desktop/clutter/clutter-gtk
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libchamplain
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/desktop/webkitgtk2
REQUIRED_PACKAGES += library/glib2
diff --git a/components/image/gthumb/gthumb.p5m b/components/image/gthumb/gthumb.p5m
index d9bc3c8..119ea92 100644
--- a/components/image/gthumb/gthumb.p5m
+++ b/components/image/gthumb/gthumb.p5m
@@ -195,6 +195,7 @@
file path=usr/lib/$(MACH64)/gthumb/extensions/libimporter.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libjpeg_utils.so
file path=usr/lib/$(MACH64)/gthumb/extensions/liblist_tools.so
+file path=usr/lib/$(MACH64)/gthumb/extensions/libmap_view.so
file path=usr/lib/$(MACH64)/gthumb/extensions/liboauth.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libphoto_importer.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libraw_files.so
@@ -207,6 +208,7 @@
file path=usr/lib/$(MACH64)/gthumb/extensions/libterminal.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libwebalbums.so
file path=usr/lib/$(MACH64)/gthumb/extensions/list_tools.extension
+file path=usr/lib/$(MACH64)/gthumb/extensions/map_view.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/oauth.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/photo_importer.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/raw_files.extension
diff --git a/components/image/gthumb/manifests/sample-manifest.p5m b/components/image/gthumb/manifests/sample-manifest.p5m
index 0ee3f5a..b91e6d1 100644
--- a/components/image/gthumb/manifests/sample-manifest.p5m
+++ b/components/image/gthumb/manifests/sample-manifest.p5m
@@ -195,6 +195,7 @@
file path=usr/lib/$(MACH64)/gthumb/extensions/libimporter.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libjpeg_utils.so
file path=usr/lib/$(MACH64)/gthumb/extensions/liblist_tools.so
+file path=usr/lib/$(MACH64)/gthumb/extensions/libmap_view.so
file path=usr/lib/$(MACH64)/gthumb/extensions/liboauth.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libphoto_importer.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libraw_files.so
@@ -207,6 +208,7 @@
file path=usr/lib/$(MACH64)/gthumb/extensions/libterminal.so
file path=usr/lib/$(MACH64)/gthumb/extensions/libwebalbums.so
file path=usr/lib/$(MACH64)/gthumb/extensions/list_tools.extension
+file path=usr/lib/$(MACH64)/gthumb/extensions/map_view.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/oauth.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/photo_importer.extension
file path=usr/lib/$(MACH64)/gthumb/extensions/raw_files.extension
diff --git a/components/image/gthumb/patches/enable_libchamplain.patch b/components/image/gthumb/patches/enable_libchamplain.patch
new file mode 100644
index 0000000..786a4bb
--- /dev/null
+++ b/components/image/gthumb/patches/enable_libchamplain.patch
@@ -0,0 +1,11 @@
+--- gthumb-3.12.4/meson_options.txt 2023-10-10 08:18:23.000000000 +0200
++++ gthumb-3.12.4/meson_options.txt.new 2023-11-30 14:51:42.680465236 +0100
+@@ -30,7 +30,7 @@
+
+ option('libchamplain',
+ type : 'boolean',
+- value : false,
++ value : true,
+ description : 'Use libchamplain to show the position the image refers to'
+ )
+
diff --git a/components/image/gthumb/pkg5 b/components/image/gthumb/pkg5
index 0f69349..d08ea7c 100644
--- a/components/image/gthumb/pkg5
+++ b/components/image/gthumb/pkg5
@@ -10,8 +10,11 @@
"library/audio/gstreamer1",
"library/audio/gstreamer1/plugin/base",
"library/desktop/cairo",
+ "library/desktop/clutter",
+ "library/desktop/clutter/clutter-gtk",
"library/desktop/gdk-pixbuf",
"library/desktop/gtk3",
+ "library/desktop/libchamplain",
"library/desktop/pango",
"library/desktop/webkitgtk2",
"library/glib2",
diff --git a/components/image/gthumb/test/results-all.master b/components/image/gthumb/test/results-all.master
new file mode 100644
index 0000000..38c85bd
--- /dev/null
+++ b/components/image/gthumb/test/results-all.master
@@ -0,0 +1,14 @@
+[0/1] Running all tests.
+1/5 dom OK
+2/5 glib-utils OK
+3/5 gtk-utils OK
+4/5 gsignature OK
+5/5 oauth OK
+
+Ok: 5
+Expected Fail: 0
+Fail: 0
+Unexpected Pass: 0
+Skipped: 0
+Timeout: 0
+
--
Gitblit v1.9.3