From d3de5b0594c898a31b93edcb59942cedb612c126 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 15 Jul 2014 13:23:03 -0400 Subject: [PATCH] dbus: working recipe. --- sys-apps/dbus/dbus-1.6.8.recipe | 32 ------- sys-apps/dbus/dbus-1.8.6.recipe | 112 +++++++++++++++++++++++++ sys-apps/dbus/patches/dbus-1.6.8.patch | 11 --- 3 files changed, 112 insertions(+), 43 deletions(-) delete mode 100644 sys-apps/dbus/dbus-1.6.8.recipe create mode 100644 sys-apps/dbus/dbus-1.8.6.recipe delete mode 100644 sys-apps/dbus/patches/dbus-1.6.8.patch diff --git a/sys-apps/dbus/dbus-1.6.8.recipe b/sys-apps/dbus/dbus-1.6.8.recipe deleted file mode 100644 index 9ee5b2dbe..000000000 --- a/sys-apps/dbus/dbus-1.6.8.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="dbus message bus system" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus" -SRC_URI="http://dbus.freedesktop.org/releases/dbus/dbus-1.6.8.tar.gz" -CHECKSUM_MD5="3bf059c7dd5eda5f539a1b7cfe7a14a2" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." - -BUILD() -{ - cd dbus-1.6.8 - ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ - --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ - --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" - make -} - -INSTALL() -{ - cd dbus-1.6.8 - make install -} - -TEST() -{ - cd dbus-1.6.8 - make check -} - -LICENSE="GNU GPL v2" - diff --git a/sys-apps/dbus/dbus-1.8.6.recipe b/sys-apps/dbus/dbus-1.8.6.recipe new file mode 100644 index 000000000..a6460303b --- /dev/null +++ b/sys-apps/dbus/dbus-1.8.6.recipe @@ -0,0 +1,112 @@ +SUMMARY="D-Bus provides simple way for applications to talk to one another." +DESCRIPTION="NOTE: D-Bus should not be used in native Haiku apps, but is only \ +here because some ported software requires it. + +D-Bus supplies both a system daemon (for events such as \"\ +new hardware device added\" or \"printer queue changed\") and a per-user\ +-login-session daemon (for general IPC needs among user applications). \ +Also, the message bus is built on top of a general one-to-one message passing \ +framework, which can be used by any two apps to communicate directly (without \ +going through the message bus daemon). Currently the communicating \ +applications are on one computer, or through unencrypted TCP/IP suitable for \ +use behind a firewall with shared NFS home directories." +HOMEPAGE="http://freedesktop.org/wiki/Software/dbus" +COPYRIGHT="2014 Freedesktop.org" +LICENSE="GNU GPL v2" +SRC_URI="http://dbus.freedesktop.org/releases/dbus/dbus-1.8.6.tar.gz" +CHECKSUM_SHA256="eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f" +SOURCE_DIR="dbus-$portVersion" +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +GLOBAL_WRITABLE_FILES=" + settings/dbus-1/session.conf keep-old + settings/dbus-1/system.conf keep-old + " + +PROVIDES=" + dbus$secondaryArchSuffix = $portVersion + cmd:dbus_cleanup_sockets = $portVersion + cmd:dbus_daemon = $portVersion + cmd:dbus_launch = $portVersion + cmd:dbus_monitor = $portVersion + cmd:dbus_run_session = $portVersion + cmd:dbus_send = $portVersion + cmd:dbus_uuidgen = $portVersion + lib:libdbus_1$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + glib2$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix + lib:libffi$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + glib2${secondaryArchSuffix}_devel + devel:libexecinfo$secondaryArchSuffix + devel:libffi$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:awk + cmd:pkg_config$secondaryArchSuffix + cmd:find + cmd:make + cmd:g++$secondaryArchSuffix + " + +PROVIDES_devel=" + dbus${secondaryArchSuffix}_devel = $portVersion + devel:libdbus_1$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + dbus$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD() +{ +# runConfigure --omit-dirs binDir ./configure \ +# --with-system-pid-file=/var/run/dbus/pid \ +# --with-system-socket=/var/run/dbus/system_bus_socket \ +# --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install + fixPkgconfig + + # no way to tell autoconf about this + mv $libDir/*.a $developLibDir + mv $libDir/*.la $developLibDir + + prepareInstalledDevelLibs \ + libdbus-1 + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} diff --git a/sys-apps/dbus/patches/dbus-1.6.8.patch b/sys-apps/dbus/patches/dbus-1.6.8.patch deleted file mode 100644 index d63b40a1b..000000000 --- a/sys-apps/dbus/patches/dbus-1.6.8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dbus-1.6.8/dbus/sd-daemon.c 2011-07-13 20:42:21.040108032 +0000 -+++ dbus-1.6.8-haiku/dbus/sd-daemon.c 2013-02-12 18:57:28.067108864 +0000 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include