[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/

[Matt Turner]

commit:     284fa7b9c84407be55015e601768262d5c2c0f0d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 01:54:50 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 01:55:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284fa7b9

x11-libs/gtksourceview: Add patch to build with GCC-11

I mistakenly thought this patch was included in the v4.8.1 release when
I added it and closed bug #732784.

Closes: https://bugs.gentoo.org/732784
Closes: https://bugs.gentoo.org/786630
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...ble-Werror-for-incompatible-pointer-types.patch | 33 ++++++++++++++++++++++
 x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild  |  4 +++
 2 files changed, 37 insertions(+)

diff --git a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
new file mode 100644
index 00000000000..e13a65c3bc4
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
@@ -0,0 +1,33 @@
+From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Thu, 15 Apr 2021 08:11:22 -0700
+Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
+
+This causes an issue with volatile and GLib in some configurations, so
+just keep it out for now. We will bring it back at some point going
+forward.
+
+We are already doing the same in 5.0.
+
+Fixes #179
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 826a3121..6ff5b155 100644
+--- a/meson.build
++++ b/meson.build
+@@ -181,7 +181,8 @@ else
+     '-Werror=empty-body',
+     '-Werror=implicit',
+     '-Werror=implicit-function-declaration',
+-    '-Werror=incompatible-pointer-types',
++    # Disabled due to volatile changes in GLib
++    # '-Werror=incompatible-pointer-types',
+     '-Werror=init-self',
+     '-Werror=int-conversion',
+     '-Werror=int-to-pointer-cast',
+-- 
+2.26.3
+

diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
index c8e7a97d1ba..ea3909535ab 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
+)
+
 src_prepare() {
 	use vala && vala_src_prepare
 	xdg_src_prepare

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/

[Matt Turner]

commit:     b269cdb814bb9514f6b36d09317e9d4602bbc04b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 21:16:21 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 22:42:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b269cdb8

x11-libs/gtksourceview: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-libs/gtksourceview/Manifest                    |  1 -
 ...ble-Werror-for-incompatible-pointer-types.patch | 33 ----------
 ...sure-access-to-resources-in-corelib-build.patch | 57 ----------------
 x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild  | 75 ----------------------
 4 files changed, 166 deletions(-)

diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index e0c490536dbe..b8e4498fb35d 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,4 +1,3 @@
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
-DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b
 DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04

diff --git a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
deleted file mode 100644
index e13a65c3bc4d..000000000000
--- a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Thu, 15 Apr 2021 08:11:22 -0700
-Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
-
-This causes an issue with volatile and GLib in some configurations, so
-just keep it out for now. We will bring it back at some point going
-forward.
-
-We are already doing the same in 5.0.
-
-Fixes #179
----
- meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 826a3121..6ff5b155 100644
---- a/meson.build
-+++ b/meson.build
-@@ -181,7 +181,8 @@ else
-     '-Werror=empty-body',
-     '-Werror=implicit',
-     '-Werror=implicit-function-declaration',
--    '-Werror=incompatible-pointer-types',
-+    # Disabled due to volatile changes in GLib
-+    # '-Werror=incompatible-pointer-types',
-     '-Werror=init-self',
-     '-Werror=int-conversion',
-     '-Werror=int-to-pointer-cast',
--- 
-2.26.3
-

diff --git a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
deleted file mode 100644
index 3fde96b14850..000000000000
--- a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Sun, 7 Mar 2021 08:54:15 -0800
-Subject: [PATCH] build: ensure access to resources in corelib build
-
-This should help with some transient build failures in dependent projects.
----
- gtksourceview/meson.build | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
-index fd080a9c..b6192604 100644
---- a/gtksourceview/meson.build
-+++ b/gtksourceview/meson.build
-@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
-     install_dir: join_paths(pkgincludedir, 'gtksourceview'),
- )
- 
-+gtksource_res = gnome.compile_resources(
-+  'gtksourceview-gresources',
-+  'gtksourceview.gresource.xml'
-+)
-+
- core_sources = [
-   core_public_c,
-   core_private_c,
-   core_enums,
-   gtksourceversion_h,
-   core_marshallers,
-+  gtksource_res,
- ]
- 
- install_headers(
-@@ -216,11 +222,6 @@ extra_public_sources = []
- 
- subdir('completion-providers')
- 
--gtksource_res = gnome.compile_resources(
--  'gtksourceview-gresources',
--  'gtksourceview.gresource.xml'
--)
--
- 
- # We can't use the static libs on Visual Studio builds
- # to form our DLL here directly, so we must use
-@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
-   gtksource_objs += int_lib.extract_all_objects()
- endforeach
- 
--gtksource_lib = shared_library(package_string, gtksource_res,
-+gtksource_lib = shared_library(package_string,
-                 version: lib_version,
-         darwin_versions: lib_osx_version,
-     include_directories: gtksourceview_include_dirs,
--- 
-2.26.3
-

diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
deleted file mode 100644
index 1693f4853c98..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="4"
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2
-	>=x11-libs/gtk+-3.24:3[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	>=dev-libs/fribidi-0.19.7
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
-	"${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		-Dinstall_tests=false
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-4/language-specs
-	newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
-
-	# Avoid conflict with gtksourceview:3.0 glade-catalog
-	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
-	if use glade; then
-		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/

[Pacho Ramos]

commit:     4fbd6f859e97bcc87fe4c391d3c775362073939e
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Fri Aug  9 11:32:05 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Aug  9 12:04:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbd6f85

x11-libs/gtksourceview: fix compilation with gcc-14

Closes: https://bugs.gentoo.org/919080
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/38025
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 x11-libs/gtksourceview/files/3.24.11-gcc14.patch   | 62 ++++++++++++++++++++++
 .../gtksourceview/gtksourceview-3.24.11-r2.ebuild  | 54 +++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/x11-libs/gtksourceview/files/3.24.11-gcc14.patch b/x11-libs/gtksourceview/files/3.24.11-gcc14.patch
new file mode 100644
index 000000000000..161d060183fe
--- /dev/null
+++ b/x11-libs/gtksourceview/files/3.24.11-gcc14.patch
@@ -0,0 +1,62 @@
+
+Patch from:
+https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/16db686c0b3170d9ec4d7c7eda4a8e9c0fb1c544
+
+From 16db686c0b3170d9ec4d7c7eda4a8e9c0fb1c544 Mon Sep 17 00:00:00 2001
+From: Martin Blanchard <martin.blanchard@codethink.co.uk>
+Date: Mon, 26 Feb 2018 14:26:59 +0000
+Subject: [PATCH] View: fix includes (implicit declarations)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=793842
+---
+ gtksourceview/gtksourceview.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
+index 7d567157c..4e086464f 100644
+--- a/gtksourceview/gtksourceview.c
++++ b/gtksourceview/gtksourceview.c
+@@ -40,8 +40,9 @@
+ #include "gtksourcemark.h"
+ #include "gtksourcemarkattributes.h"
+ #include "gtksourcestylescheme.h"
+-#include "gtksourcecompletionprovider.h"
++#include "gtksourcecompletion.h"
+ #include "gtksourcecompletion-private.h"
++#include "gtksourcecompletionprovider.h"
+ #include "gtksourcegutter.h"
+ #include "gtksourcegutter-private.h"
+ #include "gtksourcegutterrendererlines.h"
+
+Patch from:
+https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/b25e71c57fc934a7ce36e51826af9fa7c2cf9a80
+
+From b25e71c57fc934a7ce36e51826af9fa7c2cf9a80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Thu, 14 Dec 2017 13:03:15 +0100
+Subject: [PATCH] View: fix assignment from incompatible pointer type
+
+GLib now propagates types with g_object_ref().
+
+At that code path we are sure that buffer is a GtkSourceBuffer since
+there is a condition if (GTK_SOURCE_IS_BUFFER (buffer)).
+---
+ gtksourceview/gtksourceview.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
+index 21424be97..e642ce360 100644
+--- a/gtksourceview/gtksourceview.c
++++ b/gtksourceview/gtksourceview.c
+@@ -1531,7 +1531,7 @@ set_source_buffer (GtkSourceView *view,
+ 	{
+ 		GtkSourceBufferInternal *buffer_internal;
+ 
+-		view->priv->source_buffer = g_object_ref (buffer);
++		view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer));
+ 
+ 		g_signal_connect (buffer,
+ 				  "highlight-updated",
+-- 
+GitLab
+

diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
new file mode 100644
index 000000000000..3ba07b75a29d
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND="vapigen"
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="glade +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-build/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=( "${FILESDIR}/3.24.11-gcc14.patch" )
+
+src_configure() {
+	use vala && vala_setup
+
+	gnome2_src_configure \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}