rev 20554 - in kde-extras/digikam/trunk/debian: . patches

Sun Jun 26 16:25:22 UTC 2016

Author: smr
Date: 2016-06-26 16:25:21 +0000 (Sun, 26 Jun 2016)
New Revision: 20554

Added:
   kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/patches/series
   kde-extras/digikam/trunk/debian/rules
Log:
Initial changes for building 5.0.0.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================

--- kde-extras/digikam/trunk/debian/changelog	2016-06-26 07:19:30 UTC (rev 20553)
+++ kde-extras/digikam/trunk/debian/changelog	2016-06-26 16:25:21 UTC (rev 20554)
@@ -1,3 +1,22 @@
+digikam (4:5.0.0~git20160625-1) experimental; urgency=medium
+
+  * Staging the upcoming 5.0.0 release.
+    - Updated all build-depends.
+    - Remove obsolete cmake flags DIGIKAMSC_COMPILE_*, ENABLE_LCMS2,
+      KDE4_BUILD_TESTS.
+  
+  * patches/doc-linkage.patch: 
+  * patches/sendimages-icedove.diff: Remove.  Patched file no longer
+    in sources.
+
+  * patches/upstream_fix-compilation-with-Lensfun-0.3.2.patch: Remove.
+    Applied upstream.
+
+  * patches/cmake-disable-jasper.patch: New.  Disable build-time probe
+    for Jasper libraries.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 26 Jun 2016 11:18:24 -0500
+
 digikam (4:4.14.0-4) unstable; urgency=medium
 
   * Switch build-dep from libusb-dev to libusb-1.0-0-dev.

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2016-06-26 07:19:30 UTC (rev 20553)
+++ kde-extras/digikam/trunk/debian/control	2016-06-26 16:25:21 UTC (rev 20554)
@@ -3,43 +3,38 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>, Pino Toscano <pino at debian.org>, Steve M. Robbins <smr at debian.org>
-Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.9), pkg-config, cmake (>= 2.8.0),
+Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.15.21), pkg-config,
+ cmake (>= 3.0.0),
+ flex, bison,
  doxygen,
- kdelibs5-dev, kdepimlibs5-dev,
- libmarble-dev,
- libkipi-dev (>= 4:4.12), libkexiv2-dev (>= 4:4.12), libkdcraw-dev (>= 4:4.12), libksane-dev,
- baloo-dev, libkfilemetadata-dev,
- libqt4-dev, libqt4-opengl-dev, libgl1-mesa-dev, libglu1-mesa-dev,
- libqtwebkit-dev, libqtgstreamer-dev,
- libmagickcore-dev, imagemagick,
- libhupnp-dev,
- libgtk2.0-dev,
- libxslt1-dev | libxslt-dev, libxml2-dev,
- libgpod-nogtk-dev,
- libqca2-dev,
- libqjson-dev,
- libpng-dev, libtiff-dev, libjpeg-dev,
- mysql-server-core-5.6 | virtual-mysql-server-core,
- libglib2.0-dev, libgphoto2-dev (>= 2.4),
- libusb-1.0-0-dev [!kfreebsd-any], libusb2-dev [kfreebsd-any],
- liblcms2-dev, liblqr-1-0-dev,
+ extra-cmake-modules (>= 1.7.0),
+ qtbase5-dev (>= 5.4.0), qtbase5-dev-tools (>= 5.4.0),
+ qtmultimedia5-dev,
+ libkf5calendarcore-dev,
+ libkf5filemetadata-dev,
+ libkf5kipi-dev,
+ libkf5notifications-dev,
+ libkf5notifyconfig-dev,
+ libqt5opengl5-dev,
+ libkf5sane-dev,
+ libkf5threadweaver-dev,
+ libqt5webkit5-dev,
+ libqt5x11extras5-dev,
+ libexiv2-dev,
+ libjpeg-dev,
+ libtiff-dev,
+ libpng-dev, 
+ liblcms2-dev,
+ libboost-graph1.60-dev,
+ libexpat1-dev | libexpat-dev,
  libopencv-dev (>= 2.4.9),
- libjasper-dev,
- liblensfun-dev (>= 0.2.7),
- libsqlite3-dev,
- libsqlite0-dev,
- libpgf-dev,
- flex, bison, libeigen3-dev (>= 3.1.2),
- libboost-graph-dev,
- libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev
-#
-# Missing optional build-deps:
-#   libkgeomap -- not packaged (2015-12-19)
-#   libmediawiki
-#   libkvkontatke
-#
+ liblqr-1-0-dev,
+ liblensfun-dev,
+ libgphoto2-dev, libgusb-dev,
+ libmarble-dev,
+ libeigen3-dev (>= 3.1.2)
 Build-Conflicts: libgraphicsmagick1-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/digikam/trunk/
 Homepage: http://www.digikam.org

Added: kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch	2016-06-26 16:25:21 UTC (rev 20554)
@@ -0,0 +1,21 @@
+Description: Disable probe for Jasper library
+Author: Steve Robbins <smr at debian.org>
+Forwarded: no
+
+Jasper is due to be removed from Debian so it would be a bug to link with it -- c.f. #818219.
+However, the upstream build process always probes for Jasper and at present the list of
+build-dependencies also pulls in Jasper dev libraries.  So we need to disable the probe.
+
+
+
+--- digikam-5.0.0~git20160625.orig/CMakeLists.txt
++++ digikam-5.0.0~git20160625/CMakeLists.txt
+@@ -267,7 +267,7 @@
+ find_package(Marble)
+ 
+ find_package(PkgConfig)
+-find_package(Jasper)
++#find_package(Jasper) -- disabled by Debian
+ find_package(Eigen3)                               # For Refocus tool.
+ find_package(OpenGL)                               # For Presentation tool.
+ 

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2016-06-26 07:19:30 UTC (rev 20553)
+++ kde-extras/digikam/trunk/debian/patches/series	2016-06-26 16:25:21 UTC (rev 20554)
@@ -1 +1,2 @@
+cmake-disable-jasper.patch
 mysql-global-conf.patch

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2016-06-26 07:19:30 UTC (rev 20553)
+++ kde-extras/digikam/trunk/debian/rules	2016-06-26 16:25:21 UTC (rev 20554)
@@ -7,18 +7,17 @@
 #CONFLICTS_SUBSTVAR := libkipi-data, libkexiv2-data, libkdcraw-data, libksane-data
 
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Augment path to find gphoto2-config; workaround for #826166
+export PATH := $(PATH):/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2-dev/bin
+
 %:
 	dh $@ --with kde --parallel 
 
 override_dh_auto_configure:
-	ln -s -n -f ../libkface15083 extra/libkface
 	dh_auto_configure --buildsystem=kde -- \
 	  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
-	  -DDIGIKAMSC_COMPILE_DOC=on \
-	  -DDIGIKAMSC_COMPILE_PO=on \
-	  -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
-	  -DENABLE_LCMS2=ON \
-	  -DKDE4_BUILD_TESTS=OFF \
 	  -DENABLE_MYSQLSUPPORT=ON \
 	  -DENABLE_INTERNALMYSQL=ON
 


