[arch-commits] Commit in gpicview/repos/community-x86_64 (5 files)
Balló György
bgyorgy at archlinux.org
Fri Apr 30 16:49:02 UTC 2021
Date: Friday, April 30, 2021 @ 16:49:02
Author: bgyorgy
Revision: 925379
archrelease: copy trunk to community-x86_64
Added:
gpicview/repos/community-x86_64/0001-Fix-displaying-images-with-GTK3.patch
(from rev 925378, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
gpicview/repos/community-x86_64/PKGBUILD
(from rev 925378, gpicview/trunk/PKGBUILD)
gpicview/repos/community-x86_64/gpicview.appdata.xml
(from rev 925378, gpicview/trunk/gpicview.appdata.xml)
Deleted:
gpicview/repos/community-x86_64/0001-Fix-displaying-images-with-GTK3.patch
gpicview/repos/community-x86_64/PKGBUILD
--------------------------------------------+
0001-Fix-displaying-images-with-GTK3.patch | 346 +++++++++++++--------------
PKGBUILD | 108 +++-----
gpicview.appdata.xml | 29 ++
3 files changed, 247 insertions(+), 236 deletions(-)
Deleted: 0001-Fix-displaying-images-with-GTK3.patch
===================================================================
--- 0001-Fix-displaying-images-with-GTK3.patch 2021-04-30 16:48:51 UTC (rev 925378)
+++ 0001-Fix-displaying-images-with-GTK3.patch 2021-04-30 16:49:02 UTC (rev 925379)
@@ -1,173 +0,0 @@
-From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at 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
-
Copied: gpicview/repos/community-x86_64/0001-Fix-displaying-images-with-GTK3.patch (from rev 925378, gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch)
===================================================================
--- 0001-Fix-displaying-images-with-GTK3.patch (rev 0)
+++ 0001-Fix-displaying-images-with-GTK3.patch 2021-04-30 16:49:02 UTC (rev 925379)
@@ -0,0 +1,173 @@
+From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at 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: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-30 16:48:51 UTC (rev 925378)
+++ PKGBUILD 2021-04-30 16:49:02 UTC (rev 925379)
@@ -1,63 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgbase=gpicview
-pkgname=(gpicview gpicview-gtk3)
-pkgver=0.2.5
-pkgrel=5
-pkgdesc='Lightweight image viewer'
-arch=('x86_64')
-license=('GPL2')
-url='https://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/PKGBUILD (from rev 925378, gpicview/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-30 16:49:02 UTC (rev 925379)
@@ -0,0 +1,45 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=gpicview
+pkgver=0.2.5
+pkgrel=6
+pkgdesc='Lightweight image viewer'
+arch=('x86_64')
+url='https://www.lxde.org/'
+license=('GPL2')
+groups=('lxde')
+depends=('gtk3')
+makedepends=('intltool')
+replaces=('gpicview-gtk3')
+source=("https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz"
+ 'gpicview.appdata.xml'
+ '0001-Fix-displaying-images-with-GTK3.patch')
+sha256sums=('38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942'
+ 'dab79b2be536005044cc5edcc4f47e9f407a5fcf3126110a1ef2ab65c873dbf7'
+ 'f597fa7d5e8537665ea7bdf7bfffebaa32046e8feb4866866bfb64c219d8ea6d')
+
+prepare() {
+ cd $pkgname-$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() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --enable-gtk3
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
+}
Copied: gpicview/repos/community-x86_64/gpicview.appdata.xml (from rev 925378, gpicview/trunk/gpicview.appdata.xml)
===================================================================
--- gpicview.appdata.xml (rev 0)
+++ gpicview.appdata.xml 2021-04-30 16:49:02 UTC (rev 925379)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>org.lxde.gpicview</id>
+ <launchable type="desktop-id">gpicview.desktop</launchable>
+ <name>Image Viewer</name>
+ <summary>View your images easily</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <developer_name>LXDE team</developer_name>
+ <description>
+ <p>GPicView is the standard picture viewer of LXDE. GPicView features lightning fast startup and an intuitive interface.</p>
+ <p>Features:</p>
+ <ul>
+ <li>Extremely lightweight and fast with low memory usage</li>
+ <li>Very suitable for default image viewer of a desktop system</li>
+ <li>Simple and intuitive interface</li>
+ <li>Minimal lib dependency: Only pure GTK is used</li>
+ <li>Desktop independent: Doesn't require any specific desktop environment</li>
+ </ul>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://wiki.lxde.org/en/images/9/9e/Gpicview.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://sourceforge.net/p/lxde/bugs/search/?q=labels:gpicview</url>
+ <url type="homepage">https://www.lxde.org/</url>
+ <translation type="gettext">gpicview</translation>
+</component>
More information about the arch-commits
mailing list