[arch-commits] Commit in xsane/trunk (PKGBUILD xsane-preview-selection.patch)

Antonio Rojas arojas at archlinux.org
Thu Jun 4 14:18:03 UTC 2020


    Date: Thursday, June 4, 2020 @ 14:18:01
  Author: arojas
Revision: 388281

Fix selection preview (FS#46850)

Added:
  xsane/trunk/xsane-preview-selection.patch
Modified:
  xsane/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    9 ++++---
 xsane-preview-selection.patch |   50 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 14:02:32 UTC (rev 388280)
+++ PKGBUILD	2020-06-04 14:18:01 UTC (rev 388281)
@@ -4,7 +4,7 @@
 pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.999
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 url="https://gitlab.com/sane-project/frontend/xsane"
 license=('GPL2')
@@ -12,11 +12,13 @@
 source=(http://http.debian.net/debian/pool/main/x/$pkgname/${pkgname}_$pkgver.orig.tar.gz
 	xsane-0.995-xdg-open.patch
 	0165-xsane-0.999-lcms2.patch
-	0001-lcms2_configure.patch)
+	0001-lcms2_configure.patch
+        xsane-preview-selection.patch)
 sha512sums=('73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed'
             'ed1c1b0fab10b456f7dc6befd6f91eb8d3e1bae0f1be3abf71d334d4a2ae8f8335ba37fdd73f336f7c5f45916df917dc77fd792e6b849a87bde95babc698bf39'
             '557913adab90b2ba051a2988bdbfc600ca6a33f099810f5f867c8d8b2c5a45b0468dd8a1a1593ff33d149b4a5917b24d716b54ae2605b3a2e19053e02e5b64c6'
-            'a8b5e0466c1306b8df68d814a3f02bc74e4d470aa42b9e0eebad41d2e274ff74328a837dd9a0b5ca59e4df63ecbb53b268f6d4948a690d9346c5399bb5b3d1e4')
+            'a8b5e0466c1306b8df68d814a3f02bc74e4d470aa42b9e0eebad41d2e274ff74328a837dd9a0b5ca59e4df63ecbb53b268f6d4948a690d9346c5399bb5b3d1e4'
+            '001b021ddf0f92e2bbab0211cfe92c54b785e94e7c92102caedd8d4ce34c833847157174a4d800d8859ba8d05300db74b8af352e5347d2883e17bca57454e96d')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,6 +27,7 @@
   sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
   patch -Np1 -i "${srcdir}/0165-xsane-0.999-lcms2.patch"
   patch -Np1 -i "${srcdir}/0001-lcms2_configure.patch"
+  patch -p1 -i ../xsane-preview-selection.patch # Fix selection preview
 }
 
 build() {

Added: xsane-preview-selection.patch
===================================================================
--- xsane-preview-selection.patch	                        (rev 0)
+++ xsane-preview-selection.patch	2020-06-04 14:18:01 UTC (rev 388281)
@@ -0,0 +1,50 @@
+commit e7c03a6de0c76256810b6340e0a954e88c3448e9
+Author: Reinhard Fössmeier <info at ais-sanmarino.org>
+Date:   Wed May 12 20:23:18 2010 +0200
+
+    fixed a problem in mouse event processing
+
+    Fixed a problem in mouse event processing that interfered with selecting
+    the scan rectangle in the preview window.
+---
+ src/xsane-preview.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/xsane-preview.c b/src/xsane-preview.c
+index f089dd1..264c775 100644
+--- a/src/xsane-preview.c
++++ b/src/xsane-preview.c
+@@ -80,7 +80,6 @@
+ #include "xsane-preview.h"
+ #include "xsane-preferences.h"
+ #include "xsane-gamma.h"
+-#include <gdk/gdkkeysyms.h>
+ 
+ 
+ #ifndef PATH_MAX
+@@ -3023,9 +3022,9 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo
+     preview_display_color_components(p, event->motion.x, event->motion.y);
+ 
+     switch (((GdkEventMotion *)event)->state &
+-            GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */
++            (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */
+     {
+-      case 256: /* left button */
++      case GDK_BUTTON1_MASK: /* left button */
+ 
+         DBG(DBG_info2, "left button\n");
+ 
+@@ -3292,8 +3291,8 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo
+         }
+        break;
+ 
+-      case 512: /* middle button */
+-      case 1024: /* right button */
++      case GDK_BUTTON2_MASK: /* middle button */
++      case GDK_BUTTON3_MASK: /* right button */
+         DBG(DBG_info2, "middle or right button\n");
+ 
+         if (p->selection_drag)
+-- 
+1.7.11.4
+



More information about the arch-commits mailing list