[packages/geeqie] - fix build on x32 - rel 2

baggins baggins at pld-linux.org
Wed Feb 13 00:08:26 CET 2019


commit 78f116f5bb9b9796890d3d6789dae7c4540fd31c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 13 00:08:13 2019 +0100

    - fix build on x32
    - rel 2

 geeqie.spec |  4 +++-
 x32.patch   | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/geeqie.spec b/geeqie.spec
index f1d86a0..58d1d14 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -13,7 +13,7 @@ Summary(hu.UTF-8):	Képfájl-böngésző eszköz
 Summary(pl.UTF-8):	Narzędzie do przeglądania plików graficznych
 Name:		geeqie
 Version:	1.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://www.geeqie.org/%{name}-%{version}.tar.xz
@@ -21,6 +21,7 @@ Source0:	http://www.geeqie.org/%{name}-%{version}.tar.xz
 Patch0:		libdir-fix.patch
 Patch1:		exiv2-0.27.patch
 Patch2:		no-changelog.patch
+Patch3:		x32.patch
 URL:		http://www.geeqie.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -83,6 +84,7 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d auxdir
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..01d00b4
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- geeqie-1.4/src/thumb_standard.c~	2017-12-31 13:31:21.000000000 +0100
++++ geeqie-1.4/src/thumb_standard.c	2019-02-13 00:06:19.836517723 +0100
+@@ -348,7 +348,11 @@
+ 		mark_uri = (tl->cache_local) ? tl->local_uri :tl->thumb_uri;
+ 
+ 		mark_app = g_strdup_printf("%s %s", GQ_APPNAME, VERSION);
++#ifdef __ILP32__
++		mark_mtime = g_strdup_printf("%llu", tl->source_mtime);
++#else
+ 		mark_mtime = g_strdup_printf("%lu", tl->source_mtime);
++#endif
+ 
+ 		pathl = path_from_utf8(tmp_path);
+ 		success = gdk_pixbuf_save(pixbuf, pathl, "png", NULL,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geeqie.git/commitdiff/78f116f5bb9b9796890d3d6789dae7c4540fd31c



More information about the pld-cvs-commit mailing list