[kipi-plugins/f14/master] fixup for slightly different gdk-pixbuf2 in f14+

Rex Dieter rdieter at fedoraproject.org
Thu Aug 26 15:26:31 UTC 2010


commit d51a9c2427b98ec315ff29cc05130f703d9fac08
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 26 10:31:07 2010 -0500

    fixup for slightly different gdk-pixbuf2 in f14+

 kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch |   12 ++++++++++++
 kipi-plugins.spec                             |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch b/kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch
new file mode 100644
index 0000000..2830e85
--- /dev/null
+++ b/kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch
@@ -0,0 +1,12 @@
+diff -up kipi-plugins-1.4.0/cmake/modules/FindGdk.cmake.gtk3 kipi-plugins-1.4.0/cmake/modules/FindGdk.cmake
+--- kipi-plugins-1.4.0/cmake/modules/FindGdk.cmake.gtk3	2010-08-22 03:04:10.000000000 -0500
++++ kipi-plugins-1.4.0/cmake/modules/FindGdk.cmake	2010-08-26 10:25:59.030277097 -0500
+@@ -23,7 +23,7 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+     set(GDK_DEFINITIONS ${_GDKCflags})
+   endif(NOT WIN32)
+ 
+-  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
++  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0 /usr/include/gdk-pixbuf-2.0
+     ${_GDKIncDir}
+   )
+   
diff --git a/kipi-plugins.spec b/kipi-plugins.spec
index 82cafc5..cd4c3fe 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -32,7 +32,7 @@ BuildRequires: libxslt-devel
 ## DNG converter
 BuildRequires: expat-devel
 ## RemoveRedeye
-BuildRequires: opencv-devel >= 2.0.0-9
+#BuildRequires: opencv-devel >= 2.0.0-9
 ## Shwup
 BuildRequires: qca2-devel
 
@@ -46,6 +46,10 @@ Requires: ImageMagick
 Requires: hugin-base
 
 ##upstreamable patches
+# look for gdk-pixbuf-2.0 headers in new fc14+ location.
+# too bad it hard-codes places instead of just output from 
+# pkg-config --cflags libgpod-1.0 
+Patch50: kipi-plugins-1.4.0-cmake_gdk_pixbuf_2.0.patch
 
 %description
 This package contains plugins to use with Kipi, the KDE Image Plugin
@@ -86,6 +90,9 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch50 -p1 -b .cmake_gdk_pixbuf_2.0
+
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}


More information about the scm-commits mailing list