From 08157903ad042826dd080c97cfe1946a5bf150a4 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 19 Mar 2018 20:49:24 +0100 Subject: [PATCH] gnome-session: remove workarounds that aren't needed anymore --- .../patches/patch-gnome-session_main_c.diff | 15 --------------- srcpkgs/gnome-session/template | 13 +++---------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/gnome-session/patches/patch-gnome-session_main_c.diff diff --git a/srcpkgs/gnome-session/patches/patch-gnome-session_main_c.diff b/srcpkgs/gnome-session/patches/patch-gnome-session_main_c.diff deleted file mode 100644 index 15a718a6f27..00000000000 --- a/srcpkgs/gnome-session/patches/patch-gnome-session_main_c.diff +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-gnome-session_main_c,v 1.13 2015/04/03 12:43:19 ajacoutot Exp $ - -XXX no rpmatch(3) on OpenBSD - ---- gnome-session/main.c.orig Fri Apr 3 14:18:31 2015 -+++ gnome-session/main.c Fri Apr 3 14:19:42 2015 -@@ -260,7 +260,7 @@ main (int argc, char **argv) - - debug_string = g_getenv ("GNOME_SESSION_DEBUG"); - if (debug_string != NULL) { -- debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1; -+ debug = atoi (debug_string) == 1; - } - - error = NULL; diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index d132a0ee00d..5628c9c19a3 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -2,9 +2,9 @@ pkgname=gnome-session version=3.28.0 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile" -hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" +build_style=meson +hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel xmlto" +configure_args="-Dsystemd_journal=false" makedepends="upower-devel json-glib-devel gtk+3-devel libSM-devel startup-notification-devel libXtst-devel dbus-glib-devel elogind-devel gsettings-desktop-schemas-devel gnome-desktop-devel" @@ -16,10 +16,3 @@ homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=0b803d9a6011f5d49d9b4c3c15390e8b6f36ef710f4dc47756109f982455acd1 - -pre_configure() { - sed -i "s/^#ifdef HAVE_SYSTEMD/#if 0/" \ - gnome-session/main.c \ - gnome-session/gsm-manager.c \ - gnome-session/gsm-autostart-app.c -}