1 |
commit: 41370b8a0a71e06d09487d321b8e45b0eeb80c63 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 8 15:05:51 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 9 12:40:10 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41370b8a |
7 |
|
8 |
net-im/psi: remove old |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
net-im/psi/Manifest | 4 - |
13 |
net-im/psi/files/psi-0.14-input-validation.patch | 257 -------------------- |
14 |
net-im/psi/files/psi-0.14-minizip-detection.patch | 284 ---------------------- |
15 |
net-im/psi/files/psi-0.14-qt-compat.patch | 40 --- |
16 |
net-im/psi/psi-0.14-r4.ebuild | 171 ------------- |
17 |
5 files changed, 756 deletions(-) |
18 |
|
19 |
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest |
20 |
index 266581a..edd5f48 100644 |
21 |
--- a/net-im/psi/Manifest |
22 |
+++ b/net-im/psi/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d WHIRLPOOL 95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da |
25 |
-DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9 WHIRLPOOL 79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a |
26 |
DIST psi-0.15.tar.bz2 1984777 SHA256 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a WHIRLPOOL 6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983 |
27 |
DIST psi-0.15_be.qm 255759 SHA256 0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad WHIRLPOOL f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667 |
28 |
DIST psi-0.15_cs.qm 242386 SHA256 d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f WHIRLPOOL d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31 |
29 |
@@ -14,5 +12,3 @@ DIST psi-0.15_sl.qm 248478 SHA256 5be33716a12b297d609ec7493f9da21a23b3ab89303dc6 |
30 |
DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0 |
31 |
DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5 |
32 |
DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344 |
33 |
-DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759 |
34 |
-DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40 |
35 |
|
36 |
diff --git a/net-im/psi/files/psi-0.14-input-validation.patch b/net-im/psi/files/psi-0.14-input-validation.patch |
37 |
deleted file mode 100644 |
38 |
index 7260c80..0000000 |
39 |
--- a/net-im/psi/files/psi-0.14-input-validation.patch |
40 |
+++ /dev/null |
41 |
@@ -1,257 +0,0 @@ |
42 |
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d |
43 |
-Author: rion <rion4ik@×××××.com> |
44 |
-Date: Fri Oct 7 22:19:05 2011 +0600 |
45 |
- |
46 |
- Fixed QLabel CVE |
47 |
- |
48 |
---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000 |
49 |
-+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000 |
50 |
-@@ -1,105 +1,118 @@ |
51 |
--<ui version="4.0" > |
52 |
-+<?xml version="1.0" encoding="UTF-8"?> |
53 |
-+<ui version="4.0"> |
54 |
- <class>CertificateDisplay</class> |
55 |
-- <widget class="QDialog" name="CertificateDisplay" > |
56 |
-- <property name="geometry" > |
57 |
-+ <widget class="QDialog" name="CertificateDisplay"> |
58 |
-+ <property name="geometry"> |
59 |
- <rect> |
60 |
- <x>0</x> |
61 |
- <y>0</y> |
62 |
-- <width>518</width> |
63 |
-+ <width>525</width> |
64 |
- <height>369</height> |
65 |
- </rect> |
66 |
- </property> |
67 |
-- <property name="windowTitle" > |
68 |
-+ <property name="windowTitle"> |
69 |
- <string>Certificate Information</string> |
70 |
- </property> |
71 |
-- <layout class="QVBoxLayout" > |
72 |
-- <property name="margin" > |
73 |
-+ <layout class="QVBoxLayout"> |
74 |
-+ <property name="spacing"> |
75 |
-+ <number>6</number> |
76 |
-+ </property> |
77 |
-+ <property name="margin"> |
78 |
- <number>11</number> |
79 |
- </property> |
80 |
-- <property name="spacing" > |
81 |
-- <number>6</number> |
82 |
-- </property> |
83 |
- <item> |
84 |
-- <layout class="QHBoxLayout" > |
85 |
-- <property name="margin" > |
86 |
-+ <layout class="QHBoxLayout"> |
87 |
-+ <property name="spacing"> |
88 |
-+ <number>6</number> |
89 |
-+ </property> |
90 |
-+ <property name="margin"> |
91 |
- <number>0</number> |
92 |
- </property> |
93 |
-- <property name="spacing" > |
94 |
-- <number>6</number> |
95 |
-- </property> |
96 |
- <item> |
97 |
-- <layout class="QVBoxLayout" > |
98 |
-- <property name="margin" > |
99 |
-+ <layout class="QVBoxLayout"> |
100 |
-+ <property name="spacing"> |
101 |
-+ <number>6</number> |
102 |
-+ </property> |
103 |
-+ <property name="margin"> |
104 |
- <number>0</number> |
105 |
- </property> |
106 |
-- <property name="spacing" > |
107 |
-- <number>6</number> |
108 |
-- </property> |
109 |
- <item> |
110 |
-- <widget class="QLabel" name="textLabel4" > |
111 |
-- <property name="text" > |
112 |
-+ <widget class="QLabel" name="textLabel4"> |
113 |
-+ <property name="text"> |
114 |
- <string>Certificate Validation:</string> |
115 |
- </property> |
116 |
- </widget> |
117 |
- </item> |
118 |
- <item> |
119 |
-- <widget class="QLabel" name="lb_valid" > |
120 |
-- <property name="text" > |
121 |
-+ <widget class="QLabel" name="lb_valid"> |
122 |
-+ <property name="text"> |
123 |
- <string/> |
124 |
- </property> |
125 |
-+ <property name="textFormat"> |
126 |
-+ <enum>Qt::PlainText</enum> |
127 |
-+ </property> |
128 |
- </widget> |
129 |
- </item> |
130 |
- <item> |
131 |
-- <widget class="QLabel" name="textLabel2" > |
132 |
-- <property name="text" > |
133 |
-+ <widget class="QLabel" name="textLabel2"> |
134 |
-+ <property name="text"> |
135 |
- <string>Valid From:</string> |
136 |
- </property> |
137 |
- </widget> |
138 |
- </item> |
139 |
- <item> |
140 |
-- <widget class="QLabel" name="lb_notBefore" > |
141 |
-- <property name="text" > |
142 |
-+ <widget class="QLabel" name="lb_notBefore"> |
143 |
-+ <property name="text"> |
144 |
- <string/> |
145 |
- </property> |
146 |
-+ <property name="textFormat"> |
147 |
-+ <enum>Qt::PlainText</enum> |
148 |
-+ </property> |
149 |
- </widget> |
150 |
- </item> |
151 |
- <item> |
152 |
-- <widget class="QLabel" name="textLabel3" > |
153 |
-- <property name="text" > |
154 |
-+ <widget class="QLabel" name="textLabel3"> |
155 |
-+ <property name="text"> |
156 |
- <string>Valid Until:</string> |
157 |
- </property> |
158 |
- </widget> |
159 |
- </item> |
160 |
- <item> |
161 |
-- <widget class="QLabel" name="lb_notAfter" > |
162 |
-- <property name="text" > |
163 |
-+ <widget class="QLabel" name="lb_notAfter"> |
164 |
-+ <property name="text"> |
165 |
- <string/> |
166 |
- </property> |
167 |
-+ <property name="textFormat"> |
168 |
-+ <enum>Qt::PlainText</enum> |
169 |
-+ </property> |
170 |
- </widget> |
171 |
- </item> |
172 |
- <item> |
173 |
-- <widget class="QLabel" name="textLabel1" > |
174 |
-- <property name="text" > |
175 |
-+ <widget class="QLabel" name="textLabel1"> |
176 |
-+ <property name="text"> |
177 |
- <string>Serial Number:</string> |
178 |
- </property> |
179 |
- </widget> |
180 |
- </item> |
181 |
- <item> |
182 |
-- <widget class="QLabel" name="lb_sn" > |
183 |
-- <property name="text" > |
184 |
-+ <widget class="QLabel" name="lb_sn"> |
185 |
-+ <property name="text"> |
186 |
- <string/> |
187 |
- </property> |
188 |
-+ <property name="textFormat"> |
189 |
-+ <enum>Qt::PlainText</enum> |
190 |
-+ </property> |
191 |
- </widget> |
192 |
- </item> |
193 |
- <item> |
194 |
- <spacer> |
195 |
-- <property name="orientation" > |
196 |
-+ <property name="orientation"> |
197 |
- <enum>Qt::Vertical</enum> |
198 |
- </property> |
199 |
-- <property name="sizeType" > |
200 |
-+ <property name="sizeType"> |
201 |
- <enum>QSizePolicy::Expanding</enum> |
202 |
- </property> |
203 |
-- <property name="sizeHint" > |
204 |
-+ <property name="sizeHint" stdset="0"> |
205 |
- <size> |
206 |
- <width>20</width> |
207 |
- <height>106</height> |
208 |
-@@ -110,14 +123,14 @@ |
209 |
- </layout> |
210 |
- </item> |
211 |
- <item> |
212 |
-- <widget class="QTextBrowser" name="tb_cert" > |
213 |
-- <property name="minimumSize" > |
214 |
-+ <widget class="QTextBrowser" name="tb_cert"> |
215 |
-+ <property name="minimumSize"> |
216 |
- <size> |
217 |
- <width>350</width> |
218 |
- <height>300</height> |
219 |
- </size> |
220 |
- </property> |
221 |
-- <property name="horizontalScrollBarPolicy" > |
222 |
-+ <property name="horizontalScrollBarPolicy"> |
223 |
- <enum>Qt::ScrollBarAlwaysOff</enum> |
224 |
- </property> |
225 |
- </widget> |
226 |
-@@ -125,35 +138,35 @@ |
227 |
- </layout> |
228 |
- </item> |
229 |
- <item> |
230 |
-- <widget class="Line" name="line1" > |
231 |
-- <property name="frameShape" > |
232 |
-+ <widget class="Line" name="line1"> |
233 |
-+ <property name="frameShape"> |
234 |
- <enum>QFrame::HLine</enum> |
235 |
- </property> |
236 |
-- <property name="frameShadow" > |
237 |
-+ <property name="frameShadow"> |
238 |
- <enum>QFrame::Sunken</enum> |
239 |
- </property> |
240 |
-- <property name="orientation" > |
241 |
-+ <property name="orientation"> |
242 |
- <enum>Qt::Horizontal</enum> |
243 |
- </property> |
244 |
- </widget> |
245 |
- </item> |
246 |
- <item> |
247 |
-- <layout class="QHBoxLayout" > |
248 |
-- <property name="margin" > |
249 |
-+ <layout class="QHBoxLayout"> |
250 |
-+ <property name="spacing"> |
251 |
-+ <number>6</number> |
252 |
-+ </property> |
253 |
-+ <property name="margin"> |
254 |
- <number>0</number> |
255 |
- </property> |
256 |
-- <property name="spacing" > |
257 |
-- <number>6</number> |
258 |
-- </property> |
259 |
- <item> |
260 |
- <spacer> |
261 |
-- <property name="orientation" > |
262 |
-+ <property name="orientation"> |
263 |
- <enum>Qt::Horizontal</enum> |
264 |
- </property> |
265 |
-- <property name="sizeType" > |
266 |
-+ <property name="sizeType"> |
267 |
- <enum>QSizePolicy::Expanding</enum> |
268 |
- </property> |
269 |
-- <property name="sizeHint" > |
270 |
-+ <property name="sizeHint" stdset="0"> |
271 |
- <size> |
272 |
- <width>421</width> |
273 |
- <height>20</height> |
274 |
-@@ -162,17 +175,17 @@ |
275 |
- </spacer> |
276 |
- </item> |
277 |
- <item> |
278 |
-- <widget class="QPushButton" native="1" name="pb_close"> |
279 |
-- <property name="text"> |
280 |
-- <string>Close</string> |
281 |
-- </property> |
282 |
-- </widget> |
283 |
-+ <widget class="QPushButton" name="pb_close"> |
284 |
-+ <property name="text"> |
285 |
-+ <string>Close</string> |
286 |
-+ </property> |
287 |
-+ </widget> |
288 |
- </item> |
289 |
- </layout> |
290 |
- </item> |
291 |
- </layout> |
292 |
- </widget> |
293 |
-- <layoutdefault spacing="6" margin="11" /> |
294 |
-+ <layoutdefault spacing="6" margin="11"/> |
295 |
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> |
296 |
- <tabstops> |
297 |
- <tabstop>tb_cert</tabstop> |
298 |
- |
299 |
|
300 |
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch |
301 |
deleted file mode 100644 |
302 |
index 1eff6da..0000000 |
303 |
--- a/net-im/psi/files/psi-0.14-minizip-detection.patch |
304 |
+++ /dev/null |
305 |
@@ -1,284 +0,0 @@ |
306 |
-=== modified file 'conf_windows.pri' |
307 |
---- conf_windows.pri 2011-10-25 10:03:42 +0000 |
308 |
-+++ conf_windows.pri 2011-10-25 10:04:13 +0000 |
309 |
-@@ -5,7 +5,7 @@ |
310 |
- #CONFIG += qca-static |
311 |
- |
312 |
- # tell iris to use our internal libz |
313 |
--CONFIG += psi-zip |
314 |
-+CONFIG += psi-winzlib |
315 |
- |
316 |
- # OpenSSL |
317 |
- qca-static { |
318 |
- |
319 |
-=== modified file 'configure' |
320 |
---- configure 2011-10-25 10:03:42 +0000 |
321 |
-+++ configure 2011-10-25 10:04:13 +0000 |
322 |
-@@ -955,41 +955,68 @@ |
323 |
- { |
324 |
- #ifdef Q_OS_WIN |
325 |
- // HACK: on windows, always use psi's bundled zlib |
326 |
-- conf->addExtra("CONFIG += psi-zip"); |
327 |
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip"); |
328 |
- return true; |
329 |
- #else |
330 |
-- QString inc, lib; |
331 |
-+ QStringList incs; |
332 |
-+ QString version, libs, other; |
333 |
- QString s; |
334 |
- |
335 |
-- s = conf->getenv("QC_WITH_ZLIB_INC"); |
336 |
-- if(!s.isEmpty()) { |
337 |
-- if(!conf->checkHeader(s, "zlib.h")) |
338 |
-- return false; |
339 |
-- inc = s; |
340 |
-- } |
341 |
-- else { |
342 |
-- if(!conf->findHeader("zlib.h", QStringList(), &s)) |
343 |
-- return false; |
344 |
-- inc = s; |
345 |
-- } |
346 |
-- |
347 |
-- s = conf->getenv("QC_WITH_ZLIB_LIB"); |
348 |
-- if(!s.isEmpty()) { |
349 |
-- if(!conf->checkLibrary(s, "z")) |
350 |
-- return false; |
351 |
-- lib = s; |
352 |
-- } |
353 |
-- else { |
354 |
-- if(!conf->findLibrary("z", &s)) |
355 |
-- return false; |
356 |
-- lib = s; |
357 |
-- } |
358 |
-- |
359 |
-- if(!inc.isEmpty()) |
360 |
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { |
361 |
-+ |
362 |
-+ s = conf->getenv("QC_WITH_ZLIB_INC"); |
363 |
-+ if(!s.isEmpty()) { |
364 |
-+ if(!conf->checkHeader(s, "zlib.h")) |
365 |
-+ return false; |
366 |
-+ } |
367 |
-+ else { |
368 |
-+ if(!conf->findHeader("zlib.h", QStringList(), &s)) |
369 |
-+ return false; |
370 |
-+ } |
371 |
-+ incs.append(s); |
372 |
-+ |
373 |
-+ s = conf->getenv("QC_WITH_ZLIB_LIB"); |
374 |
-+ if(!s.isEmpty()) { |
375 |
-+ if(!conf->checkLibrary(s, "z")) |
376 |
-+ return false; |
377 |
-+ } |
378 |
-+ else { |
379 |
-+ if(!conf->findLibrary("z", &s)) |
380 |
-+ return false; |
381 |
-+ } |
382 |
-+ libs = QString("-L%1 -lz").arg(s); |
383 |
-+ } |
384 |
-+ |
385 |
-+ foreach(const QString &inc, incs) { |
386 |
- conf->addIncludePath(inc); |
387 |
-- if(!lib.isEmpty()) |
388 |
-- conf->addLib(QString("-L") + s); |
389 |
-- conf->addLib("-lz"); |
390 |
-+ } |
391 |
-+ conf->addLib(libs); |
392 |
-+ |
393 |
-+ incs.clear(); |
394 |
-+ libs.clear(); |
395 |
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) { |
396 |
-+ |
397 |
-+ s = conf->getenv("QC_WITH_MINIZIP_INC"); |
398 |
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) || |
399 |
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) { |
400 |
-+ incs.append(s); |
401 |
-+ } |
402 |
-+ |
403 |
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB"); |
404 |
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) || |
405 |
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) { |
406 |
-+ libs = QString("-L%1 -lminizip").arg(s); |
407 |
-+ } |
408 |
-+ } |
409 |
-+ |
410 |
-+ if (!incs.isEmpty() && !libs.isEmpty()) { |
411 |
-+ foreach(const QString &inc, incs) { |
412 |
-+ conf->addIncludePath(inc); |
413 |
-+ } |
414 |
-+ conf->addLib(libs); |
415 |
-+ } else { |
416 |
-+ conf->addExtra("CONFIG += psi-minizip"); |
417 |
-+ } |
418 |
- |
419 |
- return true; |
420 |
- #endif |
421 |
- |
422 |
-=== modified file 'qcm/zlib.qcm' |
423 |
---- qcm/zlib.qcm 2011-10-25 10:03:42 +0000 |
424 |
-+++ qcm/zlib.qcm 2011-10-25 10:04:13 +0000 |
425 |
-@@ -26,41 +26,68 @@ |
426 |
- { |
427 |
- #ifdef Q_OS_WIN |
428 |
- // HACK: on windows, always use psi's bundled zlib |
429 |
-- conf->addExtra("CONFIG += psi-zip"); |
430 |
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip"); |
431 |
- return true; |
432 |
- #else |
433 |
-- QString inc, lib; |
434 |
-+ QStringList incs; |
435 |
-+ QString version, libs, other; |
436 |
- QString s; |
437 |
- |
438 |
-- s = conf->getenv("QC_WITH_ZLIB_INC"); |
439 |
-- if(!s.isEmpty()) { |
440 |
-- if(!conf->checkHeader(s, "zlib.h")) |
441 |
-- return false; |
442 |
-- inc = s; |
443 |
-- } |
444 |
-- else { |
445 |
-- if(!conf->findHeader("zlib.h", QStringList(), &s)) |
446 |
-- return false; |
447 |
-- inc = s; |
448 |
-- } |
449 |
-- |
450 |
-- s = conf->getenv("QC_WITH_ZLIB_LIB"); |
451 |
-- if(!s.isEmpty()) { |
452 |
-- if(!conf->checkLibrary(s, "z")) |
453 |
-- return false; |
454 |
-- lib = s; |
455 |
-- } |
456 |
-- else { |
457 |
-- if(!conf->findLibrary("z", &s)) |
458 |
-- return false; |
459 |
-- lib = s; |
460 |
-- } |
461 |
-- |
462 |
-- if(!inc.isEmpty()) |
463 |
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { |
464 |
-+ |
465 |
-+ s = conf->getenv("QC_WITH_ZLIB_INC"); |
466 |
-+ if(!s.isEmpty()) { |
467 |
-+ if(!conf->checkHeader(s, "zlib.h")) |
468 |
-+ return false; |
469 |
-+ } |
470 |
-+ else { |
471 |
-+ if(!conf->findHeader("zlib.h", QStringList(), &s)) |
472 |
-+ return false; |
473 |
-+ } |
474 |
-+ incs.append(s); |
475 |
-+ |
476 |
-+ s = conf->getenv("QC_WITH_ZLIB_LIB"); |
477 |
-+ if(!s.isEmpty()) { |
478 |
-+ if(!conf->checkLibrary(s, "z")) |
479 |
-+ return false; |
480 |
-+ } |
481 |
-+ else { |
482 |
-+ if(!conf->findLibrary("z", &s)) |
483 |
-+ return false; |
484 |
-+ } |
485 |
-+ libs = QString("-L%1 -lz").arg(s); |
486 |
-+ } |
487 |
-+ |
488 |
-+ foreach(const QString &inc, incs) { |
489 |
- conf->addIncludePath(inc); |
490 |
-- if(!lib.isEmpty()) |
491 |
-- conf->addLib(QString("-L") + s); |
492 |
-- conf->addLib("-lz"); |
493 |
-+ } |
494 |
-+ conf->addLib(libs); |
495 |
-+ |
496 |
-+ incs.clear(); |
497 |
-+ libs.clear(); |
498 |
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) { |
499 |
-+ |
500 |
-+ s = conf->getenv("QC_WITH_MINIZIP_INC"); |
501 |
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) || |
502 |
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) { |
503 |
-+ incs.append(s); |
504 |
-+ } |
505 |
-+ |
506 |
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB"); |
507 |
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) || |
508 |
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) { |
509 |
-+ libs = QString("-L%1 -lminizip").arg(s); |
510 |
-+ } |
511 |
-+ } |
512 |
-+ |
513 |
-+ if (!incs.isEmpty() && !libs.isEmpty()) { |
514 |
-+ foreach(const QString &inc, incs) { |
515 |
-+ conf->addIncludePath(inc); |
516 |
-+ } |
517 |
-+ conf->addLib(libs); |
518 |
-+ } else { |
519 |
-+ conf->addExtra("CONFIG += psi-minizip"); |
520 |
-+ } |
521 |
- |
522 |
- return true; |
523 |
- #endif |
524 |
- |
525 |
-=== modified file 'src/conf_iris.pri' |
526 |
---- src/conf_iris.pri 2011-10-25 10:03:42 +0000 |
527 |
-+++ src/conf_iris.pri 2011-10-25 10:04:13 +0000 |
528 |
-@@ -13,11 +13,6 @@ |
529 |
- CONFIG += crypto |
530 |
- } |
531 |
- |
532 |
--# use zlib from psi if necessary |
533 |
--psi-zip { |
534 |
-- INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32 |
535 |
--} |
536 |
-- |
537 |
- mac { |
538 |
- # Universal binaries |
539 |
- qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) { |
540 |
- |
541 |
-=== modified file 'src/libpsi/tools/zip/zip.cpp' |
542 |
---- src/libpsi/tools/zip/zip.cpp 2011-10-25 10:03:42 +0000 |
543 |
-+++ src/libpsi/tools/zip/zip.cpp 2011-10-25 10:04:13 +0000 |
544 |
-@@ -22,7 +22,11 @@ |
545 |
- #include <QStringList> |
546 |
- #include <QFile> |
547 |
- |
548 |
-+#ifdef PSIMINIZIP |
549 |
- #include "minizip/unzip.h" |
550 |
-+#else |
551 |
-+#include <minizip/unzip.h> |
552 |
-+#endif |
553 |
- #include "zip.h" |
554 |
- |
555 |
- class UnZipPrivate |
556 |
- |
557 |
-=== modified file 'src/libpsi/tools/zip/zip.pri' |
558 |
---- src/libpsi/tools/zip/zip.pri 2011-10-25 10:03:42 +0000 |
559 |
-+++ src/libpsi/tools/zip/zip.pri 2011-10-25 10:04:13 +0000 |
560 |
-@@ -2,17 +2,20 @@ |
561 |
- $$PWD/zip.h |
562 |
- |
563 |
- SOURCES += \ |
564 |
-- $$PWD/zip.cpp \ |
565 |
-- $$PWD/minizip/unzip.c |
566 |
-- |
567 |
--INCLUDEPATH += $$PWD |
568 |
--DEPENDPATH += $$PWD |
569 |
-- |
570 |
--win32: { |
571 |
-+ $$PWD/zip.cpp |
572 |
-+ |
573 |
-+psi-minizip { |
574 |
-+ SOURCES += $$PWD/minizip/unzip.c |
575 |
-+ DEFINES += PSIMINIZIP |
576 |
-+ INCLUDEPATH += $$PWD |
577 |
-+ DEPENDPATH += $$PWD |
578 |
-+} |
579 |
-+ |
580 |
-+psi-winzlib { |
581 |
- INCLUDEPATH += $$PWD/minizip/win32 |
582 |
- DEPENDPATH += $$PWD/minizip/win32 |
583 |
- LIBS += $$PWD/minizip/win32/libz.a |
584 |
- } |
585 |
--mac: { |
586 |
-+mac { |
587 |
- QMAKE_LFLAGS += -lz |
588 |
- } |
589 |
- |
590 |
|
591 |
diff --git a/net-im/psi/files/psi-0.14-qt-compat.patch b/net-im/psi/files/psi-0.14-qt-compat.patch |
592 |
deleted file mode 100644 |
593 |
index 99fa307..0000000 |
594 |
--- a/net-im/psi/files/psi-0.14-qt-compat.patch |
595 |
+++ /dev/null |
596 |
@@ -1,40 +0,0 @@ |
597 |
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd |
598 |
-Author: Michail Pishchagin <mblsha@×××××××××××××××××.net> |
599 |
-Date: Tue Oct 19 11:26:31 2010 +0400 |
600 |
- |
601 |
- Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087) |
602 |
- Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+ |
603 |
- |
604 |
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp |
605 |
-index 722b762..fd0a830 100644 |
606 |
---- a/src/mucaffiliationsmodel.cpp |
607 |
-+++ b/src/mucaffiliationsmodel.cpp |
608 |
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists() |
609 |
- |
610 |
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a) |
611 |
- { |
612 |
-+ emit layoutAboutToBeChanged(); |
613 |
- enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false; |
614 |
- QModelIndex index = affiliationListIndex(a); |
615 |
- if (hasChildren(index)) { |
616 |
- removeRows(0,rowCount(index),index); |
617 |
- } |
618 |
-+ emit layoutChanged(); |
619 |
- } |
620 |
- |
621 |
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b) |
622 |
- { |
623 |
-+ emit layoutAboutToBeChanged(); |
624 |
- QModelIndex index = affiliationListIndex(a); |
625 |
- enabled_[(AffiliationListIndex) index.row()] = b; |
626 |
- emit layoutChanged(); |
627 |
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items) |
628 |
- foreach(MUCItem item, items) { |
629 |
- QModelIndex list = affiliationListIndex(item.affiliation()); |
630 |
- if (list.isValid() && !item.jid().isEmpty()) { |
631 |
-+ if (!dirty) { |
632 |
-+ emit layoutAboutToBeChanged(); |
633 |
-+ } |
634 |
- int row = rowCount(list); |
635 |
- if (row == 0) { |
636 |
- enabled_[(AffiliationListIndex) list.row()] = true; |
637 |
|
638 |
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild |
639 |
deleted file mode 100644 |
640 |
index fe68d9c..0000000 |
641 |
--- a/net-im/psi/psi-0.14-r4.ebuild |
642 |
+++ /dev/null |
643 |
@@ -1,171 +0,0 @@ |
644 |
-# Copyright 1999-2015 Gentoo Foundation |
645 |
-# Distributed under the terms of the GNU General Public License v2 |
646 |
-# $Id$ |
647 |
- |
648 |
-EAPI=4 |
649 |
- |
650 |
-inherit eutils qt4-r2 multilib |
651 |
- |
652 |
-MY_P="${P/_rc/-rc}" |
653 |
- |
654 |
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface" |
655 |
-HOMEPAGE="http://psi-im.org/" |
656 |
-# Langpack: |
657 |
-# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html |
658 |
-# Later found his site: http://fs.scs-tsa.de/psi_l10n/ |
659 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 |
660 |
- http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip |
661 |
- extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2 |
662 |
- mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )" |
663 |
- |
664 |
-LICENSE="GPL-2" |
665 |
-SLOT="0" |
666 |
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd" |
667 |
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit" |
668 |
-RESTRICT="test" |
669 |
- |
670 |
-LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW" |
671 |
-for LNG in ${LANGS}; do |
672 |
- IUSE="${IUSE} linguas_${LNG}" |
673 |
- #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm" |
674 |
-done |
675 |
- |
676 |
-RDEPEND=" |
677 |
- app-arch/unzip |
678 |
- =app-crypt/qca-2.0*[qt4(+)] |
679 |
- dev-qt/qt3support:4 |
680 |
- dev-qt/qtcore:4 |
681 |
- dev-qt/qtgui:4[qt3support] |
682 |
- >=sys-libs/zlib-1.2.5.1-r2[minizip] |
683 |
- dbus? ( dev-qt/qtdbus:4 ) |
684 |
- extras? ( webkit? ( dev-qt/qtwebkit:4 ) ) |
685 |
- spell? ( >=app-text/enchant-1.3.0 ) |
686 |
- xscreensaver? ( x11-libs/libXScrnSaver ) |
687 |
-" |
688 |
-DEPEND="${RDEPEND} |
689 |
- sys-devel/qconf |
690 |
- doc? ( app-doc/doxygen ) |
691 |
-" |
692 |
-PDEPEND=" |
693 |
- crypt? ( app-crypt/qca:2[gpg] ) |
694 |
- jingle? ( |
695 |
- net-im/psimedia |
696 |
- app-crypt/qca:2[openssl] |
697 |
- ) |
698 |
- ssl? ( app-crypt/qca:2[openssl] ) |
699 |
-" |
700 |
- |
701 |
-S=${WORKDIR}/${MY_P} |
702 |
- |
703 |
-src_prepare() { |
704 |
- epatch "${FILESDIR}/psi-0.14-qt-compat.patch" |
705 |
- epatch "${FILESDIR}/psi-0.14-minizip-detection.patch" |
706 |
- epatch "${FILESDIR}/psi-0.14-input-validation.patch" |
707 |
- epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch" |
708 |
- sed -i '/#include <errno.h>/a #include <unistd.h>' \ |
709 |
- iris/src/irisnet/corelib/netinterface_unix.cpp || die 'sed failed' |
710 |
- |
711 |
- if use extras; then |
712 |
- # some patches from psi+ project https://code.google.com/p/psi-dev |
713 |
- ewarn "You're about to build heavily patched version of Psi called Psi+." |
714 |
- ewarn "It has really nice features but still is under heavy development." |
715 |
- ewarn "Take a look at homepage for more info: https://code.google.com/p/psi-dev" |
716 |
- ewarn "If you wish to disable some patches just put" |
717 |
- ewarn "MY_EPATCH_EXCLUDE=\"list of patches\"" |
718 |
- ewarn "into /etc/portage/env/${CATEGORY}/${PN} file." |
719 |
- ewarn |
720 |
- ewarn "Note: some patches depend on other. So if you disabled some patch" |
721 |
- ewarn "and other started to fail to apply, you'll have to disable patches" |
722 |
- ewarn "that fail too." |
723 |
- |
724 |
- EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} |
725 |
- 005-less-includes.diff |
726 |
- 755-psiplus-fix-application-info-defines.diff |
727 |
- 9999-psiplus-application-info.diff" \ |
728 |
- EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch |
729 |
- sed -e 's/\(^#define PROG_CAPS_NODE \).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \ |
730 |
- -e 's:\(^#define PROG_NAME "Psi\):\1+:' \ |
731 |
- -i src/applicationinfo.cpp || die |
732 |
- else |
733 |
- if use webkit; then |
734 |
- ewarn "Webkit support disabled as it is only available in Psi+" |
735 |
- ewarn "(USE='extras' enabled)." |
736 |
- fi |
737 |
- fi |
738 |
- |
739 |
- qconf || die "Failed to create ./configure." |
740 |
- rm -rf third-party/qca || die # We use system libraries. |
741 |
-} |
742 |
- |
743 |
-src_configure() { |
744 |
- # unable to use econf because of non-standard configure script |
745 |
- # disable growl as it is a MacOS X extension only |
746 |
- local confcmd="./configure |
747 |
- --prefix=/usr |
748 |
- --qtdir=/usr |
749 |
- --disable-bundled-qca |
750 |
- --disable-growl |
751 |
- $(use dbus || echo '--disable-qdbus') |
752 |
- $(use debug && echo '--debug') |
753 |
- $(use spell || echo '--disable-aspell') |
754 |
- $(use spell || echo '--disable-enchant') |
755 |
- $(use xscreensaver || echo '--disable-xss') |
756 |
- $(use extras && { use webkit && echo '--enable-qtwebkit';} )" |
757 |
- |
758 |
- echo ${confcmd} |
759 |
- ${confcmd} || die "configure failed" |
760 |
- # Makefile is not always created... |
761 |
- [[ ! -f Makefile ]] && die "configure failed" |
762 |
-} |
763 |
- |
764 |
-src_compile() { |
765 |
- eqmake4 |
766 |
- |
767 |
- emake |
768 |
- |
769 |
- if use doc; then |
770 |
- cd doc || die |
771 |
- mkdir -p api || die # 259632 |
772 |
- emake api_public |
773 |
- fi |
774 |
-} |
775 |
- |
776 |
-src_install() { |
777 |
- emake INSTALL_ROOT="${D}" install |
778 |
- rm "${D}"/usr/share/psi/{COPYING,README} || die |
779 |
- |
780 |
- # this way the docs will be installed in the standard gentoo dir |
781 |
- newdoc iconsets/roster/README README.roster |
782 |
- newdoc iconsets/system/README README.system |
783 |
- newdoc certs/README README.certs |
784 |
- dodoc README |
785 |
- |
786 |
- if use doc; then |
787 |
- cd doc || die |
788 |
- dohtml -r api |
789 |
- fi |
790 |
- |
791 |
- # install translations |
792 |
- cd "${WORKDIR}" || die |
793 |
- insinto /usr/share/${PN}/ |
794 |
- local nolangs=true |
795 |
- for LNG in ${LANGS}; do |
796 |
- if use linguas_${LNG}; then |
797 |
- doins ${LNG}/${PN}_${LNG}.qm |
798 |
- newins ${LNG}/INFO INFO.${LNG} |
799 |
- nolangs=false |
800 |
- fi |
801 |
- done |
802 |
- |
803 |
- # if linguas is empty install all translations |
804 |
- if ${nolangs}; then |
805 |
- for LNG in ${LANGS}; do |
806 |
- doins ${LNG}/${PN}_${LNG}.qm |
807 |
- newins ${LNG}/INFO INFO.${LNG} |
808 |
- done |
809 |
- fi |
810 |
- |
811 |
- if use extras; then |
812 |
- cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die |
813 |
- fi |
814 |
-} |