[packages/qiv] convert inline edit to patch. refs d6e748b

glen glen at pld-linux.org
Mon Aug 10 08:51:06 CEST 2015


commit 874ca25ba105d47e2da0b3b85756166e83483a77
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Aug 10 09:50:40 2015 +0300

    convert inline edit to patch. refs d6e748b

 non-24bit.patch | 11 +++++++++++
 qiv.spec        |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/qiv.spec b/qiv.spec
index 04f56db..532d31a 100644
--- a/qiv.spec
+++ b/qiv.spec
@@ -9,6 +9,7 @@ Source0:	http://spiegl.de/qiv/download/%{name}-%{version}.tgz
 # Source0-md5:	93aea7469be64ebd35277a6dac079fc8
 Source1:	%{name}.desktop
 Source2:	%{name}.png
+Patch0:		non-24bit.patch
 URL:		http://spiegl.de/qiv/
 BuildRequires:	gtk+2-devel
 BuildRequires:	imlib2-devel
@@ -35,7 +36,7 @@ GDK/Imlib.
 
 %prep
 %setup -q
-%{__sed} -e 's|q->p = gdk_pixmap_foreign_new_for_screen(screen, x_pixmap, q->win_w, q->win_h, 24);|q->p = gdk_pixmap_foreign_new_for_screen(screen, x_pixmap, q->win_w, q->win_h, gdk_drawable_get_depth(q->win));|' -i image.c
+%patch0 -p1
 
 %build
 %{__make} \
diff --git a/non-24bit.patch b/non-24bit.patch
new file mode 100644
index 0000000..1c85ca2
--- /dev/null
+++ b/non-24bit.patch
@@ -0,0 +1,11 @@
+--- qiv-2.3.1/image.c~	2013-12-20 02:50:37.000000000 +0200
++++ qiv-2.3.1/image.c	2015-08-10 09:48:57.192314422 +0300
+@@ -735,7 +735,7 @@
+             (before.tv_sec + before.tv_usec / 1.0e6));
+ 
+         /*TODO: Hier gibt es XID collision, wenn am Bild eigentlich nix geändert wurde*/
+-        q->p = gdk_pixmap_foreign_new_for_screen(screen, x_pixmap, q->win_w, q->win_h, 24);
++        q->p = gdk_pixmap_foreign_new_for_screen(screen, x_pixmap, q->win_w, q->win_h, gdk_drawable_get_depth(q->win));
+         gdk_drawable_set_colormap(GDK_DRAWABLE(q->p),
+             gdk_drawable_get_colormap(GDK_DRAWABLE(q->win)));
+ //        m = x_mask == None ? NULL : gdk_pixmap_foreign_new(x_mask);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qiv.git/commitdiff/874ca25ba105d47e2da0b3b85756166e83483a77



More information about the pld-cvs-commit mailing list