[arch-commits] Commit in gnome-session/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Friday, September 20, 2019 @ 22:47:39
  Author: heftig
Revision: 363177

archrelease: copy trunk to extra-x86_64

Added:
  gnome-session/repos/extra-x86_64/PKGBUILD
    (from rev 363176, gnome-session/trunk/PKGBUILD)
  gnome-session/repos/extra-x86_64/neuter-debugging.diff
    (from rev 363176, gnome-session/trunk/neuter-debugging.diff)
Deleted:
  gnome-session/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   81 +++++++++++++++++++++++++-----------------------
 neuter-debugging.diff |   25 ++++++++++++++
 2 files changed, 68 insertions(+), 38 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-20 22:44:27 UTC (rev 363176)
+++ PKGBUILD	2019-09-20 22:47:39 UTC (rev 363177)
@@ -1,38 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-session
-pkgver=3.34.0
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-url="https://gitlab.gnome.org/GNOME/gnome-session"
-arch=(x86_64)
-license=(GPL)
-depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
-         json-glib libgl libsm libxtst systemd)
-makedepends=(mesa gtk-doc xtrans git python xmlto docbook-xsl meson)
-groups=(gnome)
-_commit=02b301128b766b49a55de4eabe1d29c7ac4e359c  # tags/3.34.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-session.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-  
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}

Copied: gnome-session/repos/extra-x86_64/PKGBUILD (from rev 363176, gnome-session/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-20 22:47:39 UTC (rev 363177)
@@ -0,0 +1,43 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-session
+pkgver=3.34.0+2+g9d8b0709
+pkgrel=1
+pkgdesc="The GNOME Session Handler"
+url="https://gitlab.gnome.org/GNOME/gnome-session"
+arch=(x86_64)
+license=(GPL)
+depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
+         json-glib libgl libsm libxtst systemd)
+makedepends=(mesa gtk-doc xtrans git python xmlto docbook-xsl meson)
+groups=(gnome)
+_commit=9d8b070982403ff8e608d4c7cce313bc2a7dce4a  # master
+source=("git+https://gitlab.gnome.org/GNOME/gnome-session.git#commit=$_commit"
+        neuter-debugging.diff)
+sha256sums=('SKIP'
+            '1970f676ff510d2c169d9252f69733412206d0d6a082e587e6a0fd6073e483a1')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Stopgap for https://gitlab.gnome.org/GNOME/gnome-session/issues/31
+  git apply -3 ../neuter-debugging.diff
+}
+  
+build() {
+  arch-meson $pkgname build
+  ninja -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Copied: gnome-session/repos/extra-x86_64/neuter-debugging.diff (from rev 363176, gnome-session/trunk/neuter-debugging.diff)
===================================================================
--- neuter-debugging.diff	                        (rev 0)
+++ neuter-debugging.diff	2019-09-20 22:47:39 UTC (rev 363177)
@@ -0,0 +1,25 @@
+diff --git i/data/gnome-session-manager at .service.in w/data/gnome-session-manager at .service.in
+index dd10cc9b..b06dbeb3 100644
+--- i/data/gnome-session-manager at .service.in
++++ w/data/gnome-session-manager at .service.in
+@@ -15,5 +15,5 @@ Before=gnome-session-manager.target
+ 
+ [Service]
+ Type=notify
+-ExecStart=@libexecdir@/gnome-session-binary --debug --systemd-service --session=%i
++ExecStart=@libexecdir@/gnome-session-binary --systemd-service --session=%i
+ ExecStopPost=- at libexecdir@/gnome-session-ctl --shutdown
+diff --git i/gnome-session/gdm-log.c w/gnome-session/gdm-log.c
+index c0dca411..687f7e8e 100644
+--- i/gnome-session/gdm-log.c
++++ w/gnome-session/gdm-log.c
+@@ -187,9 +187,6 @@ gdm_log_init (void)
+         prg_name = g_get_prgname ();
+ 
+         options = LOG_PID;
+-#ifdef LOG_PERROR
+-        options |= LOG_PERROR;
+-#endif
+ 
+         openlog (prg_name, options, LOG_DAEMON);
+