commit de64f434cececbc394e7991ae236f781f681d559 Author: Tim Biermann <tbier@posteo.de> Date: Tue Mar 1 09:55:57 2022 +0100 upower: removed old files, changed libexecdir, always disable gtk-doc diff --git a/upower/.footprint b/upower/.footprint index 16faf86f1..b470cb6c4 100644 --- a/upower/.footprint +++ b/upower/.footprint @@ -29,8 +29,8 @@ lrwxrwxrwx root/root usr/lib/libupower-glib.so.3 -> libupower-glib.so.3.1.0 -rwxr-xr-x root/root usr/lib/libupower-glib.so.3.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/upower-glib.pc -drwxr-xr-x root/root usr/libexec/ --rwxr-xr-x root/root usr/libexec/upowerd +drwxr-xr-x root/root usr/lib/upower/ +-rwxr-xr-x root/root usr/lib/upower/upowerd drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/interfaces/ diff --git a/upower/.signature b/upower/.signature index c10e8291d..47f0a6a39 100644 --- a/upower/.signature +++ b/upower/.signature @@ -1,9 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SealILcAgFQ6GUHKYLGS67k8XmsnOfcFWug4BdZ31h+igzywKdivHE6sXbD60vS9PCa9N7c3c4Ri1QJ8vfdjQI= -SHA256 (Pkgfile) = 0740be64bd428ce9e50f06d237263dd89dfbd17acf08a9aa1b6bfdab25bcd7ed -SHA256 (.footprint) = a5797f1ce30b51d4c9b92180ea4120e7e8cf8a1f2a47c968ae07808443868837 +RWSE3ohX2g5d/RhXe4/G0ZQJyjpMwyt3nQqVGunT71qkwwyWra0wtfP2jxaOa5MoL+iDPt/s7y83nUtrpRa2bFuoMvYsjOU5eAM= +SHA256 (Pkgfile) = 52b86f3467319a4b9cd3452fb5a25bc4cdb1d211876cbd0be03fa6ec938043ad +SHA256 (.footprint) = 3280d5dabdd7fdc9c791e99c5dca2fb5911e6670603106dd27326ff0d9a35e65 SHA256 (upower-v0.99.16.tar.bz2) = 7e6a6867fcfc477dab24ae2e34b8f196eae062ef662197b59f618743fdf28e6e -SHA256 (upower.1) = c4e05bc89b31c9ddc206a33d97c15c2babbce5330f79e0849c84fb878e896c6b -SHA256 (UPower.7) = 50b3e3b2cec513492c88e270fcf3dee2f98d11f52130827740f804a1492b6dd8 -SHA256 (upowerd.8) = d31cd082985a171a92d63126304964453d5dc3c1431960885f2fe2259784786f -SHA256 (disable-gtk-docs.patch) = 7aadf5aeea7f667beadfec29febfc0cd63a5b7ec6b725b3af9a16242ce0dd7c9 diff --git a/upower/0001-build-Fix-default-udevrulesdir.patch b/upower/0001-build-Fix-default-udevrulesdir.patch deleted file mode 100644 index ad70b1ca0..000000000 --- a/upower/0001-build-Fix-default-udevrulesdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 5 Feb 2022 02:26:48 +0000 -Subject: [PATCH] build: Fix default udevrulesdir - -We need to append 'rules.d' to the udev_dir. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f87de19b98cf..3858cbe0afdf 100644 ---- a/meson.build -+++ b/meson.build -@@ -90,7 +90,7 @@ endif - udevrulesdir = get_option('udevrulesdir') - if udevrulesdir == 'auto' - udev_dep = dependency('udev', required: true) -- udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') -+ udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') / 'rules.d' - endif - - dbusdir = get_option('datadir') / 'dbus-1' diff --git a/upower/105.patch b/upower/105.patch deleted file mode 100644 index 0aee93c1e..000000000 --- a/upower/105.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8eb8ab1056e03b68634098b754c89c5a99f33c5c Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 5 Feb 2022 02:26:48 +0000 -Subject: [PATCH 1/2] build: Fix default udevrulesdir - -We need to append 'rules.d' to the udev_dir. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f87de19..3858cbe 100644 ---- a/meson.build -+++ b/meson.build -@@ -90,7 +90,7 @@ endif - udevrulesdir = get_option('udevrulesdir') - if udevrulesdir == 'auto' - udev_dep = dependency('udev', required: true) -- udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') -+ udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') / 'rules.d' - endif - - dbusdir = get_option('datadir') / 'dbus-1' --- -GitLab - - -From 1dc74629ff24a2121f17f6e38b2c8067be0b7182 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 5 Feb 2022 02:30:52 +0000 -Subject: [PATCH 2/2] build: Fix version macros - -The project version is a string. We need to split it into an array of -version components. ---- - libupower-glib/meson.build | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/libupower-glib/meson.build b/libupower-glib/meson.build -index 1bab59b..2ff7baf 100644 ---- a/libupower-glib/meson.build -+++ b/libupower-glib/meson.build -@@ -1,7 +1,12 @@ -+version_arr = meson.project_version().split('.') -+major_version = version_arr[0].to_int() -+minor_version = version_arr[1].to_int() -+micro_version = version_arr[2].to_int() -+ - cdata = configuration_data() --cdata.set('UP_MAJOR_VERSION', meson.project_version()[0]) --cdata.set('UP_MINOR_VERSION', meson.project_version()[1]) --cdata.set('UP_MICRO_VERSION', meson.project_version()[2]) -+cdata.set('UP_MAJOR_VERSION', major_version) -+cdata.set('UP_MINOR_VERSION', minor_version) -+cdata.set('UP_MICRO_VERSION', micro_version) - - up_version_h = configure_file( - output: 'up-version.h', --- -GitLab - diff --git a/upower/Pkgfile b/upower/Pkgfile index ad724f506..14a00ecff 100644 --- a/upower/Pkgfile +++ b/upower/Pkgfile @@ -6,23 +6,23 @@ name=upower version=0.99.16 -release=1 -source=(https://gitlab.freedesktop.org/upower/upower/-/archive/v$version/upower-v$ve... - upower.1 UPower.7 upowerd.8 disable-gtk-docs.patch) +release=2 +source=(https://gitlab.freedesktop.org/upower/upower/-/archive/v$version/upower-v$ve...) build() { prt-get isinst libxslt || PKGMK_UPOWER+=' -D man=false' - prt-get isinst gtk-doc || PKGMK_UPOWER+=' -D gtk-doc=false' meson setup build $name-v$version $PKGMK_UPOWER \ --prefix=/usr \ + --libexecdir=lib/upower \ --buildtype=plain \ --wrap-mode nodownload \ -D b_lto=true \ -D b_pie=true \ -D os_backend=dummy \ -D udevrulesdir=/lib/udev/rules.d \ - -D systemdsystemunitdir=no + -D systemdsystemunitdir=no \ + -D gtk-doc=false meson compile -C build -j ${JOBS:-1} DESTDIR=$PKG meson install -C build diff --git a/upower/UPower.7 b/upower/UPower.7 deleted file mode 100644 index 18e46397f..000000000 --- a/upower/UPower.7 +++ /dev/null @@ -1,76 +0,0 @@ -'\" t -.\" Title: UPower -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: March 2008 -.\" Manual: UPower -.\" Source: UPower -.\" Language: English -.\" -.TH "UPOWER" "7" "March 2008" "UPower" "UPower" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- - - - - - - .SH "NAME" -UPower \- System\-wide Power Management - - - .SH "DESCRIPTION" - - .PP -UPower provides an interface to enumerate power sources on the system and control system\-wide power management\&. Any application can access the -\fIorg\&.freedesktop\&.UPower\fR -service on the system message bus\&. - - - - .SH "AUTHOR" - - .PP -Written by David Zeuthen -<davidz@redhat\&.com>, Richard Hughes -<richard@hughsie\&.com> -and with a lot of help from many others\&. - - - - .SH "BUGS" - - - .PP -Please send bug reports to either the distribution or the DeviceKit mailing list, see -\m[blue]\fB\%http://lists.freedesktop.org/mailman/listinfo/devkit-devel\fR\m[] -on how to subscribe\&. - - - - .SH "SEE ALSO" - - - .PP -\fBPolicyKit\fR(8), -\fBupowerd\fR(8), -\fBupower\fR(1) - - diff --git a/upower/disable-gtk-docs.patch b/upower/disable-gtk-docs.patch deleted file mode 100644 index a79553c2e..000000000 --- a/upower/disable-gtk-docs.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur upower-UPOWER_0_99_12.orig/Makefile.am upower-UPOWER_0_99_12/Makefile.am ---- upower-UPOWER_0_99_12.orig/Makefile.am 2021-08-06 16:26:55.755525389 +0200 -+++ upower-UPOWER_0_99_12/Makefile.am 2021-08-06 16:30:22.687472177 +0200 -@@ -2,7 +2,7 @@ - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = etc dbus libupower-glib src doc tools po -+SUBDIRS = etc dbus libupower-glib src tools po - - if BACKEND_TYPE_LINUX - SUBDIRS += rules -@@ -35,7 +35,6 @@ - build-aux \ - ChangeLog \ - config.h.in \ -- gtk-doc.make \ - po/Makefile.in.in~ \ - po/Makevars.template \ - po/Rules-quot \ -@@ -51,12 +50,6 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = upower-glib.pc - --# xsltproc barfs on 'make distcheck'; disable for now --DISTCHECK_CONFIGURE_FLAGS=--enable-man-pages --enable-gtk-doc \ -- --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \ -- --with-udevrulesdir='$${libdir}/udev/rules.d-distcheck' \ -- --enable-introspection=yes -- - clean-local : - rm -f *~ - -diff -Naur upower-UPOWER_0_99_12.orig/autogen.sh upower-UPOWER_0_99_12/autogen.sh ---- upower-UPOWER_0_99_12.orig/autogen.sh 2021-08-06 16:26:55.755525389 +0200 -+++ upower-UPOWER_0_99_12/autogen.sh 2021-08-06 16:27:13.529153011 +0200 -@@ -13,13 +13,6 @@ - exit 1 - fi - --GTKDOCIZE=`which gtkdocize` --if test -z $GTKDOCIZE; then -- echo "*** No GTK-Doc found, please install it ***" -- exit 1 --fi -- --gtkdocize --copy || exit 1 - autoreconf --verbose --force --install || exit 1 - - cd $olddir -diff -Naur upower-UPOWER_0_99_12.orig/configure.ac upower-UPOWER_0_99_12/configure.ac ---- upower-UPOWER_0_99_12.orig/configure.ac 2021-08-06 16:26:55.755525389 +0200 -+++ upower-UPOWER_0_99_12/configure.ac 2021-08-06 16:30:32.639222344 +0200 -@@ -80,8 +80,6 @@ - fi - AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes) - --GTK_DOC_CHECK([1.11],[--flavour no-tmpl]) -- - AC_ARG_WITH([udevrulesdir], - AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]), - [], -@@ -249,8 +247,6 @@ - src/linux/Makefile - src/bsd/Makefile - tools/Makefile --doc/Makefile --doc/version.xml - doc/man/Makefile - rules/Makefile - libupower-glib/Makefile \ No newline at end of file diff --git a/upower/upower.1 b/upower/upower.1 deleted file mode 100644 index c5a31f6cd..000000000 --- a/upower/upower.1 +++ /dev/null @@ -1,133 +0,0 @@ -'\" t -.\" Title: upower -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: April 2008 -.\" Manual: upower -.\" Source: upower -.\" Language: English -.\" -.TH "UPOWER" "1" "April 2008" "upower" "upower" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- - - - - - - .SH "NAME" -upower \- UPower command line tool - - - .SH "SYNOPSIS" - - .HP \w'\fBupower\fR\ 'u - - \fBupower\fR - [\fB\-\-dump\fR] - [\fB\-\-enumerate\fR] - [\fB\-\-monitor\-detail\fR] - [\fB\-\-monitor\fR] - [\fB\-\-show\-info\fR] - [\fB\-\-version\fR] - [\fB\-\-wakeups\fR] - [\fB\-\-help\fR] - - - - - - .SH "DESCRIPTION" - - .PP -\fIupower\fR -is a simple command line client for the -\fBUPower\fR(7) -daemon\&. TODO: not fully documented\&. - - - - .SH "OPTIONS" - - - - - .PP -\fB\-\-monitor\fR -.RS 4 - - - - Connect to the UPower daemon and print a line every time a power source is added, removed or changed\&. - - - .RE - .PP -\fB\-\-monitor\-detail\fR -.RS 4 - - - - Like -\fB\-\-monitor\fR -but prints the full details of the power source whenever an event happens\&. - - - .RE - .PP -\fB\-\-help\fR -.RS 4 - - - - Show help options\&. - - - .RE - - - - .SH "AUTHOR" - - .PP -Written by David Zeuthen -<davidz@redhat\&.com> -with a lot of help from many others\&. - - - - .SH "BUGS" - - - .PP -Please send bug reports to either the distribution or the DeviceKit mailing list, see -\m[blue]\fB\%http://lists.freedesktop.org/mailman/listinfo/devkit-devel\fR\m[] -on how to subscribe\&. - - - - .SH "SEE ALSO" - - - .PP -\fBupowerd\fR(8), -\fBUPower\fR(7), - - diff --git a/upower/upowerd.8 b/upower/upowerd.8 deleted file mode 100644 index a8340c38a..000000000 --- a/upower/upowerd.8 +++ /dev/null @@ -1,109 +0,0 @@ -'\" t -.\" Title: upowerd -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: April 2008 -.\" Manual: upowerd -.\" Source: upowerd -.\" Language: English -.\" -.TH "UPOWERD" "8" "April 2008" "upowerd" "upowerd" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- - - - - - - .SH "NAME" -upowerd \- UPower Daemon - - - .SH "SYNOPSIS" - - .HP \w'\fBupowerd\fR\ 'u - - \fBupowerd\fR - [\fB\-\-help\fR] - - - - - - .SH "DESCRIPTION" - - .PP -\fIupowerd\fR -provides the -\fIorg\&.freedesktop\&.UPower\fR -service on the system message bus\&. Users or administrators should never need to start this daemon as it will be automatically started by -\fBdbus-daemon\fR(1) -whenever an application calls into the -\fIorg\&.freedesktop\&.UPower\fR -service\&. - - - - .SH "OPTIONS" - - - - - .PP -\fB\-\-help\fR -.RS 4 - - - - Show help options\&. - - - .RE - - - - .SH "AUTHOR" - - .PP -Written by David Zeuthen -<davidz@redhat\&.com> -with a lot of help from many others\&. - - - - .SH "BUGS" - - - .PP -Please send bug reports to either the distribution or the DeviceKit mailing list, see -\m[blue]\fB\%http://lists.freedesktop.org/mailman/listinfo/devkit-devel\fR\m[] -on how to subscribe\&. - - - - .SH "SEE ALSO" - - - .PP -\fBUPower\fR(7), -\fBupower\fR(1), -\fBdbus-daemon\fR(1), - -