diff options
| -rw-r--r-- | net-im/psi/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/psi/files/psi-0.14-minizip-detection.patch | 39 | ||||
| -rw-r--r-- | net-im/psi/psi-0.14-r4.ebuild | 8 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 3 |
4 files changed, 33 insertions, 24 deletions
diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 2a62055f2219..f69e0397d7f3 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/psi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.219 2011/10/23 11:33:51 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.220 2011/10/25 10:13:42 pva Exp $ + + 25 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild, + files/psi-0.14-minizip-detection.patch, psi-9999.ebuild: + Fix build issue, bug #387985 thank Nikolaj Sjujskij for report and Rion for + fix. 23 Oct 2011; Markus Meier <maekke@gentoo.org> psi-0.14-r4.ebuild: x86 stable, bug #384227 diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch index 61ad4114f308..1eff6dadec4d 100644 --- a/net-im/psi/files/psi-0.14-minizip-detection.patch +++ b/net-im/psi/files/psi-0.14-minizip-detection.patch @@ -1,6 +1,6 @@ === modified file 'conf_windows.pri' ---- conf_windows.pri 2011-10-04 06:27:15 +0000 -+++ conf_windows.pri 2011-10-04 06:27:28 +0000 +--- 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 @@ -12,8 +12,8 @@ qca-static { === modified file 'configure' ---- configure 2011-10-04 06:27:15 +0000 -+++ configure 2011-10-04 06:27:38 +0000 +--- configure 2011-10-25 10:03:42 +0000 ++++ configure 2011-10-25 10:04:13 +0000 @@ -955,41 +955,68 @@ { #ifdef Q_OS_WIN @@ -115,8 +115,8 @@ #endif === modified file 'qcm/zlib.qcm' ---- qcm/zlib.qcm 2011-10-04 06:27:15 +0000 -+++ qcm/zlib.qcm 2011-10-04 06:27:38 +0000 +--- 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 @@ -218,8 +218,8 @@ #endif === modified file 'src/conf_iris.pri' ---- src/conf_iris.pri 2011-10-04 06:27:15 +0000 -+++ src/conf_iris.pri 2011-10-04 06:27:28 +0000 +--- 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 } @@ -234,8 +234,8 @@ 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-04 06:27:15 +0000 -+++ src/libpsi/tools/zip/zip.cpp 2011-10-04 06:27:43 +0000 +--- 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> @@ -250,25 +250,28 @@ class UnZipPrivate === modified file 'src/libpsi/tools/zip/zip.pri' ---- src/libpsi/tools/zip/zip.pri 2011-10-04 06:27:15 +0000 -+++ src/libpsi/tools/zip/zip.pri 2011-10-04 06:29:25 +0000 -@@ -2,17 +2,21 @@ +--- 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 +} - - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - --win32: { ++ +psi-winzlib { INCLUDEPATH += $$PWD/minizip/win32 DEPENDPATH += $$PWD/minizip/win32 diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild index 3b14c6650353..890e17097900 100644 --- a/net-im/psi/psi-0.14-r4.ebuild +++ b/net-im/psi/psi-0.14-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.5 2011/10/23 11:33:51 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.6 2011/10/25 10:13:42 pva Exp $ EAPI=4 @@ -36,7 +36,8 @@ RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?] spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit ) ) - app-arch/unzip" + app-arch/unzip + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )" DEPEND="${RDEPEND} extras? ( sys-devel/qconf ) @@ -76,8 +77,6 @@ src_prepare() { 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 - - qconf || die "Failed to create ./configure." else if use webkit; then ewarn "Webkit support disabled as it is only available in Psi+" @@ -85,6 +84,7 @@ src_prepare() { fi fi + qconf || die "Failed to create ./configure." rm -rf third-party/qca || die # We use system libraries. } diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 99745830c952..5005ca9d61ec 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.12 2011/06/30 09:23:16 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.13 2011/10/25 10:13:42 pva Exp $ EAPI="4" @@ -41,6 +41,7 @@ RDEPEND=" xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit:4 ) ) app-arch/unzip + || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) " DEPEND="${RDEPEND} extras? ( |