From 348a2ce5950f3314c7cf583a7634773da0ad46b0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 11 Jul 2011 10:32:29 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/anjuta revision 63.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=2432bc9bb544bc05acac34f9ba9cfbb6 --- anjuta.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anjuta.spec b/anjuta.spec index 89c7fb4..d99dc19 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -16,6 +16,7 @@ # + Name: anjuta Version: 3.1.3 Release: 1 From 325d731d41de9276d8af373de7b4ef5db9ce99ca Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 13 Jul 2011 06:06:32 +0000 Subject: [PATCH 2/2] Accepting request 76143 from home:dimstar:branches:GNOME:Factory Allow detection of libgda-0.14 / fixes Unresolvable on Factory OBS-URL: https://build.opensuse.org/request/show/76143 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=93 --- anjuta-libvala-0.14.patch | 30 ++++++++++++++++++++++++++++++ anjuta.changes | 8 ++++++++ anjuta.spec | 7 +++++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 anjuta-libvala-0.14.patch diff --git a/anjuta-libvala-0.14.patch b/anjuta-libvala-0.14.patch new file mode 100644 index 0000000..2417d5c --- /dev/null +++ b/anjuta-libvala-0.14.patch @@ -0,0 +1,30 @@ +Index: anjuta-3.1.3/configure.ac +=================================================================== +--- anjuta-3.1.3.orig/configure.ac ++++ anjuta-3.1.3/configure.ac +@@ -52,7 +52,8 @@ dnl Glade + GLADEUI_REQUIRED=3.9.2 + + dnl Vala +-VALA_REQUIRED=0.11.2 ++VALA12_REQUIRED=0.11.2 ++VALA14_REQUIRED=0.13.0 + + dnl Introspection + GI_REQUIRED=0.9.5 +@@ -254,11 +255,13 @@ else + AC_MSG_RESULT(no) + enable_vala="yes" + PKG_CHECK_MODULES(VALA, +- [libvala-0.12 >= $VALA_REQUIRED]) ++ [libvala-0.14 >= $VALA14_REQUIRED],, ++ [PKG_CHECK_MODULES(VALA, ++ [libvala-0.12 >= $VALA12_REQUIRED])]) + fi + + if test x$enable_vala = xyes; then +- AC_PATH_PROGS(VALAC, [valac-0.12 valac], valac) ++ AC_PATH_PROGS(VALAC, [valac-0.14 valac-0.12 valac], valac) + AC_SUBST(VALAC) + fi + diff --git a/anjuta.changes b/anjuta.changes index 7da8632..257fc22 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 12 19:32:28 UTC 2011 - dimstar@opensuse.org + +- Add anjuta-libvala-0.14.patch: Allow building against + libvala 0.14. Patch sent upstream as bgo#654502. +- Change pkgconfig(libvala-0.12) BuildRequires to + pkgconfig(libvala-0.14) + ------------------------------------------------------------------- Tue Jul 5 09:50:02 CEST 2011 - vuntz@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index d99dc19..0fc9522 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -28,6 +28,8 @@ Source: http://download.gnome.org/sources/anjuta/3.1/%{name}-%{version}. Source1: %{name}-rpmlintrc # PATCH-FEATURE-UPSTREAM anjuta-support-libgda-5.0.patch bgo#652047 dimstar@opensuse.org -- Also support building with libgda-5.0. Patch0: anjuta-support-libgda-5.0.patch +# PATCH-FEATURE-UPSTREAM anjuta-libvala-0.14.patch bgo#654502 dimstar@opesuse.org -- Also support building with libvala 0.14, +Patch1: anjuta-libvala-0.14.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison @@ -61,7 +63,7 @@ BuildRequires: pkgconfig(libdevhelp-3.0) BuildRequires: pkgconfig(libgda-5.0) BuildRequires: pkgconfig(libgraph) BuildRequires: pkgconfig(libgvc) -BuildRequires: pkgconfig(libvala-0.12) +BuildRequires: pkgconfig(libvala-0.14) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(vte-2.90) @@ -128,10 +130,11 @@ and more. %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build -# Needed by patch0 +# Needed by patch0 and patch1 NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-static \