1 |
commit: c7b15e28f5bdc399b564c5017350b8083ce0623b |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 16 17:10:06 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 16 17:15:54 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b15e28 |
7 |
|
8 |
net-p2p/litecoin-qt: fix for API change in miniunpnc, bug #567080. |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
.../litecoin-qt/files/litecoin-miniupnpc-abi.patch | 19 +++ |
13 |
....2-r1.ebuild => litecoin-qt-0.10.2.2-r2.ebuild} | 11 +- |
14 |
net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild | 143 --------------------- |
15 |
3 files changed, 25 insertions(+), 148 deletions(-) |
16 |
|
17 |
diff --git a/net-p2p/litecoin-qt/files/litecoin-miniupnpc-abi.patch b/net-p2p/litecoin-qt/files/litecoin-miniupnpc-abi.patch |
18 |
new file mode 100644 |
19 |
index 0000000..7315ea9 |
20 |
--- /dev/null |
21 |
+++ b/net-p2p/litecoin-qt/files/litecoin-miniupnpc-abi.patch |
22 |
@@ -0,0 +1,19 @@ |
23 |
+diff -Nuar litecoin-0.10.2.2/src/net.cpp litecoin-0.10.2.2-fix/src/net.cpp |
24 |
+--- litecoin-0.10.2.2/src/net.cpp 2015-06-15 08:51:30.000000000 +0000 |
25 |
++++ litecoin-0.10.2.2-fix/src/net.cpp 2015-12-16 12:38:52.881533970 +0000 |
26 |
+@@ -1020,10 +1020,14 @@ |
27 |
+ #ifndef UPNPDISCOVER_SUCCESS |
28 |
+ /* miniupnpc 1.5 */ |
29 |
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); |
30 |
+-#else |
31 |
++#elif MINIUPNPC_API_VERSION < 14 |
32 |
+ /* miniupnpc 1.6 */ |
33 |
+ int error = 0; |
34 |
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); |
35 |
++#else |
36 |
++ /* miniupnpc 1.9.20150730 */ |
37 |
++ int error = 0; |
38 |
++ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); |
39 |
+ #endif |
40 |
+ |
41 |
+ struct UPNPUrls urls; |
42 |
\ No newline at end of file |
43 |
|
44 |
diff --git a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r1.ebuild b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild |
45 |
similarity index 92% |
46 |
rename from net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r1.ebuild |
47 |
rename to net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild |
48 |
index 6c2056b..49c5cac 100644 |
49 |
--- a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r1.ebuild |
50 |
+++ b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2-r2.ebuild |
51 |
@@ -57,8 +57,9 @@ DOCS="doc/README.md doc/release-notes.md" |
52 |
S="${WORKDIR}/${MyP}" |
53 |
|
54 |
src_prepare() { |
55 |
- epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" |
56 |
- epatch "${FILESDIR}/litecoind-0.10.2.2-memenv_h.patch" |
57 |
+ epatch "${FILESDIR}"/0.9.0-sys_leveldb.patch |
58 |
+ epatch "${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch |
59 |
+ epatch "${FILESDIR}"/litecoin-miniupnpc-abi.patch |
60 |
eautoreconf |
61 |
rm -r src/leveldb |
62 |
|
63 |
@@ -107,9 +108,9 @@ src_configure() { |
64 |
--without-libs \ |
65 |
--without-utils \ |
66 |
--without-daemon \ |
67 |
- --with-gui=$(usex qt5 qt5 qt4) \ |
68 |
- $(use_with dbus qtdbus) \ |
69 |
- $(use_with qrcode qrencode) \ |
70 |
+ --with-gui=$(usex qt5 qt5 qt4) \ |
71 |
+ $(use_with dbus qtdbus) \ |
72 |
+ $(use_with qrcode qrencode) \ |
73 |
${my_econf} |
74 |
} |
75 |
|
76 |
|
77 |
diff --git a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild |
78 |
deleted file mode 100644 |
79 |
index 2d33a74..0000000 |
80 |
--- a/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild |
81 |
+++ /dev/null |
82 |
@@ -1,143 +0,0 @@ |
83 |
-# Copyright 1999-2015 Gentoo Foundation |
84 |
-# Distributed under the terms of the GNU General Public License v2 |
85 |
-# $Id$ |
86 |
- |
87 |
-EAPI=5 |
88 |
- |
89 |
-DB_VER="4.8" |
90 |
- |
91 |
-LANGS="ach af_ZA ar be_BY bg bs ca_ES ca ca@valencia cmn cs cy da de el_GR en eo es_CL es_DO es_MX es es_UY et eu_ES fa_IR fa fi fr_CA fr gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_CN zh_HK zh_TW" |
92 |
- |
93 |
-inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 |
94 |
- |
95 |
-MyPV="${PV/_/-}" |
96 |
-MyPN="litecoin" |
97 |
-MyP="${MyPN}-${MyPV}" |
98 |
- |
99 |
-DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine" |
100 |
-HOMEPAGE="https://litecoin.org/" |
101 |
-SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyP}.tar.gz" |
102 |
- |
103 |
-LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )" |
104 |
-SLOT="0" |
105 |
-KEYWORDS="~amd64 ~x86" |
106 |
-IUSE="dbus kde +qrcode qt5 upnp" |
107 |
- |
108 |
-RDEPEND=" |
109 |
- dev-libs/boost[threads(+)] |
110 |
- dev-libs/openssl:0[-bindist] |
111 |
- dev-libs/protobuf:= |
112 |
- qrcode? ( |
113 |
- media-gfx/qrencode |
114 |
- ) |
115 |
- upnp? ( |
116 |
- net-libs/miniupnpc |
117 |
- ) |
118 |
- sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] |
119 |
- <=dev-libs/leveldb-1.15.0-r1 |
120 |
- !qt5? ( |
121 |
- dev-qt/qtgui:4 |
122 |
- dbus? ( |
123 |
- dev-qt/qtdbus:4 |
124 |
- ) |
125 |
- ) |
126 |
- qt5? ( |
127 |
- dev-qt/qtgui:5 |
128 |
- dbus? ( |
129 |
- dev-qt/qtdbus:5 |
130 |
- ) |
131 |
- ) |
132 |
-" |
133 |
-DEPEND="${RDEPEND} |
134 |
- >=app-shells/bash-4.1 |
135 |
-" |
136 |
- |
137 |
-DOCS="doc/README.md doc/release-notes.md" |
138 |
- |
139 |
-S="${WORKDIR}/${MyP}" |
140 |
- |
141 |
-src_prepare() { |
142 |
- epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" |
143 |
- eautoreconf |
144 |
- rm -r src/leveldb |
145 |
- |
146 |
- cd src || die |
147 |
- |
148 |
- local filt= yeslang= nolang= |
149 |
- |
150 |
- for lan in $LANGS; do |
151 |
- if [ ! -e qt/locale/bitcoin_$lan.ts ]; then |
152 |
- ewarn "Language '$lan' no longer supported. Ebuild needs update." |
153 |
- fi |
154 |
- done |
155 |
- |
156 |
- for ts in $(ls qt/locale/*.ts) |
157 |
- do |
158 |
- x="${ts/*bitcoin_/}" |
159 |
- x="${x/.ts/}" |
160 |
- if ! use "linguas_$x"; then |
161 |
- nolang="$nolang $x" |
162 |
- #rm "$ts" |
163 |
- filt="$filt\\|$x" |
164 |
- else |
165 |
- yeslang="$yeslang $x" |
166 |
- fi |
167 |
- done |
168 |
- |
169 |
- filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" |
170 |
- sed "/${filt}/d" -i 'qt/bitcoin_locale.qrc' |
171 |
- einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" |
172 |
-} |
173 |
- |
174 |
-src_configure() { |
175 |
- local my_econf= |
176 |
- if use upnp; then |
177 |
- my_econf="${my_econf} --with-miniupnpc --enable-upnp-default" |
178 |
- else |
179 |
- my_econf="${my_econf} --without-miniupnpc --disable-upnp-default" |
180 |
- fi |
181 |
- econf \ |
182 |
- --enable-wallet \ |
183 |
- --disable-ccache \ |
184 |
- --disable-static \ |
185 |
- --disable-tests \ |
186 |
- --with-system-leveldb \ |
187 |
- --with-system-libsecp256k1 \ |
188 |
- --without-libs \ |
189 |
- --without-utils \ |
190 |
- --without-daemon \ |
191 |
- --with-gui=$(usex qt5 qt5 qt4) \ |
192 |
- $(use_with dbus qtdbus) \ |
193 |
- $(use_with qrcode qrencode) \ |
194 |
- ${my_econf} |
195 |
-} |
196 |
- |
197 |
-src_install() { |
198 |
- default |
199 |
- |
200 |
- insinto /usr/share/pixmaps |
201 |
- newins "share/pixmaps/bitcoin.ico" "${PN}.ico" |
202 |
- |
203 |
- make_desktop_entry "${PN} %u" "Litecoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/litecoin;\nTerminal=false" |
204 |
- |
205 |
- newman contrib/debian/manpages/bitcoin-qt.1 ${PN}.1 |
206 |
- |
207 |
- if use kde; then |
208 |
- insinto /usr/share/kde4/services |
209 |
- newins contrib/debian/bitcoin-qt.protocol ${PN}.protocol |
210 |
- fi |
211 |
-} |
212 |
- |
213 |
-update_caches() { |
214 |
- gnome2_icon_cache_update |
215 |
- fdo-mime_desktop_database_update |
216 |
- buildsycoca |
217 |
-} |
218 |
- |
219 |
-pkg_postinst() { |
220 |
- update_caches |
221 |
-} |
222 |
- |
223 |
-pkg_postrm() { |
224 |
- update_caches |
225 |
-} |