[SCM] libkcompactdisc packaging branch, master, updated. debian/4.10.2-1-4-g364d512

Pino Toscano pino at alioth.debian.org
Mon Apr 8 17:14:10 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkcompactdisc.git;a=commitdiff;h=99a2cea

The following commit has been merged in the master branch:
commit 99a2cea01d7dee3988352188ad1bbe69d160c81d
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 8 18:52:02 2013 +0200

    disable wmlib on Hurd
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 .../upstream_disable-wmlib-on-GNU-Hurd.patch       |   32 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8c83f0..5bfd9dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 libkcompactdisc (4:4.10.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 4d7f2c572dec110ea71eae95f203e057cb4e41e3 to
+    disable wmlib on GNU/Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 08 Apr 2013 18:47:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 50dc78f..10b5943 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_target_link_libraries.diff
+upstream_disable-wmlib-on-GNU-Hurd.patch
diff --git a/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch b/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch
new file mode 100644
index 0000000..1e99265
--- /dev/null
+++ b/debian/patches/upstream_disable-wmlib-on-GNU-Hurd.patch
@@ -0,0 +1,32 @@
+From 4d7f2c572dec110ea71eae95f203e057cb4e41e3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Mon, 8 Apr 2013 18:45:35 +0200
+Subject: [PATCH] disable wmlib on GNU/Hurd
+
+there is no implementation for it, yet
+---
+ CMakeLists.txt |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 59aeaa5..57004fa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,11 +44,11 @@ set(wmlib_SRCS
+         wmlib/drv_toshiba.c
+ )
+ 
+-if (APPLE OR WIN32)
++if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 	set(USE_WMLIB false)
+-else (APPLE OR WIN32)
++else (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 	set(USE_WMLIB true)
+-endif (APPLE OR WIN32)
++endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 
+ set(kcompactdisc_LIB_SRCS kcompactdisc.cpp kcompactdisc_p.cpp phonon_interface.cpp)
+ 
+-- 
+1.7.10.4
+

-- 
libkcompactdisc packaging



More information about the pkg-kde-commits mailing list