1 |
commit: e6a75d84e95663f09e43e2e249d462883880c2b1 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 22:18:36 2021 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 22:18:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a75d84 |
7 |
|
8 |
x11-themes/arc-theme: Version bump to 20210127, switch to Meson |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.1 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
x11-themes/arc-theme/Manifest | 2 + |
14 |
x11-themes/arc-theme/arc-theme-20210127.ebuild | 110 ++++++++++++++++++++++++ |
15 |
x11-themes/arc-theme/files/meson-inkscape.patch | 91 ++++++++++++++++++++ |
16 |
x11-themes/arc-theme/files/pre-rendered.ini | 3 + |
17 |
4 files changed, 206 insertions(+) |
18 |
|
19 |
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest |
20 |
index 6d006ca8b0b..129141c7d15 100644 |
21 |
--- a/x11-themes/arc-theme/Manifest |
22 |
+++ b/x11-themes/arc-theme/Manifest |
23 |
@@ -1,2 +1,4 @@ |
24 |
DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86 |
25 |
DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c |
26 |
+DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159 |
27 |
+DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594 |
28 |
|
29 |
diff --git a/x11-themes/arc-theme/arc-theme-20210127.ebuild b/x11-themes/arc-theme/arc-theme-20210127.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..e7a1d5c3bff |
32 |
--- /dev/null |
33 |
+++ b/x11-themes/arc-theme/arc-theme-20210127.ebuild |
34 |
@@ -0,0 +1,110 @@ |
35 |
+# Copyright 1999-2021 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=7 |
39 |
+ |
40 |
+# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile |
41 |
+# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work |
42 |
+# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root |
43 |
+ |
44 |
+inherit meson toolchain-funcs |
45 |
+ |
46 |
+DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell" |
47 |
+HOMEPAGE="https://github.com/jnsh/arc-theme" |
48 |
+SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz |
49 |
+ pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )" |
50 |
+LICENSE="GPL-3" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
53 |
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce" |
54 |
+ |
55 |
+SASSC_DEPEND=" |
56 |
+ dev-lang/sassc |
57 |
+" |
58 |
+ |
59 |
+SVG_DEPEND=" |
60 |
+ !pre-rendered? ( |
61 |
+ media-gfx/inkscape |
62 |
+ media-gfx/optipng |
63 |
+ ) |
64 |
+" |
65 |
+ |
66 |
+# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses |
67 |
+# pkg-config to determine which set of files to build. Updates will |
68 |
+# therefore break existing installs but there's no way around this. At |
69 |
+# least GTK+3 is unlikely to see a release beyond 3.24. |
70 |
+BDEPEND=" |
71 |
+ >=dev-util/meson-0.56.0 |
72 |
+ cinnamon? ( |
73 |
+ ${SASSC_DEPEND} |
74 |
+ gnome-extra/cinnamon |
75 |
+ ) |
76 |
+ gnome-shell? ( |
77 |
+ ${SASSC_DEPEND} |
78 |
+ >=gnome-base/gnome-shell-3.18 |
79 |
+ ) |
80 |
+ gtk2? ( |
81 |
+ ${SVG_DEPEND} |
82 |
+ ) |
83 |
+ gtk3? ( |
84 |
+ ${SASSC_DEPEND} |
85 |
+ ${SVG_DEPEND} |
86 |
+ virtual/pkgconfig |
87 |
+ =x11-libs/gtk+-3.24*:3 |
88 |
+ ) |
89 |
+ xfce? ( |
90 |
+ ${SVG_DEPEND} |
91 |
+ ) |
92 |
+" |
93 |
+ |
94 |
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita |
95 |
+# engine. This engine is built into GTK+3. |
96 |
+RDEPEND=" |
97 |
+ gtk2? ( |
98 |
+ x11-themes/gnome-themes-standard |
99 |
+ x11-themes/gtk-engines-murrine |
100 |
+ ) |
101 |
+" |
102 |
+ |
103 |
+PATCHES=( |
104 |
+ "${FILESDIR}"/meson-inkscape.patch |
105 |
+) |
106 |
+ |
107 |
+src_configure() { |
108 |
+ local themes=$( |
109 |
+ printf "%s," \ |
110 |
+ $(usev cinnamon) \ |
111 |
+ $(usev gnome-shell) \ |
112 |
+ $(usev gtk2) \ |
113 |
+ $(usev gtk3) \ |
114 |
+ $(usex mate metacity "") \ |
115 |
+ $(usex xfce xfwm "") |
116 |
+ ) |
117 |
+ |
118 |
+ local emesonargs=( |
119 |
+ -Dthemes="${themes%,}" |
120 |
+ -Dgtk3_version=3.24 |
121 |
+ ) |
122 |
+ |
123 |
+ if use pre-rendered; then |
124 |
+ emesonargs+=( |
125 |
+ $(if tc-is-cross-compiler; then |
126 |
+ echo --cross-file |
127 |
+ else |
128 |
+ echo --native-file |
129 |
+ fi) |
130 |
+ "${FILESDIR}"/pre-rendered.ini |
131 |
+ ) |
132 |
+ fi |
133 |
+ |
134 |
+ meson_src_configure |
135 |
+} |
136 |
+ |
137 |
+src_compile() { |
138 |
+ # fontconfig issue? |
139 |
+ # https://bugs.gentoo.org/666418#c28 |
140 |
+ use pre-rendered || |
141 |
+ addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX |
142 |
+ |
143 |
+ meson_src_compile |
144 |
+} |
145 |
|
146 |
diff --git a/x11-themes/arc-theme/files/meson-inkscape.patch b/x11-themes/arc-theme/files/meson-inkscape.patch |
147 |
new file mode 100644 |
148 |
index 00000000000..dfec810aa53 |
149 |
--- /dev/null |
150 |
+++ b/x11-themes/arc-theme/files/meson-inkscape.patch |
151 |
@@ -0,0 +1,91 @@ |
152 |
+From 6c2e91fb79177f64eae875e1091d35ad94a74f5a Mon Sep 17 00:00:00 2001 |
153 |
+From: James Le Cuirot <chewi@g.o> |
154 |
+Date: Thu, 28 Jan 2021 23:14:22 +0000 |
155 |
+Subject: [PATCH] build: Fix building with Inkscape 1.0 |
156 |
+ |
157 |
+This wasn't matching the >1.0.0 version check. |
158 |
+--- |
159 |
+ common/gtk-2.0/dark/meson.build | 2 +- |
160 |
+ common/gtk-2.0/light/meson.build | 2 +- |
161 |
+ common/gtk-3.0/meson.build | 4 ++-- |
162 |
+ common/xfwm4/dark/meson.build | 2 +- |
163 |
+ common/xfwm4/light/meson.build | 2 +- |
164 |
+ 5 files changed, 6 insertions(+), 6 deletions(-) |
165 |
+ |
166 |
+diff --git a/common/gtk-2.0/dark/meson.build b/common/gtk-2.0/dark/meson.build |
167 |
+index 869beda9..c13608a8 100644 |
168 |
+--- a/common/gtk-2.0/dark/meson.build |
169 |
++++ b/common/gtk-2.0/dark/meson.build |
170 |
+@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names |
171 |
+ command : [ |
172 |
+ inkscape, |
173 |
+ '--export-id-only', |
174 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
175 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
176 |
+ '--export-id=' + asset, |
177 |
+ '--export-dpi=96', |
178 |
+ '@INPUT@' |
179 |
+diff --git a/common/gtk-2.0/light/meson.build b/common/gtk-2.0/light/meson.build |
180 |
+index 3df389a0..4dd32c63 100644 |
181 |
+--- a/common/gtk-2.0/light/meson.build |
182 |
++++ b/common/gtk-2.0/light/meson.build |
183 |
+@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names |
184 |
+ command : [ |
185 |
+ inkscape, |
186 |
+ '--export-id-only', |
187 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
188 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
189 |
+ '--export-id=' + asset, |
190 |
+ '--export-dpi=96', |
191 |
+ '@INPUT@' |
192 |
+diff --git a/common/gtk-3.0/meson.build b/common/gtk-3.0/meson.build |
193 |
+index fcb2e074..085bb739 100644 |
194 |
+--- a/common/gtk-3.0/meson.build |
195 |
++++ b/common/gtk-3.0/meson.build |
196 |
+@@ -50,7 +50,7 @@ foreach asset : gtk3_asset_names |
197 |
+ command : [ |
198 |
+ inkscape, |
199 |
+ '--export-id-only', |
200 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
201 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
202 |
+ '--export-id=' + asset, |
203 |
+ '--export-dpi=96', |
204 |
+ '@INPUT@' |
205 |
+@@ -65,7 +65,7 @@ foreach asset : gtk3_asset_names |
206 |
+ command : [ |
207 |
+ inkscape, |
208 |
+ '--export-id-only', |
209 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
210 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
211 |
+ '--export-id=' + asset, |
212 |
+ '--export-dpi=192', |
213 |
+ '@INPUT@' |
214 |
+diff --git a/common/xfwm4/dark/meson.build b/common/xfwm4/dark/meson.build |
215 |
+index a2820df2..9bb7d46b 100644 |
216 |
+--- a/common/xfwm4/dark/meson.build |
217 |
++++ b/common/xfwm4/dark/meson.build |
218 |
+@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names |
219 |
+ command : [ |
220 |
+ inkscape, |
221 |
+ '--export-id-only', |
222 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
223 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
224 |
+ '--export-id=' + asset, |
225 |
+ '--export-dpi=96', |
226 |
+ '@INPUT@' |
227 |
+diff --git a/common/xfwm4/light/meson.build b/common/xfwm4/light/meson.build |
228 |
+index c65b891b..6ee79fc4 100644 |
229 |
+--- a/common/xfwm4/light/meson.build |
230 |
++++ b/common/xfwm4/light/meson.build |
231 |
+@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names |
232 |
+ command : [ |
233 |
+ inkscape, |
234 |
+ '--export-id-only', |
235 |
+- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
236 |
++ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@', |
237 |
+ '--export-id=' + asset, |
238 |
+ '--export-dpi=96', |
239 |
+ '@INPUT@' |
240 |
+-- |
241 |
+2.26.2 |
242 |
+ |
243 |
|
244 |
diff --git a/x11-themes/arc-theme/files/pre-rendered.ini b/x11-themes/arc-theme/files/pre-rendered.ini |
245 |
new file mode 100644 |
246 |
index 00000000000..cf3b5771c2d |
247 |
--- /dev/null |
248 |
+++ b/x11-themes/arc-theme/files/pre-rendered.ini |
249 |
@@ -0,0 +1,3 @@ |
250 |
+[binaries] |
251 |
+inkscape = 'true' |
252 |
+optipng = 'true' |