pool/anjuta
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 76147 from GNOME:Factory

Browse Source 
Allow detection of libgda-0.14 / fixes Unresolvable on Factory

OBS-URL: https://build.opensuse.org/request/show/76147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=64
This commit is contained in:
Sascha Peilicke 2011-07-14 08:16:26 +00:00 committed by Git OBS Bridge
commit 05cf1eb6ea
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
anjuta-libvala-0.14.patch Normal file
View File

@ -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

8
anjuta.changes
View File

@ -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

7
anjuta.spec
View File

@ -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 \