From a91de9a98144b0719ae85a5e99554776cab9f1b7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jan 15 2013 23:32:01 +0000 Subject: Fix build with automake 1.13 --- diff --git a/gtk-automak.patch b/gtk-automak.patch new file mode 100644 index 0000000..034a18e --- /dev/null +++ b/gtk-automak.patch @@ -0,0 +1,27 @@ +diff -up gtk+-2.24.14/configure.in.automak gtk+-2.24.14/configure.in +--- gtk+-2.24.14/configure.in.automak 2013-01-15 18:29:09.834915289 -0500 ++++ gtk+-2.24.14/configure.in 2013-01-15 18:30:19.857912786 -0500 +@@ -44,14 +44,13 @@ AC_INIT([gtk+], [gtk_version], + [gtk+]) + + AC_CONFIG_SRCDIR([gdk/gdktypes.h]) +- ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + + # Save this value here, since automake will set cflags later + cflags_set=${CFLAGS+set} + + AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2]) +-AM_CONFIG_HEADER(config.h) + + # Support silent build rules, requires at least automake-1.11. Enable + # by either passing --enable-silent-rules to configure or passing V=0 +@@ -300,7 +299,6 @@ AM_SANITY_CHECK + + # Checks for programs. + AC_ISC_POSIX +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_MAKE_SET diff --git a/gtk2.spec b/gtk2.spec index d6585ba..c91f64e 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -38,9 +38,10 @@ Patch8: tooltip-positioning.patch #Patch14: gtk2-landscape-pdf-print.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 Patch15: window-dragging.patch - # fix dso. Patch17: gtk2-fixdso.patch +# automake 1.13 :-( +Patch18: gtk-automak.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -157,6 +158,7 @@ This package contains developer documentation for the GTK+ widget toolkit. #%patch14 -p1 -b .landscape-pdf-print %patch15 -p1 -b .window-dragging %patch17 -p1 -b .fixdso +%patch18 -p1 -b .automak libtoolize autoreconf