Accepting request 147768 from GNOME:Apps

tweaked (forwarded request 147767 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/147768
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geeqie?expand=0&rev=6
This commit is contained in:
Stephan Kulow 2013-01-10 10:11:41 +00:00 committed by Git OBS Bridge
commit a67dd6b8cb
3 changed files with 48 additions and 1 deletions

39
geeqie-bigendian.patch Normal file
View File

@ -0,0 +1,39 @@
Index: geeqie-1.1/src/image_load_tiff.c
===================================================================
--- geeqie-1.1.orig/src/image_load_tiff.c
+++ geeqie-1.1/src/image_load_tiff.c
@@ -326,18 +326,21 @@ static gboolean image_loader_tiff_load (
/* Turns out that the packing used by TIFFRGBAImage depends on
* the host byte order...
*/
- while (pixels < pixbuf->pixels + bytes)
+ {
+ guchar *ptr = pixels;
+ while (ptr < pixels + bytes)
{
- uint32 pixel = *(uint32 *)pixels;
+ uint32 pixel = *(uint32 *)ptr;
int r = TIFFGetR(pixel);
int g = TIFFGetG(pixel);
int b = TIFFGetB(pixel);
int a = TIFFGetA(pixel);
- *pixels++ = r;
- *pixels++ = g;
- *pixels++ = b;
- *pixels++ = a;
+ *ptr++ = r;
+ *ptr++ = g;
+ *ptr++ = b;
+ *ptr++ = a;
}
+ }
#endif
lt->area_updated_cb(loader, 0, 0, width, height, lt->data);
@@ -419,4 +422,4 @@ void image_loader_backend_set_tiff(Image
-#endif
\ No newline at end of file
+#endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 28 11:53:06 UTC 2012 - dvaleev@suse.com
- Add geeqie-bigendian.patch: fix bigendian build.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 16 13:05:05 UTC 2012 - zaitor@opensuse.org Sun Sep 16 13:05:05 UTC 2012 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package geeqie # spec file for package geeqie
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,6 +25,8 @@ Group: Productivity/Graphics/Viewers
## FIXME - Check on version update if support for the libchamplain we have in factory is finaly supported, last checked version 1.1 ## FIXME - Check on version update if support for the libchamplain we have in factory is finaly supported, last checked version 1.1
Url: http://geeqie.sourceforge.net/ Url: http://geeqie.sourceforge.net/
Source: http://downloads.sourceforge.net/project/geeqie/geeqie/geeqie-1.1/%{name}-%{version}.tar.gz Source: http://downloads.sourceforge.net/project/geeqie/geeqie/geeqie-1.1/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM geeqie-bigendian.patch dvaleev@suse.com -- Fix build on big endian systems. Taken from upstream commit c6793b7
Patch0: geeqie-bigendian.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gnome-doc-utils BuildRequires: gnome-doc-utils
@ -50,6 +52,7 @@ operating systems.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure \ %configure \