commit: ba7c1018429bc6a19573b07943c00c21fd732fff Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Mar 20 17:02:16 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 19:54:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7c1018
app-editors/gedit: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../gedit/files/3.38-make-gspell-optional.patch | 59 --------------- .../gedit/files/3.38-make-python-optional.patch | 86 ---------------------- app-editors/gedit/files/40.1-fix-meson-0.61.patch | 29 -------- .../gedit/files/restore-overlay-scrollbars.patch | 26 ------- 4 files changed, 200 deletions(-) diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch deleted file mode 100644 index f1197ebb5222..000000000000 --- a/app-editors/gedit/files/3.38-make-gspell-optional.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <[email protected]> -Date: Sun, 16 Aug 2020 23:20:31 +0300 -Subject: [PATCH 1/2] build: Make gspell optional - ---- - meson.build | 3 ++- - meson_options.txt | 4 ++++ - plugins/spell/meson.build | 4 ++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index acaad0dad..2c5dccb82 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ deps_basic_list = [ - dependency('gobject-introspection-1.0'), - ] - --gspell_dep = dependency('gspell-1', version: '>= 1.0') -+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell')) - python3 = python.find_installation('python3') - - # Configurations -@@ -94,3 +94,4 @@ summary('Prefix', get_option('prefix')) - summary('API documentation', get_option('gtk_doc')) - summary('User documentation', get_option('user_documentation')) - summary('Require all tests', get_option('require_all_tests')) -+summary('Spell checker plugin', get_option('spell').enabled().to_string()) -diff --git a/meson_options.txt b/meson_options.txt -index 4e842d1ea..bb3923dd1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -14,6 +14,10 @@ option( - description: 'Require that all tests can be run, even those that depend on third party programs' - ) - -+option('spell', -+ type: 'feature', value: 'enabled', -+ description: 'Build spell checking plugin') -+ - # This option exists for the developers, to speed up the install. - option( - 'user_documentation', -diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build -index 8ce7634b7..cccb42fc1 100644 ---- a/plugins/spell/meson.build -+++ b/plugins/spell/meson.build -@@ -1,3 +1,7 @@ -+if not gspell_dep.found() -+ subdir_done() -+endif -+ - libspell_sources = files( - 'gedit-spell-app-activatable.c', - 'gedit-spell-plugin.c', --- -2.26.2 - diff --git a/app-editors/gedit/files/3.38-make-python-optional.patch b/app-editors/gedit/files/3.38-make-python-optional.patch deleted file mode 100644 index 7dccb18191cd..000000000000 --- a/app-editors/gedit/files/3.38-make-python-optional.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <[email protected]> -Date: Sun, 16 Aug 2020 23:34:42 +0300 -Subject: [PATCH 2/2] build: Make python optional - ---- - gedit/meson.build | 2 ++ - meson.build | 2 ++ - meson_options.txt | 4 ++++ - plugins/meson.build | 9 ++++++--- - 4 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/gedit/meson.build b/gedit/meson.build -index 9fc81468e..5e808a2d8 100644 ---- a/gedit/meson.build -+++ b/gedit/meson.build -@@ -197,10 +197,12 @@ libgedit_gir = gnome.generate_gir( - install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0', - ) - -+if get_option('python') - python3.install_sources( - 'Gedit.py', - subdir: 'gi/overrides', - ) -+endif - - # Vala API - libgedit_vapi = gnome.generate_vapi( -diff --git a/meson.build b/meson.build -index 2c5dccb82..5e1e9340a 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,9 @@ deps_basic_list = [ - ] - - gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell')) -+if get_option('python') - python3 = python.find_installation('python3') -+endif - - # Configurations - config_h = configuration_data() -diff --git a/meson_options.txt b/meson_options.txt -index bb3923dd1..962b82934 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -14,6 +14,10 @@ option( - description: 'Require that all tests can be run, even those that depend on third party programs' - ) - -+option('python', -+ type: 'boolean', value: true, -+ description: 'Install GIR python overrides and python plugins') -+ - option('spell', - type: 'feature', value: 'enabled', - description: 'Build spell checking plugin') -diff --git a/plugins/meson.build b/plugins/meson.build -index 50bc5d393..63bb7c094 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -18,14 +18,17 @@ msgfmt_plugin_cmd = [ - subdir('docinfo') - subdir('filebrowser') - subdir('modelines') --subdir('pythonconsole') - subdir('quickhighlight') --subdir('quickopen') --subdir('snippets') - subdir('sort') - subdir('spell') - subdir('time') - -+if get_option('python') - if get_option('plugin_externaltools') - subdir('externaltools') - endif -+ -+ subdir('pythonconsole') -+ subdir('quickopen') -+ subdir('snippets') -+endif --- -2.26.2 - diff --git a/app-editors/gedit/files/40.1-fix-meson-0.61.patch b/app-editors/gedit/files/40.1-fix-meson-0.61.patch deleted file mode 100644 index cac046067cb2..000000000000 --- a/app-editors/gedit/files/40.1-fix-meson-0.61.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch -https://bugs.gentoo.org/831925 - -From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001 -From: rvalue <[email protected]> -Date: Wed, 15 Dec 2021 07:02:09 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -The positional argument has been silently ignored for a time. And it causes failure -with "ERROR: Function does not take positional arguments" since meson 0.60.0 ---- a/data/meson.build -+++ b/data/meson.build -@@ -4,7 +4,6 @@ install_man('gedit.1') - - appdata = 'org.gnome.gedit.appdata.xml' - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: '../po/', -@@ -23,7 +22,6 @@ endif - - desktop_file = 'org.gnome.gedit.desktop' - desktop_output_file = i18n.merge_file( -- desktop_file, - type: 'desktop', - input: desktop_file + '.in', - output: desktop_file, -GitLab diff --git a/app-editors/gedit/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch deleted file mode 100644 index 55a353a796bf..000000000000 --- a/app-editors/gedit/files/restore-overlay-scrollbars.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <[email protected]> -Date: Fri, 20 Mar 2020 11:32:59 -0500 -Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the - GtkScrolledWindow" - -This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453. ---- - gedit/resources/ui/gedit-view-frame.ui | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui -index ebf70b013..4c783c711 100644 ---- a/gedit/resources/ui/gedit-view-frame.ui -+++ b/gedit/resources/ui/gedit-view-frame.ui -@@ -11,7 +11,6 @@ - <property name="visible">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> -- <property name="overlay_scrolling">False</property> - <child> - <object class="GeditView" id="view"> - <property name="visible">True</property> --- -2.25.1 -
