Date: Sunday, September 27, 2020 @ 21:41:37
Author: heftig
Revision: 396818
3.34.0-5: remove vala plugin; no longer builds (again)
Modified:
anjuta/trunk/PKGBUILD
Deleted:
anjuta/trunk/0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
anjuta/trunk/0002-language-support-vala-Support-for-vala-0.48-API.patch
anjuta/trunk/0003-build-Allow-building-with-vala-0.48.patch
-----------------------------------------------------------------+
0001-build-Allow-building-with-vala-0.46-and-drop-support.patch | 39 ---
0002-language-support-vala-Support-for-vala-0.48-API.patch | 103
----------
0003-build-Allow-building-with-vala-0.48.patch | 25 --
PKGBUILD | 27 --
4 files changed, 10 insertions(+), 184 deletions(-)
Deleted: 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
===================================================================
--- 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
2020-09-27 21:33:41 UTC (rev 396817)
+++ 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
2020-09-27 21:41:37 UTC (rev 396818)
@@ -1,39 +0,0 @@
-From ebaac39cbd1f9e3442326262837230c3d71303fb Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ric...@ubuntu.com>
-Date: Wed, 18 Sep 2019 18:26:03 +0200
-Subject: [PATCH 1/3] build: Allow building with vala 0.46 and drop support for
- 0.30 and earlier
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3b4c99504..3526a16e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -338,19 +338,19 @@ if test "$user_disabled_vala" = 1; then
- else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(if libvala is available)
-- m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34],
[0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
-+ m4_foreach_w([VERSION], [0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
- [PKG_CHECK_EXISTS([ libvala-VERSION ],
- [ valaver="-VERSION" ])
- ])
- if test "x$valaver" != "x"; then
- AC_MSG_RESULT(yes)
- enable_vala="yes"
- LIBVALA="libvala${valaver}"
- PKG_CHECK_MODULES([VALA], ${LIBVALA})
- else
- AC_MSG_RESULT(no)
- enable_vala="no"
-- VALA_REQUIRED=0.18.0
-+ VALA_REQUIRED=0.32.0
- fi
- AC_SUBST(LIBVALA)
- fi
---
-2.25.1
-
Deleted: 0002-language-support-vala-Support-for-vala-0.48-API.patch
===================================================================
--- 0002-language-support-vala-Support-for-vala-0.48-API.patch 2020-09-27
21:33:41 UTC (rev 396817)
+++ 0002-language-support-vala-Support-for-vala-0.48-API.patch 2020-09-27
21:41:37 UTC (rev 396818)
@@ -1,103 +0,0 @@
-From 56d2487cb26f90fd850d6fab47e0ec33e229ed1c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ric...@ubuntu.com>
-Date: Thu, 6 Feb 2020 09:04:39 +0100
-Subject: [PATCH 2/3] language-support-vala: Support for vala 0.48 API
-
----
- plugins/language-support-vala/plugin.vala | 33 +++++++++++++++++------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/language-support-vala/plugin.vala
b/plugins/language-support-vala/plugin.vala
-index 13d35fec4..718d74cc8 100644
---- a/plugins/language-support-vala/plugin.vala
-+++ b/plugins/language-support-vala/plugin.vala
-@@ -414,11 +414,19 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- builder.append_printf ("%s sender",
widget.get_full_name ());
-
- foreach (var param in sig.get_parameters ()) {
-+#if VALA_0_48
-+ builder.append_printf (", %s %s",
param.variable_type.type_symbol.get_full_name (), param.name);
-+#else
- builder.append_printf (", %s %s",
param.variable_type.data_type.get_full_name (), param.name);
-+#endif
- }
- } else {
- foreach (var param in sig.get_parameters ()) {
-+#if VALA_0_48
-+ builder.append_printf ("%s %s, ",
param.variable_type.type_symbol.get_full_name (), param.name);
-+#else
- builder.append_printf ("%s %s, ",
param.variable_type.data_type.get_full_name (), param.name);
-+#endif
- }
-
- builder.append_printf ("%s sender",
widget.get_full_name ());
-@@ -563,49 +571,58 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- }
- return matching_symbols;
- }
-+
-+ inline List<Vala.Symbol> symbol_lookup_inherited_for_type
(Vala.DataType data_type, string name, bool prefix_match, bool invocation =
false) {
-+#if VALA_0_48
-+ return symbol_lookup_inherited (data_type.type_symbol, name,
prefix_match, invocation);
-+#else
-+ return symbol_lookup_inherited (data_type.data_type, name,
prefix_match, invocation);
-+#endif
-+ }
-+
- List<Vala.Symbol> symbol_lookup_inherited (Vala.Symbol? sym, string
name, bool prefix_match, bool invocation = false) {
- List<Vala.Symbol> result = null;
-
- // This may happen if we cannot find all the needed packages
- if (sym == null)
- return result;
-
- var symbol_table = sym.scope.get_symbol_table ();
- if (symbol_table != null) {
- foreach (string key in symbol_table.get_keys()) {
- if (((prefix_match && key.has_prefix (name)) ||
key == name)) {
- result.append (symbol_table[key]);
- }
- }
- }
- if (invocation && sym is Vala.Method) {
- var func = (Vala.Method) sym;
-- result.concat (symbol_lookup_inherited
(func.return_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(func.return_type, name, prefix_match));
- } else if (sym is Vala.Class) {
- var cl = (Vala.Class) sym;
- foreach (var base_type in cl.get_base_types ()) {
-- result.concat (symbol_lookup_inherited
(base_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(base_type, name, prefix_match));
- }
- } else if (sym is Vala.Struct) {
- var st = (Vala.Struct) sym;
-- result.concat (symbol_lookup_inherited
(st.base_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(st.base_type, name, prefix_match));
- } else if (sym is Vala.Interface) {
- var iface = (Vala.Interface) sym;
- foreach (var prerequisite in iface.get_prerequisites
()) {
-- result.concat (symbol_lookup_inherited
(prerequisite.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(prerequisite, name, prefix_match));
- }
- } else if (sym is Vala.LocalVariable) {
- var variable = (Vala.LocalVariable) sym;
-- result.concat (symbol_lookup_inherited
(variable.variable_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(variable.variable_type, name, prefix_match));
- } else if (sym is Vala.Field) {
- var field = (Vala.Field) sym;
-- result.concat (symbol_lookup_inherited
(field.variable_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(field.variable_type, name, prefix_match));
- } else if (sym is Vala.Property) {
- var prop = (Vala.Property) sym;
-- result.concat (symbol_lookup_inherited
(prop.property_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(prop.property_type, name, prefix_match));
- } else if (sym is Vala.Parameter) {
- var fp = (Vala.Parameter) sym;
-- result.concat (symbol_lookup_inherited
(fp.variable_type.data_type, name, prefix_match));
-+ result.concat (symbol_lookup_inherited_for_type
(fp.variable_type, name, prefix_match));
- }
-
- return result;
---
-2.25.1
-
Deleted: 0003-build-Allow-building-with-vala-0.48.patch
===================================================================
--- 0003-build-Allow-building-with-vala-0.48.patch 2020-09-27 21:33:41 UTC
(rev 396817)
+++ 0003-build-Allow-building-with-vala-0.48.patch 2020-09-27 21:41:37 UTC
(rev 396818)
@@ -1,25 +0,0 @@
-From 536337dda1fa4bd30decc0e89f944603dc97fad9 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ric...@ubuntu.com>
-Date: Thu, 6 Feb 2020 08:46:54 +0100
-Subject: [PATCH 3/3] build: Allow building with vala 0.48
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3526a16e6..200526c2d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then
- else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(if libvala is available)
-- m4_foreach_w([VERSION], [0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
-+ m4_foreach_w([VERSION], [0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
- [PKG_CHECK_EXISTS([ libvala-VERSION ],
- [ valaver="-VERSION" ])
- ])
---
-2.25.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-27 21:33:41 UTC (rev 396817)
+++ PKGBUILD 2020-09-27 21:41:37 UTC (rev 396818)
@@ -4,30 +4,21 @@
pkgbase=anjuta
pkgname=('libanjuta' 'anjuta')
pkgver=3.34.0
-pkgrel=4
+pkgrel=5
pkgdesc="GNOME Integrated Development Environment (IDE)"
arch=(x86_64)
license=(GPL)
-makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon vala dconf
gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs git
python)
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon dconf
gtk-doc
+ yelp-tools gnome-common intltool gobject-introspection itstool gjs
+ git python)
url="http://www.anjuta.org/";
options=('!emptydirs')
_commit=aaadfafe19450d8524400af9ae09d5187b2d627a # master
-source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
- 0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
- 0002-language-support-vala-Support-for-vala-0.48-API.patch
- 0003-build-Allow-building-with-vala-0.48.patch)
-sha256sums=('42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f'
- 'bbcdb92d9c31aafdad7781880d637793a689d50128ed17f5c329ba022778497a'
- '007b83c44ce19dabbf7b54052f50a691637d560b78c36d75239db632f5788897'
- '684efde31001bbd83e7679e0e1de4721e7a99ac8a32f647dddc94c690b61cd4b')
+source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f')
prepare() {
cd $pkgbase-$pkgver
-
- patch -Np1 -i
../0001-build-Allow-building-with-vala-0.46-and-drop-support.patch
- patch -Np1 -i ../0002-language-support-vala-Support-for-vala-0.48-API.patch
- patch -Np1 -i ../0003-build-Allow-building-with-vala-0.48.patch
-
AUTOPOINT="intltoolize" autoreconf -fvi
}
@@ -41,11 +32,13 @@
--disable-schemas-compile \
--disable-silent-rules \
--disable-static \
+ --disable-vala \
--enable-introspection \
--enable-plugin-devhelp \
--enable-plugin-glade \
--enable-plugin-subversion \
- --enable-glade-catalog --enable-gtk-doc
+ --enable-glade-catalog \
+ --enable-gtk-doc
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
@@ -63,7 +56,7 @@
package_anjuta(){
pkgdesc="GNOME Integrated Development Environment (IDE)"
- depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon vala
dconf
+ depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon dconf
libgladeui-2.so)
cd $pkgbase-$pkgver
