From 821a163a9e7d6cea55e7915cbf5c87c0ef56a626 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:07:54 +0100 Subject: [PATCH 01/13] cairo-dock-plugins: drop upower0 in favour of upower --- srcpkgs/cairo-dock-plugins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 31a4e5028ab..dcfbf50e503 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -1,15 +1,15 @@ # Template file for 'cairo-dock-plugins' pkgname=cairo-dock-plugins version=3.4.1 -revision=5 +revision=6 build_style=cmake hostmakedepends="pkg-config" # XXX libetpan, libdbusmenu, etc makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel libical-devel libxklavier-devel zeitgeist-devel libsensors-devel cairo-dock-devel gnome-menus-devel webkitgtk-devel - vte290-devel vala-devel python-devel python3-devel upower0-devel" -depends="cairo-dock>=${version} ConsoleKit2 upower0" + vte290-devel vala-devel python-devel python3-devel upower-devel" +depends="cairo-dock>=${version} ConsoleKit2 upower" short_desc="Plugins for cairo-dock" maintainer="Juan RP " license="GPL-2" From 846a4b83ac36d1aac3c2e8c7287f3662968c4f4d Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:22:49 +0100 Subject: [PATCH 02/13] mate-power-manager: drop upower0 in favour of upower --- srcpkgs/mate-power-manager/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index c6e8a13b35d..0eaf94337ac 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,15 +1,15 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager version=1.18.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-schemas-compile" hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel mate-common mate-desktop-devel" makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libunique-devel - upower0-devel libcanberra-devel libgnome-keyring-devel libmate-panel-devel + upower-devel libcanberra-devel libgnome-keyring-devel libmate-panel-devel mate-desktop-devel" -depends="dconf upower0" +depends="dconf upower" short_desc="Power management tool for the MATE desktop" maintainer="Juan RP " license="GPL-2" From 8420110b4b8970f66811f5d4cdfb740266beb522 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:37:16 +0100 Subject: [PATCH 03/13] lightdm: drop upower0 in favour of upower --- srcpkgs/lightdm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 3b6f667a80c..9e2d4ca21a0 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.24.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests @@ -18,7 +18,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection makedepends="dbus-glib-devel libxklavier-devel libxml2-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel libgcrypt-devel accountsservice-devel" -depends="dbus accountsservice ConsoleKit2 upower0" +depends="dbus accountsservice ConsoleKit2 upower" conf_files="/etc/$pkgname/*.conf /etc/pam.d/*" system_accounts="lightdm" lightdm_homedir="/var/lib/lightdm" From 4938d97f1f60acd0cde4068406e304b09a11f022 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:39:11 +0100 Subject: [PATCH 04/13] lxde: drop upower0 in favour of upower --- srcpkgs/lxde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxde/template b/srcpkgs/lxde/template index f093938472e..e3537c29641 100644 --- a/srcpkgs/lxde/template +++ b/srcpkgs/lxde/template @@ -1,7 +1,7 @@ # Template file for 'lxde' pkgname=lxde version=0.5.0 -revision=13 +revision=14 build_style=meta depends=" openbox @@ -22,7 +22,7 @@ depends=" xdg-utils xdg-user-dirs ConsoleKit2 - upower0" + upower" short_desc="The LXDE meta-package for Void Linux" homepage="http://lxde.org" license="GPL-2" From 20cccc9060885fb2f282e723d462b2478eb8270f Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:39:55 +0100 Subject: [PATCH 05/13] xfce4: drop upower0 in favour of upower --- srcpkgs/xfce4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template index 86174c700ab..337b85b3afe 100644 --- a/srcpkgs/xfce4/template +++ b/srcpkgs/xfce4/template @@ -1,7 +1,7 @@ # Template file for 'xfce4'. pkgname=xfce4 version=4.12.0 -revision=6 +revision=7 build_style=meta depends=" xfce4-appfinder>=${version} @@ -27,7 +27,7 @@ depends=" tumbler>=0.1.31 xdg-user-dirs-gtk ConsoleKit2 - upower0" + upower" short_desc="The XFCE meta-package for Void Linux" maintainer="Juan RP " license="GPL-2, LGPL-2.1, BSD" From 5522f075e5fa49dd13a64c483e8dabd1efed1d0c Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:46:22 +0100 Subject: [PATCH 06/13] xfce4-settings: drop upower0 in favour of upower --- srcpkgs/xfce4-settings/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template index 3b70f455dba..ea131f8fa34 100644 --- a/srcpkgs/xfce4-settings/template +++ b/srcpkgs/xfce4-settings/template @@ -1,13 +1,13 @@ # Template file for 'xfce4-settings' pkgname=xfce4-settings version=4.12.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-sound-settings --enable-pluggable-dialogs" hostmakedepends="pkg-config intltool" makedepends="libxfce4ui-devel libXi-devel libXcursor-devel exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel - libcanberra-devel garcon-devel upower0-devel" + libcanberra-devel garcon-devel upower-devel" depends="desktop-file-utils gnome-icon-theme" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" short_desc="Xfce settings manager" From 4ffa47b19faa5e66eb6a15c18406d0fb33c7883c Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 8 Mar 2018 23:48:45 +0100 Subject: [PATCH 07/13] xfce4-session: drop upower0 in favour of upower --- srcpkgs/xfce4-session/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template index ef79a9803f5..db14f84ba26 100644 --- a/srcpkgs/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -1,11 +1,11 @@ # Template file for 'xfce4-session' pkgname=xfce4-session version=4.12.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --enable-upower --enable-polkit" hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth" -makedepends="libxfce4ui-devel dbus-glib-devel upower0-devel +makedepends="libxfce4ui-devel dbus-glib-devel upower-devel libwnck2-devel xfce4-panel-devel libSM-devel polkit-devel" depends="iceauth hicolor-icon-theme desktop-file-utils" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" From 499b39e3d6545a3cb80e38c5f9293114a004057c Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 20:04:07 +0100 Subject: [PATCH 08/13] mate-applets: drop upower0 in favour of upower --- srcpkgs/mate-applets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template index 37c239527fd..fa6b8086361 100644 --- a/srcpkgs/mate-applets/template +++ b/srcpkgs/mate-applets/template @@ -1,13 +1,13 @@ # Template file for 'mate-applets' pkgname=mate-applets version=1.18.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --enable-ipv6" hostmakedepends="pkg-config intltool itstool libxslt glib-devel" makedepends="libSM-devel gtk+3-devel libmate-panel-devel NetworkManager-devel mate-desktop-devel mate-settings-daemon-devel libgtop-devel libwnck-devel - upower0-devel polkit-devel libxml2-devel libmateweather-devel libnotify-devel + upower-devel polkit-devel libxml2-devel libmateweather-devel libnotify-devel gtksourceview-devel wireless_tools-devel mate-icon-theme" depends="mate-icon-theme" short_desc="Applets for MATE panel" From e10a69bb59796bc1b40a4b2e38c36c43d563fb2c Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 20:24:39 +0100 Subject: [PATCH 09/13] kde: drop upower0 in favour of upower --- srcpkgs/kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kde/template b/srcpkgs/kde/template index e6e0abb123d..39088673da9 100644 --- a/srcpkgs/kde/template +++ b/srcpkgs/kde/template @@ -1,7 +1,7 @@ # Template file for 'kde' pkgname=kde version=4.14.3 -revision=5 +revision=6 build_style=meta depends=" kde-wallpapers>=${version} @@ -30,7 +30,7 @@ depends=" udisks2 polkit-kde ConsoleKit2 - upower0" + upower" short_desc="The KDE meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.kde.org" From d0ac3d3620842855a206698f4100214a7d5bb211 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 20:25:55 +0100 Subject: [PATCH 10/13] lxqt: drop upower0 in favour of upower --- srcpkgs/lxqt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template index d7bc6468573..a98b8a060a0 100644 --- a/srcpkgs/lxqt/template +++ b/srcpkgs/lxqt/template @@ -1,7 +1,7 @@ # Template file for 'lxqt' pkgname=lxqt version=0.12.0 -revision=1 +revision=2 build_style=meta depends=" lxqt-about>=${version} @@ -28,7 +28,7 @@ depends=" breeze-icons xdg-utils ConsoleKit2 - upower0" + upower" short_desc="The LXQt meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.lxqt.org" From 8008b08d9730a2ca7bb60f5f7a0e357cb9eb2233 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 20:26:41 +0100 Subject: [PATCH 11/13] mixxx: drop upower0 in favour of upower --- srcpkgs/mixxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 614fb07e978..cdc706b4249 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,13 +1,13 @@ # Template file for 'mixxx' pkgname=mixxx version=2.0.0.20180219 -revision=1 +revision=2 _gitrev="231132e108804db7f832faf0d9d0dce238118e2a" hostmakedepends="scons pkg-config" makedepends="portaudio-devel libusb-devel libmad-devel protobuf-devel libid3tag-devel glu-devel taglib-devel opus-devel portmidi-devel vamp-plugin-sdk-devel faad2-devel libmp4v2-devel libshout-devel - rubberband-devel chromaprint-devel fftw-devel ffmpeg-devel upower0-devel + rubberband-devel chromaprint-devel fftw-devel ffmpeg-devel upower-devel qt5-svg-devel qt5-script-devel qt5-xmlpatterns-devel qt5-script-devel" depends="qt5-plugin-sqlite" short_desc="Open source digital DJing software that allows mixing music" From 38cd520dd78439c10a29a1ba72a5b3ce23fbadac Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 21:39:53 +0100 Subject: [PATCH 12/13] budgie-desktop: drop upower0 in favour of upower (no revbump, is broken anyway) --- srcpkgs/budgie-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 4127e46a832..b9d179e9b26 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -5,7 +5,7 @@ revision=3 configure_args="-Dwith-gtk-doc=false" hostmakedepends="meson gtk-doc pkg-config intltool libtool gobject-introspection sassc" makedepends="libglib-devel gtk+3-devel libpeas-devel pulseaudio-devel gnome-desktop-devel - mutter-devel gnome-menus-devel libwnck-devel libupower-glib1 vala + mutter-devel gnome-menus-devel libwnck-devel libupower-glib3 vala libuuid-devel polkit-devel gettext-devel ibus-devel accountsservice-devel upower-devel gnome-bluetooth-devel" depends="gnome-session gnome-settings-daemon" From 9c9f2f364622e6b47404850e3a2726c0b5248298 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 9 Mar 2018 22:03:34 +0100 Subject: [PATCH 13/13] upower0: drop in favour of upower --- srcpkgs/upower0-devel | 1 - srcpkgs/upower0/template | 50 ---------------------------------------- 2 files changed, 51 deletions(-) delete mode 120000 srcpkgs/upower0-devel delete mode 100644 srcpkgs/upower0/template diff --git a/srcpkgs/upower0-devel b/srcpkgs/upower0-devel deleted file mode 120000 index b20547cf957..00000000000 --- a/srcpkgs/upower0-devel +++ /dev/null @@ -1 +0,0 @@ -upower0 \ No newline at end of file diff --git a/srcpkgs/upower0/template b/srcpkgs/upower0/template deleted file mode 100644 index c312e0f2b7e..00000000000 --- a/srcpkgs/upower0/template +++ /dev/null @@ -1,50 +0,0 @@ -# Template file for 'upower0' -pkgname=upower0 -version=0.9.23 -revision=10 -wrksrc="upower-${version}" -build_style=gnu-configure -configure_args="--disable-static --enable-deprecated --with-backend=linux --with-udevrulesdir=/usr/lib/udev/rules.d" -hostmakedepends="pkg-config intltool libxslt docbook-xsl $(vopt_if gir gobject-introspection)" -makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel libimobiledevice-devel" -depends="pm-utils" -conf_files="/etc/UPower/UPower.conf" -make_dirs="/var/lib/upower 0755 root root" -short_desc="Abstraction for enumerating power devices" -maintainer="Juan RP " -license="GPL-2" -homepage="http://upower.freedesktop.org" -distfiles="${homepage}/releases/upower-${version}.tar.xz" -checksum=433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b - -provides="upower-${version}_${revision}" -replaces="upower>=0" - -# Package build options -build_options="gir" -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi - -libupower-glib1_package() { - replaces="upower0<0.9.23_4" - short_desc+=" - runtime library" - pkg_install() { - vmove usr/lib/*.so.* - } -} -upower0-devel_package() { - provides="upower-devel-${version}_${revision}" - replaces="upower-devel>=0" - depends="dbus-glib-devel upower0>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - vmove "usr/lib/*.so" - } -}