Merge pull request #2052 from Rmys/master

dbus-1.16.0

system/base/dbus/actions.py

@@ -8,57 +8,54 @@ from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools
+
 
 def setup():
-    pisitools.dosed("configure.ac", '(AS_AC_EXPAND\(EXPANDED_LOCALSTATEDIR, )"\$localstatedir"\)', r'\1 "")')
-    for f in ["bus/Makefile.am", "bus/Makefile.in"]:
-        pisitools.dosed(f, "\$\(localstatedir\)(\/run\/dbus)", "\\1")
+    # pisitools.dosed("configure.ac", '(AS_AC_EXPAND\(EXPANDED_LOCALSTATEDIR, )"\$localstatedir"\)', r'\1 "")')
+    # for f in ["bus/Makefile.am", "bus/Makefile.in"]:
+        # pisitools.dosed(f, "\$\(localstatedir\)(\/run\/dbus)", "\\1")
     options = "\
-               --disable-selinux \
-               --disable-static \
-               --disable-tests \
-               --disable-asserts \
-               --disable-checks \
-               --disable-embedded-tests \
-               --disable-modular-tests \
-               --disable-doxygen-docs \
-               --disable-libaudit \
-               --disable-silent-rules \
-               --enable-inotify \
-               --enable-user-session \
-               --with-systemduserunitdir=no \
-               --with-systemdsystemunitdir=no \
-               --with-xml=expat \
-               --with-system-pid-file=/run/dbus/pid \
-               --with-system-socket=/run/dbus/system_bus_socket \
-               --with-console-auth-dir=/run/console/ \
-               --with-session-socket-dir=/tmp \
-               --with-dbus-user=dbus \
-               --enable-abstract-sockets=auto \
-               --disable-xml-docs"
+               -Dselinux=disabled \
+               -Dasserts=false \
+               -Dchecks=false \
+               -Dmodular_tests=disabled \
+               -Ddoxygen_docs=disabled \
+               -Dlibaudit=disabled \
+               -Dinotify=enabled \
+               -Duser_session=true \
+               -Dsystemd=disabled \
+               -Dsystemd_system_unitdir=disabled \
+               -Dsystemd_user_unitdir=disabled \
+               -Dsystem_pid_file=/run/dbus/pid \
+               -Dsystem_socket=/run/dbus/system_bus_socket \
+               -Dsession_socket_dir=/tmp \
+               -Ddbus_user=dbus \
+               -Dxml_docs=disabled"
 
-    if get.buildTYPE() == "emul32":
+                # --with-console-auth-dir=/run/console/ \
+                # --enable-abstract-sockets=auto \
+
+    if get.buildTYPE() == "_emul32":
         options += " \
                      --libdir=/usr/lib32 \
-                     --disable-xml-docs \
-                     --without-elogind \
-                     --disable-doxygen-docs \
+                    -Druntime_dir=/run \
+                     -Ddoxygen_docs=disabled \
                    "
-        # Build only libdbus
-        pisitools.dosed("Makefile.am", "(.*SUBDIRS=dbus) .*", "\\1")
 
-    autotools.autoreconf("-vif")
-    autotools.configure(options)
+    mesontools.configure(options)
 
 def build():
-    autotools.make()
+    mesontools.build()
 
 def check():
-    autotools.make("check")
+    mesontools.build("test")
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    if get.buildTYPE() == "emul32":
+    mesontools.install()
+    if get.buildTYPE() == "_emul32":
+        # pisitools.removeDir("/usr/bin32")
+        pisitools.dosed("%s/usr/lib32/pkgconfig/*.pc" % get.installDIR(), "bin32", "bin")
         return
 
     # needs to exist for the system socket

system/base/dbus/pspec.xml

@@ -13,8 +13,9 @@
         <IsA>service</IsA>
         <Summary>A message bus system, a simple way for applications to talk to each other</Summary>
         <Description>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, but TCP/IP option is available and remote support planned.</Description>
-        <Archive sha1sum="47f03306a491509cdebacded837e51b086835252" type="tarxz">https://dbus.freedesktop.org/releases/dbus/dbus-1.14.10.tar.xz</Archive>
+        <Archive sha1sum="29a3de47fef882e620b7b2ff275250fa3fd442be" type="tarxz">https://dbus.freedesktop.org/releases/dbus/dbus-1.16.0.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency versionFrom="2.5.0">expat-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
             <!--<Dependency>doxygen</Dependency>-->
@@ -85,9 +86,9 @@
 
     <Package>
         <Name>dbus-32bit</Name>
-        <PartOf>emul32</PartOf>
+        <PartOf>_emul32</PartOf>
         <Summary>32-bit shared libraries for dbus</Summary>
-        <BuildType>emul32</BuildType>
+        <BuildType>_emul32</BuildType>
         <BuildDependencies>
             <Dependency>expat-32bit</Dependency>
         </BuildDependencies>
@@ -99,6 +100,13 @@
     </Package>
 
     <History>
+        <Update release="25">
+            <Date>2024-12-21</Date>
+            <Version>1.16.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="24">
             <Date>2024-07-16</Date>
             <Version>1.14.10</Version>