summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/dbus-python/Makefile34
-rw-r--r--package/dbus/Makefile6
-rw-r--r--package/dbus/patches/patch-configure30
3 files changed, 37 insertions, 33 deletions
diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile
new file mode 100644
index 000000000..e76d508a7
--- /dev/null
+++ b/package/dbus-python/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= dbus-python
+PKG_VERSION:= 1.2.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b09cd2d1a057cc432ce944de3fc06bf7
+PKG_DESCR:= DBUS python bindings
+PKG_SECTION:= libs
+PKG_DEPENDS:= dbus dbus-glib
+PKG_BUILDDEP:= dbus dbus-glib
+PKG_URL:= http://dbus.freedesktop.org/doc/dbus-python/
+PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-python/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,DBUS_PYTHON,dbus-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+dbus-python-install:
+ $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/
+ $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/*.so \
+ $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/
+ $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus
+ $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/*.py \
+ $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/
+ $(INSTALL_DIR) $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
+ $(CP) $(WRKINST)/usr/lib/python2.7/site-packages/dbus/mainloop/*.py \
+ $(IDIR_DBUS_PYTHON)/usr/lib/python2.7/site-packages/dbus/mainloop
+
+
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 8b7a96504..f0f89e666 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
-PKG_VERSION:= 1.4.6
+PKG_VERSION:= 1.6.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= 99b165f727dd8a5c4b7e2c20a8bf5db6
-PKG_DESCR:= DBUS library
+PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748
+PKG_DESCR:= DBUS library and daemon
PKG_SECTION:= libs
PKG_DEPENDS:= libexpat libx11
PKG_BUILDDEP:= expat libX11
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
deleted file mode 100644
index 1aa31b56b..000000000
--- a/package/dbus/patches/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- dbus-1.4.6.orig/configure 2011-02-17 21:06:57.000000000 +0100
-+++ dbus-1.4.6/configure 2011-04-26 16:00:48.797847993 +0200
-@@ -18718,7 +18718,7 @@ DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_
-
-
- DBUS_BUS_CFLAGS="$XML_CFLAGS"
--DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs"
-+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $ADT_LIBS $NETWORK_libs"
-
-
-
-@@ -19608,18 +19608,6 @@ if test "x$GCC" = "xyes"; then
- ;;
- esac
-
-- case " $CFLAGS " in
-- *[\ \ ]-fPIE[\ \ ]*) ;;
-- *) if test x$dbus_win = xno && cc_supports_flag -fPIE; then
-- PIE_CFLAGS="-fPIE"
-- if ld_supports_flag -z,relro; then
-- PIE_LDFLAGS="-pie -Wl,-z,relro"
-- else
-- PIE_LDFLAGS="-pie"
-- fi
-- fi
-- ;;
-- esac
-
- ### Disabled warnings, and compiler flag overrides
-