[SCM] qtzeitgeist packaging branch, master, updated. debian/0.7.0-1-7-g9bfeefb

[Felix Geyer]

The following commit has been merged in the master branch:
commit 6db3513d4e48ac3eb8e57e515b026e46c00bea18
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri May 27 16:39:16 2011 +0200

    Add a patch to insert missing Q_DECL_EXPORT and re-enable the tests.
---
 debian/libqzeitgeist0.symbols         |    7 +++
 debian/patches/remove_tests.patch     |   19 --------
 debian/patches/series                 |    2 +-
 debian/patches/visibility_hidden.diff |   82 +++++++++++++++++++++++++++++++++
 debian/rules                          |    2 -
 5 files changed, 90 insertions(+), 22 deletions(-)

diff --git a/debian/libqzeitgeist0.symbols b/debian/libqzeitgeist0.symbols
index b556f39..c38848c 100644
--- a/debian/libqzeitgeist0.symbols
+++ b/debian/libqzeitgeist0.symbols
@@ -31,6 +31,7 @@ libqzeitgeist.so.0 libqzeitgeist0 #MINVER#
  _ZN11QtZeitgeist3LogD0Ev at Base 0.7.0
  _ZN11QtZeitgeist3LogD1Ev at Base 0.7.0
  _ZN11QtZeitgeist3LogD2Ev at Base 0.7.0
+ _ZN11QtZeitgeist4initEv at Base 0.7.0
  _ZN11QtZeitgeist7Monitor11qt_metacallEN11QMetaObject4CallEiPPv at Base 0.7.0
  _ZN11QtZeitgeist7Monitor11qt_metacastEPKc at Base 0.7.0
  _ZN11QtZeitgeist7Monitor13eventsDeletedERKNS_9DataModel9TimeRangeERK5QListIjE at Base 0.7.0
@@ -106,6 +107,12 @@ libqzeitgeist.so.0 libqzeitgeist0 #MINVER#
  _ZN11QtZeitgeist9DataModel9TimeRangeD1Ev at Base 0.7.0
  _ZN11QtZeitgeist9DataModel9TimeRangeD2Ev at Base 0.7.0
  _ZN11QtZeitgeist9DataModel9TimeRangeaSERKS1_ at Base 0.7.0
+ _ZN11QtZeitgeist9DataModellsER13QDBusArgumentRKNS0_10DataSourceE at Base 0.7.0
+ _ZN11QtZeitgeist9DataModellsER13QDBusArgumentRKNS0_5EventE at Base 0.7.0
+ _ZN11QtZeitgeist9DataModellsER13QDBusArgumentRKNS0_9TimeRangeE at Base 0.7.0
+ _ZN11QtZeitgeist9DataModelrsERK13QDBusArgumentRNS0_10DataSourceE at Base 0.7.0
+ _ZN11QtZeitgeist9DataModelrsERK13QDBusArgumentRNS0_5EventE at Base 0.7.0
+ _ZN11QtZeitgeist9DataModelrsERK13QDBusArgumentRNS0_9TimeRangeE at Base 0.7.0
  _ZNK11QtZeitgeist18DataSourceRegistry10metaObjectEv at Base 0.7.0
  _ZNK11QtZeitgeist3Log10metaObjectEv at Base 0.7.0
  _ZNK11QtZeitgeist7Monitor10metaObjectEv at Base 0.7.0
diff --git a/debian/patches/remove_tests.patch b/debian/patches/remove_tests.patch
deleted file mode 100644
index 1799944..0000000
--- a/debian/patches/remove_tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
-Subject: disable the compilation of tests.
-
-The tests FTBFS when the following flags are set up:
-
-CXXFLAGS+=-fvisibility=hidden -fvisibility-inlines-hidden
-
-As we are not shipping the tests, I'm disabling them.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,6 @@
- 
- add_subdirectory(include)
- add_subdirectory(src)
--add_subdirectory(tests)
- 
- # Generate cmake file
- get_target_property(QZEITGEIST_LIBRARY qzeitgeist LOCATION)
diff --git a/debian/patches/series b/debian/patches/series
index f2850ba..4648005 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_tests.patch
+visibility_hidden.diff
diff --git a/debian/patches/visibility_hidden.diff b/debian/patches/visibility_hidden.diff
new file mode 100644
index 0000000..d0126f1
--- /dev/null
+++ b/debian/patches/visibility_hidden.diff
@@ -0,0 +1,82 @@
+Description: Build with -fvisiblity=hidden.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+Forwarded: yes, http://quickgit.kde.org/?p=libqzeitgeist.git&a=commit&h=37edd54b446aa754e3ef9ecc8c0c7c861abeb127
+
+--- libqzeitgeist-0.7.0.orig/CMakeLists.txt
++++ libqzeitgeist-0.7.0/CMakeLists.txt
+@@ -7,6 +7,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR
+ 
+ find_package(Qt4 4.7.0 COMPONENTS QtCore QtDBus QtTest REQUIRED)
+ 
++include(CheckCXXCompilerFlag)
++
++check_cxx_compiler_flag(-fvisibility=hidden __HAVE_GCC_VISIBILITY)
++if (__HAVE_GCC_VISIBILITY AND NOT WIN32)
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
++endif (__HAVE_GCC_VISIBILITY AND NOT WIN32)
++
+ 
+ set(CPACK_PACKAGE_VERSION_MAJOR "0")
+ set(CPACK_PACKAGE_VERSION_MINOR "7")
+--- libqzeitgeist-0.7.0.orig/include/QtZeitgeist/qtzeitgeist.h
++++ libqzeitgeist-0.7.0/include/QtZeitgeist/qtzeitgeist.h
+@@ -22,6 +22,8 @@
+ #ifndef QTZEITGEIST_H_
+ #define QTZEITGEIST_H_
+ 
++#include <QtGlobal>
++
+ namespace QtZeitgeist
+ {
+ 
+@@ -33,7 +35,7 @@ namespace QtZeitgeist
+  * registering custom types.
+  * Note: It's really important to call this function before using the library.
+  */
+-void init();
++Q_DECL_EXPORT void init();
+ 
+ };
+ #endif // QTZEITGEIST_H_
+--- libqzeitgeist-0.7.0.orig/include/QtZeitgeist/DataModel/datasource.h
++++ libqzeitgeist-0.7.0/include/QtZeitgeist/DataModel/datasource.h
+@@ -145,6 +145,11 @@ private:
+             DataSource &datasource);
+ };
+ 
++Q_DECL_EXPORT QDBusArgument & operator << (QDBusArgument &argument,
++               const DataSource &datasource);
++Q_DECL_EXPORT const QDBusArgument & operator >> (const QDBusArgument &argument,
++               DataSource &datasource);
++
+ // Create additional types.
+ typedef QList<DataSource> DataSourceList;
+ 
+--- libqzeitgeist-0.7.0.orig/include/QtZeitgeist/DataModel/event.h
++++ libqzeitgeist-0.7.0/include/QtZeitgeist/DataModel/event.h
+@@ -219,6 +219,11 @@ private:
+             Event &event);
+ };
+ 
++Q_DECL_EXPORT QDBusArgument & operator << (QDBusArgument &argument,
++               const Event &event);
++Q_DECL_EXPORT const QDBusArgument & operator >> (const QDBusArgument &argument,
++               Event &event);
++
+ // Create additional types.
+ typedef QList<Event> EventList;
+ typedef QList<quint32> EventIdList;
+--- libqzeitgeist-0.7.0.orig/include/QtZeitgeist/DataModel/timerange.h
++++ libqzeitgeist-0.7.0/include/QtZeitgeist/DataModel/timerange.h
+@@ -141,6 +141,11 @@ private:
+             TimeRange &event);
+ };
+ 
++Q_DECL_EXPORT QDBusArgument & operator << (QDBusArgument &argument,
++               const TimeRange &event);
++Q_DECL_EXPORT const QDBusArgument & operator >> (const QDBusArgument &argument,
++               TimeRange &event);
++
+ };
+ 
+ };
diff --git a/debian/rules b/debian/rules
index 31add13..312d522 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CXXFLAGS+=-fvisibility=hidden -fvisibility-inlines-hidden
-
 %:
 	dh $@ --parallel --dbg-package=libqzeitgeist0-dbg

-- 
qtzeitgeist packaging