qtdbus-win32.patch fix

Stromek stromek at realtime.sk
Sat Jan 27 15:37:56 CET 2007


Hi there,

I haven't contributed all the modifications yet I had to perfom to get kdelibs
compiled last weekend.

In qtdbus-win32.patch there are missing quotations around dbus include
dir:

diff -u -r -N windbus-orig/trunk/QtDBus-win32.patch windbus/trunk/QtDBus-win32.patch
--- windbus-orig/trunk/QtDBus-win32.patch	2007-01-19 16:04:08.000000000 +0100
+++ windbus/trunk/QtDBus-win32.patch	2007-01-27 07:56:15.000000000 +0100
@@ -47,17 +47,16 @@
 diff -u -r -N qt-win-opensource-src-4.2.0-snapshot-20060921-orig/tools/qdbus/src/src.pro tools/qdbus/src/src.pro
 --- qt-win-opensource-src-4.2.0-snapshot-20060921-orig/tools/qdbus/src/src.pro	2006-09-21 01:23:54.000000000 +0200
 +++ tools/qdbus/src/src.pro	Mon Oct 23 10:47:32 2006
-@@ -45,6 +45,14 @@
+@@ -45,6 +45,13 @@
     LIBS += -lws2_32 -ladvapi32 -lnetapi32
     CONFIG(debug, debug|release):LIBS += -ldbus-1d
     else:LIBS += -ldbus-1
 +   DBUS_INSTALL_DIR=$$(DBUSDIR)
 +   isEmpty( DBUS_INSTALL_DIR ) {
-+      
 +      DBUS_INSTALL_DIR = "$$(PROGRAMFILES)/dbus"
 +      message( "DBUSDIR not specified. Using $$DBUS_INSTALL_DIR" )
 +   }
-+   INCLUDEPATH += $$DBUS_INSTALL_DIR/include
++   INCLUDEPATH += "$$DBUS_INSTALL_DIR/include"
 +   LIBS +=  -L\"$$DBUS_INSTALL_DIR/lib\" -luser32
  }
   

Without those quotes it generates makefile with screwed includes like the following:

-I"c:\Program" -I"Files\dbus\include"

Without quotes it works just for those who have program files located in "C:\Programme" folder. Someone with svn write access, commit this fix please.

Have a nice weekend and make the world better.

-- 
Stromek



More information about the Kde-windows mailing list