Hello,
While running through a number of patches, it seems that this one
still has not been included in our Qt3 tree
It adds support for newer platform namings (as far as I can see) from
SQLLEN and SQLINTEGER
seems to patch without a problem
Calvin Morrison
This looks for dbus-tqt using pkg-config, rather than explicitly
hardwiring it (though the compilation test is retained).
This fixes the case where dbus-tqt is installed using a different prefix
from Qt or dbus itself. This is fairly common these days (I have kde3
installed in /usr/kde3, but Qt3 is installed in /usr, because non-KDE3
programs need it.)
It requires my previous dbus-tqt pkgconfig patch.
Index: ConfigureChecks.cmake
===================================================================
--- ConfigureChecks.cmake (revision 1242239)
+++ ConfigureChecks.cmake (working copy)
@@ -189,9 +189,10 @@
endif( )
# check for dbus-tqt
+ pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
- set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} )
- set( CMAKE_REQUIRED_LIBRARIES ${TQT_LDFLAGS} )
+ set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS})
+ set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
check_cxx_source_compiles("
#include <tqt.h>
#include <dbus/connection.h>
--
NULL && (void)
These fixes make it possible to use pkgconfig to locate dbus-tqt,
while using the normal #include <dbus/connection.h> pattern to
include it.
Used by the following kdebase patch.
Index: dbus-tqt.pc.cmake
===================================================================
--- dbus-tqt.pc.cmake (revision 1242244)
+++ dbus-tqt.pc.cmake (working copy)
@@ -6,5 +6,6 @@
Name: @PROJECT_NAME@
Description: D-BUS TQt bindings
Version: @VERSION@
+Requires: dbus-1
Libs: -L${libdir} @PC_LIBRARIES@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/dbus-1.0
--
NULL && (void)
The most recent libmad release does not use pkgconfig, and while some
distributors have gone ahead and provided a .pc file, not all have.
This fixes it for the non-pkgconfig case.
Index: flow/gsl/CMakeLists.txt
===================================================================
--- flow/gsl/CMakeLists.txt (revision 1242076)
+++ flow/gsl/CMakeLists.txt (working copy)
@@ -63,7 +63,11 @@
if( MAD_FOUND )
set( GSL_HAVE_LIBMAD 1 )
else( MAD_FOUND )
- message(FATAL_ERROR "\nMAD support are requested, but `libmad` not found" )
+ find_library( MAD_LIBRARIES NAMES mad )
+ find_path( MAD_INCLUDE_DIRS mad.h )
+ if( NOT MAD_LIBRARIES )
+ message(FATAL_ERROR "\nMAD support is requested, but `libmad` not found" )
+ endif( NOT MAD_LIBRARIES )
endif( MAD_FOUND )
endif( WITH_MAD )
Hi all,
As was stated before, there's supposed to be a July Meeting tomorrow.
But, we do not know if everyone is ready (especially with the Etherpad purge).
So, could everyone please tell me what they think about the meeting
still happening tomorrow?
If I get enough (I have something to share) or (II think we should
have it) I will keep it to tomorrow.
Else, I will postpone it one week.
--
later, Robert Xu + rxu AT lincomlinux DOT org
Hey!
I just got a message from the arch dev ML. They are talking about kdelibs3
and someone mentioned us. Are we compatible with old kdelibs3? We could
start providing upstream support and also for qt3
Sorry I don't have any links or more info, this is a rushed message.
Calvin
It's time to start planning for the July Meeting!
If you haven't already, please request an account on Etherpad (there's
a link, or you can just PM me) and get started on this pad:
http://trinity.etherpad.trinitydesktop.org/4
Meeting is 19 July 2011 at TBD. Raindate is 20 July 2011.
Please make sure you are there!
(I will *try* to send out a reminder. No guarantees though)
--
later, Robert Xu + rxu AT lincomlinux DOT org
