Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/, x11-libs/gtksourceview/files/
Date: Mon, 24 Jan 2022 22:43:45
Message-Id: 1643064178.b269cdb814bb9514f6b36d09317e9d4602bbc04b.mattst88@gentoo
1 commit: b269cdb814bb9514f6b36d09317e9d4602bbc04b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 24 21:16:21 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 24 22:42:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b269cdb8
7
8 x11-libs/gtksourceview: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-libs/gtksourceview/Manifest | 1 -
13 ...ble-Werror-for-incompatible-pointer-types.patch | 33 ----------
14 ...sure-access-to-resources-in-corelib-build.patch | 57 ----------------
15 x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild | 75 ----------------------
16 4 files changed, 166 deletions(-)
17
18 diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
19 index e0c490536dbe..b8e4498fb35d 100644
20 --- a/x11-libs/gtksourceview/Manifest
21 +++ b/x11-libs/gtksourceview/Manifest
22 @@ -1,4 +1,3 @@
23 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
24 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
25 -DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b
26 DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
27
28 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
29 deleted file mode 100644
30 index e13a65c3bc4d..000000000000
31 --- a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
32 +++ /dev/null
33 @@ -1,33 +0,0 @@
34 -From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
35 -From: Christian Hergert <chergert@××××××.com>
36 -Date: Thu, 15 Apr 2021 08:11:22 -0700
37 -Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
38 -
39 -This causes an issue with volatile and GLib in some configurations, so
40 -just keep it out for now. We will bring it back at some point going
41 -forward.
42 -
43 -We are already doing the same in 5.0.
44 -
45 -Fixes #179
46 ----
47 - meson.build | 3 ++-
48 - 1 file changed, 2 insertions(+), 1 deletion(-)
49 -
50 -diff --git a/meson.build b/meson.build
51 -index 826a3121..6ff5b155 100644
52 ---- a/meson.build
53 -+++ b/meson.build
54 -@@ -181,7 +181,8 @@ else
55 - '-Werror=empty-body',
56 - '-Werror=implicit',
57 - '-Werror=implicit-function-declaration',
58 -- '-Werror=incompatible-pointer-types',
59 -+ # Disabled due to volatile changes in GLib
60 -+ # '-Werror=incompatible-pointer-types',
61 - '-Werror=init-self',
62 - '-Werror=int-conversion',
63 - '-Werror=int-to-pointer-cast',
64 ---
65 -2.26.3
66 -
67
68 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
69 deleted file mode 100644
70 index 3fde96b14850..000000000000
71 --- a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
72 +++ /dev/null
73 @@ -1,57 +0,0 @@
74 -From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
75 -From: Christian Hergert <chergert@××××××.com>
76 -Date: Sun, 7 Mar 2021 08:54:15 -0800
77 -Subject: [PATCH] build: ensure access to resources in corelib build
78 -
79 -This should help with some transient build failures in dependent projects.
80 ----
81 - gtksourceview/meson.build | 13 +++++++------
82 - 1 file changed, 7 insertions(+), 6 deletions(-)
83 -
84 -diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
85 -index fd080a9c..b6192604 100644
86 ---- a/gtksourceview/meson.build
87 -+++ b/gtksourceview/meson.build
88 -@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
89 - install_dir: join_paths(pkgincludedir, 'gtksourceview'),
90 - )
91 -
92 -+gtksource_res = gnome.compile_resources(
93 -+ 'gtksourceview-gresources',
94 -+ 'gtksourceview.gresource.xml'
95 -+)
96 -+
97 - core_sources = [
98 - core_public_c,
99 - core_private_c,
100 - core_enums,
101 - gtksourceversion_h,
102 - core_marshallers,
103 -+ gtksource_res,
104 - ]
105 -
106 - install_headers(
107 -@@ -216,11 +222,6 @@ extra_public_sources = []
108 -
109 - subdir('completion-providers')
110 -
111 --gtksource_res = gnome.compile_resources(
112 -- 'gtksourceview-gresources',
113 -- 'gtksourceview.gresource.xml'
114 --)
115 --
116 -
117 - # We can't use the static libs on Visual Studio builds
118 - # to form our DLL here directly, so we must use
119 -@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
120 - gtksource_objs += int_lib.extract_all_objects()
121 - endforeach
122 -
123 --gtksource_lib = shared_library(package_string, gtksource_res,
124 -+gtksource_lib = shared_library(package_string,
125 - version: lib_version,
126 - darwin_versions: lib_osx_version,
127 - include_directories: gtksourceview_include_dirs,
128 ---
129 -2.26.3
130 -
131
132 diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
133 deleted file mode 100644
134 index 1693f4853c98..000000000000
135 --- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
136 +++ /dev/null
137 @@ -1,75 +0,0 @@
138 -# Copyright 1999-2021 Gentoo Authors
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=7
142 -
143 -inherit gnome.org meson vala virtualx xdg
144 -
145 -DESCRIPTION="A text widget implementing syntax highlighting and other features"
146 -HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
147 -
148 -LICENSE="LGPL-2.1+"
149 -SLOT="4"
150 -
151 -IUSE="glade gtk-doc +introspection +vala"
152 -REQUIRED_USE="vala? ( introspection )"
153 -
154 -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
155 -
156 -RDEPEND="
157 - >=dev-libs/glib-2.48:2
158 - >=x11-libs/gtk+-3.24:3[introspection?]
159 - >=dev-libs/libxml2-2.6:2
160 - glade? ( >=dev-util/glade-3.9:3.10 )
161 - introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
162 - >=dev-libs/fribidi-0.19.7
163 -"
164 -DEPEND="${RDEPEND}"
165 -BDEPEND="
166 - dev-util/glib-utils
167 - gtk-doc? (
168 - >=dev-util/gtk-doc-1.25
169 - app-text/docbook-xml-dtd:4.3
170 - )
171 - >=sys-devel/gettext-0.19.8
172 - virtual/pkgconfig
173 - vala? ( $(vala_depend) )
174 -"
175 -
176 -PATCHES=(
177 - "${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
178 - "${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch
179 -)
180 -
181 -src_prepare() {
182 - use vala && vala_src_prepare
183 - xdg_src_prepare
184 -}
185 -
186 -src_configure() {
187 - local emesonargs=(
188 - $(meson_use glade glade_catalog)
189 - -Dinstall_tests=false
190 - $(meson_use introspection gir)
191 - $(meson_use vala vapi)
192 - $(meson_use gtk-doc gtk_doc)
193 - )
194 - meson_src_configure
195 -}
196 -
197 -src_test() {
198 - virtx meson_src_test
199 -}
200 -
201 -src_install() {
202 - meson_src_install
203 -
204 - insinto /usr/share/${PN}-4/language-specs
205 - newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
206 -
207 - # Avoid conflict with gtksourceview:3.0 glade-catalog
208 - # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
209 - if use glade; then
210 - mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
211 - fi
212 -}