From 7cb5e94a91c3a0d24306deb3c66c4c011c9488f5 Mon Sep 17 00:00:00 2001 From: Anke Date: Mon, 10 Sep 2012 15:52:41 +0000 Subject: [PATCH] last of the system platform merge --- rtkit/PKGBUILD | 11 +++++------ rtkit/rtkit.install | 9 +++++++-- systemd-units/PKGBUILD | 3 ++- udisks/PKGBUILD | 6 ++++-- upower/PKGBUILD | 6 +++--- xf86-input-evdev/PKGBUILD | 29 ++++++++++++----------------- xf86-video-ati/PKGBUILD | 4 ++-- xf86-video-intel/PKGBUILD | 6 +++--- xf86-video-nouveau/PKGBUILD | 4 ++-- xorg-server/PKGBUILD | 4 ++-- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/rtkit/PKGBUILD b/rtkit/PKGBUILD index ee8d010ea..f3ccfa8cf 100644 --- a/rtkit/PKGBUILD +++ b/rtkit/PKGBUILD @@ -4,17 +4,16 @@ # maintainer abveritas@chakra-project.org pkgname=rtkit -pkgver=0.10 -pkgrel=2 +pkgver=0.11 +pkgrel=1 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64') url="http://git.0pointer.de/?p=rtkit.git" license=('GPL' 'custom:BSD') depends=('dbus' 'polkit') -makedepends=('pkg-config') install=rtkit.install -source=(http://0pointer.de/public/$pkgname-$pkgver.tar.gz) -md5sums=('9ab7f2a25ddf05584ea2216dfe4cefd4') +source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz) +md5sums=('a96c33b9827de66033d2311f82d79a5d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,7 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --libexecdir=/usr/lib \ + --libexecdir=/usr/lib/rtkit \ --with-systemdsystemunitdir=/usr/lib/systemd/system make diff --git a/rtkit/rtkit.install b/rtkit/rtkit.install index fb381173d..0ec1fab52 100644 --- a/rtkit/rtkit.install +++ b/rtkit/rtkit.install @@ -1,6 +1,6 @@ post_install() { - getent group rtkit &>/dev/null || /usr/sbin/groupadd -r rtkit || return 1 - getent passwd rtkit &>/dev/null || /usr/sbin/useradd -r -g rtkit -c 'RealtimeKit' -s /sbin/nologin -d /proc rtkit || return 1 + getent group rtkit &>/dev/null || /usr/sbin/groupadd -g 133 rtkit || return 1 + getent passwd rtkit &>/dev/null || /usr/sbin/useradd -u 133 -g rtkit -c 'RealtimeKit' -s /sbin/nologin -d /proc rtkit || return 1 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 @@ -8,6 +8,11 @@ post_install() { } post_upgrade() { + if (( $(vercmp $2 0.10) < 0 )); then + # Get rid of old user and group + post_remove + fi + post_install } diff --git a/systemd-units/PKGBUILD b/systemd-units/PKGBUILD index 9cec30344..1bb2e190b 100644 --- a/systemd-units/PKGBUILD +++ b/systemd-units/PKGBUILD @@ -2,7 +2,7 @@ pkgname=systemd-units pkgver=20120528 -pkgrel=3 +pkgrel=4 pkgdesc="Chakra GNU/Linux specific Systemd unit files" arch=('any') url="http://github.com/falconindy/systemd-arch-units" @@ -45,4 +45,5 @@ package() { rm "$pkgdir"/usr/lib/tmpfiles.d/openssh.conf rm "$pkgdir"/usr/lib/systemd/system/wpa_supplicant.service rm "$pkgdir"/usr/lib/systemd/system/ufw.service + rm "$pkgdir"/usr/lib/systemd/system/kdm.service } diff --git a/udisks/PKGBUILD b/udisks/PKGBUILD index 3fdc912d3..9dee109d5 100644 --- a/udisks/PKGBUILD +++ b/udisks/PKGBUILD @@ -5,12 +5,12 @@ pkgname=udisks pkgver=1.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject') +depends=('systemd' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject') makedepends=('intltool' 'docbook-xsl') options=(!libtool) replaces=('devicekit-disks') @@ -40,4 +40,6 @@ package() { # install systemd units install -Dm644 "${srcdir}/udisks.service" "${pkgdir}/usr/lib/systemd/system/udisks.service" + echo "SystemdService=udisks.service" \ + >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" } diff --git a/upower/PKGBUILD b/upower/PKGBUILD index da2b948a7..4d86c636b 100644 --- a/upower/PKGBUILD +++ b/upower/PKGBUILD @@ -4,18 +4,18 @@ # maintainer abveritas@chakra-project.org pkgname=upower -pkgver=0.9.16 +pkgver=0.9.18 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" license=('GPL') -depends=('udev>=182' 'libusb>=1.0.8' 'polkit>=0.98' 'pm-utils>=1.4.1' 'dbus-glib>=0.92') +depends=('systemd>=188' 'libusbx' 'polkit>=0.98' 'pm-utils>=1.4.1' 'dbus-glib>=0.92') makedepends=('pkg-config' 'intltool' 'docbook-xsl') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.xz) -sha256sums=('eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212') +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/xf86-input-evdev/PKGBUILD b/xf86-input-evdev/PKGBUILD index d9e04b3f1..789a8f27a 100644 --- a/xf86-input-evdev/PKGBUILD +++ b/xf86-input-evdev/PKGBUILD @@ -1,32 +1,27 @@ # -# Platform Packages for Chakra, part of chakra-project.org +# Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas[at]chakra-project[dot]org> +# maintainer abveritas@chakra-project.org pkgname=xf86-input-evdev -pkgver=2.7.0 +pkgver=2.7.3 pkgrel=1 pkgdesc="X.org evdev input driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server>=1.12.3') -conflicts=('xorg-server<1.12.3') -options=('!libtool') -groups=('xorg-input-drivers') -source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" - 'Fix_inverted_horizontal_scroll.diff') -sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa' - '2210aa4757aecfb4be50bec700b978e208f679ae') +depends=('glibc' 'systemd' 'mtdev') +makedepends=('xorg-server>=1.12.0') +conflicts=('xorg-server<1.12.0') +options=('!libtool' '!makeflags') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff - - ./configure --prefix=/usr - make + ./configure --prefix=/usr + make } package() { diff --git a/xf86-video-ati/PKGBUILD b/xf86-video-ati/PKGBUILD index aa476af5c..ce6a42591 100644 --- a/xf86-video-ati/PKGBUILD +++ b/xf86-video-ati/PKGBUILD @@ -5,12 +5,12 @@ pkgname=xf86-video-ati pkgver=6.14.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libpciaccess' 'libdrm' 'udev' 'pixman' 'ati-dri') +depends=('libpciaccess' 'libdrm' 'systemd' 'pixman' 'ati-dri') makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa') conflicts=('xorg-server<1.12.3') groups=('xorg-video-drivers') diff --git a/xf86-video-intel/PKGBUILD b/xf86-video-intel/PKGBUILD index 22ca508a8..5dc53802f 100644 --- a/xf86-video-intel/PKGBUILD +++ b/xf86-video-intel/PKGBUILD @@ -5,12 +5,12 @@ pkgname=xf86-video-intel pkgver=2.19.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org/" +url="http://xorg.freedesktop.org" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util' 'libxfixes' 'udev') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util' 'libxfixes' 'systemd') makedepends=('xorg-server>=1.12.3' 'libx11' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.12.3' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') diff --git a/xf86-video-nouveau/PKGBUILD b/xf86-video-nouveau/PKGBUILD index e67b3a7df..f441c4edd 100644 --- a/xf86-video-nouveau/PKGBUILD +++ b/xf86-video-nouveau/PKGBUILD @@ -5,12 +5,12 @@ pkgname=xf86-video-nouveau pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" arch=('i686' 'x86_64') url="http://nouveau.freedesktop.org/" license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm' 'udev' 'libgl') +depends=('libdrm' 'systemd' 'libgl') optdepends=('nouveau-dri: experimental gallium3d features') makedepends=('xorg-server' 'xf86driproto') conflicts=('xorg-server<1.12.3') diff --git a/xorg-server/PKGBUILD b/xorg-server/PKGBUILD index 0bb026bac..c8599d65b 100644 --- a/xorg-server/PKGBUILD +++ b/xorg-server/PKGBUILD @@ -5,7 +5,7 @@ pkgname=xorg-server pkgver=1.12.3 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org X servers" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +13,7 @@ url="http://xorg.freedesktop.org" depends=('xproto' 'randrproto' 'renderproto' 'xextproto' 'inputproto' 'kbproto' 'fontsproto' 'videoproto' 'dri2proto' 'xineramaproto' 'xorg-util-macros' 'pixman' 'libpciaccess' 'libxfont' 'libxi' 'mesa' 'libgcrypt' 'libxv' 'libxau' 'libxaw' 'libxrender' 'libdmx' - 'libdrm' 'libxfixes' 'libxext' 'libxdmcp' 'libxau' 'udev' 'xf86-input-evdev' + 'libdrm' 'libxfixes' 'libxext' 'libxdmcp' 'libxau' 'systemd' 'xf86-input-evdev' 'xkeyboard-config' 'xorg-xkb-utils' 'xorg-fonts-misc') makedepends=('libx11' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'libxkbfile'