[arch-commits] Commit in gthumb/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Thu Apr 27 04:25:59 UTC 2017
Date: Thursday, April 27, 2017 @ 04:25:58
Author: felixonmars
Revision: 294876
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gthumb/repos/staging-i686/
gthumb/repos/staging-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
(from rev 294875, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
gthumb/repos/staging-i686/PKGBUILD
(from rev 294875, gthumb/trunk/PKGBUILD)
gthumb/repos/staging-x86_64/
gthumb/repos/staging-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
(from rev 294875, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
gthumb/repos/staging-x86_64/PKGBUILD
(from rev 294875, gthumb/trunk/PKGBUILD)
--------------------------------------------------------------------------------+
staging-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch | 40 +++++++
staging-i686/PKGBUILD | 56 ++++++++++
staging-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch | 40 +++++++
staging-x86_64/PKGBUILD | 56 ++++++++++
4 files changed, 192 insertions(+)
Copied: gthumb/repos/staging-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (from rev 294875, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
===================================================================
--- staging-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (rev 0)
+++ staging-i686/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch 2017-04-27 04:25:58 UTC (rev 294876)
@@ -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
+
Copied: gthumb/repos/staging-i686/PKGBUILD (from rev 294875, gthumb/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-04-27 04:25:58 UTC (rev 294876)
@@ -0,0 +1,56 @@
+# $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.5+1+geec2172e
+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=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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
+ 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/staging-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (from rev 294875, gthumb/trunk/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch)
===================================================================
--- staging-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch (rev 0)
+++ staging-x86_64/0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch 2017-04-27 04:25:58 UTC (rev 294876)
@@ -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
+
Copied: gthumb/repos/staging-x86_64/PKGBUILD (from rev 294875, gthumb/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-04-27 04:25:58 UTC (rev 294876)
@@ -0,0 +1,56 @@
+# $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.5+1+geec2172e
+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=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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch
+ 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
+}
More information about the arch-commits
mailing list