diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 09a46916773..d2fa9e7f31f 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=0.9.10.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no @@ -35,7 +35,6 @@ systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on" # Package build options build_options="gir systemd" -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index d4c5702b629..5bdd05ee83d 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -1,7 +1,7 @@ # Template file for 'accountsservice' pkgname=accountsservice version=0.6.37 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static ac_cv_file__etc_redhat_release=no ac_cv_file__etc_debian_version=no @@ -20,8 +20,6 @@ checksum=b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1 # Package build options build_options="gir systemd" - -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 59f55b8255f..c302c50fb3c 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,7 +1,7 @@ # Template file for 'bluez' pkgname=bluez version=5.21 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --with-systemdsystemunitdir=/usr/lib/systemd/system @@ -20,7 +20,6 @@ checksum=81eb073516f39ff1fa02fa40120e834f40fdb0b772f8f4153a9ab566cc0a1f4f # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd" diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 3c80b4591f0..b2631934e45 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,7 +1,7 @@ # Template file for 'colord' pkgname=colord version=1.1.7 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala @@ -31,7 +31,6 @@ fi # Package build options build_options="gir systemd" -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 5a7fec72c7a..8e6e4bd7e87 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -4,7 +4,7 @@ _systemd_version=208 pkgname=dbus version=1.8.6 -revision=1 +revision=2 short_desc="Message bus system" maintainer="Juan RP " license="GPL-2" @@ -24,12 +24,6 @@ conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" # Package build options build_options="systemd" -# Disable systemd option for *-musl. -case "$XBPS_TARGET_MACHINE" in - *-musl) ;; - *) build_options_default="systemd";; -esac - if [ "$build_option_systemd" ]; then if [ "$CROSS_BUILD" ]; then _systemddir="$XBPS_CROSS_BASE" diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 81185ae99bb..678b3ff8a1f 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.12.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers @@ -36,8 +36,6 @@ checksum=cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 # Package build options build_options="gir systemd" - -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index f0438586b9f..e8c145654c5 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,7 +1,7 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility version=3.12.1 -revision=2 +revision=3 lib32disabled=yes build_style=gnu-configure configure_args="--disable-static" @@ -19,7 +19,6 @@ checksum=5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e # Package build options build_options="gir systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-libsystemd-login" diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 5f4079db97d..875361c1697 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,7 +1,7 @@ # Template file for 'gnome-session' pkgname=gnome-session version=3.12.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool libxslt docbook-xsl" @@ -19,7 +19,6 @@ checksum=fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd" diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index a79a6ffd890..36de96563f6 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon version=3.12.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static --enable-cups --disable-schemas-compile --disable-packagekit" @@ -22,7 +22,6 @@ checksum=e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f # Package build options build_options="gir systemd" -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 41b3c3f9b54..a12d8691a3c 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,7 +1,7 @@ # Template file for 'gnome-shell' pkgname=gnome-shell version=3.12.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool gnome-doc-utils" diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 7804fdae10b..09e62ca8b32 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,7 +1,7 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor version=3.12.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-wnck" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" @@ -16,7 +16,6 @@ checksum=ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8 # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd" diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 24efba9faa6..21cff6beccc 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.20.2 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-hal --disable-afc --with-bash-completion-dir=/usr/share/bash-completion/completions" @@ -21,7 +21,6 @@ checksum=84d9412e7bedfba902696ae7fb0cfceb0b66b98823f8388745b20693e3b24f8e # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd" diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 0becbf7549f..a17f0dd621e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.18.11 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --enable-soundcloud --enable-pipe-output --disable-twolame-encoder @@ -42,7 +42,7 @@ post_install() { # Package build options build_options="jack lame mpcdec pulseaudio systemd wavpack" -build_options_default="systemd pulseaudio" +build_options_default="pulseaudio" if [ "$build_option_jack" ]; then configure_args+=" --enable-jack" diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index 692b73bb1a5..5803a4117cb 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,7 +1,7 @@ # Template file for 'polkit' pkgname=polkit version=0.112 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static --with-authfw=pam --with-systemdsystemunitdir=/usr/lib/systemd/system --with-os-type=void @@ -19,7 +19,6 @@ system_accounts="polkitd" # Package build options build_options="gir systemd" -build_options_default="systemd" # Disable gir for cross builds. if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection" diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index adc7045a031..2329d154a7f 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=5.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc @@ -30,7 +30,6 @@ checksum=99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd --enable-systemd-journal" diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index 73222910800..56615245e07 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,7 +1,7 @@ # Template file for 'udisks2' pkgname=udisks2 version=2.1.3 -revision=2 +revision=3 wrksrc="udisks-${version}" build_style=gnu-configure configure_args="--disable-static --with-udevdir=/usr/lib/udev @@ -19,7 +19,6 @@ checksum=5cc92fd651ee49a7888f90d091282b949afc629b31fdb34e187208750720632d # Package build options build_options="gir systemd" -build_options_default="systemd" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 1be7630d6ce..ecbd8dcd349 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston version=1.5.0 -revision=3 +revision=4 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. configure_args="--enable-libinput-backend @@ -25,7 +25,7 @@ lib32disabled=yes # Package build options build_options="backtrace dbus systemd vaapi" -build_options_default="backtrace dbus systemd" +build_options_default="backtrace dbus" if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then build_options_default+=" vaapi" diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template index 8d6930049ad..910b0c42cd9 100644 --- a/srcpkgs/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-session' pkgname=xfce4-session version=4.10.1 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel" @@ -19,7 +19,6 @@ checksum=0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd" diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 36a27e87fb6..4cb8d7750e8 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template build file for 'xorg-server'. pkgname=xorg-server version=1.16.0 -revision=7 +revision=8 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xcsecurity --enable-record --enable-xnest --enable-xephyr --enable-composite --enable-xvfb @@ -40,7 +40,6 @@ provides="xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_ # Package build options build_options="systemd" -build_options_default="systemd" if [ "$build_option_systemd" ]; then configure_args+=" --enable-systemd-logind --with-systemd-daemon"