diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
commit | 24fd814c326e282c4321965c31f341dad77e270d (patch) | |
tree | 033d63b33c21a3209964ab56005bb9bdd523630d /app-editors/gedit | |
parent | 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff) |
gentoo resync : 08.01.2021
Diffstat (limited to 'app-editors/gedit')
-rw-r--r-- | app-editors/gedit/Manifest | 4 | ||||
-rw-r--r-- | app-editors/gedit/files/3.38-make-gspell-optional.patch | 59 | ||||
-rw-r--r-- | app-editors/gedit/files/3.38-make-python-optional.patch | 86 | ||||
-rw-r--r-- | app-editors/gedit/gedit-3.38.1.ebuild | 102 |
4 files changed, 251 insertions, 0 deletions
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 0c99d45370ff..ca338f626e9a 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,9 +1,13 @@ AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23 AUX 3.36-make-gspell-optional.patch 2126 BLAKE2B b4e56744d3ece3e380c1aa628c02237ec8b36fa1c2b9efeee30391cbe9e3d5016e540862b25404ec4f807d9dfb3b78c2a6dc5f5ead2a71dbf4889d78af4cc2b1 SHA512 5916685a00ffa2f1b6f0b0ae77f5165a0199a40eb87e32d00a534d5049454df8aba9c1ba507fb5c1b8c4009c1c1689b962d2051a70173fd335007d5872eeaad0 AUX 3.36-make-python-optional.patch 2509 BLAKE2B d88b0bf53e37cf20520b5d22565e3ecdfadb112751345784c962747602fd086cf238196ef33c340e228d0aa799631645d5b250bbaa650acfcb387000409405cf SHA512 bc87270a19d8f067ba5d7e697468526a931e020959b04bb1c824dcdf8ca5fe5799cfbf53b1b6e70862a7badbc7a0be98b34cbae1e3cabf90cbfccfd7d6c81b83 +AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275 +AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5 +DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547 EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3 EBUILD gedit-3.36.2.ebuild 2454 BLAKE2B af8b8e2fa943c9a80d8ffa9d42a8d620207d6f170e187177815f7a037bc0cada8ebff990789b7af786c306ae87ea329e86f9ce6742c681736882c7cdcac24355 SHA512 274a54a606648b3604b78a99e9a932794236c68f1c14916636807da4d1eca42813e477742e4f377354267f3036d0434a66b6b5c250d8d494b6e98e131fc6b267 +EBUILD gedit-3.38.1.ebuild 2311 BLAKE2B eaf4b0925c8ab83f1a2d30fd117c022c5b474bdbbe08db598b6a5defed5bc85a7b51ce6ee770db298d58b08e73efa506297714c85bb3b0446eef070afa240ce1 SHA512 f8661bc217ca2c1c7ee580aabf4cb16e883dfc624f8da1bbae093b46b63453144890493bf09397f76116c2b320cade7a8157c840205c0b29cd222e302a9db1e3 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch new file mode 100644 index 000000000000..f1197ebb5222 --- /dev/null +++ b/app-editors/gedit/files/3.38-make-gspell-optional.patch @@ -0,0 +1,59 @@ +From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +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 new file mode 100644 index 000000000000..7dccb18191cd --- /dev/null +++ b/app-editors/gedit/files/3.38-make-python-optional.patch @@ -0,0 +1,86 @@ +From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +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/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild new file mode 100644 index 000000000000..f387f481f9aa --- /dev/null +++ b/app-editors/gedit/gedit-3.38.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit gnome.org gnome2-utils meson python-single-r1 vala xdg + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+python gtk-doc spell" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# X libs are not needed for OSX (aqua) +DEPEND=" + >=dev-libs/glib-2.64:2 + >=dev-libs/libpeas-1.14.1[gtk] + >=dev-libs/gobject-introspection-1.54:= + >=x11-libs/gtk+-3.22.0:3[introspection] + >=x11-libs/gtksourceview-4.0.2:4[introspection] + gui-libs/tepl:5 + + spell? ( >=app-text/gspell-0.2.5:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs +" +BDEPEND=" + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1 ) + dev-util/itstool + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" +PATCHES=( + # Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily + # disagree with; those wanting them off in general would set that globally for gtk + "${FILESDIR}"/restore-overlay-scrollbars.patch + # Make gspell and python optional + "${FILESDIR}"/3.38-make-gspell-optional.patch + "${FILESDIR}"/3.38-make-python-optional.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use python) + $(meson_use gtk-doc gtk_doc) + -Duser_documentation=true + $(meson_feature spell) + ) + meson_src_configure +} + +# Only appdata and desktop file validation in v3.32.2 +src_test() { :; } + +src_install() { + meson_src_install + if use python; then + python_optimize + python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} |