Hello community, here is the log from the commit of package anjuta-extras for openSUSE:Factory checked in at 2012-01-09 11:14:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anjuta-extras (Old) and /work/SRC/openSUSE:Factory/.anjuta-extras.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "anjuta-extras", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/anjuta-extras/anjuta-extras.changes 2011-10-13 19:41:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.anjuta-extras.new/anjuta-extras.changes 2012-01-09 11:14:45.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 21 14:45:34 UTC 2011 - [email protected] + +- Add anjuta-extras-link-gmodule.patch: fix build against glib + 2.31. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + +------------------------------------------------------------------- New: ---- anjuta-extras-link-gmodule.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta-extras.spec ++++++ --- /var/tmp/diff_new_pack.WlvGH9/_old 2012-01-09 11:14:45.000000000 +0100 +++ /var/tmp/diff_new_pack.WlvGH9/_new 2012-01-09 11:14:45.000000000 +0100 @@ -17,19 +17,22 @@ # - Name: anjuta-extras Summary: Extra plugins for anjuta -Version: 3.2.0 -Release: 1 License: GPL-2.0+ Group: Development/Tools/IDE +Version: 3.2.0 +Release: 0 Url: http://download.gnome.org/sources/anjuta-extras Source: http://download.gnome.org/sources/anjuta-extras/3.2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM anjuta-extras-link-gmodule.patch bgo#666656 [email protected] -- Link to gmodule +Patch0: anjuta-extras-link-gmodule.patch # For directory ownership; okay since we have a Requires on anjuta BuildRequires: anjuta BuildRequires: anjuta-devel BuildRequires: gcc-c++ +# needed by patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream Recommends: %{name}-lang @@ -48,8 +51,11 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build +# needed by patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static %__make %{?smp_mflags} ++++++ anjuta-extras-link-gmodule.patch ++++++ commit 8a4d2416fdf600c8486cef5b56c9329ab555f954 Author: Vincent Untz <[email protected]> Date: Wed Dec 21 15:44:05 2011 +0100 scintilla: Link to gmodule to fix build against glib >= 2.31 https://bugzilla.gnome.org/show_bug.cgi?id=666656 diff --git a/configure.ac b/configure.ac index e148ee9..be6ba6e 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,9 @@ PKG_CHECK_MODULES(LIBANJUTA, [libanjuta-3.0 >= $ANJUTA_REQUIRED]) dnl check for gthread PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED) +dnl check for gthread +PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + dnl Scintilla Editor dnl ------------------------------------------------------------- diff --git a/plugins/scintilla/scintilla/Makefile.am b/plugins/scintilla/scintilla/Makefile.am index 700f2c0..e21ea41 100644 --- a/plugins/scintilla/scintilla/Makefile.am +++ b/plugins/scintilla/scintilla/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I$(srcdir)/include \ $(LIBANJUTA_CFLAGS) \ $(GTHREAD_CFLAGS) \ + $(GMODULE_CFLAGS) \ -DGTK -DSCI_LEXER -DUSE_XIM AM_CXXFLAGS = -DGTK -DSCI_LEXER -DUSE_XIM @@ -89,7 +90,8 @@ libanjuta_scintilla_la_SOURCES =\ libanjuta_scintilla_la_LIBADD = \ $(LIBANJUTA_LIBS) \ - $(GTHREAD_LIBS) + $(GTHREAD_LIBS) \ + $(GMODULE_LIBS) noinst_PROGRAMS = test-scintilla -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
