diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
| commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
| tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /extra/metacity | |
| parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
| parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'extra/metacity')
| -rw-r--r-- | extra/metacity/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/metacity/fix_compositing_startup.patch | 12 |
2 files changed, 20 insertions, 5 deletions
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 8ff77f984..3bf16c859 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 165026 2012-08-09 07:46:44Z jgc $ +# $Id: PKGBUILD 166589 2012-09-12 17:45:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity -pkgver=2.34.5 +pkgver=2.34.8 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'yelp-tools') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8e0712d4e3a4402b6b818348019dd864999585dda624a6ac0d44bf6a37ed2534') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix_compositing_startup.patch) +sha256sums=('ab83038a9dc0b53a63b66c3f9323a10abb0b9a9ae2b5c5d3cc6bbabe2b607806' + '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/fix_compositing_startup.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/metacity \ --localstatedir=/var --disable-static \ diff --git a/extra/metacity/fix_compositing_startup.patch b/extra/metacity/fix_compositing_startup.patch new file mode 100644 index 000000000..56b218ae7 --- /dev/null +++ b/extra/metacity/fix_compositing_startup.patch @@ -0,0 +1,12 @@ +diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c +--- metacity-2.34.5.orig/src/compositor/compositor-xrender.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.5/src/compositor/compositor-xrender.c 2012-08-28 14:23:04.093750568 +0200 +@@ -3066,6 +3057,8 @@ + #endif + + xrc->enabled = TRUE; ++ xrc->show_redraw = FALSE; ++ xrc->debug = FALSE; + g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc); + + return compositor; |