Date: Wednesday, September 12, 2012 @ 13:45:09 Author: jgc Revision: 166589
archrelease: copy trunk to extra-i686, extra-x86_64 Added: metacity/repos/extra-i686/PKGBUILD (from rev 166588, metacity/trunk/PKGBUILD) metacity/repos/extra-i686/fix_compositing_startup.patch (from rev 166588, metacity/trunk/fix_compositing_startup.patch) metacity/repos/extra-i686/metacity.install (from rev 166588, metacity/trunk/metacity.install) metacity/repos/extra-x86_64/PKGBUILD (from rev 166588, metacity/trunk/PKGBUILD) metacity/repos/extra-x86_64/fix_compositing_startup.patch (from rev 166588, metacity/trunk/fix_compositing_startup.patch) metacity/repos/extra-x86_64/metacity.install (from rev 166588, metacity/trunk/metacity.install) Deleted: metacity/repos/extra-i686/PKGBUILD metacity/repos/extra-i686/metacity.install metacity/repos/extra-x86_64/PKGBUILD metacity/repos/extra-x86_64/metacity.install --------------------------------------------+ extra-i686/PKGBUILD | 65 ++++++++++++++------------- extra-i686/fix_compositing_startup.patch | 12 ++++ extra-i686/metacity.install | 38 +++++++-------- extra-x86_64/PKGBUILD | 65 ++++++++++++++------------- extra-x86_64/fix_compositing_startup.patch | 12 ++++ extra-x86_64/metacity.install | 38 +++++++-------- 6 files changed, 130 insertions(+), 100 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-09-12 17:44:28 UTC (rev 166588) +++ extra-i686/PKGBUILD 2012-09-12 17:45:09 UTC (rev 166589) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=metacity -pkgver=2.34.5 -pkgrel=1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'gnome-doc-utils') -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') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} Copied: metacity/repos/extra-i686/PKGBUILD (from rev 166588, metacity/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-09-12 17:45:09 UTC (rev 166589) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=metacity +pkgver=2.34.8 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +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 + 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 \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} Copied: metacity/repos/extra-i686/fix_compositing_startup.patch (from rev 166588, metacity/trunk/fix_compositing_startup.patch) =================================================================== --- extra-i686/fix_compositing_startup.patch (rev 0) +++ extra-i686/fix_compositing_startup.patch 2012-09-12 17:45:09 UTC (rev 166589) @@ -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; Deleted: extra-i686/metacity.install =================================================================== --- extra-i686/metacity.install 2012-09-12 17:44:28 UTC (rev 166588) +++ extra-i686/metacity.install 2012-09-12 17:45:09 UTC (rev 166589) @@ -1,19 +0,0 @@ -pkgname=metacity - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - /usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: metacity/repos/extra-i686/metacity.install (from rev 166588, metacity/trunk/metacity.install) =================================================================== --- extra-i686/metacity.install (rev 0) +++ extra-i686/metacity.install 2012-09-12 17:45:09 UTC (rev 166589) @@ -0,0 +1,19 @@ +pkgname=metacity + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-09-12 17:44:28 UTC (rev 166588) +++ extra-x86_64/PKGBUILD 2012-09-12 17:45:09 UTC (rev 166589) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=metacity -pkgver=2.34.5 -pkgrel=1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'gnome-doc-utils') -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') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} Copied: metacity/repos/extra-x86_64/PKGBUILD (from rev 166588, metacity/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-09-12 17:45:09 UTC (rev 166589) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=metacity +pkgver=2.34.8 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +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 + 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 \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} Copied: metacity/repos/extra-x86_64/fix_compositing_startup.patch (from rev 166588, metacity/trunk/fix_compositing_startup.patch) =================================================================== --- extra-x86_64/fix_compositing_startup.patch (rev 0) +++ extra-x86_64/fix_compositing_startup.patch 2012-09-12 17:45:09 UTC (rev 166589) @@ -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; Deleted: extra-x86_64/metacity.install =================================================================== --- extra-x86_64/metacity.install 2012-09-12 17:44:28 UTC (rev 166588) +++ extra-x86_64/metacity.install 2012-09-12 17:45:09 UTC (rev 166589) @@ -1,19 +0,0 @@ -pkgname=metacity - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - /usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: metacity/repos/extra-x86_64/metacity.install (from rev 166588, metacity/trunk/metacity.install) =================================================================== --- extra-x86_64/metacity.install (rev 0) +++ extra-x86_64/metacity.install 2012-09-12 17:45:09 UTC (rev 166589) @@ -0,0 +1,19 @@ +pkgname=metacity + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}