[arch-commits] Commit in gnome-session/repos (4 files)

[Jan Steffens]

    Date: Sunday, January 29, 2017 @ 02:53:47
  Author: heftig
Revision: 287697

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnome-session/repos/extra-i686/PKGBUILD
    (from rev 287696, gnome-session/trunk/PKGBUILD)
  gnome-session/repos/extra-x86_64/PKGBUILD
    (from rev 287696, gnome-session/trunk/PKGBUILD)
Deleted:
  gnome-session/repos/extra-i686/PKGBUILD
  gnome-session/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   90 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   40 ---------------------
 extra-x86_64/PKGBUILD |   40 ---------------------
 3 files changed, 90 insertions(+), 80 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-29 02:53:13 UTC (rev 287696)
+++ extra-i686/PKGBUILD	2017-01-29 02:53:47 UTC (rev 287697)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.22.2
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-url="https://git.gnome.org/browse/gnome-session"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
-         json-glib libgl libsm libxtst systemd)
-makedepends=(intltool mesa gtk-doc xtrans git gnome-common python)
-groups=(gnome)
-_commit=f5d6a6da547e048c0f4a5a13e5113abbed9cbcb3  # tags/3.22.2^0
-source=("git://git.gnome.org/gnome-session#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-  
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd --disable-gconf
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-session/repos/extra-i686/PKGBUILD (from rev 287696, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-29 02:53:47 UTC (rev 287697)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.22.2
+pkgrel=2
+pkgdesc="The GNOME Session Handler"
+url="https://git.gnome.org/browse/gnome-session"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
+         json-glib libgl libsm libxtst systemd)
+makedepends=(intltool mesa gtk-doc xtrans git gnome-common python xmlto)
+groups=(gnome)
+_commit=f5d6a6da547e048c0f4a5a13e5113abbed9cbcb3  # tags/3.22.2^0
+source=("git://git.gnome.org/gnome-session#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Environment fixes for systemd and Wayland
+  git cherry-pick -n 52a3c15a1d756c559402cc9505926a9b9d6cf3a7
+  git cherry-pick -n 0af8ef83205fcb4ee52a9f66121d20177b050f65
+  git cherry-pick -n 7e307f8ddb91db5d4051c4c792519a660ba67f35
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+  
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-29 02:53:13 UTC (rev 287696)
+++ extra-x86_64/PKGBUILD	2017-01-29 02:53:47 UTC (rev 287697)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.22.2
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-url="https://git.gnome.org/browse/gnome-session"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
-         json-glib libgl libsm libxtst systemd)
-makedepends=(intltool mesa gtk-doc xtrans git gnome-common python)
-groups=(gnome)
-_commit=f5d6a6da547e048c0f4a5a13e5113abbed9cbcb3  # tags/3.22.2^0
-source=("git://git.gnome.org/gnome-session#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-}
-  
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd --disable-gconf
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: gnome-session/repos/extra-x86_64/PKGBUILD (from rev 287696, gnome-session/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-29 02:53:47 UTC (rev 287697)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.22.2
+pkgrel=2
+pkgdesc="The GNOME Session Handler"
+url="https://git.gnome.org/browse/gnome-session"
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
+         json-glib libgl libsm libxtst systemd)
+makedepends=(intltool mesa gtk-doc xtrans git gnome-common python xmlto)
+groups=(gnome)
+_commit=f5d6a6da547e048c0f4a5a13e5113abbed9cbcb3  # tags/3.22.2^0
+source=("git://git.gnome.org/gnome-session#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Environment fixes for systemd and Wayland
+  git cherry-pick -n 52a3c15a1d756c559402cc9505926a9b9d6cf3a7
+  git cherry-pick -n 0af8ef83205fcb4ee52a9f66121d20177b050f65
+  git cherry-pick -n 7e307f8ddb91db5d4051c4c792519a660ba67f35
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+  
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+      --disable-schemas-compile --enable-systemd --disable-gconf
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}