[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-4-9-g3ee18c5

Diane Trout diane at moszumanska.debian.org
Wed Apr 6 18:19:29 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=7be6938

The following commit has been merged in the master branch:
commit 7be693897ef215da053fdd9ab4f913881571de99
Author: Diane Trout <diane at ghic.org>
Date:   Fri Mar 25 14:01:35 2016 -0700

    Add fix-deprecated-bsd-source.patch
---
 debian/changelog                               |  6 ++++++
 debian/patches/fix-deprecated-bsd-source.patch | 14 ++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3b8d447..d6c3bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-qt (0.9.6.1-6) UNRELEASED; urgency=medium
+
+  * Add fix-deprecated-bsd-source.patch
+
+ -- Diane Trout <diane at debian.org>  Fri, 25 Mar 2016 13:56:45 -0700
+
 telepathy-qt (0.9.6.1-5) unstable; urgency=medium
 
   * Add force-service-pic.patch to allow linking against service library
diff --git a/debian/patches/fix-deprecated-bsd-source.patch b/debian/patches/fix-deprecated-bsd-source.patch
new file mode 100644
index 0000000..5f26c71
--- /dev/null
+++ b/debian/patches/fix-deprecated-bsd-source.patch
@@ -0,0 +1,14 @@
+Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
+Commit: https://cgit.freedesktop.org/cgit/?url=telepathy/telepathy-qt/commit/&id=2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b
+Description: _DEFAULT_SOURCE is now required
+--- a/cmake/modules/TelepathyDefaults.cmake
++++ b/cmake/modules/TelepathyDefaults.cmake
+@@ -108,7 +108,7 @@
+     endif(${NOT_RELEASE} EQUAL 1)
+ 
+     if(CMAKE_SYSTEM_NAME MATCHES Linux)
+-        add_definitions(-D_BSD_SOURCE)
++        add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
+     endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+ 
+     # Compiler coverage
diff --git a/debian/patches/series b/debian/patches/series
index 4782022..de7e11a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ improve-doxygen-build.patch
 update-doxygen.patch
 gstreamer-1.5.patch
 force-service-pic.patch
+fix-deprecated-bsd-source.patch

-- 
telepathy-qt4 packaging



More information about the pkg-kde-commits mailing list