[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.0-10-gae98f11

X2go dev team git-admin at x2go.org
Wed Feb 29 16:28:46 CET 2012


The branch, master has been updated
       via  ae98f113fa1079b1ec0667e25e55c0b108f7b996 (commit)
       via  c8b59f5802e87941dd8c8a462b8b6173e32eb8d9 (commit)
      from  437e34c48f017b0014bb422da512f2bcd0e07710 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae98f113fa1079b1ec0667e25e55c0b108f7b996
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 29 16:28:34 2012 +0100

    Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard.

commit c8b59f5802e87941dd8c8a462b8b6173e32eb8d9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 29 16:26:31 2012 +0100

    Prettify x2goclient.pro.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    6 ++
 x2goclient.pro   |  201 +++++++++++++++++++++++++++--------------------------
 2 files changed, 108 insertions(+), 99 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cbf4a4b..3d26561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,12 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low
     - Update copyright year in about window. Including all translations.
     - Power button icon: make inner part transparent. Needed for people
       with a dark GUI theme.
+    - Prettify x2goclient.pro.
+
+  [ Mihai Moldovan ]
+  * New upstream version (3.99.1.1):
+    - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with
+      Leopard.
 
   [ Daniel Lindgren ]
   * New upstream version (3.99.1.1):
diff --git a/x2goclient.pro b/x2goclient.pro
index 5c96688..16c5f06 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -12,13 +12,14 @@ CONFIG += $$(X2GO_LINUX_STATIC)
 
 FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui
 
-TRANSLATIONS += x2goclient_en.ts 
-TRANSLATIONS += x2goclient_de.ts 
-TRANSLATIONS += x2goclient_ru.ts 
-TRANSLATIONS += x2goclient_nb_no.ts 
-TRANSLATIONS += x2goclient_sv.ts 
-TRANSLATIONS += x2goclient_fr.ts 
-TRANSLATIONS += x2goclient_zh_tw.ts
+TRANSLATIONS += x2goclient_en.ts \
+                x2goclient_de.ts \
+                x2goclient_ru.ts \
+                x2goclient_nb_no.ts \
+                x2goclient_sv.ts \
+                x2goclient_fr.ts \
+                x2goclient_zh_tw.ts
+
 HEADERS += configdialog.h \
            editconnectiondialog.h \
            exportdialog.h \
@@ -31,78 +32,78 @@ HEADERS += configdialog.h \
            sshprocess.h \
            SVGFrame.h \
            userbutton.h \
-	   x2goclientconfig.h \
-	   x2gologdebug.h \
- printprocess.h \
- cupsprint.h \
- cupsprintwidget.h \
- cupsprintersettingsdialog.h \
- printwidget.h \
- printercmddialog.h \
- printdialog.h \
- wapi.h \
- sessionwidget.h \
- configwidget.h \
- connectionwidget.h \
- settingswidget.h \
- sharewidget.h \
- clicklineedit.h \
- httpbrokerclient.h \
- ongetpass.h \
- onmainwindow_privat.h \
- x2gosettings.h \
- brokerpassdlg.h \
- contest.h \
- xsettingswidget.h
+           x2goclientconfig.h \
+           x2gologdebug.h \
+           printprocess.h \
+           cupsprint.h \
+           cupsprintwidget.h \
+           cupsprintersettingsdialog.h \
+           printwidget.h \
+           printercmddialog.h \
+           printdialog.h \
+           wapi.h \
+           sessionwidget.h \
+           configwidget.h \
+           connectionwidget.h \
+           settingswidget.h \
+           sharewidget.h \
+           clicklineedit.h \
+           httpbrokerclient.h \
+           ongetpass.h \
+           onmainwindow_privat.h \
+           x2gosettings.h \
+           brokerpassdlg.h \
+           contest.h \
+           xsettingswidget.h
 
 SOURCES += sharewidget.cpp \
- settingswidget.cpp\
- configwidget.cpp \
- sessionwidget.cpp \
- connectionwidget.cpp \
- configdialog.cpp \
- editconnectiondialog.cpp \
- exportdialog.cpp \
- imgframe.cpp \
- LDAPSession.cpp \
- onmainwindow.cpp \
- onmainwindow_part2.cpp \
- onmainwindow_part3.cpp \
- onmainwindow_part4.cpp \
- sessionbutton.cpp \
- sessionmanagedialog.cpp \
- sshmasterconnection.cpp \
- sshprocess.cpp \
- SVGFrame.cpp \
- userbutton.cpp \
- x2gologdebug.cpp \
- printprocess.cpp \
- cupsprint.cpp \
- cupsprintwidget.cpp \
- cupsprintersettingsdialog.cpp \
- printwidget.cpp \
- printercmddialog.cpp \
- printdialog.cpp \
- wapi.cpp \
- clicklineedit.cpp \
- httpbrokerclient.cpp \
- ongetpass.cpp \
- x2gosettings.cpp \
- brokerpassdlg.cpp \
- contest.cpp \
- xsettingswidget.cpp
+           settingswidget.cpp\
+           configwidget.cpp \
+           sessionwidget.cpp \
+           connectionwidget.cpp \
+           configdialog.cpp \
+           editconnectiondialog.cpp \
+           exportdialog.cpp \
+           imgframe.cpp \
+           LDAPSession.cpp \
+           onmainwindow.cpp \
+           onmainwindow_part2.cpp \
+           onmainwindow_part3.cpp \
+           onmainwindow_part4.cpp \
+           sessionbutton.cpp \
+           sessionmanagedialog.cpp \
+           sshmasterconnection.cpp \
+           sshprocess.cpp \
+           SVGFrame.cpp \
+           userbutton.cpp \
+           x2gologdebug.cpp \
+           printprocess.cpp \
+           cupsprint.cpp \
+           cupsprintwidget.cpp \
+           cupsprintersettingsdialog.cpp \
+           printwidget.cpp \
+           printercmddialog.cpp \
+           printdialog.cpp \
+           wapi.cpp \
+           clicklineedit.cpp \
+           httpbrokerclient.cpp \
+           ongetpass.cpp \
+           x2gosettings.cpp \
+           brokerpassdlg.cpp \
+           contest.cpp \
+           xsettingswidget.cpp
 
 LIBS += -lssh
 
 plugin {
-TARGET = x2goplugin
+	TARGET = x2goplugin
 }
 else{
-RC_FILE = x2goclient.rc
-SOURCES += x2goclient.cpp
-TARGET = x2goclient
-DEFINES += CFGCLIENT
-message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin)
+	RC_FILE = x2goclient.rc
+	SOURCES += x2goclient.cpp
+	TARGET = x2goclient
+	DEFINES += CFGCLIENT
+	message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin)
 }
 
 TEMPLATE = app
@@ -111,47 +112,49 @@ INCLUDEPATH += .
 RESOURCES += resources.rcc
 
 linux-g++ {
-    message(building $$TARGET with ldap and cups)
-    LIBS += -lldap -lcups -lX11 -lXpm
+	message(building $$TARGET with ldap and cups)
+	LIBS += -lldap -lcups -lX11 -lXpm
 }
 linux-g++-64 {
-    message(building $$TARGET with ldap and cups)
-    LIBS += -lldap -lcups -lX11 -lXpm
+	message(building $$TARGET with ldap and cups)
+	LIBS += -lldap -lcups -lX11 -lXpm
 }
 x2go_linux_static {
-    message (linking all libs statically)
-    LIBS -= -lssh
-    LIBS += -lssh_static -lssl -lXpm
-    QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS
+	message (linking all libs statically)
+	LIBS -= -lssh
+	LIBS += -lssh_static -lssl -lXpm
+	QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS
 }
 
 macx {
-    message(building $$TARGET with ldap and cups)
-    LIBS += -lldap -lcups
+	message(building $$TARGET with ldap and cups)
+	LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
+	CONFIG += x86 x86_64
 }
 win32-* {
-    message(building $$TARGET for windows without ldap and cups)
-    LIBS += -lwinspool -lws2_32
-    CONFIG += static release
+	message(building $$TARGET for windows without ldap and cups)
+	LIBS += -lwinspool -lws2_32
+	CONFIG += static release
 }
 QT += svg network
 ICON =icons/x2go-mac.icns
-QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk
-
+QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
 plugin{
 
-DEFINES += CFGPLUGIN
-   linux-g++ {
-      include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
-   }
-   linux-g++-64 {
-      include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
-   }
-   win32-* {
-         DEFINES += QT_NODLL
-         CONFIG += qaxserver
-         include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
-   }
-RC_FILE = x2goplugin.rc
+	DEFINES += CFGPLUGIN
+	linux-g++ {
+		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+	}
+	linux-g++-64 {
+		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+	}
+	win32-* {
+		DEFINES += QT_NODLL
+		CONFIG += qaxserver
+		include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri)
+		}
+	RC_FILE = x2goplugin.rc
+
 }


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).




More information about the x2go-commits mailing list