1 |
commit: 120bd952507979ea2623b697032de11493e1c006 |
2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 2 05:21:58 2020 +0000 |
4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 2 05:55:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=120bd952 |
7 |
|
8 |
media-gfx/eom: Sync with ::gentoo |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
12 |
|
13 |
media-gfx/eom/Manifest | 2 - |
14 |
media-gfx/eom/eom-1.22.0.ebuild | 62 ---------------------- |
15 |
media-gfx/eom/eom-1.22.1.ebuild | 62 ---------------------- |
16 |
media-gfx/eom/eom-1.22.2.ebuild | 2 +- |
17 |
.../{eom-1.24.0.ebuild => eom-1.24.0-r2.ebuild} | 6 ++- |
18 |
.../eom/files/eom-1.24.0-add-gdk-includes.patch | 29 ++++++++++ |
19 |
6 files changed, 34 insertions(+), 129 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest |
22 |
index 6d59d34..8c61051 100644 |
23 |
--- a/media-gfx/eom/Manifest |
24 |
+++ b/media-gfx/eom/Manifest |
25 |
@@ -1,4 +1,2 @@ |
26 |
-DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0 |
27 |
-DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87 |
28 |
DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe |
29 |
DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab |
30 |
|
31 |
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild |
32 |
deleted file mode 100644 |
33 |
index 9e84c4e..0000000 |
34 |
--- a/media-gfx/eom/eom-1.22.0.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,62 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-inherit mate |
43 |
- |
44 |
-if [[ ${PV} != 9999 ]]; then |
45 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
46 |
-fi |
47 |
- |
48 |
-DESCRIPTION="The MATE image viewer" |
49 |
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" |
50 |
-SLOT="0" |
51 |
- |
52 |
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp" |
53 |
- |
54 |
-RDEPEND=" |
55 |
- dev-libs/atk |
56 |
- >=dev-libs/glib-2.50:2 |
57 |
- >=dev-libs/libpeas-1.8.0[gtk] |
58 |
- >=dev-libs/libxml2-2:2 |
59 |
- gnome-base/dconf |
60 |
- >=mate-base/mate-desktop-1.17.0 |
61 |
- sys-libs/zlib |
62 |
- x11-libs/cairo |
63 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?] |
64 |
- >=x11-libs/gtk+-3.22:3[introspection?] |
65 |
- x11-libs/libX11 |
66 |
- >=x11-misc/shared-mime-info-0.20 |
67 |
- virtual/libintl |
68 |
- exif? ( |
69 |
- >=media-libs/libexif-0.6.14 |
70 |
- virtual/jpeg:0 |
71 |
- ) |
72 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
73 |
- jpeg? ( virtual/jpeg:0 ) |
74 |
- lcms? ( media-libs/lcms:2 ) |
75 |
- svg? ( >=gnome-base/librsvg-2.36.2:2 ) |
76 |
- xmp? ( >=media-libs/exempi-1.99.5:2 ) |
77 |
- !!media-gfx/mate-image-viewer" |
78 |
- |
79 |
-DEPEND="${RDEPEND} |
80 |
- app-text/yelp-tools |
81 |
- dev-util/glib-utils |
82 |
- dev-util/gtk-doc |
83 |
- dev-util/gtk-doc-am |
84 |
- >=dev-util/intltool-0.50.1 |
85 |
- sys-devel/gettext |
86 |
- virtual/pkgconfig" |
87 |
- |
88 |
-src_configure() { |
89 |
- mate_src_configure \ |
90 |
- $(use_enable debug) \ |
91 |
- $(use_enable introspection) \ |
92 |
- $(use_with X x) \ |
93 |
- $(use_with exif libexif) \ |
94 |
- $(use_with jpeg libjpeg) \ |
95 |
- $(use_with lcms cms) \ |
96 |
- $(use_with svg librsvg) \ |
97 |
- $(use_with xmp) |
98 |
-} |
99 |
|
100 |
diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild |
101 |
deleted file mode 100644 |
102 |
index 9732879..0000000 |
103 |
--- a/media-gfx/eom/eom-1.22.1.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,62 +0,0 @@ |
106 |
-# Copyright 1999-2020 Gentoo Authors |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
- |
109 |
-EAPI=6 |
110 |
- |
111 |
-inherit mate |
112 |
- |
113 |
-if [[ ${PV} != 9999 ]]; then |
114 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
115 |
-fi |
116 |
- |
117 |
-DESCRIPTION="The MATE image viewer" |
118 |
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+" |
119 |
-SLOT="0" |
120 |
- |
121 |
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp" |
122 |
- |
123 |
-RDEPEND=" |
124 |
- dev-libs/atk |
125 |
- >=dev-libs/glib-2.50:2 |
126 |
- >=dev-libs/libpeas-1.8.0[gtk] |
127 |
- >=dev-libs/libxml2-2:2 |
128 |
- gnome-base/dconf |
129 |
- >=mate-base/mate-desktop-1.17.0 |
130 |
- sys-libs/zlib |
131 |
- x11-libs/cairo |
132 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?] |
133 |
- >=x11-libs/gtk+-3.22:3[introspection?] |
134 |
- x11-libs/libX11 |
135 |
- >=x11-misc/shared-mime-info-0.20 |
136 |
- virtual/libintl |
137 |
- exif? ( |
138 |
- >=media-libs/libexif-0.6.14 |
139 |
- virtual/jpeg:0 |
140 |
- ) |
141 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
142 |
- jpeg? ( virtual/jpeg:0 ) |
143 |
- lcms? ( media-libs/lcms:2 ) |
144 |
- svg? ( >=gnome-base/librsvg-2.36.2:2 ) |
145 |
- xmp? ( >=media-libs/exempi-1.99.5:2 ) |
146 |
- !!media-gfx/mate-image-viewer" |
147 |
- |
148 |
-DEPEND="${RDEPEND} |
149 |
- app-text/yelp-tools |
150 |
- dev-util/glib-utils |
151 |
- dev-util/gtk-doc |
152 |
- dev-util/gtk-doc-am |
153 |
- >=dev-util/intltool-0.50.1 |
154 |
- sys-devel/gettext |
155 |
- virtual/pkgconfig" |
156 |
- |
157 |
-src_configure() { |
158 |
- mate_src_configure \ |
159 |
- $(use_enable debug) \ |
160 |
- $(use_enable introspection) \ |
161 |
- $(use_with X x) \ |
162 |
- $(use_with exif libexif) \ |
163 |
- $(use_with jpeg libjpeg) \ |
164 |
- $(use_with lcms cms) \ |
165 |
- $(use_with svg librsvg) \ |
166 |
- $(use_with xmp) |
167 |
-} |
168 |
|
169 |
diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild |
170 |
index cd0a1d6..42ba95e 100644 |
171 |
--- a/media-gfx/eom/eom-1.22.2.ebuild |
172 |
+++ b/media-gfx/eom/eom-1.22.2.ebuild |
173 |
@@ -6,7 +6,7 @@ EAPI=6 |
174 |
inherit mate |
175 |
|
176 |
if [[ ${PV} != 9999 ]]; then |
177 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
178 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
179 |
fi |
180 |
|
181 |
DESCRIPTION="The MATE image viewer" |
182 |
|
183 |
diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0-r2.ebuild |
184 |
similarity index 92% |
185 |
rename from media-gfx/eom/eom-1.24.0.ebuild |
186 |
rename to media-gfx/eom/eom-1.24.0-r2.ebuild |
187 |
index c1052d3..0eaa262 100644 |
188 |
--- a/media-gfx/eom/eom-1.24.0.ebuild |
189 |
+++ b/media-gfx/eom/eom-1.24.0-r2.ebuild |
190 |
@@ -6,7 +6,7 @@ EAPI=6 |
191 |
inherit mate |
192 |
|
193 |
if [[ ${PV} != 9999 ]]; then |
194 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
195 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
196 |
fi |
197 |
|
198 |
DESCRIPTION="The MATE image viewer" |
199 |
@@ -54,6 +54,8 @@ DEPEND="${COMMON_DEPEND} |
200 |
virtual/pkgconfig |
201 |
" |
202 |
|
203 |
+PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" ) |
204 |
+ |
205 |
src_configure() { |
206 |
mate_src_configure \ |
207 |
--enable-thumbnailer \ |
208 |
@@ -63,7 +65,7 @@ src_configure() { |
209 |
$(use_with exif libexif) \ |
210 |
$(usex imagemagick \ |
211 |
--without-gdk-pixbuf-thumbnailer \ |
212 |
- --with-gdk-pixbuf-thumbnail \ |
213 |
+ --with-gdk-pixbuf-thumbnailer \ |
214 |
) \ |
215 |
$(use_with jpeg libjpeg) \ |
216 |
$(use_with lcms cms) \ |
217 |
|
218 |
diff --git a/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch |
219 |
new file mode 100644 |
220 |
index 0000000..ced5dbc |
221 |
--- /dev/null |
222 |
+++ b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch |
223 |
@@ -0,0 +1,29 @@ |
224 |
+From 3b76a9f57ea65a7ebd22395eb5d3fda9cc929e8c Mon Sep 17 00:00:00 2001 |
225 |
+From: NP-Hardass <np.hardass@×××××.com> |
226 |
+Date: Tue, 4 Aug 2020 19:35:28 -0400 |
227 |
+Subject: [PATCH] eom-metadata-reader: add gdk/gdk.h include to resolve #258 |
228 |
+ |
229 |
+be4fa2808c4e1a36c2c9b58c1267a54cdda6e495, enable wayland support |
230 |
+ |
231 |
+added "defined(GDK_WINDOWING_x11)" macros without the accompanying gdk |
232 |
+headers |
233 |
+--- |
234 |
+ src/eom-metadata-reader.c | 2 ++ |
235 |
+ 1 file changed, 2 insertions(+) |
236 |
+ |
237 |
+diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c |
238 |
+index cd796f0..2c93a14 100644 |
239 |
+--- a/src/eom-metadata-reader.c |
240 |
++++ b/src/eom-metadata-reader.c |
241 |
+@@ -23,6 +23,8 @@ |
242 |
+ #include <config.h> |
243 |
+ #endif |
244 |
+ |
245 |
++#include <gdk/gdk.h> |
246 |
++ |
247 |
+ #include "eom-metadata-reader.h" |
248 |
+ #include "eom-metadata-reader-jpg.h" |
249 |
+ #include "eom-metadata-reader-png.h" |
250 |
+-- |
251 |
+2.26.2 |
252 |
+ |