[arch-commits] Commit in gthumb/trunk (2 files)

[Jan Steffens]

    Date: Monday, October 2, 2017 @ 20:08:10
  Author: heftig
Revision: 306595

3.5.3-1

Modified:
  gthumb/trunk/PKGBUILD
Deleted:
  gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch

-----------------------------------------------------------------+
 0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch |   40 ----------
 PKGBUILD                                                        |   15 +--
 2 files changed, 6 insertions(+), 49 deletions(-)

Deleted: 0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
===================================================================
--- 0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	2017-10-02 20:04:27 UTC (rev 306594)
+++ 0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	2017-10-02 20:08:10 UTC (rev 306595)
@@ -1,40 +0,0 @@
-From 2019d1ed9d3cc6085598b92c2001690fb41af8f7 Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-02 20:04:27 UTC (rev 306594)
+++ PKGBUILD	2017-10-02 20:08:10 UTC (rev 306595)
@@ -4,14 +4,14 @@
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=gthumb
-pkgver=3.4.5+1+geec2172e
-pkgrel=3
+pkgver=3.5.3
+pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 url="https://wiki.gnome.org/Apps/gthumb"
 arch=(i686 x86_64)
 license=(GPL)
 depends=(dconf librsvg clutter-gtk gst-plugins-base-libs gsettings-desktop-schemas libwebp
-         libsecret libsoup webkit2gtk json-glib)
+         libsecret libsoup webkit2gtk json-glib gtk3-print-backends)
 makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
              yelp-tools flex gnome-common git)
 optdepends=('libraw: read RAW files'
@@ -19,11 +19,9 @@
             'libchamplain: map viewer'
             'brasero: burn discs'
             'liboauth: web albums')
-_commit=eec2172e3554ecdca40dfeb1b84f8d7fc322338e  # gthumb-3-4
-source=("git+https://git.gnome.org/browse/gthumb#commit=$_commit"
-        0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
-sha256sums=('SKIP'
-            '9cdffadd2b2c21904a997b4ab4ef311c18a59dfa6a3b236570af7f1465a36c60')
+_commit=2e6cb187cac9cfa56aee1dbb37319acbd5570b26  # tags/3.5.3^0
+source=("git+https://git.gnome.org/browse/gthumb#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -32,7 +30,6 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
   NOCONFIGURE=1 ./autogen.sh
 }