commit 717b6d6475d7efb7ccb09bf372951ac9b5e6fad5
Author: Jan Rękorajski <[email protected]>
Date: Thu Dec 25 11:57:38 2014 +0000
- gtk+2 needs deprecated GdkPixdata type
gdk-GdkPixdata-deprecated.patch | 10 ++++++++++
gtk+2.spec | 7 +++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/gtk+2.spec b/gtk+2.spec
index a275bc3..3672c68 100644
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -24,6 +24,7 @@ Source0:
http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
Patch0: %{name}-arch_confdir.patch
Patch1: gobject-introspection.patch
Patch2: %{name}-papi.patch
+Patch3: gdk-GdkPixdata-deprecated.patch
URL: http://www.gtk.org/
BuildRequires: atk-devel >= 1:1.30.0-3
BuildRequires: autoconf >= 2.62
@@ -35,7 +36,7 @@ BuildRequires: cups-devel
BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-style-xsl
BuildRequires: gdk-pixbuf2-devel >= 2.22.0
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.27.3
BuildRequires: gobject-introspection-devel >= 0.10.0
%{?with_apidocs:BuildRequires: gtk-doc >= 1.17}
@@ -252,6 +253,7 @@ Moduł GTK+ do drukowania przez PAPI.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,'
gtk/gtk-builder-convert
@@ -274,7 +276,8 @@ CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
--with-gdktarget=x11 \
--with-html-dir=%{_gtkdocdir} \
--with-xinput=yes
-%{__make}
+
+%{__make} CC="%{__cc}"
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/gdk-GdkPixdata-deprecated.patch b/gdk-GdkPixdata-deprecated.patch
new file mode 100644
index 0000000..f6b769b
--- /dev/null
+++ b/gdk-GdkPixdata-deprecated.patch
@@ -0,0 +1,10 @@
+--- gtk+-2.24.25/configure.ac~ 2014-10-10 15:46:36.000000000 +0000
++++ gtk+-2.24.25/configure.ac 2014-12-25 11:02:08.449957921 +0000
+@@ -621,7 +621,6 @@
+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+ fi
+
+-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+
+
+ dnl
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk+2.git/commitdiff/717b6d6475d7efb7ccb09bf372951ac9b5e6fad5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
