diff options
author | horsemanoffaith | 2016-09-11 21:06:20 -0700 |
---|---|---|
committer | horsemanoffaith | 2016-09-11 21:06:20 -0700 |
commit | 531e7609ae514365329ef5fffcf137621f3adf03 (patch) | |
tree | ad3b9c593573a688f4f4994e570c39f4527fbf1d | |
parent | 25f53998df9dff4f2c8e29f3f3ec78391901a174 (diff) | |
download | aur-531e7609ae514365329ef5fffcf137621f3adf03.tar.gz |
update to version 3.20.1
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 61 | ||||
-rw-r--r-- | gnome-settings-daemon.install | 12 |
3 files changed, 37 insertions, 51 deletions
@@ -1,9 +1,8 @@ pkgbase = gnome-settings-daemon-ubuntu pkgdesc = The GNOME Settings daemon with Ubuntu's patches - pkgver = 3.19.92 + pkgver = 3.20.1 pkgrel = 1 url = http://www.gnome.org - install = gnome-settings-daemon.install arch = i686 arch = x86_64 groups = gnome @@ -17,7 +16,6 @@ pkgbase = gnome-settings-daemon-ubuntu depends = dconf depends = gnome-desktop depends = gsettings-desktop-schemas-ubuntu - depends = hicolor-icon-theme depends = libcanberra-pulse depends = libnotify depends = libsystemd @@ -30,13 +28,14 @@ pkgbase = gnome-settings-daemon-ubuntu depends = geocode-glib depends = geoclue2 depends = nss - provides = gnome-settings-daemon=3.19.92 + depends = libgudev + provides = gnome-settings-daemon=3.20.1 conflicts = gnome-settings-daemon options = !emptydirs - source = http://ftp.gnome.org/pub/gnome/sources/gnome-settings-daemon/3.19/gnome-settings-daemon-3.19.92.tar.xz - source = http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-settings-daemon/gnome-settings-daemon_3.19.92-0ubuntu1~xenial1.debian.tar.xz - sha512sums = 7a243216e19520937c90c8b7e5a18081721cf82e7f936a27352e7ceac0acd3cf638a7ef7130b20f63e75172d0fa44c4d104b39a0c6dcb15e1af9cf72d28e6f07 - sha512sums = 86b149a70e0bcb0af01e2b1cb7b7ee63cc4ae115539b446e78cb2fb11ce40ae6c1dc7f98d7b28d1e3293f1141a9135b5c9ef1f6c6f78ebbca4b1d754adfe600b + source = http://ftp.gnome.org/pub/gnome/sources/gnome-settings-daemon/3.20/gnome-settings-daemon-3.20.1.tar.xz + source = http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-settings-daemon/gnome-settings-daemon_3.20.1-2ubuntu1~ubuntu16.04.1.debian.tar.xz + sha512sums = 4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84 + sha512sums = 8eb04cf39ad83c8ed1a1b5d280021f19fe87723be387d5569f1f85bf882f366c7bf8a42870726d91408b28d3b7b39011797eb06b625650123128936b73bf8eee pkgname = gnome-settings-daemon-ubuntu @@ -1,34 +1,33 @@ -# Maintainer: Michael Healy <horsemanoffaith@gmail.com> +# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to> # Original Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: thn81 <root@scrat> # vercheck-pkgbuild: auto # vercheck-ubuntu: name=${pkgname%-*}, repo=xenial # vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64 -# vercheck-gnome: name=${pkgname%-*}, majorver=3.19 +# vercheck-gnome: name=${pkgname%-*}, majorver=3.20 # vercheck-ppa: name=${pkgname%-*}, url=ppa:gnome3-team/gnome3-staging pkgname=gnome-settings-daemon-ubuntu _use_ppa=true -_ppa_rel=0ubuntu1~xenial1 -#_ppa_ver=3.19.92 -#_ubuntu_rel=0ubuntu3 +_ppa_rel=2ubuntu1~ubuntu16.04.1 +_ppa_ver=3.20.1 +#_ubuntu_rel=0ubuntu3.1 #_ubuntu_ver=3.18.2 -pkgver=3.19.92 +pkgver=3.20.1 pkgrel=1 pkgdesc="The GNOME Settings daemon with Ubuntu's patches" arch=(i686 x86_64) url="http://www.gnome.org" license=(GPL) -depends=(dconf gnome-desktop gsettings-desktop-schemas-ubuntu hicolor-icon-theme - libcanberra-pulse libnotify libsystemd libwacom pulseaudio - pulseaudio-alsa upower librsvg libgweather geocode-glib geoclue2 nss) +depends=(dconf gnome-desktop gsettings-desktop-schemas-ubuntu libcanberra-pulse + libnotify libsystemd libwacom pulseaudio pulseaudio-alsa upower librsvg + libgweather geocode-glib geoclue2 nss libgudev) makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python2) groups=(gnome unity) provides=("gnome-settings-daemon=${pkgver}") conflicts=(gnome-settings-daemon) options=(!emptydirs) -install=gnome-settings-daemon.install source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz" ) @@ -38,38 +37,38 @@ else source+=("https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz") fi -sha512sums=('7a243216e19520937c90c8b7e5a18081721cf82e7f936a27352e7ceac0acd3cf638a7ef7130b20f63e75172d0fa44c4d104b39a0c6dcb15e1af9cf72d28e6f07' - '86b149a70e0bcb0af01e2b1cb7b7ee63cc4ae115539b446e78cb2fb11ce40ae6c1dc7f98d7b28d1e3293f1141a9135b5c9ef1f6c6f78ebbca4b1d754adfe600b') +sha512sums=('4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84' + '8eb04cf39ad83c8ed1a1b5d280021f19fe87723be387d5569f1f85bf882f366c7bf8a42870726d91408b28d3b7b39011797eb06b625650123128936b73bf8eee') prepare() { - cd "${pkgname%-*}-${pkgver}" + cd "${pkgname%-*}-${pkgver}" - # Apply Ubuntu's patches - patch -p1 -i ../debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch - patch -p1 -i ../debian/patches/ubuntu-lid-close-suspend.patch - patch -p1 -i ../debian/patches/revert_background_dropping.patch - patch -p1 -i ../debian/patches/revert-gsettings-removals.patch + # Apply Ubuntu's patches + patch -p1 -i ../debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch + patch -p1 -i ../debian/patches/ubuntu-lid-close-suspend.patch + patch -p1 -i ../debian/patches/revert_background_dropping.patch + patch -p1 -i ../debian/patches/revert-gsettings-removals.patch } build() { - cd "${pkgname%-*}-${pkgver}" + cd "${pkgname%-*}-${pkgver}" - autoreconf -vfi + autoreconf -vfi - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon \ - --disable-static + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon \ + --disable-static - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + # https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + make } package() { - cd "${pkgname%-*}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${pkgname%-*}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/gnome-settings-daemon.install b/gnome-settings-daemon.install deleted file mode 100644 index 4f25a2be8a1a..000000000000 --- a/gnome-settings-daemon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor/ -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} |