Date: Wednesday, November 27, 2013 @ 16:53:02 Author: andrea Revision: 200384
Fix build and proper versioning Added: bluedevil/trunk/fix-build.patch Modified: bluedevil/trunk/PKGBUILD -----------------+ PKGBUILD | 23 ++++++++++++++++++----- fix-build.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-27 11:26:40 UTC (rev 200383) +++ PKGBUILD 2013-11-27 15:53:02 UTC (rev 200384) @@ -2,8 +2,8 @@ # Maintainer: Andrea Scarpino <and...@archlinux.org> pkgname=bluedevil -pkgver=2.0 -pkgrel=0.1 +pkgver=2.0git3a7a27e +pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') url="https://projects.kde.org/projects/extragear/base/bluedevil" @@ -11,11 +11,24 @@ depends=('kdebase-workspace' 'libbluedevil') makedepends=('cmake' 'automoc4' 'git') install="${pkgname}.install" -source=("git://anongit.kde.org/${pkgname}.git#branch=bluez5") -md5sums=('SKIP') +source=("git://anongit.kde.org/${pkgname}.git#branch=bluez5" + 'fix-build.patch') +md5sums=('SKIP' + '4bc2613ab2b5d1125f63af615911d7f1') +pkgver() { + cd ${pkgname} + echo "2.0.git$(git log --pretty=format:'%h' -n 1)" +} + +prepare() { + mkdir build + + cd ${pkgname} + patch -p1 -i "${srcdir}"/fix-build.patch +} + build(){ - mkdir build cd build cmake ../${pkgname} \ -DCMAKE_BUILD_TYPE=Release \ Added: fix-build.patch =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2013-11-27 15:53:02 UTC (rev 200384) @@ -0,0 +1,46 @@ +From 5720d2054d2e5e087811093378bf6096e714f3dc Mon Sep 17 00:00:00 2001 +From: Andrea Scarpino <scarp...@kde.org> +Date: Wed, 27 Nov 2013 16:19:32 +0100 +Subject: [PATCH] Fix build + +--- + src/kio/obexftp/daemon/CMakeLists.txt | 2 +- + src/kio/obexftp/obexdtypes.h | 7 ------- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/kio/obexftp/daemon/CMakeLists.txt b/src/kio/obexftp/daemon/CMakeLists.txt +index e45f64f..4fcf880 100644 +--- a/src/kio/obexftp/daemon/CMakeLists.txt ++++ b/src/kio/obexftp/daemon/CMakeLists.txt +@@ -7,7 +7,7 @@ set(SENDER_PLUGIN_PATH ${CMAKE_SOURCE_DIR}/src/actionplugins/sendfile/helper/) + qt4_add_dbus_interface(kded_obexftp_SRCS ${SENDER_PLUGIN_PATH}org.bluez.obex.Client1.xml obexd_client) + + set(OBJECT_MANAGER_FILE org.freedesktop.DBus.ObjectManager.xml) +-set_source_files_properties(${OBJECT_MANAGER_FILE} PROPERTIES INCLUDE "../obexdtypes.h") ++set_source_files_properties(${OBJECT_MANAGER_FILE} PROPERTIES INCLUDE "${LibBlueDevil_INCLUDE_DIR}/bluedevil/bluedevildbustypes.h") + qt4_add_dbus_interface(kded_obexftp_SRCS org.freedesktop.DBus.ObjectManager.xml dbus_object_manager) + + kde4_add_plugin(kded_obexftpdaemon +diff --git a/src/kio/obexftp/obexdtypes.h b/src/kio/obexftp/obexdtypes.h +index f3496f1..2e957a0 100644 +--- a/src/kio/obexftp/obexdtypes.h ++++ b/src/kio/obexftp/obexdtypes.h +@@ -21,15 +21,8 @@ + + #include <QtCore/QList> + #include <QtCore/QVariantMap> +-#include <QVariantMap> +-#include <QDBusObjectPath> + + typedef QList<QVariantMap> QVariantMapList; + Q_DECLARE_METATYPE(QVariantMapList); + +-typedef QMap<QString,QVariantMap> QVariantMapMap; +-Q_DECLARE_METATYPE(QVariantMapMap) +- +-typedef QMap<QDBusObjectPath, QVariantMapMap> DBusManagerStruct; +-Q_DECLARE_METATYPE(DBusManagerStruct) + #endif //OBEXD_TYPES_H +-- +1.8.4.2 +