[SCM] libkdcraw packaging branch, kubuntu_wily_archive, updated. debian/4.14.0-1-23-g3522f17

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Mon Jun 8 06:05:18 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkdcraw.git;a=commitdiff;h=3522f17

The following commit has been merged in the kubuntu_wily_archive branch:
commit 3522f17e94455d2f55482b752c9e021107fd1ea5
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 8 08:05:14 2015 +0200

    Add upstream_libraw-0.16.1-needs-exceptions.patch
---
 debian/changelog                                   |  4 ++++
 debian/patches/series                              |  1 +
 .../upstream_libraw-0.16.1-needs-exceptions.patch  | 26 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc8af08..d1a6c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ libkdcraw (4:15.04.2-0ubuntu1) UNRELEASED; urgency=medium
   [ Jonathan Riddell ]
   * New upstream release
 
+  [ José Manuel Santamaría Lema ]
+  * Add upstream_libraw-0.16.1-needs-exceptions.patch in order to avoid
+    FTBFS'ing because of latest libraw.
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 02:12:04 +0200
 
 libkdcraw (4:14.12.3-0ubuntu1) vivid; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d8ade79
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_libraw-0.16.1-needs-exceptions.patch
diff --git a/debian/patches/upstream_libraw-0.16.1-needs-exceptions.patch b/debian/patches/upstream_libraw-0.16.1-needs-exceptions.patch
new file mode 100644
index 0000000..c085478
--- /dev/null
+++ b/debian/patches/upstream_libraw-0.16.1-needs-exceptions.patch
@@ -0,0 +1,26 @@
+From 46898ec97a0462eb08a5b6d09999450a86b27aae Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Thu, 14 May 2015 22:54:16 +0200
+Subject: [PATCH] libraw 0.16.1 needs C++ exceptions rules while compilation
+ BUGS: 347728 FIXED-IN: 4.11.0
+
+---
+ libkdcraw/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libkdcraw/CMakeLists.txt b/libkdcraw/CMakeLists.txt
+index f23e5af..73b279f 100644
+--- a/libkdcraw/CMakeLists.txt
++++ b/libkdcraw/CMakeLists.txt
+@@ -4,6 +4,8 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+ 
+ set(kdcraw_LIB_SRCS kdcraw.cpp
+-- 
+2.1.4
+

-- 
libkdcraw packaging



More information about the pkg-kde-commits mailing list