diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-26 10:52:42 +0200 |
commit | 127dc69a077301eaf514a49a1c8f883584396e1c (patch) | |
tree | a48e082ea38a50dee109bbfe7d977b5a81c3c4a1 /extra/gnome-session | |
parent | b820811488f4e50bbff8e8e84af774adc79375d9 (diff) | |
parent | a247f0004e94d32b5fe69a5123e1c6684d8cf096 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/audit/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/dia/PKGBUILD
community/gedit-plugins/PKGBUILD
community/giggle/PKGBUILD
community/gitg/PKGBUILD
community/gmic/PKGBUILD
community/gnome-applets/PKGBUILD
community/gnome-panel/PKGBUILD
community/gnome-screensaver/PKGBUILD
community/gtranslator/PKGBUILD
community/metacity/PKGBUILD
community/zeitgeist-datahub/PKGBUILD
core/glib2/PKGBUILD
core/perl/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/brltty/PKGBUILD
extra/cheese/PKGBUILD
extra/clutter/PKGBUILD
extra/cogl/PKGBUILD
extra/devhelp/PKGBUILD
extra/empathy/PKGBUILD
extra/eog/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gcr/PKGBUILD
extra/gdl/PKGBUILD
extra/gedit/PKGBUILD
extra/gjs/PKGBUILD
extra/glade/PKGBUILD
extra/glib-networking/PKGBUILD
extra/gnome-calculator/PKGBUILD
extra/gnome-contacts/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-documents/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-games/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-session/PKGBUILD
extra/gnome-terminal/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo-plugins/PKGBUILD
extra/gssdp/PKGBUILD
extra/gthumb/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gtksourceview3/PKGBUILD
extra/gucharmap/PKGBUILD
extra/gupnp-av/PKGBUILD
extra/gupnp-dlna/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/gupnp/PKGBUILD
extra/gvfs/PKGBUILD
extra/js/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgee/PKGBUILD
extra/libgweather/PKGBUILD
extra/liboauth/PKGBUILD
extra/libpeas/PKGBUILD
extra/librsvg/PKGBUILD
extra/libsocialweb/PKGBUILD
extra/libsoup/PKGBUILD
extra/mash/PKGBUILD
extra/modemmanager/PKGBUILD
extra/mutter/PKGBUILD
extra/mysql/PKGBUILD
extra/nautilus-sendto/PKGBUILD
extra/nautilus/PKGBUILD
extra/network-manager-applet/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/p11-kit/PKGBUILD
extra/pango/PKGBUILD
extra/pangomm/PKGBUILD
extra/polkit/PKGBUILD
extra/pygobject/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/rygel/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/totem/PKGBUILD
extra/vala/PKGBUILD
extra/vinagre/PKGBUILD
extra/vte3/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/yelp/PKGBUILD
extra/zeitgeist/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'extra/gnome-session')
-rw-r--r-- | extra/gnome-session/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch | 9 |
2 files changed, 9 insertions, 23 deletions
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 552c7f486..7b4aac462 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 170916 2012-11-12 23:48:19Z heftig $ +# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') -license=('GPL' 'LGPL') -depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' - 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' - 'upower') -makedepends=('intltool' 'mesa' 'xtrans') +license=(GPL LGPL) +depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop + hicolor-icon-theme json-glib libgl libsm libxtst upower) +makedepends=(intltool mesa gtk-doc) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" -groups=('gnome') +groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - gnome-session-3.3.1-llvmpipe.patch timeout.patch) -sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4' - '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' + timeout.patch) +sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { cd $pkgname-$pkgver - # Allow software rendering - patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch - # Increase timeout, for slow machines patch -Np1 -i ../timeout.patch diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch deleted file mode 100644 index 40da1c9b7..000000000 --- a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility ---- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 -+++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 -@@ -20,4 +20,4 @@ - - # Gallium has softpipe and llvmpipe - -softpipe ---llvmpipe -+#llvmpipe |