Changeset 475d4388

Timestamp:

03/06/2022 09:50:13 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

7969f18

Parents:

02d60dda

git-author:

Pierre Labastie <pierre.labastie@…> (03/06/2022 09:49:32 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (03/06/2022 09:50:13 AM)

Message:

Update to upower-0.99.16

Files:

• general/sysutils/upower.xml (modified) (5 diffs)
• packages.ent (modified) (1 diff)

general/sysutils/upower.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY upower-download-http "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-&upower-version;.tar.xz">
+  <!ENTITY upower-download-http "https://gitlab.freedesktop.org/upower/upower/-/archive/v&upower-version;/upower-v&upower-version;.tar.bz2">
   <!ENTITY upower-download-ftp  " ">
-  <!ENTITY upower-md5sum        "0c945817c12a7967d2c5edf7138fcf80">
-  <!ENTITY upower-size          "438 KB">
-  <!ENTITY upower-buildsize     "15 MB (with tests)">
-  <!ENTITY upower-time          "0.1 SBU (using parallelism=4, add 0.8 SBU for tests)">
+  <!ENTITY upower-md5sum        "f87ac5b7198f3041f06e7b3c121d442c">
+  <!ENTITY upower-size          "136 KB">
+  <!ENTITY upower-buildsize     "6.2 MB (with tests)">
+  <!ENTITY upower-time          "less than 0.1 SBU (using parallelism=4, 0.4 SBU for tests)">
 ]>
 
@@ -128 +128 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr         \
-             --sysconfdir=/etc    \
-             --localstatedir=/var \
-             --enable-deprecated  \
-             --disable-static     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Some
+<screen revision="sysv"><userinput>sed '/subdir.*doc/d' -i meson.build &amp;&amp;
+mkdir build                         &amp;&amp;
+cd    build                         &amp;&amp;
+meson --prefix=/usr                        \
+      --buildtype=release                  \
+      -Dgtk-doc=false                      \
+      -Dman=false                          \
+      -Dsystemdsystemunitdir=no            \
+      -Dudevrulesdir=/usr/lib/udev/rules.d \
+      ..                            &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>sed '/subdir.*doc/d' -i meson.build &amp;&amp;
+mkdir build                         &amp;&amp;
+cd    build                         &amp;&amp;
+meson --prefix=/usr       \
+      --buildtype=release \
+      -Dgtk-doc=false     \
+      -Dman=false         \
+      ..                            &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>. Some
       checks may not pass due to missing files. Test suite should be run from
       a local GUI session started with dbus-launch.
@@ -145 +160 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -153 +168 @@
 
     <para>
-      <parameter>--enable-deprecated</parameter>: This switch enables
-      deprecated functionality which is still needed by some
-      applications.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+      <command>sed 'subdir.*doc/d' ...</command>: Even when passing
+      <parameter>-Dgtk-doc=false</parameter> and
+      <parameter>-Dman=false</parameter>, the build still needs
+      <application>GTK-doc</application>. This command allows building
+      without it. Remove if you have <application>GTK-doc</application>
+      installed and you wish to build the documentation (remove also
+      the next two parameters).
+    </para>
+
+    <para>
+      <parameter>-Dgtk-doc=false</parameter>: Prevents building the
+      documentation. Remove if you have <application>GTK-doc</application>
+      installed and wish to build the documentation.
+    </para>
+
+    <para>
+      <parameter>-Dman=false</parameter>: Prevents building the
+      manual pages. Remove if you have <application>GTK-doc</application>
+      installed and wish to build the manual pages.
+    </para>
+
+    <para revision="sysv">
+      <parameter>-Dsystemdsystemunitdir=no</parameter>: Removes
+      the dependency on <application>systemd</application>.
+    </para>
+
+    <para revision="sysv">
+      <parameter>-Dudevrulesdir=/usr/lib/udev/rules.d</parameter>: Tells
+      the build system where to install <application>udev</application>
+      rules, because the information is missing in
+      <filename>/usr/lib/pkgconfig/libudev.pc</filename>
+    </para>
 
   </sect2>
@@ -183 +220 @@
     </para>
 -->
-    <sect3  id="upower-init" revision="systemd">
+    <sect3  id="upower-init">
       <title>Systemd Unit</title>
 

packages.ent

@@ -324 +324 @@
 <!ENTITY unrar-version                "6.1.4">
 <!ENTITY unzip-version                "6.0">
-<!ENTITY upower-version               "0.99.13">
+<!ENTITY upower-version               "0.99.16">
 <!ENTITY usbutils-version             "014">
 <!ENTITY weston-version               "1.12.0">