summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-05-14 15:38:32 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-05-14 15:38:32 +0000
commit14cafe907e16114c11031cfd1ea1ee19bcb56471 (patch)
treec5b90de7255119afe3fcf9195aa37017d1e5c582 /net-misc/x2goclient/files
parentAdded an ldap patch so that the ldap modules for kcontrol now can handle bind... (diff)
downloadnx-14cafe907e16114c11031cfd1ea1ee19bcb56471.tar.gz
nx-14cafe907e16114c11031cfd1ea1ee19bcb56471.tar.bz2
nx-14cafe907e16114c11031cfd1ea1ee19bcb56471.zip
Fix patch for no-ldap, changed some spaces in tabs
svn path=/testing/; revision=230
Diffstat (limited to 'net-misc/x2goclient/files')
-rw-r--r--net-misc/x2goclient/files/x2goclient-2.0.1-noldap.patch39
-rw-r--r--net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch41
2 files changed, 41 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 fb87922..0000000
--- 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.00.1-noldap.patch b/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
new file mode 100644
index 0000000..6c50a83
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-3.00.1-noldap.patch
@@ -0,0 +1,41 @@
+diff -Naur x2goclient-3.00.orig/x2goclientconfig.h x2goclient-3.00/x2goclientconfig.h
+--- x2goclient-3.00.orig/x2goclientconfig.h 2009-05-14 17:28:13.000000000 +0200
++++ x2goclient-3.00/x2goclientconfig.h 2009-05-14 17:28:59.000000000 +0200
+@@ -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-3.00.orig/x2goclient.pro x2goclient-3.00/x2goclient.pro
+--- x2goclient-3.00.orig/x2goclient.pro 2009-05-14 17:28:13.000000000 +0200
++++ x2goclient-3.00/x2goclient.pro 2009-05-14 17:29:05.000000000 +0200
+@@ -51,7 +51,7 @@
+ INCLUDEPATH += .
+ RESOURCES += resources.rcc
+ RC_FILE = x2goclient.rc
+-LIBS += -lldap -lcups
++LIBS += -lcups
+ QT += svg network
+ ICON =icons/x2go-mac.icns
+ QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk
+diff -Naur x2goclient-3.00.orig/x2goclient.pro.default x2goclient-3.00/x2goclient.pro.default
+--- x2goclient-3.00.orig/x2goclient.pro.default 2009-05-14 17:28:13.000000000 +0200
++++ x2goclient-3.00/x2goclient.pro.default 2009-05-14 17:29:05.000000000 +0200
+@@ -51,7 +51,7 @@
+ INCLUDEPATH += .
+ RESOURCES += resources.rcc
+ RC_FILE = x2goclient.rc
+-LIBS += -lldap -lcups
++LIBS += -lcups
+ QT += svg network
+ ICON =icons/x2go-mac.icns
+ QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk