[SCM] qtzeitgeist packaging branch, master, updated. 032c8695ed3658922dde442a1d17e0340ae2cd14

Modestas Vainius modax at alioth.debian.org
Sun Feb 19 17:34:22 UTC 2012


The following commit has been merged in the master branch:
commit eba611947dba57e8515a8760aeb8d4fde1a38bba
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 19 19:16:28 2012 +0200

    Drop visibility_hidden.diff, merged upstream.
---
 debian/changelog                      |    3 +
 debian/patches/series                 |    1 -
 debian/patches/visibility_hidden.diff |   82 ---------------------------------
 3 files changed, 3 insertions(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c68076..1a64ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtzeitgeist (0.8.0-1) UNRELEASED; urgency=low
   * Change my email address.
   * Remove DM-Upload-Allowed flag. It is no longer needed.
 
+  [ Modestas Vainius ]
+  * Drop visibility_hidden.diff, merged upstream.
+
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 25 Sep 2011 15:14:01 -0300
 
 qtzeitgeist (0.7.0-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 4648005..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-visibility_hidden.diff
diff --git a/debian/patches/visibility_hidden.diff b/debian/patches/visibility_hidden.diff
deleted file mode 100644
index d0126f1..0000000
--- a/debian/patches/visibility_hidden.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-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);
-+
- };
- 
- };

-- 
qtzeitgeist packaging



More information about the pkg-kde-commits mailing list