1 |
commit: 7587775a50aaab00ffe7d396dfc7328de1928852 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 25 09:25:44 2017 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 25 09:31:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7587775a |
7 |
|
8 |
app-text/apvlv: Fix building with gcc7 with Debian patch. |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
app-text/apvlv/Manifest | 2 +- |
13 |
app-text/apvlv/apvlv-0.1.5-r2.ebuild | 63 +++++++++++++++++++++++++++++ |
14 |
app-text/apvlv/files/apvlv-0.1.5-gcc7.patch | 22 ++++++++++ |
15 |
3 files changed, 86 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest |
18 |
index fa048e6d7be..e2e8e977e53 100644 |
19 |
--- a/app-text/apvlv/Manifest |
20 |
+++ b/app-text/apvlv/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST apvlv-0.1.5.tar.gz 4254177 SHA256 dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd WHIRLPOOL c254d3ca939b308dc58aadee20e33c5a6bda7495c4521d3433d2eb4a03ab4c9fd25f0589554506b08496f9024ef6d8c8648abc31b5175ad5b181272b9e6cae00 |
23 |
+DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd |
24 |
|
25 |
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..ba041b48bf2 |
28 |
--- /dev/null |
29 |
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild |
30 |
@@ -0,0 +1,63 @@ |
31 |
+# Copyright 1999-2017 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=5 |
35 |
+inherit eutils cmake-utils gnome2-utils |
36 |
+ |
37 |
+DESCRIPTION="Alf's PDF Viewer Like Vim" |
38 |
+HOMEPAGE="https://naihe2010.github.com/apvlv/" |
39 |
+SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
40 |
+ |
41 |
+LICENSE="GPL-2" |
42 |
+SLOT="0" |
43 |
+KEYWORDS="~amd64 ~x86" |
44 |
+IUSE="debug djvu" |
45 |
+ |
46 |
+RDEPEND=" |
47 |
+ >=app-text/poppler-0.18:=[cairo,xpdf-headers(+)] |
48 |
+ dev-libs/glib:2 |
49 |
+ x11-libs/gtk+:3 |
50 |
+ djvu? ( app-text/djvu:= ) |
51 |
+" |
52 |
+DEPEND="${RDEPEND} |
53 |
+ virtual/pkgconfig |
54 |
+" |
55 |
+ |
56 |
+PATCHES=( |
57 |
+ # preserve cflags |
58 |
+ "${FILESDIR}/${PN}-0.1.5-cflags.patch" |
59 |
+ "${FILESDIR}/${PN}-0.1.5-gcc6.patch" |
60 |
+ "${FILESDIR}/${PN}-0.1.5-gcc7.patch" |
61 |
+) |
62 |
+ |
63 |
+src_configure() { |
64 |
+ local mycmakeargs=( |
65 |
+ -DSYSCONFDIR=/etc/${PN} |
66 |
+ -DDOCDIR=/usr/share/${PN} |
67 |
+ -DMANDIR=/usr/share/man |
68 |
+ -DAPVLV_WITH_HTML=OFF |
69 |
+ -DAPVLV_WITH_UMD=OFF |
70 |
+ -DAPVLV_WITH_TXT=ON |
71 |
+ $(cmake-utils_use djvu APVLV_WITH_DJVU) |
72 |
+ $(cmake-utils_use debug APVLV_ENABLE_DEBUG) |
73 |
+ ) |
74 |
+ cmake-utils_src_configure |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ cmake-utils_src_install |
79 |
+ dodoc AUTHORS NEWS README THANKS TODO |
80 |
+ newicon -s 32 icons/pdf.png ${PN}.png |
81 |
+} |
82 |
+ |
83 |
+pkg_preinst() { |
84 |
+ gnome2_icon_savelist |
85 |
+} |
86 |
+ |
87 |
+pkg_postinst() { |
88 |
+ gnome2_icon_cache_update |
89 |
+} |
90 |
+ |
91 |
+pkg_postrm() { |
92 |
+ gnome2_icon_cache_update |
93 |
+} |
94 |
|
95 |
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch |
96 |
new file mode 100644 |
97 |
index 00000000000..e55f2771395 |
98 |
--- /dev/null |
99 |
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch |
100 |
@@ -0,0 +1,22 @@ |
101 |
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc |
102 |
++++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc |
103 |
+@@ -200,7 +200,7 @@ namespace apvlv |
104 |
+ |
105 |
+ if (len >= 4 |
106 |
+ && *s == '<' |
107 |
+- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-') |
108 |
++ && (e = strchr ((char *) s, '>')) && *(s + 2) != '-') |
109 |
+ { |
110 |
+ e++; |
111 |
+ StringKeyMap::iterator it; |
112 |
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc |
113 |
++++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc |
114 |
+@@ -90,7 +90,7 @@ namespace apvlv |
115 |
+ { |
116 |
+ mInuse = use; |
117 |
+ |
118 |
+- if (mInuse == false && gView->hasloaded (filename (), type ()) == false) |
119 |
++ if (mInuse == false && !gView->hasloaded (filename (), type ())) |
120 |
+ { |
121 |
+ debug ("core :%p is not needed, delete it\n", this); |
122 |
+ delete this; |