From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- x11-libs/gtksourceview/Manifest | 4 ++ ...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, 169 insertions(+) create mode 100644 x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch create mode 100644 x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch create mode 100644 x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild (limited to 'x11-libs/gtksourceview') diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest index 4ad288f08544..078549a1cd1b 100644 --- a/x11-libs/gtksourceview/Manifest +++ b/x11-libs/gtksourceview/Manifest @@ -1,10 +1,14 @@ AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2 AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595 +AUX 4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch 971 BLAKE2B 0ff23c398baf4b0bc324b2fbc9227798efdb87262a6165cc92d5756bfb1987250a7cda195c905954cec3d557ec16a83e47044a8af1c50c51f6a578794b18e38c SHA512 036fe1cb0d3f460635dc738f2d06c15d233409285e3df513946ce995b5a651b06602e4923a9f9756a2504bd7f3404fdcf6117ed75fb217c06d5dc0b9a635870b +AUX 4.8.1-build-ensure-access-to-resources-in-corelib-build.patch 1631 BLAKE2B 2535dea32425643cc47aa26571e9c2cb2c02553357f7efafaa03b7fdcdc28a88f5739d5310362f4321a50676eceab06b12d4d4f49bc25271710fceb7409458f7 SHA512 496acbeb7e92eaf5e56ec67f40e1a8d2c0759c22cefacaecf039b93cf3099a0441931f2e3e01ce219ca6ab3040dae797abd172b644e44e61e3287547478cb06c AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 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.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec +DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489 EBUILD gtksourceview-4.6.1-r1.ebuild 1741 BLAKE2B f5867f5eb784c3bf19117a5e6556146ecbd30b5d011bb84006a0a30252111654b15b6393ff07b0bd387c770207b196d9c19ed101f6e8559638f4df3a9b90bc02 SHA512 a44dcb68b000b6346f2063181f92591f00f7b065c6d5868e3c9fc8c11abe194935e9ae2a1d575b49213f3374be7d0c1cfacb8942621097eaa796e3e4b5ecc403 +EBUILD gtksourceview-4.8.1.ebuild 1920 BLAKE2B f1f8a6626e166c2241ce17f6a0714833424dc411c7deb5e86638bda418d1ddc3550cc8cbaa6bc650093f5a570d55fd9b6a182b6217e19c8b44f4710cafdef024 SHA512 84afec914c330b263cb985975462743c0d4c91583ff645a8d4695de83c3e29c9411297919c8a80dc4d665970ca5518c01019e05aadf8f48473a28b8640d5213f MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5 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 000000000000..e13a65c3bc4d --- /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 +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 new file mode 100644 index 000000000000..3fde96b14850 --- /dev/null +++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch @@ -0,0 +1,57 @@ +From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001 +From: Christian Hergert +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 new file mode 100644 index 000000000000..8a04ceac09f8 --- /dev/null +++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild @@ -0,0 +1,75 @@ +# 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 ~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 +} -- cgit v1.2.3