* [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/files/, app-editors/gedit/
@ 2019-05-26 18:50 Sobhan Mohammadpour
0 siblings, 0 replies; 4+ messages in thread
From: Sobhan Mohammadpour @ 2019-05-26 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 565e5bde87543e739adaefd0d1b43eca860ef018
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 18:07:47 2019 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sun May 26 18:50:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565e5bde
app-editors/gedit: 3.32.0-r1 -> 3.32.2
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Sobhan Mohammadpour <sobhan <AT> gentoo.org>
app-editors/gedit/Manifest | 2 +-
.../gedit/files/3.32.2-make-spell-optional.patch | 61 ++++++++++++++++++++++
...{gedit-3.32.0-r1.ebuild => gedit-3.32.2.ebuild} | 11 ++--
3 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 31ba866ade5..4cb53c80c57 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,2 +1,2 @@
DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
-DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387
+DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
diff --git a/app-editors/gedit/files/3.32.2-make-spell-optional.patch b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
new file mode 100644
index 00000000000..1d772590f60
--- /dev/null
+++ b/app-editors/gedit/files/3.32.2-make-spell-optional.patch
@@ -0,0 +1,61 @@
+From 72efa486222cde6094c217efc6085f49af1cca85 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sun, 26 May 2019 14:19:17 -0400
+Subject: [PATCH] make spell optional
+
+---
+ meson.build | 4 +++-
+ meson_options.txt | 4 ++++
+ plugins/meson.build | 4 +++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2f4d7e5..f67e320 100644
+--- a/meson.build
++++ b/meson.build
+@@ -86,7 +86,8 @@ libxml_dep = dependency('libxml-2.0', version: libxml_req)
+ libgd_dep = libgd_sp.get_variable('libgd_dep')
+
+ libsoup_dep = dependency('libsoup-2.4', version: libsoup_req, required: true)
+-gspell_dep = dependency('gspell-1', version: gspell_req, required: true)
++with_gspell = get_option('spell')
++gspell_dep = dependency('gspell-1', version: gspell_req, required: false)
+ x11_dep = dependency('x11', required: false)
+
+ introspection_dep = dependency('gobject-introspection-1.0', version: introspection_req, required: false)
+@@ -189,6 +190,7 @@ summary = [
+ ' Introspection: @0@'.format(generate_gir),
+ ' Plugins: @0@'.format(build_plugins),
+ ' Vala API: @0@'.format(generate_vapi),
++ ' Spell: @0@'.format(with_gspell),
+ ' Gvfs metadata: @0@'.format(enable_gvfs_metadata),
+ '',
+ 'Directories:',
+diff --git a/meson_options.txt b/meson_options.txt
+index 90803fa..e1f7349 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -16,3 +16,7 @@ option('documentation',
+ option('enable-gvfs-metadata',
+ type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+ description: 'Enable using gvfs to store metadata')
++
++option('spell',
++ type:'boolean', value: true,
++ description: 'Build spell support')
+diff --git a/plugins/meson.build b/plugins/meson.build
+index af94ab7..abeeac5 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -21,5 +21,7 @@ subdir('quickhighlight')
+ subdir('quickopen')
+ subdir('snippets')
+ subdir('sort')
+-subdir('spell')
++if with_gspell
++ subdir('spell')
++endif
+ subdir('time')
+--
+2.21.0
+
diff --git a/app-editors/gedit/gedit-3.32.0-r1.ebuild b/app-editors/gedit/gedit-3.32.2.ebuild
similarity index 81%
rename from app-editors/gedit/gedit-3.32.0-r1.ebuild
rename to app-editors/gedit/gedit-3.32.2.ebuild
index 02db350e368..1efe7a9a4eb 100644
--- a/app-editors/gedit/gedit-3.32.0-r1.ebuild
+++ b/app-editors/gedit/gedit-3.32.2.ebuild
@@ -15,10 +15,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-IUSE="+introspection +python gtk-doc vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+IUSE="+introspection +python gtk-doc spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
COMMON_DEPEND="
@@ -40,7 +40,7 @@ COMMON_DEPEND="
dev-python/pycairo[${PYTHON_USEDEP}]
>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
dev-libs/libpeas[python,${PYTHON_USEDEP}] )
- >=app-text/gspell-0.2.5:0=
+ spell? ( >=app-text/gspell-0.2.5:0= )
"
RDEPEND="${COMMON_DEPEND}
x11-themes/adwaita-icon-theme
@@ -54,6 +54,7 @@ DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.18
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/${PV}-make-spell-optional.patch" )
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -69,7 +70,9 @@ src_configure() {
$(meson_use gtk-doc documentation)
$(meson_use introspection)
$(meson_use python plugins)
+ $(meson_use spell)
$(meson_use vala vapi)
+ -Denable-gvfs-metadata=yes
)
meson_src_configure
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/files/, app-editors/gedit/
@ 2020-04-20 20:30 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-04-20 20:30 UTC (permalink / raw
To: gentoo-commits
commit: ab6c19992396816928a7ec6d355e78150e06efc9
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 20:21:05 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 20:21:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6c1999
app-editors/gedit: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
app-editors/gedit/Manifest | 1 -
.../gedit/files/3.32.2-fix-parallel-build.patch | 49 ----------
app-editors/gedit/gedit-3.32.2-r1.ebuild | 102 ---------------------
3 files changed, 152 deletions(-)
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 16b9e6098bb..20b7ca30105 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,2 +1 @@
-DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
diff --git a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch b/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
deleted file mode 100644
index b3a52a0cdc9..00000000000
--- a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 79ff20c4123fb674b467f78b542f048f07516652 Mon Sep 17 00:00:00 2001
-From: Will Thompson <wjt@endlessm.com>
-Date: Wed, 17 Apr 2019 06:29:27 +0100
-Subject: [PATCH] filebrowser: fix build order for enum-types.h
-
-On Endless's package build server, building gedit on x86_64 failed as
-follows:
-
- [ 194s] [97/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_gedit-tool-merge.pl_cd41154a78cf16ac2c5a9a58261cb6418b36427a.dat
- [ 195s] [98/147] /usr/bin/msgfmt --desktop --keyword=Name --keyword=Description --template=../plugins/externaltools/externaltools.plugin.desktop.in -d /usr/src/packages/BUILD/po --output=plugins/externaltools/externaltools.plugin
- [ 195s] [99/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_glib-mkenums_ea0cb1ece8d7fa2e9a3e7c5a57f45df212823d0f.dat
- [ 195s] [100/147] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -f
stack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
- [ 195s] FAILED: plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o
- [ 195s] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-prot
ector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
- [ 195s] ../plugins/filebrowser/gedit-file-browser-plugin.c:35:10: fatal error: gedit-file-browser-enum-types.h: No such file or directory
- [ 195s] #include "gedit-file-browser-enum-types.h"
- [ 195s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- [ 195s] compilation terminated.
-
-I couldn't reproduce this locally, perhaps because I have the wrong number
-of cores. However, exploring the build graph with:
-
- ninja -t browse plugins/filebrowser/5f8d977@@filebrowser@sha/libfilebrowser.so.symbols
-
-showed that there was no dependency between
-gedit-file-browser-plugin.c.o and gedit-file-browser-enum-types.h.
-Adding the generated gedit-file-browser-enum-types.h to the sources for
-this shared_library() causes an (order-only) dependency to be added,
-ensuring that gedit-file-browser-enum-types.h is generated before
-gedit-file-browser-plugin.c is compiled.
----
- plugins/filebrowser/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
-index 708f7f1d4..94a4ab0a6 100644
---- a/plugins/filebrowser/meson.build
-+++ b/plugins/filebrowser/meson.build
-@@ -59,6 +59,7 @@ libfilebrowser_enums_c = custom_target('libfilebrowser_enums_c',
-
- libfilebrowser_sources += [
- libfilebrowser_enums_c,
-+ libfilebrowser_type_enums.get(1),
- ]
-
- subdir('resources')
---
-2.20.1
-
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
deleted file mode 100644
index 1a70aeb7e31..00000000000
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-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="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-DEPEND="
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.22.0:3[introspection?]
- >=x11-libs/gtksourceview-4.0.2:4[introspection?]
- >=dev-libs/libpeas-1.14.1[gtk]
- >=dev-libs/libxml2-2.5.0:2
- >=net-libs/libsoup-2.60:2.4
- x11-libs/libX11
-
- spell? ( >=app-text/gspell-0.2.5:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_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=(
- "${FILESDIR}"/${PV}-make-spell-optional.patch
- "${FILESDIR}"/${PV}-fix-parallel-build.patch # parallel build failure fix, included in 3.34
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use python plugins)
- $(meson_use gtk-doc documentation)
- -Denable-gvfs-metadata=yes
- $(meson_use 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/files/, app-editors/gedit/
@ 2020-08-16 21:02 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-08-16 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 708dc351c4d23eb2b5ffaf7d01d2318f35ca59b5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 20:54:31 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 21:01:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708dc351
app-editors/gedit: bump to 3.36.2
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
app-editors/gedit/Manifest | 1 +
.../gedit/files/3.36-make-gspell-optional.patch | 62 ++++++++++++
.../gedit/files/3.36-make-python-optional.patch | 90 ++++++++++++++++++
.../gedit/files/restore-overlay-scrollbars.patch | 26 +++++
app-editors/gedit/gedit-3.36.2.ebuild | 105 +++++++++++++++++++++
5 files changed, 284 insertions(+)
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 20b7ca30105..a226fc44cd0 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1 +1,2 @@
DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
+DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
diff --git a/app-editors/gedit/files/3.36-make-gspell-optional.patch b/app-editors/gedit/files/3.36-make-gspell-optional.patch
new file mode 100644
index 00000000000..e891f98f0c0
--- /dev/null
+++ b/app-editors/gedit/files/3.36-make-gspell-optional.patch
@@ -0,0 +1,62 @@
+From d622460b08c7c13ce8e0c23e3afcbd1e4c65d019 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:20:31 +0300
+Subject: [PATCH] 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 edb2896a6..b8707f33d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -63,7 +63,7 @@ libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req)
+
+ libgd_dep = libgd_subproject.get_variable('libgd_dep')
+
+-gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true)
++gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
+ x11_dep = dependency('x11', required: false)
+
+ introspection_dep = dependency('gobject-introspection-1.0', required: false)
+@@ -154,6 +154,7 @@ summary = [
+ ' User documentation: @0@'.format(get_option('user_documentation')),
+ ' GObject Introspection: @0@'.format(generate_gir),
+ ' Vala API: @0@'.format(generate_vapi),
++ ' Spell checker plugin: @0@'.format(gspell_dep.found().to_string()),
+ '',
+ ]
+ message('\n'.join(summary))
+diff --git a/meson_options.txt b/meson_options.txt
+index d0cbf0720..03e07244e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,10 @@ option('gtk_doc',
+ type: 'boolean', value: false,
+ description: 'Build API reference for plugins (requires gtk-doc)')
+
++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',
+ type: 'boolean', value: true,
+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.20.1
+
diff --git a/app-editors/gedit/files/3.36-make-python-optional.patch b/app-editors/gedit/files/3.36-make-python-optional.patch
new file mode 100644
index 00000000000..c27a0551f00
--- /dev/null
+++ b/app-editors/gedit/files/3.36-make-python-optional.patch
@@ -0,0 +1,90 @@
+From d082ef03b9f545980ab77e6c0a20d5bf4893be69 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 16 Aug 2020 23:34:42 +0300
+Subject: [PATCH] build: Make python optional
+
+---
+ gedit/meson.build | 2 ++
+ meson.build | 4 +++-
+ meson_options.txt | 4 ++++
+ plugins/meson.build | 11 +++++++----
+ 4 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/gedit/meson.build b/gedit/meson.build
+index 075c001b2..174deba04 100644
+--- a/gedit/meson.build
++++ b/gedit/meson.build
+@@ -214,6 +214,7 @@ if generate_gir == true
+ install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
+ )
+
++if get_option('python')
+ python3.install_sources(
+ 'Gedit.py',
+ subdir: join_paths(
+@@ -221,6 +222,7 @@ if generate_gir == true
+ 'overrides',
+ )
+ )
++endif
+
+ libgedit_dep_sources += [
+ libgedit_gir,
+diff --git a/meson.build b/meson.build
+index b8707f33d..4e40833ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -69,7 +69,9 @@ x11_dep = dependency('x11', required: false)
+ introspection_dep = dependency('gobject-introspection-1.0', required: false)
+ vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
+
+-python3 = python.find_installation('python3')
++if get_option('python')
++ python3 = python.find_installation('python3')
++endif
+
+ build_checkupdate_plugin = host_machine.system() == 'windows'
+ if build_checkupdate_plugin
+diff --git a/meson_options.txt b/meson_options.txt
+index 03e07244e..cdcec6165 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,10 @@ option('gtk_doc',
+ type: 'boolean', value: false,
+ description: 'Build API reference for plugins (requires gtk-doc)')
+
++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 a9167f8d6..97f1b1765 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -20,13 +20,16 @@ if build_checkupdate_plugin
+ endif
+
+ subdir('docinfo')
+-subdir('externaltools')
+ subdir('filebrowser')
+ subdir('modelines')
+-subdir('pythonconsole')
+ subdir('quickhighlight')
+-subdir('quickopen')
+-subdir('snippets')
+ subdir('sort')
+ subdir('spell')
+ subdir('time')
++
++if get_option('python')
++ subdir('externaltools')
++ subdir('pythonconsole')
++ subdir('quickopen')
++ subdir('snippets')
++endif
+--
+2.20.1
+
diff --git a/app-editors/gedit/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch
new file mode 100644
index 00000000000..55a353a796b
--- /dev/null
+++ b/app-editors/gedit/files/restore-overlay-scrollbars.patch
@@ -0,0 +1,26 @@
+From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+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
+
diff --git a/app-editors/gedit/gedit-3.36.2.ebuild b/app-editors/gedit/gedit-3.36.2.ebuild
new file mode 100644
index 00000000000..d1b13e1d463
--- /dev/null
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+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="+introspection +python gtk-doc spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~x86"
+
+# X libs are not needed for OSX (aqua)
+DEPEND="
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.14.1[gtk]
+ >=x11-libs/gtk+-3.22.0:3[introspection?]
+ >=x11-libs/gtksourceview-4.0.2:4[introspection?]
+ >=gui-libs/tepl-4.4:4
+ x11-libs/libX11
+
+ spell? ( >=app-text/gspell-0.2.5:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ 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.36-make-gspell-optional.patch
+ "${FILESDIR}"/3.36-make-python-optional.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ $(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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/files/, app-editors/gedit/
@ 2022-01-25 1:09 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-01-25 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 1f1a40a417c7706d03a9d87ed2bf1550fbb92c02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 01:06:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 01:06:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1a40a4
app-editors/gedit: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831925
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/gedit/files/40.1-fix-meson-0.61.patch | 29 +++++++++++++++++++++++
app-editors/gedit/gedit-40.1.ebuild | 4 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..cac046067cb2
--- /dev/null
+++ b/app-editors/gedit/files/40.1-fix-meson-0.61.patch
@@ -0,0 +1,29 @@
+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 <i@rvalue.moe>
+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/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index faf11bb7ae49..07697d136123 100644
--- a/app-editors/gedit/gedit-40.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -58,6 +58,8 @@ PATCHES=(
# Make gspell and python optional
"${FILESDIR}"/3.38-make-gspell-optional.patch
"${FILESDIR}"/3.38-make-python-optional.patch
+
+ "${FILESDIR}"/${PV}-fix-meson-0.61.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-25 1:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 1:09 [gentoo-commits] repo/gentoo:master commit in: app-editors/gedit/files/, app-editors/gedit/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-08-16 21:02 Mart Raudsepp
2020-04-20 20:30 Mart Raudsepp
2019-05-26 18:50 Sobhan Mohammadpour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox