diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2010-04-29 13:40:04 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-04-29 13:40:04 +0000 |
| commit | 7e44aacb9ca28ec8eeda00e9d84bf4443362b362 (patch) | |
| tree | adb277f2dbf67782bd7fff70849150ae6c237141 /net-misc/x2goclient/files | |
| parent | Repair ChangeLog, actually remove 2.x version (diff) | |
| download | gentoo-2-7e44aacb9ca28ec8eeda00e9d84bf4443362b362.tar.gz gentoo-2-7e44aacb9ca28ec8eeda00e9d84bf4443362b362.tar.bz2 gentoo-2-7e44aacb9ca28ec8eeda00e9d84bf4443362b362.zip | |
Version bump from NX overlay, update to qt4-r2, drop 2.x versions
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/x2goclient/files')
| -rw-r--r-- | net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch | 39 | ||||
| -rw-r--r-- | net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch | 26 |
2 files changed, 26 insertions, 39 deletions
diff --git a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch deleted file mode 100644 index fb87922f7c46..000000000000 --- a/net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur x2goclient-2.0.1.orig/x2goclientconfig.h x2goclient-2.0.1/x2goclientconfig.h ---- x2goclient-2.0.1.orig/x2goclientconfig.h 2008-12-11 19:56:03.000000000 +0100 -+++ x2goclient-2.0.1/x2goclientconfig.h 2008-12-11 19:56:40.000000000 +0100 -@@ -10,13 +10,4 @@ - - //#define LOGFILE QDir::homePath()+"/x2goclient.log" - --#if !defined WINDOWS --#define USELDAP --#endif -- -- --#if defined Q_WS_HILDON --#undef USELDAP --#endif -- - #endif -diff -Naur x2goclient-2.0.1.orig/x2goclient.pro x2goclient-2.0.1/x2goclient.pro ---- x2goclient-2.0.1.orig/x2goclient.pro 2008-12-11 19:56:03.000000000 +0100 -+++ x2goclient-2.0.1/x2goclient.pro 2008-12-11 19:56:23.000000000 +0100 -@@ -37,7 +37,6 @@ - INCLUDEPATH += . - RESOURCES += resources.rcc - RC_FILE = x2goclient.rc --LIBS += -lldap - QT += svg network - ICON =icons/x2go-mac.icns - QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk -diff -Naur x2goclient-2.0.1.orig/x2goclient.pro.default x2goclient-2.0.1/x2goclient.pro.default ---- x2goclient-2.0.1.orig/x2goclient.pro.default 2008-12-11 19:56:03.000000000 +0100 -+++ x2goclient-2.0.1/x2goclient.pro.default 2008-12-11 19:56:23.000000000 +0100 -@@ -37,7 +37,6 @@ - INCLUDEPATH += . - RESOURCES += resources.rcc - RC_FILE = x2goclient.rc --LIBS += -lldap - QT += svg network - ICON =icons/x2go-mac.icns - QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk diff --git a/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch new file mode 100644 index 000000000000..ccb27e6ae728 --- /dev/null +++ b/net-misc/x2goclient/files/x2goclient-3.01.5-noldap.patch @@ -0,0 +1,26 @@ +diff -Naur x2goclient-3.01.orig/x2goclientconfig.h x2goclient-3.01/x2goclientconfig.h +--- x2goclient-3.01.orig/x2goclientconfig.h 2010-04-19 20:19:56.000000000 +0200 ++++ x2goclient-3.01/x2goclientconfig.h 2010-04-19 20:21:05.000000000 +0200 +@@ -8,10 +8,6 @@ + + //#define LOGFILE QDir::homePath()+"/x2goclient.log" + +-#if !defined Q_OS_WIN +-#define USELDAP +-#endif +- + #ifdef Q_OS_WIN + #undef USELDAP + #endif +diff -Naur x2goclient-3.01.orig/x2goclient.pro x2goclient-3.01/x2goclient.pro +--- x2goclient-3.01.orig/x2goclient.pro 2010-04-19 20:19:57.000000000 +0200 ++++ x2goclient-3.01/x2goclient.pro 2010-04-19 20:21:30.000000000 +0200 +@@ -70,7 +70,7 @@ + + linux-g++ { + message(building x2goclient with ldap and cups) +- LIBS += -lldap -lcups ++ LIBS += -lcups + } + macx { + message(building x2goclient with ldap and cups) |