From 3167517f2d28f4a0d7c723ed1c96e96d28874daa Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 13 Jan 2012 16:27:06 +0000 Subject: [PATCH 1/3] Accepting request 100183 from home:dimstar:branches:GNOME:Factory Build with vala 0.15/0.16 OBS-URL: https://build.opensuse.org/request/show/100183 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=116 --- anjuta-vala-0_16.patch | 18 ++++++++++++++++++ anjuta.changes | 13 +++++++++++++ anjuta.spec | 17 ++++++++++++++--- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 anjuta-vala-0_16.patch diff --git a/anjuta-vala-0_16.patch b/anjuta-vala-0_16.patch new file mode 100644 index 0000000..a4f223c --- /dev/null +++ b/anjuta-vala-0_16.patch @@ -0,0 +1,18 @@ +diff -ur anjuta-3.3.3/configure.ac anjuta-3.3.3.patched/configure.ac +--- anjuta-3.3.3/configure.ac 2011-11-21 19:45:44.000000000 +0100 ++++ anjuta-3.3.3.patched/configure.ac 2012-01-13 12:20:09.376074138 +0100 +@@ -263,12 +263,12 @@ + AC_MSG_RESULT(no) + enable_vala="yes" + PKG_CHECK_MODULES(VALA, +- [libvala-0.14 >= $VALA_REQUIRED],LIBVALA="libvala-0.14") ++ [libvala-0.16 >= $VALA_REQUIRED],LIBVALA="libvala-0.16") + AC_SUBST(LIBVALA) + fi + + if test x$enable_vala = xyes; then +- AC_PATH_PROGS(VALAC, [valac-0.14 valac], valac) ++ AC_PATH_PROGS(VALAC, [valac-0.16 valac], valac) + AC_SUBST(VALAC) + fi + diff --git a/anjuta.changes b/anjuta.changes index a6c7acb..380af45 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 13 13:56:58 UTC 2012 - dimstar@opensuse.org + +- Replace pkgconfig(libvala-0.14) BuildRequires with + pkgconfig(libvala-0.16) in order to build against vala 0.15/0.16. +- Add anjuta-vala-0_16.patch: Fix build with libvala-0.16 +- Add gnome-common BuildRequires and call to autogen.sh, as the + above patch touches the build system. +- Delete .c files that are auto-generated from .vala files to + ensure they are generated with the right vala compiler. +- Add vala BuildRequires: as we drop the shipped generated .c + files, we need to rebuild them during our build. + ------------------------------------------------------------------- Tue Dec 20 23:11:52 UTC 2011 - vuntz@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index c90b43e..a143664 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,7 +1,7 @@ # # spec file for package anjuta # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: anjuta Version: 3.3.3 Release: 0 @@ -25,12 +24,16 @@ Group: Development/Tools/IDE Url: http://anjuta.sourceforge.net/ Source: http://download.gnome.org/sources/anjuta/3.3/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM anjuta-vala-0_16.patch bgo#667851 dimstar@opensuse.org -- Detect vala 0.15/0.16. +Patch0: anjuta-vala-0_16.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +# Needed bt patch0 +BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme BuildRequires: gobject-introspection-devel @@ -44,6 +47,8 @@ BuildRequires: sqlite3-devel BuildRequires: subversion-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Needed because we drop some generated .c files in order to support vala 0.15/0.16. +BuildRequires: vala %ifnarch ia64 s390 s390x BuildRequires: valgrind-devel %endif @@ -59,7 +64,7 @@ BuildRequires: pkgconfig(libdevhelp-3.0) BuildRequires: pkgconfig(libgda-5.0) >= 4.99.0 BuildRequires: pkgconfig(libgraph) BuildRequires: pkgconfig(libgvc) -BuildRequires: pkgconfig(libvala-0.14) >= 0.13.3 +BuildRequires: pkgconfig(libvala-0.16) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(vte-2.90) @@ -152,9 +157,15 @@ and more. %lang_package %prep %setup -q +%patch0 -p1 +# Remove 'pre-built' .c files built with 'older' vala versions +rm plugins/language-support-vala/{locator,plugin,provider,report}.c +rm plugins/symbol-db/anjuta-tags/ctags-visitor.c translation-update-upstream %build +# Needed by patch0 +./autogen.sh %configure\ --disable-static \ --disable-scrollkeeper From b880fb419f79ab694a60bb4b86154c2b49e4e77c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 18 Jan 2012 11:00:00 +0000 Subject: [PATCH 2/3] Accepting request 100527 from home:dimstar:branches:GNOME:Factory Update to 3.3.4 OBS-URL: https://build.opensuse.org/request/show/100527 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=117 --- anjuta-3.3.3.tar.xz | 3 --- anjuta-3.3.4.tar.xz | 3 +++ anjuta.changes | 55 +++++++++++++++++++++++++++++++++++++++++++++ anjuta.spec | 3 ++- 4 files changed, 60 insertions(+), 4 deletions(-) delete mode 100644 anjuta-3.3.3.tar.xz create mode 100644 anjuta-3.3.4.tar.xz diff --git a/anjuta-3.3.3.tar.xz b/anjuta-3.3.3.tar.xz deleted file mode 100644 index 584c74a..0000000 --- a/anjuta-3.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc9d6ebc81c709b4d9042927b4b9902cf3d483dcbfcaacd76a95238b5dc61a08 -size 5914248 diff --git a/anjuta-3.3.4.tar.xz b/anjuta-3.3.4.tar.xz new file mode 100644 index 0000000..87e47d1 --- /dev/null +++ b/anjuta-3.3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca537860250e1b03aeab24c29c4f587573f697e092d312969ddbdcb653aef06 +size 5942896 diff --git a/anjuta.changes b/anjuta.changes index 380af45..3fdbfdd 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Tue Jan 17 15:40:34 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.3.4: + + general: rename property to default_value + + anjuta: Remove old tutorial links + + libanjuta: + - set the info for the default value of a property + - gir annotation for anjuta_project_node_insert_property_info + - don't register project property lists as GObject properties + - better memory management for the properties lists + - Fix anjuta_util_help_display to use yelp + - Add a model property to AnjutaTreeComboBox + - Add IAnjutaProjectChooser interface + - Fix a critical warning when selecting a node in chooser + widget + - Add missing GdfProjectView in Anjuta glade catalog + - Improve AnjutaTreeComboBox + + am-project: + - better memory management for the properties lists + + language-support-vala: + - update .vapi for the latest changes + - take advantage of the new project API + + sourceview: + - Fix typo in a gschema key name + + anjuta-build-tutorial: Remove AM_MAINTAINER_MODE + + project-wizard: + - Don't symlink Automake files + - Use Automake variables for defines + - Move PROJECT_CFLAGS to own line + - Use pkgdatadir instead of datadir/package + - Move PROJECT_CFLAGS to own line in minimal template + - check HavePackage before adding PROJECT_CFLAGS + - Don't replace hyphen with underscore in filenames + + symbol-db: + - improved some debug messages + - minor performance bugfix. + + project-manager: + - Allow to add groups and targets in the root node + - Add a help button in some dialogs + - Implement a project node chooser + - Fix ianjuta_project_manager_add_source_quite function + - Use new improvements in ProjectChooser button + - Select a valid default node in ProjectChooser button + - Use ProjectChooser button in the Add library dialog + - Rename directory to folder in project dialogs + - Use a GtkFileChooser to add sources in a target + + file-wizard: + - Use the new project node chooser + - Cosmetic improvements of new file dialog + + class-gen: Use the new project node chooser + + Bugs fixed: bgo#664413, bgo#633341, bgo#665945, bgo#665945, + bgo#665945, bgo#665945, bgo#667903, bgo#666621, bgo#666966. + + Updated translations. + ------------------------------------------------------------------- Fri Jan 13 13:56:58 UTC 2012 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index a143664..8b00f08 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: anjuta -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: Versatile Integrated Development Environment for GNOME License: GPL-2.0+ From 669c2d4f91e2a901829fdc5af7a2189d3fc240d1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 18 Jan 2012 11:10:10 +0000 Subject: [PATCH 3/3] Accepting request 100544 from home:vuntz:branches:GNOME:Factory Simplify .changes by dropping changes that looks not interesting to human beings OBS-URL: https://build.opensuse.org/request/show/100544 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=118 --- anjuta.changes | 57 +++++++------------------------------------------- anjuta.spec | 1 - 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/anjuta.changes b/anjuta.changes index 3fdbfdd..3ca8675 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -2,55 +2,14 @@ Tue Jan 17 15:40:34 UTC 2012 - dimstar@opensuse.org - Update to version 3.3.4: - + general: rename property to default_value - + anjuta: Remove old tutorial links - + libanjuta: - - set the info for the default value of a property - - gir annotation for anjuta_project_node_insert_property_info - - don't register project property lists as GObject properties - - better memory management for the properties lists - - Fix anjuta_util_help_display to use yelp - - Add a model property to AnjutaTreeComboBox - - Add IAnjutaProjectChooser interface - - Fix a critical warning when selecting a node in chooser - widget - - Add missing GdfProjectView in Anjuta glade catalog - - Improve AnjutaTreeComboBox - + am-project: - - better memory management for the properties lists - + language-support-vala: - - update .vapi for the latest changes - - take advantage of the new project API - + sourceview: - - Fix typo in a gschema key name - + anjuta-build-tutorial: Remove AM_MAINTAINER_MODE - + project-wizard: - - Don't symlink Automake files - - Use Automake variables for defines - - Move PROJECT_CFLAGS to own line - - Use pkgdatadir instead of datadir/package - - Move PROJECT_CFLAGS to own line in minimal template - - check HavePackage before adding PROJECT_CFLAGS - - Don't replace hyphen with underscore in filenames - + symbol-db: - - improved some debug messages - - minor performance bugfix. - + project-manager: - - Allow to add groups and targets in the root node - - Add a help button in some dialogs - - Implement a project node chooser - - Fix ianjuta_project_manager_add_source_quite function - - Use new improvements in ProjectChooser button - - Select a valid default node in ProjectChooser button - - Use ProjectChooser button in the Add library dialog - - Rename directory to folder in project dialogs - - Use a GtkFileChooser to add sources in a target - + file-wizard: - - Use the new project node chooser - - Cosmetic improvements of new file dialog - + class-gen: Use the new project node chooser - + Bugs fixed: bgo#664413, bgo#633341, bgo#665945, bgo#665945, - bgo#665945, bgo#665945, bgo#667903, bgo#666621, bgo#666966. + + Small improvements in search (bgo#665945). + + Several improvements in generated files from project-wizard. + + language-support-cpp: Code completion now closes parentheses + (bgo#633341) + + symbol-db: Fix symbol update when switching branches + (bgo#664413) + + Various other code changes. + + Other bugs fixed: bgo#667903, bgo#666621, bgo#666966. + Updated translations. ------------------------------------------------------------------- diff --git a/anjuta.spec b/anjuta.spec index 8b00f08..a886cdf 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: anjuta Version: 3.3.4 Release: 0