[SCM] solid packaging branch, master, updated. debian/5.28.0-3-2-g5a262a4

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=5a262a4

The following commit has been merged in the master branch:
commit 5a262a4eb216863f542bdc4a3179310cb9b80328
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 18 16:24:12 2017 +0200

    fix build on kFreeBSD
    
    backport upstream commit f4a272b2b9c3c16f5f0e3aa1e416080aeb045c36
---
 debian/changelog                                   |  4 +++
 ...-udisks2-backend-on-FreeBSD-only-when-ena.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 264abfe..9f41646 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 solid (5.28.0-4) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit f4a272b2b9c3c16f5f0e3aa1e416080aeb045c36 to fix
+    build on kFreeBSD; patch
+    cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Jun 2017 16:22:01 +0200
 
diff --git a/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch b/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch
new file mode 100644
index 0000000..30e7460
--- /dev/null
+++ b/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch
@@ -0,0 +1,35 @@
+From f4a272b2b9c3c16f5f0e3aa1e416080aeb045c36 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Mon, 5 Jun 2017 08:40:07 +0200
+Subject: [PATCH] cmake: build udisks2 backend on FreeBSD only when enabled
+
+there is no point building sources that are not used otherwise
+---
+ src/solid/devices/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/solid/devices/CMakeLists.txt b/src/solid/devices/CMakeLists.txt
+index b841b54..cfb4f72 100644
+--- a/src/solid/devices/CMakeLists.txt
++++ b/src/solid/devices/CMakeLists.txt
+@@ -96,6 +96,8 @@ include(devices/backends/fakehw/CMakeLists.txt)
+ if(NOT WIN32 AND NOT APPLE)
+    if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+       option(EXPERIMENTAL_BSDISKS "Use UDisks2/bsdisks backend instead of HAL to manage disk devices" OFF)
++   else ()
++      set(EXPERIMENTAL_BSDISKS FALSE)
+    endif()
+ 
+    if ( UDEV_FOUND )
+@@ -107,7 +109,7 @@ if(NOT WIN32 AND NOT APPLE)
+    include(devices/backends/upower/CMakeLists.txt)
+ 
+    # FIXME: this should work on more Unix systems
+-   if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
++   if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR EXPERIMENTAL_BSDISKS)
+         message(STATUS "Building Solid UDisks2 backend." )
+         include(devices/backends/udisks2/CMakeLists.txt)
+    endif ()
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 54342a4..bc9e955 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use_shortest_filepath.diff
 fix-FTBFS-on-mipsel-and-m68k-src-solid-predicate_parser.c.patch
 Work-round-DBus-property-fetching-bug.patch
 UDisks-2-Device-Add-description-for-Floppy-Disk.patch
+cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch

-- 
solid packaging