File winbuild.diff of Package mingw32-x2goclient

Overview Repositories Revisions Requests Users Attributes Meta

File winbuild.diff of Package mingw32-x2goclient

Index: x2goclient-4.0.5.2/Makefile
===================================================================
--- x2goclient-4.0.5.2.orig/Makefile
+++ x2goclient-4.0.5.2/Makefile
@@ -9,10 +9,10 @@ PLUGIN_BINARY=$(PLUGIN_DIR)/libx2goplugi
 
 SHELL=/bin/bash
 
-INSTALL_DIR=install -d -o root -g root -m 755
-INSTALL_FILE=install -o root -g root -m 644
+INSTALL_DIR=install -dm 755
+INSTALL_FILE=install -m 644
 INSTALL_SYMLINK=ln -s -f
-INSTALL_PROGRAM=install -o root -g root -m 755
+INSTALL_PROGRAM=install -m 755
 
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
@@ -27,13 +27,10 @@ MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
 QMAKE_BINARY=qmake-qt4
 LRELEASE_BINARY=lrelease-qt4
 
-LDFLAGS+=-lldap -lcups -lX11 -lXpm
-
 all: build
 
 build: build_man build_pluginprovider
 	$(MAKE) build_client
-	$(MAKE) build_plugin
 
 build_client:
 	$(LRELEASE_BINARY) x2goclient.pro
@@ -71,7 +68,7 @@ clean_pluginprovider:
 clean_man:
 	make -f Makefile.man2html clean
 
-install: install_client install_plugin install_man install_pluginprovider
+install: install_client install_man install_pluginprovider
 
 install_client:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
@@ -81,7 +78,7 @@ install_client:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
-	$(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient $(DESTDIR)$(BINDIR)/x2goclient
+	$(INSTALL_PROGRAM) $(CLIENT_DIR)/release/x2goclient.exe $(DESTDIR)$(BINDIR)/x2goclient.exe
 	$(INSTALL_FILE) desktop/x2goclient.desktop    $(DESTDIR)$(SHAREDIR)/applications/x2goclient.desktop
 	$(INSTALL_FILE) res/img/icons/x2goclient.xpm          $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm
 	$(INSTALL_FILE) res/img/icons/128x128/x2goclient.png  $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png
Index: x2goclient-4.0.5.2/src/onmainwindow.cpp
===================================================================
--- x2goclient-4.0.5.2.orig/src/onmainwindow.cpp
+++ x2goclient-4.0.5.2/src/onmainwindow.cpp
@@ -9227,10 +9227,7 @@ QString ONMainWindow::getXDisplay()
 
 QString ONMainWindow::cygwinPath ( const QString& winPath )
 {
-    QString cPath="/cygdrive/"+winPath;
-    cPath.replace ( "\\","/" );
-    cPath.replace ( ":","" );
-    return cPath;
+    return winPath;
 }
 #endif
 
Index: x2goclient-4.0.5.2/x2goclient.pro
===================================================================
--- x2goclient-4.0.5.2.orig/x2goclient.pro
+++ x2goclient-4.0.5.2/x2goclient.pro
@@ -125,7 +125,7 @@ SOURCES += src/sharewidget.cpp \
            src/help.cpp
 
 LIBS += -lssh
-win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
+win32:LIBS += -ladvapi32 -lshell32 -luser32
 
 plugin {
   TARGET = x2goplugin
@@ -181,12 +181,10 @@ exists(res/txt/changelog) {
 
 linux-g++ {
   message("building $$TARGET with ldap and cups")
-  LIBS += -lldap -lcups -lX11 -lXpm
   DEFINES += __linux__
 }
 linux-g++-64 {
   message("building $$TARGET with ldap and cups")
-  LIBS += -lldap -lcups -lX11 -lXpm
   DEFINES += __linux__
 }
 x2go_linux_static {
Index: x2goclient-4.0.5.2/x2gohelper/Makefile
===================================================================
--- x2goclient-4.0.5.2.orig/x2gohelper/Makefile
+++ x2goclient-4.0.5.2/x2gohelper/Makefile
@@ -1,4 +1,4 @@
 all:
-	g++ -mwindows -o ../client_build/release/x2gohelper.exe x2gohelper.cpp
+	${CXX} -mwindows -o ../client_build/release/x2gohelper.exe x2gohelper.cpp
 clean:
 	del ..\client_build\release\x2gohelper.exe
Index: x2goclient-4.0.5.2/x2gohelper/x2gohelper.cpp
===================================================================
--- x2goclient-4.0.5.2.orig/x2gohelper/x2gohelper.cpp
+++ x2goclient-4.0.5.2/x2gohelper/x2gohelper.cpp
@@ -15,7 +15,7 @@
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/
 #include <windows.h>
-#include <TlHelp32.h>
+#include <tlhelp32.h>
 void killProcess(DWORD pid)
 {
     HANDLE handle=OpenProcess(PROCESS_TERMINATE,0,pid);

Places

File winbuild.diff of Package mingw32-x2goclient

Places