[arch-commits] Commit in bluedevil/repos (10 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Thu Nov 28 07:44:33 UTC 2013
Date: Thursday, November 28, 2013 @ 08:44:32
Author: andrea
Revision: 200405
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
bluedevil/repos/extra-i686/PKGBUILD
(from rev 200404, bluedevil/trunk/PKGBUILD)
bluedevil/repos/extra-i686/bluedevil.install
(from rev 200404, bluedevil/trunk/bluedevil.install)
bluedevil/repos/extra-x86_64/PKGBUILD
(from rev 200404, bluedevil/trunk/PKGBUILD)
bluedevil/repos/extra-x86_64/bluedevil.install
(from rev 200404, bluedevil/trunk/bluedevil.install)
Deleted:
bluedevil/repos/extra-i686/PKGBUILD
bluedevil/repos/extra-i686/bluedevil.install
bluedevil/repos/extra-i686/fix-build.patch
bluedevil/repos/extra-x86_64/PKGBUILD
bluedevil/repos/extra-x86_64/bluedevil.install
bluedevil/repos/extra-x86_64/fix-build.patch
--------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++++++++++
/bluedevil.install | 24 ++++++++++++
extra-i686/PKGBUILD | 42 ----------------------
extra-i686/bluedevil.install | 12 ------
extra-i686/fix-build.patch | 46 ------------------------
extra-x86_64/PKGBUILD | 42 ----------------------
extra-x86_64/bluedevil.install | 12 ------
extra-x86_64/fix-build.patch | 46 ------------------------
8 files changed, 98 insertions(+), 200 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-i686/PKGBUILD 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=bluedevil
-pkgver=2.0.git3a7a27e
-pkgrel=1
-pkgdesc='KDE bluetooth framework'
-arch=('i686' 'x86_64')
-url="https://projects.kde.org/projects/extragear/base/bluedevil"
-license=('GPL')
-depends=('kdebase-workspace' 'libbluedevil')
-makedepends=('cmake' 'automoc4' 'git')
-install="${pkgname}.install"
-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(){
- cd build
- cmake ../${pkgname} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: bluedevil/repos/extra-i686/PKGBUILD (from rev 200404, bluedevil/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-28 07:44:32 UTC (rev 200405)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=bluedevil
+pkgver=2.0.gitdfbf95b
+pkgrel=1
+pkgdesc='KDE bluetooth framework'
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/projects/extragear/base/bluedevil"
+license=('GPL')
+depends=('kdebase-workspace' 'libbluedevil')
+makedepends=('cmake' 'automoc4' 'git')
+install="${pkgname}.install"
+source=("git://anongit.kde.org/${pkgname}.git#branch=bluez5")
+md5sums=('SKIP')
+
+pkgver() {
+ cd ${pkgname}
+ echo "2.0.git$(git log --pretty=format:'%h' -n 1)"
+}
+
+prepare() {
+ mkdir build
+}
+
+build(){
+ cd build
+ cmake ../${pkgname} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/bluedevil.install
===================================================================
--- extra-i686/bluedevil.install 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-i686/bluedevil.install 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: bluedevil/repos/extra-i686/bluedevil.install (from rev 200404, bluedevil/trunk/bluedevil.install)
===================================================================
--- extra-i686/bluedevil.install (rev 0)
+++ extra-i686/bluedevil.install 2013-11-28 07:44:32 UTC (rev 200405)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/fix-build.patch
===================================================================
--- extra-i686/fix-build.patch 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-i686/fix-build.patch 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,46 +0,0 @@
-From 5720d2054d2e5e087811093378bf6096e714f3dc Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <scarpino at 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
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-x86_64/PKGBUILD 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=bluedevil
-pkgver=2.0.git3a7a27e
-pkgrel=1
-pkgdesc='KDE bluetooth framework'
-arch=('i686' 'x86_64')
-url="https://projects.kde.org/projects/extragear/base/bluedevil"
-license=('GPL')
-depends=('kdebase-workspace' 'libbluedevil')
-makedepends=('cmake' 'automoc4' 'git')
-install="${pkgname}.install"
-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(){
- cd build
- cmake ../${pkgname} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: bluedevil/repos/extra-x86_64/PKGBUILD (from rev 200404, bluedevil/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-28 07:44:32 UTC (rev 200405)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=bluedevil
+pkgver=2.0.gitdfbf95b
+pkgrel=1
+pkgdesc='KDE bluetooth framework'
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/projects/extragear/base/bluedevil"
+license=('GPL')
+depends=('kdebase-workspace' 'libbluedevil')
+makedepends=('cmake' 'automoc4' 'git')
+install="${pkgname}.install"
+source=("git://anongit.kde.org/${pkgname}.git#branch=bluez5")
+md5sums=('SKIP')
+
+pkgver() {
+ cd ${pkgname}
+ echo "2.0.git$(git log --pretty=format:'%h' -n 1)"
+}
+
+prepare() {
+ mkdir build
+}
+
+build(){
+ cd build
+ cmake ../${pkgname} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/bluedevil.install
===================================================================
--- extra-x86_64/bluedevil.install 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-x86_64/bluedevil.install 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: bluedevil/repos/extra-x86_64/bluedevil.install (from rev 200404, bluedevil/trunk/bluedevil.install)
===================================================================
--- extra-x86_64/bluedevil.install (rev 0)
+++ extra-x86_64/bluedevil.install 2013-11-28 07:44:32 UTC (rev 200405)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/fix-build.patch
===================================================================
--- extra-x86_64/fix-build.patch 2013-11-28 07:44:24 UTC (rev 200404)
+++ extra-x86_64/fix-build.patch 2013-11-28 07:44:32 UTC (rev 200405)
@@ -1,46 +0,0 @@
-From 5720d2054d2e5e087811093378bf6096e714f3dc Mon Sep 17 00:00:00 2001
-From: Andrea Scarpino <scarpino at 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
-
More information about the arch-commits
mailing list