aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2019-06-08 10:15:58 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2019-06-22 22:34:42 +0200
commitb2dffd69b2c12f973f812c0e7ad6cdad29a2a779 (patch)
tree782a52e26f469c93d14c3ce2a1b1dff4fa94fb3e
parent511f27363868a0e861d2dd95d9ec04c53b6ca1ba (diff)
downloadkeruspe-b2dffd69b2c12f973f812c0e7ad6cdad29a2a779.tar.gz
keruspe-b2dffd69b2c12f973f812c0e7ad6cdad29a2a779.tar.xz
gnome-builder: bump to 3.22.2
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/gnome-desktop/gnome-builder/files/2908ac4b75eacf15ddd0df25bab52b6bd35cae01.patch58
-rw-r--r--packages/gnome-desktop/gnome-builder/gnome-builder-3.32.2.exheres-0 (renamed from packages/gnome-desktop/gnome-builder/gnome-builder-3.28.4.exheres-0)146
2 files changed, 69 insertions, 135 deletions
diff --git a/packages/gnome-desktop/gnome-builder/files/2908ac4b75eacf15ddd0df25bab52b6bd35cae01.patch b/packages/gnome-desktop/gnome-builder/files/2908ac4b75eacf15ddd0df25bab52b6bd35cae01.patch
deleted file mode 100644
index 4464902..0000000
--- a/packages/gnome-desktop/gnome-builder/files/2908ac4b75eacf15ddd0df25bab52b6bd35cae01.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Upstream: Yes
-From 2908ac4b75eacf15ddd0df25bab52b6bd35cae01 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 11 Jul 2018 11:57:06 +0100
-Subject: [PATCH] Python: Avoid identifier 'async', which became a keyword in
- 3.7
-
-This is an incompatible change, but so is async becoming an identifier.
-
-Fixes: #565
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903558
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- src/libide/Ide.py | 6 +++---
- src/plugins/jedi/jedi_plugin.py | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/libide/Ide.py b/src/libide/Ide.py
-index fcea6372a..4aa565086 100644
---- a/src/libide/Ide.py
-+++ b/src/libide/Ide.py
-@@ -41,9 +41,9 @@ class _Gio_DBusMethodInfo:
- in_args = None
- out_signature = None
-
--def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=False):
-+def DBusMethod(dbus_interface, in_signature=None, out_signature=None, is_async=False):
- def decorator(func):
-- func._is_async = async
-+ func._is_async = is_async
-
- func._dbus_method = _Gio_DBusMethodInfo()
- func._dbus_method.interface = dbus_interface
-@@ -54,7 +54,7 @@ def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=Fals
- in_signature_list = GLib.Variant.split_signature('('+in_signature+')')
- arg_names = inspect.getargspec(func).args
- arg_names.pop(0) # eat "self" argument
-- if async: arg_names.pop(0) # eat "invocation"
-+ if is_async: arg_names.pop(0) # eat "invocation"
- if len(in_signature) != len(arg_names):
- raise TypeError('specified signature %s for method %s does not match length of arguments' % (str(in_signature_list), func.func_name))
- for pair in zip(in_signature_list, arg_names):
-diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py
-index 9c5ac2527..985c1f605 100644
---- a/src/plugins/jedi/jedi_plugin.py
-+++ b/src/plugins/jedi/jedi_plugin.py
-@@ -617,7 +617,7 @@ class JediService(Ide.DBusService):
- self.queue = {}
- self.handler_id = 0
-
-- @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', async=True)
-+ @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', is_async=True)
- def CodeComplete(self, invocation, filename, line, column, content):
- if filename in self.queue:
- request = self.queue.pop(filename)
---
-2.17.1
-
diff --git a/packages/gnome-desktop/gnome-builder/gnome-builder-3.28.4.exheres-0 b/packages/gnome-desktop/gnome-builder/gnome-builder-3.32.2.exheres-0
index 69bf0d4..c6090f8 100644
--- a/packages/gnome-desktop/gnome-builder/gnome-builder-3.28.4.exheres-0
+++ b/packages/gnome-desktop/gnome-builder/gnome-builder-3.32.2.exheres-0
@@ -22,9 +22,9 @@ DEPENDENCIES="
app-spell/enchant:2
core/json-glib[>=1.2]
dev-libs/appstream-glib
- dev-libs/glib:2[>=2.56.0]
- dev-libs/jsonrpc-glib:1.0[>=3.28.0][gobject-introspection][vapi]
- dev-libs/libdazzle:1.0[>=3.28.0][gobject-introspection][vapi]
+ dev-libs/glib:2[>=2.59.0]
+ dev-libs/jsonrpc-glib:1.0[>=3.29.01][gobject-introspection][vapi]
+ dev-libs/libdazzle:1.0[>=3.31.90][gobject-introspection][vapi]
dev-libs/libpeas:1.0[>=1.22.0]
dev-libs/libxml2:2.0[>=2.9.0]
dev-libs/pcre
@@ -38,19 +38,20 @@ DEPENDENCIES="
gnome-desktop/devhelp:3.0[>=3.25.1][gobject-introspection]
gnome-desktop/gobject-introspection[>=1.48.0]
gnome-desktop/gspell:1[>=1.2.0][gobject-introspection]
- gnome-desktop/gtksourceview:3.0[>=3.24.0][gobject-introspection]
+ gnome-desktop/gtksourceview:4.0[>=4.0.0][gobject-introspection]
gnome-desktop/libsoup:2.4[>=2.52.2]
- net-libs/webkit:4.0[>=2.12.0][gobject-introspection]
+ net-libs/webkit:4.0[>=2.22.0][gobject-introspection]
sys-apps/flatpak[>=0.8.0]
sys-devel/bison
sys-devel/flex
sys-devel/gcc:*
sys-devel/gettext
+ sys-devel/libostree
sys-devel/libtool
sys-devel/make
x11-libs/gtk+:3[>=3.22.26][gobject-introspection]
x11-libs/pango[>=1.38.0][gobject-introspection]
- sysprof? ( gnome-desktop/sysprof[>=3.28.0] )
+ sysprof? ( gnome-desktop/sysprof[>=3.31.90] )
run:
dev-lang/clang
dev-lang/llvm[-static(-)]
@@ -63,90 +64,81 @@ DEPENDENCIES="
# Tests fail under wayland
RESTRICT="test"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/2908ac4b75eacf15ddd0df25bab52b6bd35cae01.patch
-)
-
MESON_SRC_CONFIGURE_PARAMS=(
- -Denable_tracing=false
- -Denable_profiling=false
- -Denable_rdtscp=false
- -Dwith_help=false
- -Dwith_docs=false
+ -Dtracing=false
+ -Dprofiling=false
+ -Dfusermount_wrapper=false
+ -Dtcmalloc=false
- -Dwith_channel=other
+ -Dchannel=other
- -Dwith_editorconfig=true
- -Dwith_webkit=true
- -Dwith_vapi=true
+ -Dhelp=false
+ -Ddocs=false
+ -Dnetwork_tests=false
# Plugins
- -Dwith_autotools=true
- -Dwith_autotools_template=true
- -Dwith_beautifier=true
- -Dwith_c_pack=true
- -Dwith_cargo=true
- -Dwith_clang=true
- -Dwith_cmake=true
- -Dwith_color_picker=true
- -Dwith_code_index=true
- -Dwith_command_bar=true
- -Dwith_comment_code=true
- -Dwith_create_project=true
- -Dwith_ctags=true
- -Dwith_documentation_card=true
- -Dwith_devhelp=true
- -Dwith_eslint=true
- -Dwith_file_search=true
- -Dwith_find_other_file=true
- -Dwith_flatpak=true
- -Dwith_gcc=true
- -Dwith_gdb=true
- -Dwith_gettext=true
- -Dwith_git=true
- -Dwith_gjs_symbols=true
- -Dwith_gnome_code_assistance=true
- -Dwith_history=true
- -Dwith_html_completion=true
- -Dwith_preview=true
- -Dwith_make=true
- -Dwith_meson=true
- -Dwith_meson_templates=true
- -Dwith_notification=true
- -Dwith_newcomers=true
- -Dwith_npm=true
- -Dwith_project_tree=true
- -Dwith_python_pack=true
- -Dwith_quick_highlight=true
- -Dwith_retab=true
- -Dwith_rust_langserv=true
- -Dwith_rustup=true
- -Dwith_spellcheck=true
- -Dwith_support=true
- -Dwith_symbol_tree=true
- -Dwith_sysmon=true
- -Dwith_todo=true
- -Dwith_vala_pack=true
- -Dwith_valgrind=true
- -Dwith_xml_pack=true
+ -Dplugin_autotools=true
+ -Dplugin_beautifier=true
+ -Dplugin_c_pack=true
+ -Dplugin_cargo=true
+ -Dplugin_clang=true
+ -Dplugin_cmake=true
+ -Dplugin_code_index=true
+ -Dplugin_color_picker=true
+ -Dplugin_ctags=true
+ -Dplugin_devhelp=true
+ -Dplugin_editorconfig=true
+ -Dplugin_eslint=true
+ -Dplugin_file_search=true
+ -Dplugin_flatpak=true
+ -Dplugin_gdb=true
+ -Dplugin_gettext=true
+ -Dplugin_git=true
+ -Dplugin_gjs_symbols=true
+ -Dplugin_gnome_code_assistance=true
+ -Dplugin_gradle=true
+ -Dplugin_grep=true
+ -Dplugin_html_completion=true
+ -Dplugin_html_preview=true
+ -Dplugin_make=true
+ -Dplugin_maven=true
+ -Dplugin_meson=true
+ -Dplugin_modelines=true
+ -Dplugin_newcomers=true
+ -Dplugin_notification=true
+ -Dplugin_npm=true
+ -Dplugin_python_pack=true
+ -Dplugin_quick_highlight=true
+ -Dplugin_retab=true
+ -Dplugin_rls=true
+ -Dplugin_rustup=true
+ -Dplugin_spellcheck=true
+ -Dplugin_sysroot=true
+ -Dplugin_todo=true
+ -Dplugin_vala=true
+ -Dplugin_valgrind=true
+ -Dplugin_words=true
+ -Dplugin_xml_pack=true
- -Dwith_deviced=false
- -Dwith_go_langserv=false
- -Dwith_jedi=false
- -Dwith_jhbuild=false
- -Dwith_mono=false
- -Dwith_phpize=false
- -Dwith_python_gi_import_completion=false
- -Dwith_qemu=false
+ -Dplugin_deviced=false
+ -Dplugin_glade=false
+ -Dplugin_go_langserv=false
+ -Dplugin_jedi=false
+ -Dplugin_jhbuild=false
+ -Dplugin_mono=false
+ -Dplugin_phpize=false
+ -Dplugin_podman=false
+ -Dplugin_qemu=false
+ -Dplugin_waf=false
)
MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
- 'sysprof with_sysprof'
+ 'sysprof plugin_sysprof'
)
src_install() {
meson_src_install
- edo rmdir "${IMAGE}"/usr/share/icons/hicolor/symbolic
+ edo find "${IMAGE}" -type d -empty -delete
}
pkg_postinst() {