From 46a0c294dfa00a6f31872e9adad44b5c4f819ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Sat, 18 Oct 2014 13:53:48 +0200
Subject: Fix FTBFS on openbsd beacuse of invalid headers in tdeioslave_media
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <francois.andriot@free.fr>"
---
 tdeioslave/media/medianotifier/medianotifier.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tdeioslave/media')

diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 2db917b25..4de36cad8 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -19,7 +19,13 @@
 
 #include "medianotifier.h"
 
+#ifdef __OpenBSD__
+#include <sys/statvfs.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+#else
 #include <sys/vfs.h>
+#endif
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-- 
cgit v1.2.1


From 0f2ad67259c94671dd9b3b1960ccf7aebe31f292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Sat, 18 Oct 2014 13:54:30 +0200
Subject: Fix FTBFS on openbsd because of missing header in tdeioslave_media
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <francois.andriot@free.fr>"
---
 tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tdeioslave/media')

diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index dc46e8287..61c5ccbbd 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -33,6 +33,9 @@
 #ifdef HAVE_STATVFS
 # include <sys/statvfs.h>
 #else
+# ifdef __OpenBSD__
+#  include <sys/param.h>
+# endif
 # include <sys/mount.h>
 # define statvfs statfs
 # define f_frsize f_bsize
-- 
cgit v1.2.1


From 107220694fe3387df4051dcd94ae6c9995cb45f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 18 Oct 2014 14:19:37 +0200
Subject: Allow contitional build with tdehwlib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 tdeioslave/media/mediamanager/CMakeLists.txt       | 37 ++++++++--------------
 .../media/medianotifier/notificationdialog.cpp     |  2 ++
 .../media/mounthelper/tdeio_media_mounthelper.cpp  |  4 +++
 3 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'tdeioslave/media')

diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
index 5a73f3708..21faaeaf7 100644
--- a/tdeioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -36,30 +36,21 @@ install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 set( target kded_mediamanager )
 
 if( WITH_HAL )
-  set( ${target}_SRCS
-    mediamanager.cpp mediamanager.skel medialist.cpp
-    backendbase.cpp fstabbackend.cpp removablebackend.cpp
-    mediadirnotify.cpp mediadirnotify.skel
-    decryptdialog.ui dialog.cpp
-    halbackend.cpp linuxcdpolling.cpp tdehardwarebackend.cpp
-  )
+  set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
+  set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
+endif( )
 
-  tde_add_kpart( ${target} AUTOMOC
-    SOURCES ${${target}_SRCS}
-    LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
-    DESTINATION ${PLUGIN_INSTALL_DIR}
-  )
-else( )
-  set( ${target}_SRCS
+if( WITH_TDEHWLIB )
+  set( TDEHWBACKEND tdehardwarebackend.cpp )
+endif( WITH_TDEHWLIB )
+
+tde_add_kpart( ${target} AUTOMOC
+  SOURCES
     mediamanager.cpp mediamanager.skel medialist.cpp
     backendbase.cpp fstabbackend.cpp removablebackend.cpp
     decryptdialog.ui dialog.cpp
-    mediadirnotify.cpp mediadirnotify.skel tdehardwarebackend.cpp
-  )
-
-  tde_add_kpart( ${target} AUTOMOC
-    SOURCES ${${target}_SRCS}
-    LINK mediacommon-static tdeinit_kded-shared
-    DESTINATION ${PLUGIN_INSTALL_DIR}
-  )
-endif( )
+    mediadirnotify.cpp mediadirnotify.skel
+    ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
+  LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index c9a920f99..7e4004e8c 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -28,7 +28,9 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
+#ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
+#endif
 
 #include "actionlistboxitem.h"
 #include "notificationdialogview.h"
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 5357bc68d..3f0319f9f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -33,7 +33,9 @@
 #include <kprocess.h>
 #include <tdestartupinfo.h>
 #include <kmimetype.h>
+#ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
+#endif
 
 #include "dialog.h"
 #include "tdeio_media_mounthelper.h"
@@ -187,6 +189,7 @@ MountHelper::MountHelper() : TDEApplication()
 
 void MountHelper::invokeEject(const TQString &device, bool quiet)
 {
+#ifdef __TDE_HAVE_TDEHWLIB
 	// Try TDE HW library eject first...
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
@@ -197,6 +200,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
 			::exit(0);
 		}
 	}
+#endif
 
 	// Then fall back to tdeeject if needed
 	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
-- 
cgit v1.2.1