diff options
Diffstat (limited to 'dev-util/devhelp/files')
-rw-r--r-- | dev-util/devhelp/files/41.2-meson-0.61.patch | 52 | ||||
-rw-r--r-- | dev-util/devhelp/files/41.2-webkitgtk40.patch | 38 |
2 files changed, 0 insertions, 90 deletions
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch deleted file mode 100644 index dd75f802056a..000000000000 --- a/dev-util/devhelp/files/41.2-meson-0.61.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch -https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch -https://bugs.gentoo.org/831928 - -From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001 -From: r-value <i@rvalue.moe> -Date: Wed, 17 Nov 2021 18:02:20 +0800 -Subject: [PATCH] Remove incorrect arg for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments and -explicitly rejects with error "ERROR: Function does not take -positional arguments" since meson 0.60.0 ---- - data/meson.build | 2 -- - plugins/gedit-plugin/meson.build | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index c6aeffb4..0bc531a2 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -19,7 +19,6 @@ appdata_conf = configuration_data() - appdata_conf.set('application_id', APPLICATION_ID) - appdata = APPLICATION_ID + '.appdata.xml' - appdata_file = I18N.merge_file( -- appdata, - input: configure_file( - input: 'org.gnome.Devhelp.appdata.xml.in.in', - output: APPLICATION_ID + '.appdata.xml.in', -@@ -45,7 +44,6 @@ desktop_conf = configuration_data() - desktop_conf.set('application_id', APPLICATION_ID) - desktop = APPLICATION_ID + '.desktop' - desktop_file = I18N.merge_file( -- desktop, - type: 'desktop', - input: configure_file( - input: 'org.gnome.Devhelp.desktop.in.in', -diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build -index 4f779886..877a01ff 100644 ---- a/plugins/gedit-plugin/meson.build -+++ b/plugins/gedit-plugin/meson.build -@@ -7,7 +7,6 @@ install_data( - - plugin_info_file = 'devhelp.plugin' - I18N.merge_file( -- plugin_info_file, - type: 'desktop', - input: plugin_info_file + '.desktop.in', - output: plugin_info_file, --- -GitLab - diff --git a/dev-util/devhelp/files/41.2-webkitgtk40.patch b/dev-util/devhelp/files/41.2-webkitgtk40.patch deleted file mode 100644 index 967d276bfa83..000000000000 --- a/dev-util/devhelp/files/41.2-webkitgtk40.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7b0ef55edd63c71be209aa3b57e2190d4ce4fb90 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 3 Oct 2021 23:52:27 +0300 -Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1 - -That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out, -so it wouldn't be picked up automagically once it's added or comes from some -overlay. - -This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca. ---- - meson.build | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index e57e466e..492aafed 100644 ---- a/meson.build -+++ b/meson.build -@@ -46,15 +46,10 @@ lt_revision = 3 - lt_age = 0 - LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age) - --webkit_dep = dependency('webkit2gtk-4.1', required : false) --if not webkit_dep.found() -- webkit_dep = dependency('webkit2gtk-4.0') --endif -- - LIBDEVHELP_PUBLIC_DEPS = [ - dependency('gio-2.0', version: '>= 2.64'), - dependency('gtk+-3.0', version: '>= 3.22'), -- webkit_dep, -+ dependency('webkit2gtk-4.0', version: '>= 2.26'), - ] - LIBDEVHELP_PRIVATE_DEPS = [ - dependency('gsettings-desktop-schemas'), --- -2.32.0 - |