haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

dbus, revbump, fixes for pkgconfig (#12713)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-08-08 15:12:05 +02:00
committed by GitHub
parent 9ed17f1a80
commit 25117181a3
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sys-apps/dbus/dbus-1.16.2.recipe
View File

@@ -13,7 +13,7 @@ use behind a firewall with shared NFS home directories."
HOMEPAGE="https://freedesktop.org/wiki/Software/dbus/"
COPYRIGHT="2014 Red Hat, Inc."
LICENSE="GNU GPL v2"
REVISION="7"
REVISION="8"
SOURCE_URI="https://dbus.freedesktop.org/releases/dbus/dbus-$portVersion.tar.xz"
CHECKSUM_SHA256="0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6beb7e2"
PATCHES="dbus-$portVersion.patchset"
@@ -113,6 +113,7 @@ BUILD()
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$prefix/bin \
-DDBUS_RELOCATABLE=OFF \
-DCMAKE_INSTALL_DOCDIR=$documentationDir/packages/dbus \
-DDocBookXSL_DIR=/system/data/xml/docbook/xsl-stylesheets-1.79.2
@@ -123,14 +124,6 @@ INSTALL()
{
make -C build install
mv $libDir/dbus-1.0/include/dbus/*.h $includeDir/dbus-1.0/dbus/
rm -rf $libDir/dbus-1.0/
sed -i \
-e 's|-I${libdir}/dbus-1.0/include||' \
-e "s|prefix}/include|prefix}/$relativeIncludeDir|g" \
$libDir/pkgconfig/dbus-1.pc
prepareInstalledDevelLib \
libdbus-1
fixPkgconfig

45
sys-apps/dbus/patches/dbus-1.16.2.patchset
View File

@@ -1,4 +1,4 @@
From fbdec88a9078649585af82e354eb2f051dcc3a47 Mon Sep 17 00:00:00 2001
From 858fe992a9e0674feb5efd0fe5bf58480c3b1a3b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 12 Dec 2020 14:44:55 +0100
Subject: Haiku: maximum 4096 fds
@@ -21,10 +21,10 @@ index c1158c3..ef03b7b 100644
dbus_bool_t
_dbus_rlimit_raise_fd_limit (DBusError *error)
--
2.48.1
2.50.1
From 1fb71a4f2dbd932cc47fbfd159437d16aadcb51d Mon Sep 17 00:00:00 2001
From eb91d389b07942bf07f3bb0d1634deac9814e805 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Mon, 4 Aug 2025 13:19:46 +0200
Subject: Fix check for libnetwork
@@ -49,10 +49,10 @@ index 04f9ca2..6e46500 100644
### Client library
add_library(dbus-1 SHARED
--
2.48.1
2.50.1
From ea5e184706b75f924a4d4c8da98a53b30c2e99f9 Mon Sep 17 00:00:00 2001
From 762c09fc88894f08c82a2e6036fddaa3cbf864a6 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 7 Aug 2025 17:07:53 +0200
Subject: Fix documentation path
@@ -152,5 +152,38 @@ index 5caf5de..e4731d8 100644
-install(FILES ${EXAMPLES_SCRIPTS} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/examples)
+install(FILES ${EXAMPLES_SCRIPTS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)
--
2.48.1
2.50.1
From 3cde36e6cc89fa3bfc9f06ccb24e3f4acb2dbdc2 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Fri, 8 Aug 2025 13:57:16 +0200
Subject: Some fixes for pkg-config file
diff --git a/dbus-1.pc.in b/dbus-1.pc.in
index 3581be6..9dd5d79 100644
--- a/dbus-1.pc.in
+++ b/dbus-1.pc.in
@@ -18,4 +18,4 @@ Description: Free desktop message bus
Version: @VERSION@
Libs: -L${libdir} -ldbus-1
Libs.private: @LIBDBUS_LIBS@
-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include @DBUS_STATIC_BUILD_CPPFLAGS@
+Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include @DBUS_STATIC_BUILD_CPPFLAGS@
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 6e46500..3909c17 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -316,7 +316,7 @@ endif()
install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/dbus)
-install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include/dbus)
+install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/include/dbus)
### Internal library, used for the daemon, tools and tests, compiled statically.
--
2.50.1