* [gentoo-commits] repo/gentoo:master commit in: net-im/psi/, net-im/psi/files/
@ 2015-10-09 12:40 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2015-10-09 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 41370b8a0a71e06d09487d321b8e45b0eeb80c63
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 15:05:51 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 12:40:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41370b8a
net-im/psi: remove old
Package-Manager: portage-2.2.20.1
net-im/psi/Manifest | 4 -
net-im/psi/files/psi-0.14-input-validation.patch | 257 --------------------
net-im/psi/files/psi-0.14-minizip-detection.patch | 284 ----------------------
net-im/psi/files/psi-0.14-qt-compat.patch | 40 ---
net-im/psi/psi-0.14-r4.ebuild | 171 -------------
5 files changed, 756 deletions(-)
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 266581a..edd5f48 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,3 @@
-DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d WHIRLPOOL 95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da
-DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9 WHIRLPOOL 79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a
DIST psi-0.15.tar.bz2 1984777 SHA256 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a WHIRLPOOL 6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983
DIST psi-0.15_be.qm 255759 SHA256 0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad WHIRLPOOL f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667
DIST psi-0.15_cs.qm 242386 SHA256 d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f WHIRLPOOL d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31
@@ -14,5 +12,3 @@ DIST psi-0.15_sl.qm 248478 SHA256 5be33716a12b297d609ec7493f9da21a23b3ab89303dc6
DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0
DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5
DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
-DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
-DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
diff --git a/net-im/psi/files/psi-0.14-input-validation.patch b/net-im/psi/files/psi-0.14-input-validation.patch
deleted file mode 100644
index 7260c80..0000000
--- a/net-im/psi/files/psi-0.14-input-validation.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d
-Author: rion <rion4ik@gmail.com>
-Date: Fri Oct 7 22:19:05 2011 +0600
-
- Fixed QLabel CVE
-
---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000
-+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000
-@@ -1,105 +1,118 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
- <class>CertificateDisplay</class>
-- <widget class="QDialog" name="CertificateDisplay" >
-- <property name="geometry" >
-+ <widget class="QDialog" name="CertificateDisplay">
-+ <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>518</width>
-+ <width>525</width>
- <height>369</height>
- </rect>
- </property>
-- <property name="windowTitle" >
-+ <property name="windowTitle">
- <string>Certificate Information</string>
- </property>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>11</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <layout class="QVBoxLayout" >
-- <property name="margin" >
-+ <layout class="QVBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
-- <widget class="QLabel" name="textLabel4" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel4">
-+ <property name="text">
- <string>Certificate Validation:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_valid" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_valid">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel2" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel2">
-+ <property name="text">
- <string>Valid From:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notBefore" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notBefore">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel3" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel3">
-+ <property name="text">
- <string>Valid Until:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_notAfter" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_notAfter">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="textLabel1" >
-- <property name="text" >
-+ <widget class="QLabel" name="textLabel1">
-+ <property name="text">
- <string>Serial Number:</string>
- </property>
- </widget>
- </item>
- <item>
-- <widget class="QLabel" name="lb_sn" >
-- <property name="text" >
-+ <widget class="QLabel" name="lb_sn">
-+ <property name="text">
- <string/>
- </property>
-+ <property name="textFormat">
-+ <enum>Qt::PlainText</enum>
-+ </property>
- </widget>
- </item>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>106</height>
-@@ -110,14 +123,14 @@
- </layout>
- </item>
- <item>
-- <widget class="QTextBrowser" name="tb_cert" >
-- <property name="minimumSize" >
-+ <widget class="QTextBrowser" name="tb_cert">
-+ <property name="minimumSize">
- <size>
- <width>350</width>
- <height>300</height>
- </size>
- </property>
-- <property name="horizontalScrollBarPolicy" >
-+ <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- </widget>
-@@ -125,35 +138,35 @@
- </layout>
- </item>
- <item>
-- <widget class="Line" name="line1" >
-- <property name="frameShape" >
-+ <widget class="Line" name="line1">
-+ <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
-- <property name="frameShadow" >
-+ <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
-- <layout class="QHBoxLayout" >
-- <property name="margin" >
-+ <layout class="QHBoxLayout">
-+ <property name="spacing">
-+ <number>6</number>
-+ </property>
-+ <property name="margin">
- <number>0</number>
- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
- <item>
- <spacer>
-- <property name="orientation" >
-+ <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
-- <property name="sizeType" >
-+ <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
-- <property name="sizeHint" >
-+ <property name="sizeHint" stdset="0">
- <size>
- <width>421</width>
- <height>20</height>
-@@ -162,17 +175,17 @@
- </spacer>
- </item>
- <item>
-- <widget class="QPushButton" native="1" name="pb_close">
-- <property name="text">
-- <string>Close</string>
-- </property>
-- </widget>
-+ <widget class="QPushButton" name="pb_close">
-+ <property name="text">
-+ <string>Close</string>
-+ </property>
-+ </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
- <tabstop>tb_cert</tabstop>
-
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
deleted file mode 100644
index 1eff6da..0000000
--- a/net-im/psi/files/psi-0.14-minizip-detection.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-=== modified file 'conf_windows.pri'
---- conf_windows.pri 2011-10-25 10:03:42 +0000
-+++ conf_windows.pri 2011-10-25 10:04:13 +0000
-@@ -5,7 +5,7 @@
- #CONFIG += qca-static
-
- # tell iris to use our internal libz
--CONFIG += psi-zip
-+CONFIG += psi-winzlib
-
- # OpenSSL
- qca-static {
-
-=== modified file 'configure'
---- configure 2011-10-25 10:03:42 +0000
-+++ configure 2011-10-25 10:04:13 +0000
-@@ -955,41 +955,68 @@
- {
- #ifdef Q_OS_WIN
- // HACK: on windows, always use psi's bundled zlib
-- conf->addExtra("CONFIG += psi-zip");
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
- return true;
- #else
-- QString inc, lib;
-+ QStringList incs;
-+ QString version, libs, other;
- QString s;
-
-- s = conf->getenv("QC_WITH_ZLIB_INC");
-- if(!s.isEmpty()) {
-- if(!conf->checkHeader(s, "zlib.h"))
-- return false;
-- inc = s;
-- }
-- else {
-- if(!conf->findHeader("zlib.h", QStringList(), &s))
-- return false;
-- inc = s;
-- }
--
-- s = conf->getenv("QC_WITH_ZLIB_LIB");
-- if(!s.isEmpty()) {
-- if(!conf->checkLibrary(s, "z"))
-- return false;
-- lib = s;
-- }
-- else {
-- if(!conf->findLibrary("z", &s))
-- return false;
-- lib = s;
-- }
--
-- if(!inc.isEmpty())
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_ZLIB_INC");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkHeader(s, "zlib.h"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findHeader("zlib.h", QStringList(), &s))
-+ return false;
-+ }
-+ incs.append(s);
-+
-+ s = conf->getenv("QC_WITH_ZLIB_LIB");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkLibrary(s, "z"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findLibrary("z", &s))
-+ return false;
-+ }
-+ libs = QString("-L%1 -lz").arg(s);
-+ }
-+
-+ foreach(const QString &inc, incs) {
- conf->addIncludePath(inc);
-- if(!lib.isEmpty())
-- conf->addLib(QString("-L") + s);
-- conf->addLib("-lz");
-+ }
-+ conf->addLib(libs);
-+
-+ incs.clear();
-+ libs.clear();
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_INC");
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
-+ incs.append(s);
-+ }
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB");
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
-+ libs = QString("-L%1 -lminizip").arg(s);
-+ }
-+ }
-+
-+ if (!incs.isEmpty() && !libs.isEmpty()) {
-+ foreach(const QString &inc, incs) {
-+ conf->addIncludePath(inc);
-+ }
-+ conf->addLib(libs);
-+ } else {
-+ conf->addExtra("CONFIG += psi-minizip");
-+ }
-
- return true;
- #endif
-
-=== modified file 'qcm/zlib.qcm'
---- qcm/zlib.qcm 2011-10-25 10:03:42 +0000
-+++ qcm/zlib.qcm 2011-10-25 10:04:13 +0000
-@@ -26,41 +26,68 @@
- {
- #ifdef Q_OS_WIN
- // HACK: on windows, always use psi's bundled zlib
-- conf->addExtra("CONFIG += psi-zip");
-+ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
- return true;
- #else
-- QString inc, lib;
-+ QStringList incs;
-+ QString version, libs, other;
- QString s;
-
-- s = conf->getenv("QC_WITH_ZLIB_INC");
-- if(!s.isEmpty()) {
-- if(!conf->checkHeader(s, "zlib.h"))
-- return false;
-- inc = s;
-- }
-- else {
-- if(!conf->findHeader("zlib.h", QStringList(), &s))
-- return false;
-- inc = s;
-- }
--
-- s = conf->getenv("QC_WITH_ZLIB_LIB");
-- if(!s.isEmpty()) {
-- if(!conf->checkLibrary(s, "z"))
-- return false;
-- lib = s;
-- }
-- else {
-- if(!conf->findLibrary("z", &s))
-- return false;
-- lib = s;
-- }
--
-- if(!inc.isEmpty())
-+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_ZLIB_INC");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkHeader(s, "zlib.h"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findHeader("zlib.h", QStringList(), &s))
-+ return false;
-+ }
-+ incs.append(s);
-+
-+ s = conf->getenv("QC_WITH_ZLIB_LIB");
-+ if(!s.isEmpty()) {
-+ if(!conf->checkLibrary(s, "z"))
-+ return false;
-+ }
-+ else {
-+ if(!conf->findLibrary("z", &s))
-+ return false;
-+ }
-+ libs = QString("-L%1 -lz").arg(s);
-+ }
-+
-+ foreach(const QString &inc, incs) {
- conf->addIncludePath(inc);
-- if(!lib.isEmpty())
-- conf->addLib(QString("-L") + s);
-- conf->addLib("-lz");
-+ }
-+ conf->addLib(libs);
-+
-+ incs.clear();
-+ libs.clear();
-+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_INC");
-+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
-+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
-+ incs.append(s);
-+ }
-+
-+ s = conf->getenv("QC_WITH_MINIZIP_LIB");
-+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
-+ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
-+ libs = QString("-L%1 -lminizip").arg(s);
-+ }
-+ }
-+
-+ if (!incs.isEmpty() && !libs.isEmpty()) {
-+ foreach(const QString &inc, incs) {
-+ conf->addIncludePath(inc);
-+ }
-+ conf->addLib(libs);
-+ } else {
-+ conf->addExtra("CONFIG += psi-minizip");
-+ }
-
- return true;
- #endif
-
-=== modified file 'src/conf_iris.pri'
---- src/conf_iris.pri 2011-10-25 10:03:42 +0000
-+++ src/conf_iris.pri 2011-10-25 10:04:13 +0000
-@@ -13,11 +13,6 @@
- CONFIG += crypto
- }
-
--# use zlib from psi if necessary
--psi-zip {
-- INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
--}
--
- mac {
- # Universal binaries
- qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
-
-=== modified file 'src/libpsi/tools/zip/zip.cpp'
---- src/libpsi/tools/zip/zip.cpp 2011-10-25 10:03:42 +0000
-+++ src/libpsi/tools/zip/zip.cpp 2011-10-25 10:04:13 +0000
-@@ -22,7 +22,11 @@
- #include <QStringList>
- #include <QFile>
-
-+#ifdef PSIMINIZIP
- #include "minizip/unzip.h"
-+#else
-+#include <minizip/unzip.h>
-+#endif
- #include "zip.h"
-
- class UnZipPrivate
-
-=== modified file 'src/libpsi/tools/zip/zip.pri'
---- src/libpsi/tools/zip/zip.pri 2011-10-25 10:03:42 +0000
-+++ src/libpsi/tools/zip/zip.pri 2011-10-25 10:04:13 +0000
-@@ -2,17 +2,20 @@
- $$PWD/zip.h
-
- SOURCES += \
-- $$PWD/zip.cpp \
-- $$PWD/minizip/unzip.c
--
--INCLUDEPATH += $$PWD
--DEPENDPATH += $$PWD
--
--win32: {
-+ $$PWD/zip.cpp
-+
-+psi-minizip {
-+ SOURCES += $$PWD/minizip/unzip.c
-+ DEFINES += PSIMINIZIP
-+ INCLUDEPATH += $$PWD
-+ DEPENDPATH += $$PWD
-+}
-+
-+psi-winzlib {
- INCLUDEPATH += $$PWD/minizip/win32
- DEPENDPATH += $$PWD/minizip/win32
- LIBS += $$PWD/minizip/win32/libz.a
- }
--mac: {
-+mac {
- QMAKE_LFLAGS += -lz
- }
-
diff --git a/net-im/psi/files/psi-0.14-qt-compat.patch b/net-im/psi/files/psi-0.14-qt-compat.patch
deleted file mode 100644
index 99fa307..0000000
--- a/net-im/psi/files/psi-0.14-qt-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
-Author: Michail Pishchagin <mblsha@users.sourceforge.net>
-Date: Tue Oct 19 11:26:31 2010 +0400
-
- Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
- Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
-
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
-index 722b762..fd0a830 100644
---- a/src/mucaffiliationsmodel.cpp
-+++ b/src/mucaffiliationsmodel.cpp
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
-
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
- {
-+ emit layoutAboutToBeChanged();
- enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
- QModelIndex index = affiliationListIndex(a);
- if (hasChildren(index)) {
- removeRows(0,rowCount(index),index);
- }
-+ emit layoutChanged();
- }
-
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
- {
-+ emit layoutAboutToBeChanged();
- QModelIndex index = affiliationListIndex(a);
- enabled_[(AffiliationListIndex) index.row()] = b;
- emit layoutChanged();
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
- foreach(MUCItem item, items) {
- QModelIndex list = affiliationListIndex(item.affiliation());
- if (list.isValid() && !item.jid().isEmpty()) {
-+ if (!dirty) {
-+ emit layoutAboutToBeChanged();
-+ }
- int row = rowCount(list);
- if (row == 0) {
- enabled_[(AffiliationListIndex) list.row()] = true;
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
deleted file mode 100644
index fe68d9c..0000000
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils qt4-r2 multilib
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# Langpack:
-# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
-# Later found his site: http://fs.scs-tsa.de/psi_l10n/
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
- http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
- extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
- mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
-RESTRICT="test"
-
-LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
-for LNG in ${LANGS}; do
- IUSE="${IUSE} linguas_${LNG}"
- #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
-done
-
-RDEPEND="
- app-arch/unzip
- =app-crypt/qca-2.0*[qt4(+)]
- dev-qt/qt3support:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4[qt3support]
- >=sys-libs/zlib-1.2.5.1-r2[minizip]
- dbus? ( dev-qt/qtdbus:4 )
- extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
- spell? ( >=app-text/enchant-1.3.0 )
- xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- sys-devel/qconf
- doc? ( app-doc/doxygen )
-"
-PDEPEND="
- crypt? ( app-crypt/qca:2[gpg] )
- jingle? (
- net-im/psimedia
- app-crypt/qca:2[openssl]
- )
- ssl? ( app-crypt/qca:2[openssl] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}/psi-0.14-qt-compat.patch"
- epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
- epatch "${FILESDIR}/psi-0.14-input-validation.patch"
- epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch"
- sed -i '/#include <errno.h>/a #include <unistd.h>' \
- iris/src/irisnet/corelib/netinterface_unix.cpp || die 'sed failed'
-
- if use extras; then
- # some patches from psi+ project https://code.google.com/p/psi-dev
- ewarn "You're about to build heavily patched version of Psi called Psi+."
- ewarn "It has really nice features but still is under heavy development."
- ewarn "Take a look at homepage for more info: https://code.google.com/p/psi-dev"
- ewarn "If you wish to disable some patches just put"
- ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
- ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
- ewarn
- ewarn "Note: some patches depend on other. So if you disabled some patch"
- ewarn "and other started to fail to apply, you'll have to disable patches"
- ewarn "that fail too."
-
- EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
- 005-less-includes.diff
- 755-psiplus-fix-application-info-defines.diff
- 9999-psiplus-application-info.diff" \
- EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
- sed -e 's/\(^#define PROG_CAPS_NODE \).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
- -e 's:\(^#define PROG_NAME "Psi\):\1+:' \
- -i src/applicationinfo.cpp || die
- else
- if use webkit; then
- ewarn "Webkit support disabled as it is only available in Psi+"
- ewarn "(USE='extras' enabled)."
- fi
- fi
-
- qconf || die "Failed to create ./configure."
- rm -rf third-party/qca || die # We use system libraries.
-}
-
-src_configure() {
- # unable to use econf because of non-standard configure script
- # disable growl as it is a MacOS X extension only
- local confcmd="./configure
- --prefix=/usr
- --qtdir=/usr
- --disable-bundled-qca
- --disable-growl
- $(use dbus || echo '--disable-qdbus')
- $(use debug && echo '--debug')
- $(use spell || echo '--disable-aspell')
- $(use spell || echo '--disable-enchant')
- $(use xscreensaver || echo '--disable-xss')
- $(use extras && { use webkit && echo '--enable-qtwebkit';} )"
-
- echo ${confcmd}
- ${confcmd} || die "configure failed"
- # Makefile is not always created...
- [[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
- eqmake4
-
- emake
-
- if use doc; then
- cd doc || die
- mkdir -p api || die # 259632
- emake api_public
- fi
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- rm "${D}"/usr/share/psi/{COPYING,README} || die
-
- # this way the docs will be installed in the standard gentoo dir
- newdoc iconsets/roster/README README.roster
- newdoc iconsets/system/README README.system
- newdoc certs/README README.certs
- dodoc README
-
- if use doc; then
- cd doc || die
- dohtml -r api
- fi
-
- # install translations
- cd "${WORKDIR}" || die
- insinto /usr/share/${PN}/
- local nolangs=true
- for LNG in ${LANGS}; do
- if use linguas_${LNG}; then
- doins ${LNG}/${PN}_${LNG}.qm
- newins ${LNG}/INFO INFO.${LNG}
- nolangs=false
- fi
- done
-
- # if linguas is empty install all translations
- if ${nolangs}; then
- for LNG in ${LANGS}; do
- doins ${LNG}/${PN}_${LNG}.qm
- newins ${LNG}/INFO INFO.${LNG}
- done
- fi
-
- if use extras; then
- cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/psi/, net-im/psi/files/
@ 2017-03-26 9:25 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-03-26 9:25 UTC (permalink / raw
To: gentoo-commits
commit: c61e8ac69f13196253142b90d46346c28c57c67f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 09:20:39 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 09:24:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61e8ac6
net-im/psi: Fix configure w/ >=qconf-2.0
Thanks-to: Rion <rion4ik <AT> gmail.com>
Gentoo-bug: 607644
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-im/psi/files/psi-0.15-qconf-2.patch | 87 +++++++++++++++++++++++++++++++++
net-im/psi/psi-0.15.ebuild | 3 +-
2 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/net-im/psi/files/psi-0.15-qconf-2.patch b/net-im/psi/files/psi-0.15-qconf-2.patch
new file mode 100644
index 00000000000..fb62e66f726
--- /dev/null
+++ b/net-im/psi/files/psi-0.15-qconf-2.patch
@@ -0,0 +1,87 @@
+--- a/qcm/recursiveprl.qcm
++++ a/qcm/recursiveprl.qcm
+@@ -39,10 +39,11 @@ public:
+ return false;
+ }
+
++ QFileInfo fi(qc_getenv("QC_COMMAND"));
+ QStringList args;
+ args += "-prl";
+ args += "-r";
+- args += qc_getenv("QC_PROFILE");
++ args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
+ if(conf->doCommand(conf->qmake_path, args) != 0)
+ {
+ success = false;
+@@ -91,9 +92,9 @@ public:
+ if(!conf->DEFINES.isEmpty())
+ str += "DEFINES += " + conf->DEFINES + '\n';
+ if(!conf->INCLUDEPATH.isEmpty())
+- str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
++ str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n';
+ if(!conf->LIBS.isEmpty())
+- str += "LIBS += " + conf->LIBS + '\n';
++ str += "LIBS += " + conf->escapedLibs() + '\n';
+ if(!conf->extra.isEmpty())
+ str += conf->extra;
+ str += '\n';
+--- a/qcm/zlib.qcm
++++ a/qcm/zlib.qcm
+@@ -21,6 +21,8 @@ public:
+ QStringList incs;
+ QString version, libs, other;
+ QString s;
++
++
+
+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
+
+@@ -33,21 +35,37 @@ public:
+ if(!conf->findHeader("zlib.h", QStringList(), &s))
+ return false;
+ }
+- incs.append(s.replace("\\\", "\\\\\\\"));
+
+- s = conf->getenv("QC_WITH_ZLIB_LIB");
+- if(!s.isEmpty()) {
+- if(!conf->checkLibrary(s, "z"))
+- return false;
+- }
+- else {
+- if(!conf->findLibrary("z", &s))
+- return false;
++ QStringList libNames = QStringList() << "z";
++ QString libName;
++#ifdef Q_OS_WIN
++ libNames << (qc_buildmode_debug? "zlibd" : "zlib");
++#endif
++ for (;;) {
++ s = conf->getenv("QC_WITH_ZLIB_LIB");
++ if(!s.isEmpty()) {
++ foreach (const QString l, libNames)
++ if(conf->checkLibrary(s, l)) {
++ libName = l;
++ break;
++ }
++ } else {
++ foreach (const QString l, libNames)
++ if(conf->findLibrary(l, &s)) {
++ libName = l;
++ break;
++ }
++ }
++
++ if(!libName.isEmpty())
++ break;
++
++ return false;
+ }
+ if (!s.isEmpty()) {
+- libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\"));
++ libs = QString("-L%1 -l%2").arg(s, libName);
+ } else {
+- libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
++ libs = s.isEmpty()? QString("-l")+libName : QString("-L%1 -l%2").arg(s, libName);
+ }
+ }
+
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 17f983d8341..2c60b4f0e87 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -51,6 +51,7 @@ FORCE_PRINT_ELOG=1
src_prepare() {
epatch "${FILESDIR}/${PN}-0.14-drop-debug-cflags.patch"
+ epatch "${FILESDIR}/${P}-qconf-2.patch"
epatch_user
qconf || die "Failed to create ./configure."
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-26 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-26 9:25 [gentoo-commits] repo/gentoo:master commit in: net-im/psi/, net-im/psi/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2015-10-09 12:40 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox