1 |
commit: 104c186b581d37495ff048d6803ffa9f524ca774 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 23 21:54:13 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 23 22:02:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104c186b |
7 |
|
8 |
gnome-extra/gnome-color-manager: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-extra/gnome-color-manager/Manifest | 1 - |
14 |
.../gnome-color-manager-3.24.0-exiv2-0.27.patch | 41 ----------- |
15 |
.../gnome-color-manager-3.30.0-r1.ebuild | 84 ---------------------- |
16 |
3 files changed, 126 deletions(-) |
17 |
|
18 |
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest |
19 |
index eed6ae03ccb..ff5461d412c 100644 |
20 |
--- a/gnome-extra/gnome-color-manager/Manifest |
21 |
+++ b/gnome-extra/gnome-color-manager/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc |
24 |
DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38 |
25 |
|
26 |
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch |
27 |
deleted file mode 100644 |
28 |
index 00878bc26a8..00000000000 |
29 |
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch |
30 |
+++ /dev/null |
31 |
@@ -1,41 +0,0 @@ |
32 |
-Patch kindly borrowed from Mageia. |
33 |
- |
34 |
-https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 |
35 |
- |
36 |
-diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp |
37 |
---- a/src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200 |
38 |
-+++ b/src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100 |
39 |
-@@ -19,8 +19,7 @@ |
40 |
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
41 |
- */ |
42 |
- |
43 |
--#include <exiv2/image.hpp> |
44 |
--#include <exiv2/exif.hpp> |
45 |
-+#include <exiv2/exiv2.hpp> |
46 |
- #include <iostream> |
47 |
- #include <iomanip> |
48 |
- |
49 |
-@@ -51,7 +50,11 @@ |
50 |
- if (argc == 2) |
51 |
- filename = argv[1]; |
52 |
- if (filename.empty()) |
53 |
-+#if EXIV2_TEST_VERSION(0,27,0) |
54 |
-+ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); |
55 |
-+#else |
56 |
- throw Exiv2::Error(1, "No filename specified"); |
57 |
-+#endif |
58 |
- image = Exiv2::ImageFactory::open(filename); |
59 |
- image->readMetadata(); |
60 |
- |
61 |
-@@ -60,7 +63,11 @@ |
62 |
- if (exifData.empty()) { |
63 |
- std::string error(argv[1]); |
64 |
- error += ": No Exif data found in the file"; |
65 |
-+#if EXIV2_TEST_VERSION(0,27,0) |
66 |
-+ throw Exiv2::Error(Exiv2::kerErrorMessage, error); |
67 |
-+#else |
68 |
- throw Exiv2::Error(1, error); |
69 |
-+#endif |
70 |
- } |
71 |
- |
72 |
- /* try to find make, model and serial number */ |
73 |
|
74 |
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild |
75 |
deleted file mode 100644 |
76 |
index 67ba9af2b31..00000000000 |
77 |
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild |
78 |
+++ /dev/null |
79 |
@@ -1,84 +0,0 @@ |
80 |
-# Copyright 1999-2019 Gentoo Authors |
81 |
-# Distributed under the terms of the GNU General Public License v2 |
82 |
- |
83 |
-EAPI=6 |
84 |
-inherit gnome.org meson virtualx xdg |
85 |
- |
86 |
-DESCRIPTION="GNOME color profile tools" |
87 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/" |
88 |
- |
89 |
-LICENSE="GPL-2+" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
92 |
-IUSE="packagekit raw test" |
93 |
-RESTRICT="!test? ( test )" |
94 |
- |
95 |
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 |
96 |
-# vte could be made optional |
97 |
-RDEPEND=" |
98 |
- >=dev-libs/glib-2.31.10:2 |
99 |
- >=media-libs/lcms-2.2:2 |
100 |
- >=media-libs/libcanberra-0.10[gtk3] |
101 |
- media-libs/libexif |
102 |
- media-libs/tiff:0= |
103 |
- |
104 |
- >=x11-libs/gtk+-3.3.8:3 |
105 |
- >=x11-libs/vte-0.25.1:2.91 |
106 |
- >=x11-misc/colord-1.3.1:0= |
107 |
- >=x11-libs/colord-gtk-0.1.20 |
108 |
- |
109 |
- packagekit? ( app-admin/packagekit-base ) |
110 |
- raw? ( media-gfx/exiv2:0= ) |
111 |
-" |
112 |
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages |
113 |
-DEPEND="${RDEPEND} |
114 |
- app-text/docbook-sgml-dtd:4.1 |
115 |
- app-text/docbook-sgml-utils |
116 |
- dev-libs/appstream-glib |
117 |
- dev-util/itstool |
118 |
- >=sys-devel/gettext-0.19.8 |
119 |
- virtual/pkgconfig |
120 |
-" |
121 |
- |
122 |
-PATCHES=( |
123 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=796428 |
124 |
- "${FILESDIR}"/3.28-remove-unwvanted-check.patch |
125 |
- |
126 |
- # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 |
127 |
- "${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086 |
128 |
-) |
129 |
- |
130 |
-src_prepare() { |
131 |
- xdg_src_prepare |
132 |
- |
133 |
- # Fix hard-coded package name |
134 |
- # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/3 |
135 |
- sed 's:argyllcms:media-gfx/argyllcms:' -i src/gcm-utils.h || die |
136 |
-} |
137 |
- |
138 |
-src_configure() { |
139 |
- # Always enable tests since they are check_PROGRAMS anyway |
140 |
- local emesonargs=( |
141 |
- $(meson_use raw exiv) |
142 |
- $(meson_use packagekit) |
143 |
- $(meson_use test tests) |
144 |
- ) |
145 |
- meson_src_configure |
146 |
-} |
147 |
- |
148 |
-src_test() { |
149 |
- virtx meson_src_test |
150 |
-} |
151 |
- |
152 |
-pkg_postinst() { |
153 |
- xdg_pkg_postinst |
154 |
- |
155 |
- if ! has_version media-gfx/argyllcms ; then |
156 |
- elog "If you want to do display or scanner calibration, you will need to" |
157 |
- elog "install media-gfx/argyllcms" |
158 |
- fi |
159 |
-} |
160 |
- |
161 |
-pkg_postrm() { |
162 |
- xdg_pkg_postrm |
163 |
-} |