From cf0e25f1a736a3a3ddb3c13a93a6762af2f7a09a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 31 Jul 2013 18:59:14 +0000 Subject: [PATCH 1/2] Accepting request 185064 from home:dimstar:branches:GNOME:Factory Update to 3.9.5 OBS-URL: https://build.opensuse.org/request/show/185064 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=156 --- anjuta-3.9.4.tar.xz | 3 --- anjuta-3.9.5.tar.xz | 3 +++ anjuta.changes | 10 ++++++++++ anjuta.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 anjuta-3.9.4.tar.xz create mode 100644 anjuta-3.9.5.tar.xz diff --git a/anjuta-3.9.4.tar.xz b/anjuta-3.9.4.tar.xz deleted file mode 100644 index b3648e0..0000000 --- a/anjuta-3.9.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b994f73b32f05831e5b49f01c9a85e483c2f5a429303a2ce7a01ec9d9f9ea9e5 -size 5389808 diff --git a/anjuta-3.9.5.tar.xz b/anjuta-3.9.5.tar.xz new file mode 100644 index 0000000..1844f36 --- /dev/null +++ b/anjuta-3.9.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb020f32fd93ed7e745d3cbb65dcb95556de9cc22fe483326e675296b6b8f908 +size 5392288 diff --git a/anjuta.changes b/anjuta.changes index 2c8f4a1..801918c 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 30 07:01:20 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.5: + + anjuta: Only show app-menu if supported by environment. + + libanjuta: Make AnjutaCommandBar easier to use on small + screens. + + Bugs fixed: bgo#699544. + + Updated translations. + ------------------------------------------------------------------- Tue Jul 9 06:55:25 UTC 2013 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 5d89541..372c0f1 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -17,7 +17,7 @@ Name: anjuta -Version: 3.9.4 +Version: 3.9.5 Release: 0 Summary: Versatile Integrated Development Environment for GNOME License: GPL-2.0+ From 0662cd18e9ba2b70d9e13b4c4515df931d2f8097 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Aug 2013 11:30:15 +0000 Subject: [PATCH 2/2] Accepting request 186069 from home:dimstar:branches:GNOME:Factory - Add anjuta-vala-0.22.patch: Allow building with vala 0.22. - Add gnome-common BuildRequires and call to gnome-autogen.sh, as above patch touches the build system. - Change pkgconfig(libvala-0.20) BuildRequires to pkgconfig(libvala-0.22) in order to perform the switch to Vala 0.22. - Stop passing obsolete --disable-scrollkeeper to configure. OBS-URL: https://build.opensuse.org/request/show/186069 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=157 --- anjuta-vala-0.22.patch | 33 +++++++++++++++++++++++++++++++++ anjuta.changes | 11 +++++++++++ anjuta.spec | 10 ++++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 anjuta-vala-0.22.patch diff --git a/anjuta-vala-0.22.patch b/anjuta-vala-0.22.patch new file mode 100644 index 0000000..4e1b9af --- /dev/null +++ b/anjuta-vala-0.22.patch @@ -0,0 +1,33 @@ +From b0adfbe1197ad97f39e5db583fdc63f78c3fbff3 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Tue, 6 Aug 2013 11:17:45 +0200 +Subject: [PATCH] build: add support for libvala-0.22 + +To make maintenance a little bit easier in the future, rewrite the +detection to use foreach instead of nesting the checks. +--- + configure.ac | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 41c482d..f7a9c18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -310,11 +310,9 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- PKG_CHECK_EXISTS([ libvala-0.20 ], +- [ valaver="-0.20" ], +- [ PKG_CHECK_EXISTS([ libvala-0.18 ], +- [ valaver="-0.18" ], +- [ valaver="" ]) ++ m4_foreach([VERSION], [[0.18], [0.20], [0.22]], ++ [PKG_CHECK_EXISTS([ libvala-VERSION ], ++ [ valaver="-VERSION" ]) + ]) + if test "x$valaver" != "x"; then + AC_MSG_RESULT(yes) +-- +1.7.10.4 + diff --git a/anjuta.changes b/anjuta.changes index 801918c..6560f91 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 6 09:24:08 UTC 2013 - dimstar@opensuse.org + +- Add anjuta-vala-0.22.patch: Allow building with vala 0.22. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + above patch touches the build system. +- Change pkgconfig(libvala-0.20) BuildRequires to + pkgconfig(libvala-0.22) in order to perform the switch to Vala + 0.22. +- Stop passing obsolete --disable-scrollkeeper to configure. + ------------------------------------------------------------------- Tue Jul 30 07:01:20 UTC 2013 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 372c0f1..0a3a9cc 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -25,12 +25,16 @@ Group: Development/Tools/IDE Url: http://anjuta.sourceforge.net/ Source0: http://download.gnome.org/sources/anjuta/3.9/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM anjuta-vala-0.22.patch bgo#705548 dimstar@opensuse.org -- Allow building with vala 0.22 +Patch0: anjuta-vala-0.22.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +# Needed for patch0 +BuildRequires: gnome-common BuildRequires: gnome-icon-theme BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -57,7 +61,7 @@ BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0.0 BuildRequires: pkgconfig(libdevhelp-3.0) >= 3.7.5 BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0 BuildRequires: pkgconfig(libgvc) -BuildRequires: pkgconfig(libvala-0.20) +BuildRequires: pkgconfig(libvala-0.22) BuildRequires: pkgconfig(libxml-2.0) >= 2.4.23 BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(vte-2.90) >= 0.27.6 @@ -150,12 +154,14 @@ and more. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +# Needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-static \ - --disable-scrollkeeper \ --enable-glade-catalog make %{?_smp_mflags} V=1