Date: Tuesday, February 21, 2017 @ 00:47:30
Author: bgyorgy
Revision: 213233
archrelease: copy trunk to community-i686, community-x86_64
Added:
gpicview/repos/community-i686/0001-Fix-displaying-images-with-GTK3.patch
(from rev 213232, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
gpicview/repos/community-i686/PKGBUILD
(from rev 213232, gpicview/trunk/PKGBUILD)
gpicview/repos/community-x86_64/0001-Fix-displaying-images-with-GTK3.patch
(from rev 213232, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
gpicview/repos/community-x86_64/PKGBUILD
(from rev 213232, gpicview/trunk/PKGBUILD)
Deleted:
gpicview/repos/community-i686/PKGBUILD
gpicview/repos/community-x86_64/PKGBUILD
-------------------------------------------------------------+
/PKGBUILD | 128 +++++++
community-i686/0001-Fix-displaying-images-with-GTK3.patch | 173 ++++++++++
community-i686/PKGBUILD | 36 --
community-x86_64/0001-Fix-displaying-images-with-GTK3.patch | 173 ++++++++++
community-x86_64/PKGBUILD | 36 --
5 files changed, 474 insertions(+), 72 deletions(-)
Copied:
gpicview/repos/community-i686/0001-Fix-displaying-images-with-GTK3.patch (from
rev 213232, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
===================================================================
--- community-i686/0001-Fix-displaying-images-with-GTK3.patch
(rev 0)
+++ community-i686/0001-Fix-displaying-images-with-GTK3.patch 2017-02-21
00:47:30 UTC (rev 213233)
@@ -0,0 +1,173 @@
+From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Tue, 21 Feb 2017 01:06:06 +0100
+Subject: [PATCH] Fix displaying images with GTK3
+
+We have to use the cairo context provided by the draw event, otherwise the
scrolling does not work properly.
+
+Don't paint the whole image when scale == 1, it's unneeded and slow.
+---
+ src/image-view.c | 86 +++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 44 insertions(+), 42 deletions(-)
+
+diff --git a/src/image-view.c b/src/image-view.c
+index b367f2a..820b843 100644
+--- a/src/image-view.c
++++ b/src/image-view.c
+@@ -24,11 +24,10 @@
+ static void image_view_finalize(GObject *iv);
+
+ static void image_view_clear( ImageView* iv );
+-static gboolean on_idle( ImageView* iv );
+ static void calc_image_area( ImageView* iv );
+-static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type );
+
+ #if GTK_CHECK_VERSION(3, 0, 0)
++static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type, cairo_t* cr );
+
+ static void image_view_paint( ImageView* iv, cairo_t* cr );
+
+@@ -37,6 +36,8 @@ static void on_get_preferred_height( GtkWidget* widget,
gint* minimal_height, gi
+ static gboolean on_draw_event(GtkWidget* widget, cairo_t* cr);
+
+ #else // GTK2
++static gboolean on_idle( ImageView* iv );
++static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type );
+
+ static void image_view_paint( ImageView* iv, GdkEventExpose* evt );
+
+@@ -268,16 +269,13 @@ void image_view_paint( ImageView* iv, cairo_t *cr )
+ {
+ cairo_rectangle_int_t rectangle;
+ cairo_region_get_rectangle(region, i, &rectangle);
+- paint( iv, &rectangle, GDK_INTERP_NEAREST );
++ paint( iv, &rectangle, GDK_INTERP_NEAREST, cr );
+ }
+
+ cairo_region_destroy (region);
+-
+- if( 0 == iv->idle_handler )
+- iv->idle_handler = g_idle_add( (GSourceFunc)on_idle, iv );
+ }
+ }
+-#else
++#else // GTK2
+
+ gboolean on_expose_event( GtkWidget* widget, GdkEventExpose* evt )
+ {
+@@ -390,6 +388,8 @@ void image_view_set_scale( ImageView* iv, gdouble
new_scale, GdkInterpType type
+ }
+ }
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ gboolean on_idle( ImageView* iv )
+ {
+ GDK_THREADS_ENTER();
+@@ -435,6 +435,7 @@ gboolean on_idle( ImageView* iv )
+ iv->idle_handler = 0;
+ return FALSE;
+ }
++#endif
+
+ void calc_image_area( ImageView* iv )
+ {
+@@ -460,7 +461,11 @@ void calc_image_area( ImageView* iv )
+ }
+ }
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type,
cairo_t* cr )
++#else // GTK2
+ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
++#endif
+ {
+ GdkRectangle rect;
+ if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) )
+@@ -470,51 +475,48 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect,
GdkInterpType type )
+ int dest_y;
+
+ GdkPixbuf* src_pix = NULL;
+- if( iv->scale == 1.0 ) // original size
+- {
+- src_pix = (GdkPixbuf*)g_object_ref( iv->pix );
+- dest_x = iv->img_area.x;
+- dest_y = iv->img_area.y;
+- }
+- else // scaling is needed
++ GdkPixbuf* scaled_pix = NULL;
++
++ dest_x = rect.x;
++ dest_y = rect.y;
++
++ rect.x -= iv->img_area.x;
++ rect.y -= iv->img_area.y;
++
++ int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
++ int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
++ int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
++ int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
++ if( src_y > gdk_pixbuf_get_height( iv->pix ) )
++ src_y = gdk_pixbuf_get_height( iv->pix );
++ if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
++ src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
++ if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
++ src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
++ //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
++ // src_x, src_y, src_w, src_h );
++
++ if ((src_w > 0) && (src_h > 0))
+ {
+- dest_x = rect.x;
+- dest_y = rect.y;
+-
+- rect.x -= iv->img_area.x;
+- rect.y -= iv->img_area.y;
+-
+- GdkPixbuf* scaled_pix = NULL;
+- int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
+- int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
+- int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
+- int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
+- if( src_y > gdk_pixbuf_get_height( iv->pix ) )
+- src_y = gdk_pixbuf_get_height( iv->pix );
+- if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
+- src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
+- if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
+- src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
+- //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
+- // src_x, src_y, src_w, src_h );
+-
+- if ((src_w > 0) && (src_h > 0))
+- {
+- src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,
src_w, src_h );
+- scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width,
rect.height, type );
+- g_object_unref( src_pix );
+- src_pix = scaled_pix;
+- }
+-
++ src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y, src_w,
src_h );
++ scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width,
rect.height, type );
++ g_object_unref( src_pix );
++ src_pix = scaled_pix;
+ }
+
+ if( G_LIKELY(src_pix) )
+ {
+ GtkWidget* widget = (GtkWidget*)iv;
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
++#endif
+ gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y);
+ cairo_paint (cr);
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ cairo_destroy (cr);
++#endif
+
+ g_object_unref( src_pix );
+ }
+--
+2.11.1
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-21 00:47:22 UTC (rev 213232)
+++ community-i686/PKGBUILD 2017-02-21 00:47:30 UTC (rev 213233)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr>
-
-pkgname=gpicview
-pkgver=0.2.5
-pkgrel=2
-pkgdesc='Lightweight image viewer'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://lxde.org/'
-groups=('lxde')
-depends=('gtk2')
-makedepends=('intltool')
-source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz)
-md5sums=('26be9b0c5a234f1afe7d83d02a4a33f4')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Apply only one main category (FS#34684)
- sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gpicview/repos/community-i686/PKGBUILD (from rev 213232,
gpicview/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-21 00:47:30 UTC (rev 213233)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr>
+
+pkgbase=gpicview
+pkgname=(gpicview gpicview-gtk3)
+pkgver=0.2.5
+pkgrel=3
+pkgdesc='Lightweight image viewer'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://lxde.org/'
+depends=('gtk2' 'gtk3')
+makedepends=('intltool')
+source=(https://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+ 0001-Fix-displaying-images-with-GTK3.patch)
+sha256sums=('38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942'
+ 'f597fa7d5e8537665ea7bdf7bfffebaa32046e8feb4866866bfb64c219d8ea6d')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ # Fix displaying images with GTK3
+ # https://sourceforge.net/p/lxde/patches/542/
+ patch -Np1 -i ../0001-Fix-displaying-images-with-GTK3.patch
+
+ # Apply only one main category
+ sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+}
+
+build() {
+ # GTK+ 2 version
+ [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+ cd gtk2
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+
+ cd "$srcdir"
+ # GTK+ 3 version
+ [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+ cd gtk3
+ ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
+ make
+}
+
+package_gpicview() {
+ groups=('lxde')
+ depends=('gtk2')
+
+ cd gtk2
+ make DESTDIR="$pkgdir" install
+}
+
+package_gpicview-gtk3() {
+ groups=('lxde-gtk3')
+ pkgdesc+=' (GTK+ 3 version)'
+ depends=('gtk3')
+ conflicts=('gpicview')
+
+ cd gtk3
+ make DESTDIR="$pkgdir" install
+}
Copied:
gpicview/repos/community-x86_64/0001-Fix-displaying-images-with-GTK3.patch
(from rev 213232, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
===================================================================
--- community-x86_64/0001-Fix-displaying-images-with-GTK3.patch
(rev 0)
+++ community-x86_64/0001-Fix-displaying-images-with-GTK3.patch 2017-02-21
00:47:30 UTC (rev 213233)
@@ -0,0 +1,173 @@
+From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Tue, 21 Feb 2017 01:06:06 +0100
+Subject: [PATCH] Fix displaying images with GTK3
+
+We have to use the cairo context provided by the draw event, otherwise the
scrolling does not work properly.
+
+Don't paint the whole image when scale == 1, it's unneeded and slow.
+---
+ src/image-view.c | 86 +++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 44 insertions(+), 42 deletions(-)
+
+diff --git a/src/image-view.c b/src/image-view.c
+index b367f2a..820b843 100644
+--- a/src/image-view.c
++++ b/src/image-view.c
+@@ -24,11 +24,10 @@
+ static void image_view_finalize(GObject *iv);
+
+ static void image_view_clear( ImageView* iv );
+-static gboolean on_idle( ImageView* iv );
+ static void calc_image_area( ImageView* iv );
+-static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type );
+
+ #if GTK_CHECK_VERSION(3, 0, 0)
++static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type, cairo_t* cr );
+
+ static void image_view_paint( ImageView* iv, cairo_t* cr );
+
+@@ -37,6 +36,8 @@ static void on_get_preferred_height( GtkWidget* widget,
gint* minimal_height, gi
+ static gboolean on_draw_event(GtkWidget* widget, cairo_t* cr);
+
+ #else // GTK2
++static gboolean on_idle( ImageView* iv );
++static void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType
type );
+
+ static void image_view_paint( ImageView* iv, GdkEventExpose* evt );
+
+@@ -268,16 +269,13 @@ void image_view_paint( ImageView* iv, cairo_t *cr )
+ {
+ cairo_rectangle_int_t rectangle;
+ cairo_region_get_rectangle(region, i, &rectangle);
+- paint( iv, &rectangle, GDK_INTERP_NEAREST );
++ paint( iv, &rectangle, GDK_INTERP_NEAREST, cr );
+ }
+
+ cairo_region_destroy (region);
+-
+- if( 0 == iv->idle_handler )
+- iv->idle_handler = g_idle_add( (GSourceFunc)on_idle, iv );
+ }
+ }
+-#else
++#else // GTK2
+
+ gboolean on_expose_event( GtkWidget* widget, GdkEventExpose* evt )
+ {
+@@ -390,6 +388,8 @@ void image_view_set_scale( ImageView* iv, gdouble
new_scale, GdkInterpType type
+ }
+ }
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ gboolean on_idle( ImageView* iv )
+ {
+ GDK_THREADS_ENTER();
+@@ -435,6 +435,7 @@ gboolean on_idle( ImageView* iv )
+ iv->idle_handler = 0;
+ return FALSE;
+ }
++#endif
+
+ void calc_image_area( ImageView* iv )
+ {
+@@ -460,7 +461,11 @@ void calc_image_area( ImageView* iv )
+ }
+ }
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type,
cairo_t* cr )
++#else // GTK2
+ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
++#endif
+ {
+ GdkRectangle rect;
+ if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) )
+@@ -470,51 +475,48 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect,
GdkInterpType type )
+ int dest_y;
+
+ GdkPixbuf* src_pix = NULL;
+- if( iv->scale == 1.0 ) // original size
+- {
+- src_pix = (GdkPixbuf*)g_object_ref( iv->pix );
+- dest_x = iv->img_area.x;
+- dest_y = iv->img_area.y;
+- }
+- else // scaling is needed
++ GdkPixbuf* scaled_pix = NULL;
++
++ dest_x = rect.x;
++ dest_y = rect.y;
++
++ rect.x -= iv->img_area.x;
++ rect.y -= iv->img_area.y;
++
++ int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
++ int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
++ int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
++ int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
++ if( src_y > gdk_pixbuf_get_height( iv->pix ) )
++ src_y = gdk_pixbuf_get_height( iv->pix );
++ if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
++ src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
++ if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
++ src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
++ //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
++ // src_x, src_y, src_w, src_h );
++
++ if ((src_w > 0) && (src_h > 0))
+ {
+- dest_x = rect.x;
+- dest_y = rect.y;
+-
+- rect.x -= iv->img_area.x;
+- rect.y -= iv->img_area.y;
+-
+- GdkPixbuf* scaled_pix = NULL;
+- int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
+- int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
+- int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
+- int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
+- if( src_y > gdk_pixbuf_get_height( iv->pix ) )
+- src_y = gdk_pixbuf_get_height( iv->pix );
+- if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
+- src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
+- if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
+- src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
+- //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
+- // src_x, src_y, src_w, src_h );
+-
+- if ((src_w > 0) && (src_h > 0))
+- {
+- src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,
src_w, src_h );
+- scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width,
rect.height, type );
+- g_object_unref( src_pix );
+- src_pix = scaled_pix;
+- }
+-
++ src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y, src_w,
src_h );
++ scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width,
rect.height, type );
++ g_object_unref( src_pix );
++ src_pix = scaled_pix;
+ }
+
+ if( G_LIKELY(src_pix) )
+ {
+ GtkWidget* widget = (GtkWidget*)iv;
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
++#endif
+ gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y);
+ cairo_paint (cr);
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ cairo_destroy (cr);
++#endif
+
+ g_object_unref( src_pix );
+ }
+--
+2.11.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-21 00:47:22 UTC (rev 213232)
+++ community-x86_64/PKGBUILD 2017-02-21 00:47:30 UTC (rev 213233)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr>
-
-pkgname=gpicview
-pkgver=0.2.5
-pkgrel=2
-pkgdesc='Lightweight image viewer'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://lxde.org/'
-groups=('lxde')
-depends=('gtk2')
-makedepends=('intltool')
-source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz)
-md5sums=('26be9b0c5a234f1afe7d83d02a4a33f4')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Apply only one main category (FS#34684)
- sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gpicview/repos/community-x86_64/PKGBUILD (from rev 213232,
gpicview/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-21 00:47:30 UTC (rev 213233)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr>
+
+pkgbase=gpicview
+pkgname=(gpicview gpicview-gtk3)
+pkgver=0.2.5
+pkgrel=3
+pkgdesc='Lightweight image viewer'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://lxde.org/'
+depends=('gtk2' 'gtk3')
+makedepends=('intltool')
+source=(https://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+ 0001-Fix-displaying-images-with-GTK3.patch)
+sha256sums=('38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942'
+ 'f597fa7d5e8537665ea7bdf7bfffebaa32046e8feb4866866bfb64c219d8ea6d')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ # Fix displaying images with GTK3
+ # https://sourceforge.net/p/lxde/patches/542/
+ patch -Np1 -i ../0001-Fix-displaying-images-with-GTK3.patch
+
+ # Apply only one main category
+ sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+}
+
+build() {
+ # GTK+ 2 version
+ [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+ cd gtk2
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+
+ cd "$srcdir"
+ # GTK+ 3 version
+ [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+ cd gtk3
+ ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
+ make
+}
+
+package_gpicview() {
+ groups=('lxde')
+ depends=('gtk2')
+
+ cd gtk2
+ make DESTDIR="$pkgdir" install
+}
+
+package_gpicview-gtk3() {
+ groups=('lxde-gtk3')
+ pkgdesc+=' (GTK+ 3 version)'
+ depends=('gtk3')
+ conflicts=('gpicview')
+
+ cd gtk3
+ make DESTDIR="$pkgdir" install
+}
