Date: Friday, October 4, 2013 @ 00:00:57
Author: heftig
Revision: 195894
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
mutter-wayland/repos/testing-i686/PKGBUILD
(from rev 195893, mutter-wayland/trunk/PKGBUILD)
mutter-wayland/repos/testing-i686/mutter-wayland-3.10.0.1-logfile.patch
(from rev 195893,
mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
mutter-wayland/repos/testing-i686/mutter-wayland.install
(from rev 195893, mutter-wayland/trunk/mutter-wayland.install)
mutter-wayland/repos/testing-x86_64/PKGBUILD
(from rev 195893, mutter-wayland/trunk/PKGBUILD)
mutter-wayland/repos/testing-x86_64/mutter-wayland-3.10.0.1-logfile.patch
(from rev 195893,
mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
mutter-wayland/repos/testing-x86_64/mutter-wayland.install
(from rev 195893, mutter-wayland/trunk/mutter-wayland.install)
Deleted:
mutter-wayland/repos/testing-i686/PKGBUILD
mutter-wayland/repos/testing-i686/mutter-wayland.install
mutter-wayland/repos/testing-x86_64/PKGBUILD
mutter-wayland/repos/testing-x86_64/mutter-wayland.install
------------------------------------------------------+
/PKGBUILD | 96 +++++++++++++++++
/mutter-wayland.install | 22 +++
testing-i686/PKGBUILD | 38 ------
testing-i686/mutter-wayland-3.10.0.1-logfile.patch | 17 +++
testing-i686/mutter-wayland.install | 11 -
testing-x86_64/PKGBUILD | 38 ------
testing-x86_64/mutter-wayland-3.10.0.1-logfile.patch | 17 +++
testing-x86_64/mutter-wayland.install | 11 -
8 files changed, 152 insertions(+), 98 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-10-03 21:50:52 UTC (rev 195893)
+++ testing-i686/PKGBUILD 2013-10-03 22:00:57 UTC (rev 195894)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-
-pkgname=mutter-wayland
-pkgver=3.10.0.1
-pkgrel=1
-pkgdesc="A Wayland compositor for GNOME"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(mutter)
-makedepends=(intltool gnome-doc-utils)
-url="http://www.gnome.org";
-options=('!libtool' '!emptydirs')
-install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # Already in "mutter"
- rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
- rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
-}
Copied: mutter-wayland/repos/testing-i686/PKGBUILD (from rev 195893,
mutter-wayland/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-10-03 22:00:57 UTC (rev 195894)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.0.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org";
+options=('!libtool' '!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ mutter-wayland-3.10.0.1-logfile.patch)
+sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+ 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
+
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # From Fedora: Don't try to redirect the logfile. It won't work.
+ patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/$pkgname \
+ --localstatedir=/var --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # Already in "mutter"
+ rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+ rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
Copied: mutter-wayland/repos/testing-i686/mutter-wayland-3.10.0.1-logfile.patch
(from rev 195893, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
===================================================================
--- testing-i686/mutter-wayland-3.10.0.1-logfile.patch
(rev 0)
+++ testing-i686/mutter-wayland-3.10.0.1-logfile.patch 2013-10-03 22:00:57 UTC
(rev 195894)
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16
16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02
13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+ args[3] = "-rootless";
+ args[4] = "-retro";
+ args[5] = "-noreset";
+- args[6] = "-logfile";
+- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+- args[8] = "-nolisten";
+- args[9] = "all";
+- args[10] = NULL;
++ args[6] = "-nolisten";
++ args[7] = "all";
++ args[8] = NULL;
+
+ error = NULL;
+ if (g_spawn_async (NULL, /* cwd */
Deleted: testing-i686/mutter-wayland.install
===================================================================
--- testing-i686/mutter-wayland.install 2013-10-03 21:50:52 UTC (rev 195893)
+++ testing-i686/mutter-wayland.install 2013-10-03 22:00:57 UTC (rev 195894)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mutter-wayland/repos/testing-i686/mutter-wayland.install (from rev
195893, mutter-wayland/trunk/mutter-wayland.install)
===================================================================
--- testing-i686/mutter-wayland.install (rev 0)
+++ testing-i686/mutter-wayland.install 2013-10-03 22:00:57 UTC (rev 195894)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-10-03 21:50:52 UTC (rev 195893)
+++ testing-x86_64/PKGBUILD 2013-10-03 22:00:57 UTC (rev 195894)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-
-pkgname=mutter-wayland
-pkgver=3.10.0.1
-pkgrel=1
-pkgdesc="A Wayland compositor for GNOME"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(mutter)
-makedepends=(intltool gnome-doc-utils)
-url="http://www.gnome.org";
-options=('!libtool' '!emptydirs')
-install=mutter-wayland.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname \
- --localstatedir=/var --disable-static \
- --disable-schemas-compile --enable-compile-warnings=minimum
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # Already in "mutter"
- rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
- rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
-}
Copied: mutter-wayland/repos/testing-x86_64/PKGBUILD (from rev 195893,
mutter-wayland/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-10-03 22:00:57 UTC (rev 195894)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=mutter-wayland
+pkgver=3.10.0.1
+pkgrel=2
+pkgdesc="A Wayland compositor for GNOME"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(mutter)
+makedepends=(intltool gnome-doc-utils)
+url="http://www.gnome.org";
+options=('!libtool' '!emptydirs')
+install=mutter-wayland.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ mutter-wayland-3.10.0.1-logfile.patch)
+sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+ 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
+
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # From Fedora: Don't try to redirect the logfile. It won't work.
+ patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/$pkgname \
+ --localstatedir=/var --disable-static \
+ --disable-schemas-compile --enable-compile-warnings=minimum
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # Already in "mutter"
+ rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center}
+ rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml"
+}
Copied:
mutter-wayland/repos/testing-x86_64/mutter-wayland-3.10.0.1-logfile.patch (from
rev 195893, mutter-wayland/trunk/mutter-wayland-3.10.0.1-logfile.patch)
===================================================================
--- testing-x86_64/mutter-wayland-3.10.0.1-logfile.patch
(rev 0)
+++ testing-x86_64/mutter-wayland-3.10.0.1-logfile.patch 2013-10-03
22:00:57 UTC (rev 195894)
@@ -0,0 +1,17 @@
+--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16
16:40:46.000000000 -0400
++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02
13:37:57.027318760 -0400
+@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit
+ args[3] = "-rootless";
+ args[4] = "-retro";
+ args[5] = "-noreset";
+- args[6] = "-logfile";
+- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL);
+- args[8] = "-nolisten";
+- args[9] = "all";
+- args[10] = NULL;
++ args[6] = "-nolisten";
++ args[7] = "all";
++ args[8] = NULL;
+
+ error = NULL;
+ if (g_spawn_async (NULL, /* cwd */
Deleted: testing-x86_64/mutter-wayland.install
===================================================================
--- testing-x86_64/mutter-wayland.install 2013-10-03 21:50:52 UTC (rev
195893)
+++ testing-x86_64/mutter-wayland.install 2013-10-03 22:00:57 UTC (rev
195894)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mutter-wayland/repos/testing-x86_64/mutter-wayland.install (from rev
195893, mutter-wayland/trunk/mutter-wayland.install)
===================================================================
--- testing-x86_64/mutter-wayland.install (rev 0)
+++ testing-x86_64/mutter-wayland.install 2013-10-03 22:00:57 UTC (rev
195894)
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
