1 |
commit: a15772b28d2913de0f5c6b192e867f99c10962ac |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 1 15:01:17 2018 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 1 15:06:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15772b2 |
7 |
|
8 |
media-gfx/qiv: version bump to 2.3.2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/582404 |
11 |
|
12 |
media-gfx/qiv/Manifest | 1 + |
13 |
media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch | 22 +++++++ |
14 |
media-gfx/qiv/metadata.xml | 3 + |
15 |
media-gfx/qiv/qiv-2.3.2.ebuild | 71 +++++++++++++++++++++++ |
16 |
4 files changed, 97 insertions(+) |
17 |
|
18 |
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest |
19 |
index 72f567872a6..7d53b345f3e 100644 |
20 |
--- a/media-gfx/qiv/Manifest |
21 |
+++ b/media-gfx/qiv/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST qiv-2.2.4.tgz 98874 BLAKE2B 150ea07881d8225801156d395696cef397210e1f5c2f974d08197f3429e1a7e19ebf283037b92cec40a973aa6748f1562dbeba1a6e854438cf069c70781e1561 SHA512 744014ff70c9397d7a90e60740f482976713c9e5ff295a03684ae7b50ae70b86589d9e9066702fd43241bf2767c3537f582aab5ebbde25caea1663ec825f76a5 |
24 |
DIST qiv-2.3.1.tgz 130621 BLAKE2B 7aa3a63fb83094d4b0a15c4d6422ccf35f34a16df2f0e644a2068c520024b2a22f724ed117ef90292359fb8372969511863b6b0a2ccb0d208bad12649333f993 SHA512 5a9b8ac082c78071c903e2f10a98effc412c0b6b940437b6592077978de03b5c7b6192e4d696f0389c12e99e0d3b5ca40c3be54ca2dfa5439121af2415f32812 |
25 |
+DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8 |
26 |
|
27 |
diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..e00ad10f93e |
30 |
--- /dev/null |
31 |
+++ b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch |
32 |
@@ -0,0 +1,22 @@ |
33 |
+Make tiff header usage conditional on LCMS support as intended. |
34 |
+ |
35 |
+--- ciberandy-qiv-14b562fe2fc3/qiv.h |
36 |
++++ ciberandy-qiv-14b562fe2fc3/qiv.h |
37 |
+@@ -12,6 +12,7 @@ |
38 |
+ #ifdef SUPPORT_LCMS |
39 |
+ #include <lcms2.h> |
40 |
+ #include <jpeglib.h> |
41 |
++#include <tiffio.h> |
42 |
+ #endif |
43 |
+ |
44 |
+ /* |
45 |
+--- ciberandy-qiv-14b562fe2fc3/utils.c |
46 |
++++ ciberandy-qiv-14b562fe2fc3/utils.c |
47 |
+@@ -17,7 +17,6 @@ |
48 |
+ #include <dirent.h> |
49 |
+ #include <fcntl.h> |
50 |
+ #include <errno.h> |
51 |
+-#include <tiffio.h> |
52 |
+ #include <X11/extensions/dpms.h> |
53 |
+ #ifdef HAVE_EXIF |
54 |
+ #include <libexif/exif-loader.h> |
55 |
|
56 |
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml |
57 |
index 9cc5dff0ad5..55247542f39 100644 |
58 |
--- a/media-gfx/qiv/metadata.xml |
59 |
+++ b/media-gfx/qiv/metadata.xml |
60 |
@@ -8,4 +8,7 @@ |
61 |
<use> |
62 |
<flag name="magic">Use libmagic to determine mimetypes</flag> |
63 |
</use> |
64 |
+ <upstream> |
65 |
+ <remote-id type="bitbucket">ciberandy/qiv</remote-id> |
66 |
+ </upstream> |
67 |
</pkgmetadata> |
68 |
|
69 |
diff --git a/media-gfx/qiv/qiv-2.3.2.ebuild b/media-gfx/qiv/qiv-2.3.2.ebuild |
70 |
new file mode 100644 |
71 |
index 00000000000..0b0984e667e |
72 |
--- /dev/null |
73 |
+++ b/media-gfx/qiv/qiv-2.3.2.ebuild |
74 |
@@ -0,0 +1,71 @@ |
75 |
+# Copyright 1999-2018 Gentoo Foundation |
76 |
+# Distributed under the terms of the GNU General Public License v2 |
77 |
+ |
78 |
+EAPI=6 |
79 |
+inherit desktop gnome2-utils toolchain-funcs xdg-utils vcs-snapshot |
80 |
+ |
81 |
+DESCRIPTION="Quick Image Viewer" |
82 |
+HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv" |
83 |
+SRC_URI="https://bitbucket.org/ciberandy/qiv/get/v${PV}.tar.gz -> ${P}.tar.gz" |
84 |
+ |
85 |
+LICENSE="GPL-2" |
86 |
+SLOT="0" |
87 |
+KEYWORDS="~amd64 ~mips ~x86" |
88 |
+IUSE="exif lcms magic" |
89 |
+ |
90 |
+RDEPEND=">=x11-libs/gtk+-2.12:2 |
91 |
+ media-libs/imlib2[X] |
92 |
+ exif? ( media-libs/libexif ) |
93 |
+ lcms? ( |
94 |
+ media-libs/lcms:2 |
95 |
+ media-libs/tiff:0 |
96 |
+ virtual/jpeg:0 |
97 |
+ ) |
98 |
+ magic? ( sys-apps/file )" |
99 |
+DEPEND="${RDEPEND} |
100 |
+ virtual/pkgconfig" |
101 |
+ |
102 |
+PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch ) |
103 |
+ |
104 |
+src_prepare() { |
105 |
+ default |
106 |
+ |
107 |
+ sed -i \ |
108 |
+ -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ |
109 |
+ Makefile || die |
110 |
+ |
111 |
+ if ! use exif ; then |
112 |
+ sed -i 's/^EXIF =/#\0/' Makefile || die |
113 |
+ fi |
114 |
+ |
115 |
+ if ! use lcms ; then |
116 |
+ sed -i 's/^LCMS =/#\0/' Makefile || die |
117 |
+ fi |
118 |
+ |
119 |
+ if ! use magic ; then |
120 |
+ sed -i 's/^MAGIC =/#\0/' Makefile || die |
121 |
+ fi |
122 |
+} |
123 |
+ |
124 |
+src_compile() { |
125 |
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
126 |
+} |
127 |
+ |
128 |
+src_install() { |
129 |
+ dobin qiv |
130 |
+ doman qiv.1 |
131 |
+ dodoc Changelog contrib/qiv-command.example README README.TODO |
132 |
+ |
133 |
+ domenu qiv.desktop |
134 |
+ doicon qiv.png |
135 |
+} |
136 |
+ |
137 |
+pkg_postinst() { |
138 |
+ xdg_desktop_database_update |
139 |
+ gnome2_icon_cache_update |
140 |
+} |
141 |
+ |
142 |
+pkg_postrm() { |
143 |
+ xdg_desktop_database_update |
144 |
+ gnome2_icon_cache_update |
145 |
+} |