From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 16 Jul 2015 20:40:35 +0000 (+0000)
Subject: - fix building on x32
X-Git-Tag: auto/th/darktable-1.4.2-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdarktable.git;a=commitdiff_plain;h=23260203e71174ee423f90d3567c24fd3e939be6;hp=07bc9e867566395e3733be655ec9d739d45015f8

- fix building on x32
---

diff --git a/cmake-glib.patch b/cmake-glib.patch
index a231fa3..018efa2 100644
--- a/cmake-glib.patch
+++ b/cmake-glib.patch
@@ -5,7 +5,7 @@
    HINTS ${Glib_PKGCONF_INCLUDE_DIRS}
    PATHS /usr
 -  PATH_SUFFIXES lib/glib-2.0/include ../lib/glib-2.0/include
-+  PATH_SUFFIXES lib64/glib-2.0/include lib/glib-2.0/include ../lib/glib-2.0/include
++  PATH_SUFFIXES lib64/glib-2.0/include libx32/glib-2.0/include lib/glib-2.0/include ../lib/glib-2.0/include
  )
  
  # Finally the library itself
diff --git a/darktable.spec b/darktable.spec
index 1a6a7f4..5ecc1ea 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -15,6 +15,7 @@ Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.xz
 # Source0-md5:	f86554329c2c809ffb009244a6f1d643
 Patch0:		cmake-glib.patch
+Patch1:		x32.patch
 URL:		http://darktable.sourceforge.net/
 BuildRequires:	GraphicsMagick-devel
 %{?with_opencl:BuildRequires:	OpenCL-devel}
@@ -82,6 +83,7 @@ darktable to wirtualny podświetlany stół i ciemnia dla fotografów.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..f4bec7c
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,13 @@
+--- darktable-1.4.2/cmake/modules/FindGTK2.cmake~	2014-04-22 16:59:56.000000000 +0000
++++ darktable-1.4.2/cmake/modules/FindGTK2.cmake	2015-07-16 20:31:39.503966178 +0000
+@@ -173,8 +173,10 @@
+         # look in debian/ubuntu multi-arch path (needs cmake >= 2.85~rc2)
+         /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+             /usr/local/lib64
++            /usr/local/libx32
+             /usr/local/lib
+             /usr/lib64
++            /usr/libx32
+             /usr/lib
+       /opt/local/include
+       /opt/local/lib