Bring [nonprism/gthumb] current.

4 files changed, 23 insertions, 166 deletions

diff --git a/nonprism/gthumb/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch b/nonprism/gthumb/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
deleted file mode 100644
index e7989509e..000000000
--- a/nonprism/gthumb/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2019d1ed9d3cc6085598b92c2001690fb41af8f7 Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc@archlinux.org>
-Date: Mon, 13 Feb 2017 13:28:27 +0000
-Subject: [PATCH] Do not process bitmap thumbnails with invalid color settings.
-
-Libraw sets these to 0 in an excption handler, we should not assert fatal when processing such an image.
----
- extensions/raw_files/main.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
-index 6cf2ff8e..726385a3 100644
---- a/extensions/raw_files/main.c
-+++ b/extensions/raw_files/main.c
-@@ -267,12 +267,16 @@ _cairo_image_surface_create_from_raw (GInputStream  *istream,
- 							error);
- 			break;
- 		case LIBRAW_THUMBNAIL_BITMAP:
--			image = _libraw_read_bitmap_data (raw_data->thumbnail.twidth,
--							  raw_data->thumbnail.theight,
--							  raw_data->thumbnail.tcolors,
--							  8,
--							  (guchar *) raw_data->thumbnail.thumb,
--							  raw_data->thumbnail.tlength);
-+			if (raw_data->thumbnail.tcolors > 0 && raw_data->thumbnail.tcolors < 4) {
-+				image = _libraw_read_bitmap_data (raw_data->thumbnail.twidth,
-+								  raw_data->thumbnail.theight,
-+								  raw_data->thumbnail.tcolors,
-+								  8,
-+								  (guchar *) raw_data->thumbnail.thumb,
-+								  raw_data->thumbnail.tlength);
-+			} else {
-+				g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Unsupported data format");
-+			}
- 			break;
- 		default:
- 			g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Unsupported data format");
--- 
-2.11.1
-
diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD
index 59c97ba8d..10cc92244 100644
--- a/nonprism/gthumb/PKGBUILD
+++ b/nonprism/gthumb/PKGBUILD
@@ -10,27 +10,26 @@
 #  - removed support for possibly unsafe protocols
 
 pkgname=gthumb
-pkgver=3.6.2
-pkgrel=1.nonprism1
+pkgver=3.8.3
+pkgrel=1
+pkgrel+=.nonprism1
 pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols"
 url="https://wiki.gnome.org/Apps/gthumb"
 arch=(x86_64 i686 armv7h)
 license=(GPL)
 depends=(dconf librsvg clutter-gtk gst-plugins-base-libs gsettings-desktop-schemas libwebp
          libsecret libsoup webkit2gtk json-glib gtk3-print-backends)
-makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
-             yelp-tools flex gnome-common git)
-options=(debug !strip)          
+makedepends=(libchamplain exiv2 brasero libraw liboauth docbook-xsl yelp-tools meson git)
 optdepends=('libraw: read RAW files'
             'exiv2: metadata support'
             'libchamplain: map viewer'
             'brasero: burn discs'
             'liboauth: web albums')
-_commit=28f951e14aae66b96d7a03aa887ca3844824cecb  # tags/3.6.2^0 
+_commit=ca8f528209ab78935c30e42fe53bdf1a24f3cb44  # tags/3.8.3^0
 source=("git+https://gitlab.gnome.org/GNOME/gthumb.git#commit=$_commit"
         nonprism.patch)
 sha256sums=('SKIP'
-            'cdc1c15a5c62f3b6ae26f26badbcdb0a2e6dacac2b46037643a919065e8221a4')
+            'ec0e5fdf9b7d48b90821e9ce9f7fdacc60fd843183c27479854d33f457805796')
 
 pkgver() {
   cd $pkgname
@@ -39,25 +38,19 @@ pkgver() {
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../nonprism.patch
-  NOCONFIGURE=1 ./autogen.sh
+  patch --verbose -Np1 -i ../nonprism.patch			# Set meson_options to build without webservices
+  rm ./data/icons/private/hicolor/16x16/actions/site-*.png   	# Get rid of the logos 
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson $pkgname build -D libchamplain=true
+  ninja -C build
 }
 
 check() {
-  cd $pkgname
-  make check
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
 }
diff --git a/nonprism/gthumb/gthumb.install b/nonprism/gthumb/gthumb.install
deleted file mode 100644
index 9d4e7822f..000000000
--- a/nonprism/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/nonprism/gthumb/nonprism.patch b/nonprism/gthumb/nonprism.patch
index 6e953d5bd..d43e50c94 100644
--- a/nonprism/gthumb/nonprism.patch
+++ b/nonprism/gthumb/nonprism.patch
@@ -1,88 +1,11 @@
-diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am
---- gthumb-3.2.7.orig/data/Makefile.am	2013-04-30 13:56:12.000000000 -0300
-+++ gthumb-3.2.7/data/Makefile.am	2014-04-19 12:30:38.520987588 -0300
-@@ -16,15 +16,12 @@
- 	org.gnome.gthumb.contact-sheet.gschema.xml	\
- 	org.gnome.gthumb.convert-format.gschema.xml	\
- 	org.gnome.gthumb.crop.gschema.xml		\
--	org.gnome.gthumb.facebook.gschema.xml		\
- 	org.gnome.gthumb.file-manager.gschema.xml	\
--	org.gnome.gthumb.flickr.gschema.xml		\
- 	org.gnome.gthumb.gstreamer-tools.gschema.xml	\
- 	org.gnome.gthumb.image-print.gschema.xml	\
- 	org.gnome.gthumb.image-viewer.gschema.xml	\
- 	org.gnome.gthumb.importer.gschema.xml		\
- 	org.gnome.gthumb.photo-importer.gschema.xml	\
--	org.gnome.gthumb.picasaweb.gschema.xml		\
- 	org.gnome.gthumb.pixbuf-savers.gschema.xml	\
- 	org.gnome.gthumb.rename-series.gschema.xml	\
- 	org.gnome.gthumb.resize.gschema.xml		\
-diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am
---- gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am	2015-03-30 17:08:32.000000000 -0300
-+++ gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am	2015-04-15 03:27:36.753875539 -0300
-@@ -43,10 +43,6 @@
- 	map-symbolic.svg			\
- 	palette-symbolic.svg			\
- 	presets-symbolic.svg			\
--	site-facebook.png			\
--	site-flickr.png				\
--	site-photobucket.png			\
--	site-picasaweb.png			\
- 	site-twentythree.png			\
- 	special-effects-symbolic.svg		\
- 	swap-values-symbolic.svg		\
-diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am
---- gthumb-3.2.7.orig/extensions/Makefile.am	2013-04-30 13:56:12.000000000 -0300
-+++ gthumb-3.2.7/extensions/Makefile.am	2014-04-19 13:12:36.788627648 -0300
-@@ -4,17 +4,14 @@
- 	
- FLICKR_EXPORTERS = 		\
- 	23hq			\
--	flicker			\
- 	$(NULL)	
- 	
- EXPORTERS = 			\
- 	export_tools		\
- 	burn_disc		\
- 	contact_sheet		\
--	facebook		\
- 	flicker_utils		\
- 	$(FLICKR_EXPORTERS)	\
--	picasaweb		\
- 	webalbums		\
- 	$(NULL)
- 	
-diff -Nur gthumb-3.4.0.orig/gthumb/gth-main.c gthumb-3.4.0/gthumb/gth-main.c
---- gthumb-3.4.0.orig/gthumb/gth-main.c	2015-04-04 16:27:06.000000000 -0300
-+++ gthumb-3.4.0/gthumb/gth-main.c	2015-04-15 03:29:03.749510547 -0300
-@@ -1233,10 +1233,8 @@
- 						"desktop_background",
- 						"edit_metadata",
- 						"exiv2_tools",
--						"facebook",
- 						"file_manager",
- 						"find_duplicates",
--						"flicker",
- 						"gstreamer_tools",
- 						"gstreamer_utils",
- 						"image_print",
-@@ -1246,8 +1244,6 @@
- 						"list_tools",
- 						"oauth",
- 						"photo_importer",
--						"photobucket",
--						"picasaweb",
- 						"raw_files",
- 						"red_eye_removal",
- 						"rename_series",
-diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am
---- gthumb-3.2.7.orig/help/Makefile.am	2013-04-30 13:56:13.000000000 -0300
-+++ gthumb-3.2.7/help/Makefile.am	2014-04-19 13:18:40.744859012 -0300
-@@ -30,7 +30,6 @@
- 	printing.page \
- 	shortcuts.page \
- 	sharing-disc.page \
--	sharing-social.page \
- 	wallpaper.page \
- 	bookmarks.page \
- 	import.page \
+--- a/meson_options.txt	2020-01-23 17:25:40.113885277 -0400
++++ b/meson_options.txt	2020-01-23 17:28:25.303643676 -0400
+@@ -72,7 +72,7 @@ option('libsecret',
+ 
+ option('webservices', 
+   type : 'boolean', 
+-  value : true, 
++  value : false, 
+   description : 'Compile extensions that import/export images from web services'
+ )
+