Hello community, here is the log from the commit of package devhelp for openSUSE:Factory checked in at Mon Jul 11 12:21:28 CEST 2011.
-------- --- GNOME/devhelp/devhelp.changes 2011-04-22 11:13:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/devhelp/devhelp.changes 2011-07-04 14:47:11.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 4 14:41:40 CEST 2011 - [email protected] + +- Add devhelp-fix-multiple-gdk-backends.patch to fix build against + a GTK+ built with more than one backend. +- Add gnome-common BuildRequires and call to gnome-autogen.sh to + have the patch taken into account. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- devhelp-fix-multiple-gdk-backends.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devhelp.spec ++++++ --- /var/tmp/diff_new_pack.dRXxc5/_old 2011-07-11 12:20:58.000000000 +0200 +++ /var/tmp/diff_new_pack.dRXxc5/_new 2011-07-11 12:20:58.000000000 +0200 @@ -20,14 +20,18 @@ Name: devhelp Version: 3.0.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: Developer's Help Program for GNOME Url: http://developer.imendio.com/wiki/Devhelp Group: Development/Tools/Other Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM devhelp-fix-multiple-gdk-backends.patch bgo#652999 [email protected] -- Fix build when GTK+ has more than one backend (x11 & broadway, for instance) +Patch0: devhelp-fix-multiple-gdk-backends.patch BuildRequires: fdupes BuildRequires: gconf2-devel +# Needed for patch0 +BuildRequires: gnome-common # For directory ownership of the plugins: BuildRequires: gedit BuildRequires: gtk3-devel @@ -109,8 +113,10 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static %__make %{?jobs:-j%jobs} V=1 ++++++ devhelp-fix-multiple-gdk-backends.patch ++++++ commit ca19a061bbf5e4b33119af81ff66b39e9b175b9b Author: Vincent Untz <[email protected]> Date: Mon Jul 4 14:39:22 2011 +0200 build: Fix detection of GDK backend in case of multiple backends The GDK backend detection routine only worked in the case where GTK+ is built for one and only one backend. https://bugzilla.gnome.org/show_bug.cgi?id=652999 diff --git a/acinclude.m4 b/acinclude.m4 index 56aa3a2..cc47f19 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,24 +1,32 @@ AC_DEFUN([IGE_PLATFORM_CHECK],[ - gdk_target=`$PKG_CONFIG --variable=targets gtk+-3.0` + gdk_targets=`$PKG_CONFIG --variable=targets gtk+-3.0` - if test "x$gdk_target" = "xquartz"; then - AC_MSG_CHECKING([checking for Mac OS X support]) - carbon_ok=no - AC_TRY_CPP([ - #include <Carbon/Carbon.h> - #include <CoreServices/CoreServices.h> - ], carbon_ok=yes) - AC_MSG_RESULT($carbon_ok) - if test $carbon_ok = yes; then - IGE_PLATFORM=osx - IGE_PLATFORM_NAME="GTK+ OS X" - AC_DEFINE(HAVE_PLATFORM_OSX, 1, [whether GTK+ OS X is available]) + IGE_PLATFORM= + + for gdk_target in $gdk_targets; do + if test "x$gdk_target" = "xquartz"; then + AC_MSG_CHECKING([checking for Mac OS X support]) + carbon_ok=no + AC_TRY_CPP([ + #include <Carbon/Carbon.h> + #include <CoreServices/CoreServices.h> + ], carbon_ok=yes) + AC_MSG_RESULT($carbon_ok) + if test $carbon_ok = yes; then + IGE_PLATFORM=osx + IGE_PLATFORM_NAME="GTK+ OS X" + AC_DEFINE(HAVE_PLATFORM_OSX, 1, [whether GTK+ OS X is available]) + break + fi + elif test "x$gdk_target" = "xx11"; then + IGE_PLATFORM=x11 + IGE_PLATFORM_NAME="GTK+ X11" + AC_DEFINE(HAVE_PLATFORM_X11, 1, [whether GTK+ X11 is available]) + break fi - elif test "x$gdk_target" = "xx11"; then - IGE_PLATFORM=x11 - IGE_PLATFORM_NAME="GTK+ X11" - AC_DEFINE(HAVE_PLATFORM_X11, 1, [whether GTK+ X11 is available]) - else + done + + if test "x$IGE_PLATFORM" = "x"; then AC_MSG_ERROR([Could not detect the platform]) fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
