forked from pool/cmake
fix bug 635439
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=67
This commit is contained in:
parent
8761af507a
commit
efc7ecc69e
22
cmake-FindGTK2-gdk-pixbuf.patch
Normal file
22
cmake-FindGTK2-gdk-pixbuf.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Index: cmake-2.8.2/Modules/FindGTK2.cmake
|
||||||
|
===================================================================
|
||||||
|
--- cmake-2.8.2.orig/Modules/FindGTK2.cmake
|
||||||
|
+++ cmake-2.8.2/Modules/FindGTK2.cmake
|
||||||
|
@@ -138,6 +138,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
|
||||||
|
atkmm-1.6
|
||||||
|
cairo
|
||||||
|
cairomm-1.0
|
||||||
|
+ gdk-pixbuf-2.0
|
||||||
|
gdkmm-2.4
|
||||||
|
giomm-2.4
|
||||||
|
gtk-2.0
|
||||||
|
@@ -399,6 +400,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMP
|
||||||
|
_GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h)
|
||||||
|
_GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true)
|
||||||
|
|
||||||
|
+ _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
|
||||||
|
+ _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
|
||||||
|
+
|
||||||
|
_GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
|
||||||
|
_GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h)
|
||||||
|
_GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true)
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com
|
||||||
|
|
||||||
|
- add cmake-FindGTK2-gdk-pixbuf.patch (bnc#635439)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 7 08:57:01 UTC 2010 - coolo@novell.com
|
Tue Sep 7 08:57:01 UTC 2010 - coolo@novell.com
|
||||||
|
|
||||||
|
@ -28,6 +28,8 @@ Source0: %{name}-%{version}.tar.bz2
|
|||||||
Patch4: cmake-disable-builtin-chrpath.diff
|
Patch4: cmake-disable-builtin-chrpath.diff
|
||||||
Patch5: fortify-buffer-overflows.diff
|
Patch5: fortify-buffer-overflows.diff
|
||||||
Patch6: cmake-support-new-python.diff
|
Patch6: cmake-support-new-python.diff
|
||||||
|
# Should appear in cmake-2.8.3
|
||||||
|
Patch7: cmake-FindGTK2-gdk-pixbuf.patch
|
||||||
Summary: Cross-platform, open-source make system
|
Summary: Cross-platform, open-source make system
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%if 0%{?suse_version} > 1110
|
%if 0%{?suse_version} > 1110
|
||||||
@ -53,6 +55,7 @@ Authors:
|
|||||||
%patch4
|
%patch4
|
||||||
%patch5
|
%patch5
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
|
%patch7 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user