[arch-commits] Commit in gthumb/repos (6 files)

Jan de Groot jgc at archlinux.org
Mon Feb 13 13:39:41 UTC 2017


    Date: Monday, February 13, 2017 @ 13:39:40
  Author: jgc
Revision: 288881

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gthumb/repos/extra-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
    (from rev 288880, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
  gthumb/repos/extra-i686/PKGBUILD
    (from rev 288880, gthumb/trunk/PKGBUILD)
  gthumb/repos/extra-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
    (from rev 288880, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
  gthumb/repos/extra-x86_64/PKGBUILD
    (from rev 288880, gthumb/trunk/PKGBUILD)
Deleted:
  gthumb/repos/extra-i686/PKGBUILD
  gthumb/repos/extra-x86_64/PKGBUILD

------------------------------------------------------------------------------+
 /PKGBUILD                                                                    |  124 ++++++++++
 extra-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch   |   40 +++
 extra-i686/PKGBUILD                                                          |   58 ----
 extra-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch |   40 +++
 extra-x86_64/PKGBUILD                                                        |   58 ----
 5 files changed, 204 insertions(+), 116 deletions(-)

Copied: gthumb/repos/extra-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (from rev 288880, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
===================================================================
--- extra-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	                        (rev 0)
+++ extra-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	2017-02-13 13:39:40 UTC (rev 288881)
@@ -0,0 +1,40 @@
+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
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-13 13:39:34 UTC (rev 288880)
+++ extra-i686/PKGBUILD	2017-02-13 13:39:40 UTC (rev 288881)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-
-pkgname=gthumb
-pkgver=3.4.4.1
-pkgrel=2
-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)
-makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
-             yelp-tools flex gnome-common git)
-optdepends=('libraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'liboauth: web albums')
-_commit=849e68f5ba606c25988a1e9e6669519734a7449a  # gthumb-3-4
-source=("git://git.gnome.org/gthumb#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  # Fixup tags for pkgver()
-  git tag -f 3.4.4.1 849e68f5ba606c25988a1e9e6669519734a7449a
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-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
-}
-
-check() {
-  cd $pkgname
-  make check
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: gthumb/repos/extra-i686/PKGBUILD (from rev 288880, gthumb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-13 13:39:40 UTC (rev 288881)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+
+pkgname=gthumb
+pkgver=3.4.4.1
+pkgrel=3
+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)
+makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
+             yelp-tools flex gnome-common git)
+optdepends=('libraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'liboauth: web albums')
+_commit=849e68f5ba606c25988a1e9e6669519734a7449a  # 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')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  # Fixup tags for pkgver()
+  git tag -f 3.4.4.1 849e68f5ba606c25988a1e9e6669519734a7449a
+  NOCONFIGURE=1 ./autogen.sh
+
+  patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
+}
+
+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
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: gthumb/repos/extra-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (from rev 288880, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
===================================================================
--- extra-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	                        (rev 0)
+++ extra-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch	2017-02-13 13:39:40 UTC (rev 288881)
@@ -0,0 +1,40 @@
+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
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-13 13:39:34 UTC (rev 288880)
+++ extra-x86_64/PKGBUILD	2017-02-13 13:39:40 UTC (rev 288881)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-
-pkgname=gthumb
-pkgver=3.4.4.1
-pkgrel=2
-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)
-makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
-             yelp-tools flex gnome-common git)
-optdepends=('libraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'liboauth: web albums')
-_commit=849e68f5ba606c25988a1e9e6669519734a7449a  # gthumb-3-4
-source=("git://git.gnome.org/gthumb#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  # Fixup tags for pkgver()
-  git tag -f 3.4.4.1 849e68f5ba606c25988a1e9e6669519734a7449a
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-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
-}
-
-check() {
-  cd $pkgname
-  make check
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: gthumb/repos/extra-x86_64/PKGBUILD (from rev 288880, gthumb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-13 13:39:40 UTC (rev 288881)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+
+pkgname=gthumb
+pkgver=3.4.4.1
+pkgrel=3
+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)
+makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl
+             yelp-tools flex gnome-common git)
+optdepends=('libraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'liboauth: web albums')
+_commit=849e68f5ba606c25988a1e9e6669519734a7449a  # 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')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  # Fixup tags for pkgver()
+  git tag -f 3.4.4.1 849e68f5ba606c25988a1e9e6669519734a7449a
+  NOCONFIGURE=1 ./autogen.sh
+
+  patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
+}
+
+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
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}



More information about the arch-commits mailing list