diff options
author | James Le Cuirot <chewi@gentoo.org> | 2022-06-06 21:49:37 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2022-06-06 21:51:10 +0100 |
commit | d6db1ecd0c840693e5febb5059b95f183bd038eb (patch) | |
tree | 819416953a612aba2a96cc09dc2b0f8173af5d14 /dev-util/anjuta | |
parent | gnustep-apps/cenon: Stabilize 4.0.6 amd64, #820008 (diff) | |
download | gentoo-d6db1ecd0c840693e5febb5059b95f183bd038eb.tar.gz gentoo-d6db1ecd0c840693e5febb5059b95f183bd038eb.tar.bz2 gentoo-d6db1ecd0c840693e5febb5059b95f183bd038eb.zip |
dev-util/anjuta: Drop old 3.34.0-r1
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'dev-util/anjuta')
-rw-r--r-- | dev-util/anjuta/anjuta-3.34.0-r1.ebuild | 148 | ||||
-rw-r--r-- | dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch | 132 | ||||
-rw-r--r-- | dev-util/anjuta/files/3.34.0-autoconf-2.70.patch | 15 | ||||
-rw-r--r-- | dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch | 15 | ||||
-rw-r--r-- | dev-util/anjuta/metadata.xml | 5 |
5 files changed, 0 insertions, 315 deletions
diff --git a/dev-util/anjuta/anjuta-3.34.0-r1.ebuild b/dev-util/anjuta/anjuta-3.34.0-r1.ebuild deleted file mode 100644 index 43ee21d824b3..000000000000 --- a/dev-util/anjuta/anjuta-3.34.0-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -# libanjuta-language-vala.so links to a specific slot of libvala; we want to -# avoid automagic behavior. -VALA_MIN_API_VERSION="0.56" -VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}" - -GNOME2_EAUTORECONF="yes" -inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala - -DESCRIPTION="A versatile IDE for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta https://gitlab.gnome.org/GNOME/anjuta/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -IUSE="debug devhelp glade +introspection subversion terminal test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# FIXME: automagically uses gnome-extra/libgda:6 if available -# FIXME: make python dependency non-automagic -COMMON_DEPEND=" - >=dev-libs/glib-2.34:2[dbus] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.10:3 - >=dev-libs/libxml2-2.4.23 - >=dev-libs/gdl-3.5.5:3= - >=x11-libs/gtksourceview-3:3.0 - - sys-devel/autogen - - >=gnome-extra/libgda-5:5= - dev-util/ctags - - x11-libs/libXext - x11-libs/libXrender - - ${PYTHON_DEPS} - - devhelp? ( >=dev-util/devhelp-3.7.4:= ) - glade? ( >=dev-util/glade-3.12:3.10= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - subversion? ( - >=dev-vcs/subversion-1.8:= - >=net-libs/serf-1.2:1= - >=dev-libs/apr-1:= - >=dev-libs/apr-util-1:= ) - terminal? ( >=x11-libs/vte-0.27.6:2.91 ) - vala? ( $(vala_depend) ) -" -# python plugins need pygobject and introspection; we have introspection optional, so while this is all a bit of a mess, -# restrict the pygobject dep to when python plugins can work in the build (the python loader explicitly imports gi.repository.Anjuta) -RDEPEND="${COMMON_DEPEND} - introspection? ( - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] - ') - ) - gnome-base/gsettings-desktop-schemas -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.1 - sys-devel/bison - sys-devel/flex - >=sys-devel/gettext-0.17 - virtual/pkgconfig - test? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xml-dtd:4.5 ) - app-text/yelp-tools - dev-libs/gobject-introspection-common - gnome-base/gnome-common -" -# yelp-tools, gi-common and gnome-common are required by eautoreconf - -PATCHES=( - "${FILESDIR}"/${PV}-Add-new-vala-support.patch - "${FILESDIR}"/${PV}-autoconf-2.70.patch - "${FILESDIR}"/${PV}-prefer-newer-vala.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - if use vala; then - DISABLE_AUTOFORMATTING="yes" - DOC_CONTENTS="To create a generic vala project you will need to specify -desired valac versioned binary to be used, to do that you -will need to: -1. Go to 'Build' -> 'Configure project' -2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to -'Configure options'." - fi - - # COPYING is used in Anjuta's help/about entry - DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO" - - # Conflicts with -pg in a plugin, bug #266777 - filter-flags -fomit-frame-pointer - - # Do not build benchmarks, they are not installed and for dev purpose only - sed -e '/SUBDIRS =/ s/benchmark//' \ - -i plugins/symbol-db/Makefile.{am,in} || die - - use vala && vala_setup - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-neon \ - --disable-static \ - $(use_enable debug) \ - $(use_enable devhelp plugin-devhelp) \ - $(use_enable glade plugin-glade) \ - $(use_enable glade glade-catalog) \ - $(use_enable introspection) \ - --disable-packagekit \ - $(use_enable subversion plugin-subversion) \ - $(use_enable subversion serf) \ - $(use_enable terminal plugin-terminal) \ - $(use_enable vala) -} - -src_install() { - # COPYING is used in Anjuta's help/about entry - docompress -x "/usr/share/doc/${PF}/COPYING" - - # Anjuta uses a custom rule to install DOCS, get rid of it - gnome2_src_install - rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed" - - use vala && readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - use vala && readme.gentoo_print_elog -} diff --git a/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch b/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch deleted file mode 100644 index 219a0308121b..000000000000 --- a/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch +++ /dev/null @@ -1,132 +0,0 @@ -This is a combination of 7 upstream commits: - -build: Allow building with vala 0.46 and drop support for 0.30 and earlier -language-support-vala: Support for vala 0.48 API -build: Allow building with vala 0.48 -build: Allow building with vala 0.50 -build: Allow building with vala 0.50 and 0.52 -build: Allow building with vala 0.54 -build: Allow building with vala 0.56 ---- - configure.ac | 4 +-- - plugins/language-support-vala/plugin.vala | 37 ++++++++++++++++++----- - 2 files changed, 31 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3b4c99504..4fbad5392 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([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.56 0.54 0.52 0.50 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" ]) - ]) -@@ -350,7 +350,7 @@ else - else - AC_MSG_RESULT(no) - enable_vala="no" -- VALA_REQUIRED=0.18.0 -+ VALA_REQUIRED=0.32.0 - fi - AC_SUBST(LIBVALA) - fi -diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala -index 13d35fec4..d94634c7f 100644 ---- a/plugins/language-support-vala/plugin.vala -+++ b/plugins/language-support-vala/plugin.vala -@@ -78,7 +78,11 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences { - - void init_context () { - context = new Vala.CodeContext(); -+#if VALA_0_50 -+ context.set_target_profile (Vala.Profile.GOBJECT); -+#else - context.profile = Vala.Profile.GOBJECT; -+#endif - context.report = report; - report.clear_error_indicators (); - -@@ -414,11 +418,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,6 +575,15 @@ 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; - -@@ -580,32 +601,32 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences { - } - 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.35.1 - diff --git a/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch b/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch deleted file mode 100644 index fdcc9e3158bf..000000000000 --- a/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/13 - -diff --git a/configure.ac b/configure.ac -index c637f9cf3..4b101c35e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -85,8 +85,6 @@ case "$YACC" in - AC_MSG_ERROR(bison is required) - ;; - esac --AC_LANG([C]) --AC_LANG([C++]) - AC_PROG_CXX - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],, - AC_MSG_ERROR([C++ Compiler required to compile Anjuta])) diff --git a/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch b/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch deleted file mode 100644 index 6ae0ead0f3d7..000000000000 --- a/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/14 - -diff --git a/configure.ac b/configure.ac -index c637f9cf3..b34e103b2 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.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], -+ m4_foreach_w([VERSION], [0.32 0.34 0.36 0.38 0.40 0.42 0.44 0.46 0.48 0.50 0.52 0.54 0.56], - [PKG_CHECK_EXISTS([ libvala-VERSION ], - [ valaver="-VERSION" ]) - ]) diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml index c3c257320f5c..6f7bf4da694b 100644 --- a/dev-util/anjuta/metadata.xml +++ b/dev-util/anjuta/metadata.xml @@ -5,11 +5,6 @@ <email>chewi@gentoo.org</email> <name>James Le Cuirot</name> </maintainer> - <use> - <flag name="devhelp">Enable devhelp integration</flag> - <flag name="glade">Build glade plugin for anjuta</flag> - <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag> - </use> <longdescription lang="en"> This package used to build the entire Anjuta IDE for GNOME with all its plugins. The project is now largely defunct, so the package has been |