rpms/gtk2/devel 0001-Fix-dynamic-module-check.patch, NONE, 1.1 gtk2.spec, 1.438, 1.439
Matthias Clasen
mclasen at fedoraproject.org
Mon Jun 28 16:43:21 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9725
Modified Files:
gtk2.spec
Added Files:
0001-Fix-dynamic-module-check.patch
Log Message:
Fix building of immodules
0001-Fix-dynamic-module-check.patch:
configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 0001-Fix-dynamic-module-check.patch ---
>From 6af981739294d3e30835e5eceee47b969de5f20f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Mon, 28 Jun 2010 12:38:38 -0400
Subject: [PATCH] Fix dynamic module check
Also, prevent a stray 'yes' in configure output by putting the
corresponding AC_MSG_CHECKING call back
Bug 623016
---
configure.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 5a65632..dbd04f0 100644
--- a/configure.in
+++ b/configure.in
@@ -751,6 +751,7 @@ AC_MSG_RESULT($gtk_uxtheme_h)
AC_CHECK_HEADERS(crt_externs.h)
AC_CHECK_FUNCS(_NSGetEnviron)
+AC_MSG_CHECKING(whether to build dynamic modules)
AC_ARG_ENABLE(modules,
[AC_HELP_STRING([--disable-modules],
@@ -773,7 +774,7 @@ else
dnl (in a rather ugly way even)
if $dynworks; then
module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
- module_deplibs_check=`$pixbuf_libtool_config | \
+ module_deplibs_check=`$module_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
if test "x$module_deplibs_check" = "xnone" || \
--
1.7.1
Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -p -r1.438 -r1.439
--- gtk2.spec 28 Jun 2010 16:10:30 -0000 1.438
+++ gtk2.spec 28 Jun 2010 16:43:21 -0000 1.439
@@ -41,6 +41,8 @@ Patch8: tooltip-positioning.patch
#Patch14: gtk2-landscape-pdf-print.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=611313
Patch15: window-dragging.patch
+# upstream fix
+Patch16: 0001-Fix-dynamic-module-check.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: glib2-devel >= %{glib2_version}
@@ -158,6 +160,7 @@ This package contains developer document
%patch8 -p1 -b .tooltip-positioning
#%patch14 -p1 -b .landscape-pdf-print
%patch15 -p1 -b .window-dragging
+%patch16 -p1 -b .dynamic-modules
%build
%configure --with-xinput=xfree \
More information about the scm-commits
mailing list