cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pushed upstream.

Browse Source
This commit is contained in:
ajacoutot 2017-11-10 17:29:58 +00:00
parent 5aa77d49cd
commit 19330c1972
3 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/gnome/session/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.268 2017/11/10 08:54:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.269 2017/11/10 17:29:58 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 3.26.1
REVISION= 0
REVISION= 1
CATEGORIES= x11
@ -53,15 +53,4 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-systemd \
--enable-consolekit
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS} \
devel/libtool
pre-configure:
cd ${WRKSRC} && env -i \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
.include <bsd.port.mk>

29
x11/gnome/session/patches/patch-configure_ac
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.3 2017/11/10 08:54:07 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=790154
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -20,9 +20,6 @@ PKG_PROG_PKG_CONFIG()
LT_PREREQ([2.2.6])
LT_INIT([dlopen disable-static])
-GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS([maximum])
-
AC_ARG_ENABLE(deprecation_flags,
[AS_HELP_STRING([--enable-deprecation-flags],
[use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
@@ -361,6 +358,11 @@ fi
dnl ==============================================================================
dnl End of IPv6 checks
dnl ==============================================================================
+
+dnl ====================================================================
+dnl check for rpmatch
+dnl ====================================================================
+AC_CHECK_FUNCS(rpmatch)
AC_CONFIG_FILES([
Makefile

14
x11/gnome/session/patches/patch-gnome-session_main_c
View File

@ -1,19 +1,19 @@
$OpenBSD: patch-gnome-session_main_c,v 1.21 2017/11/10 08:54:07 ajacoutot Exp $
$OpenBSD: patch-gnome-session_main_c,v 1.22 2017/11/10 17:29:58 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=790154
From fa8de58ba96ab930baa1b8036b56a938f08c1b0e Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Fri, 10 Nov 2017 17:10:59 +0100
Subject: Don't use rpmatch(3)
Index: gnome-session/main.c
--- gnome-session/main.c.orig
+++ gnome-session/main.c
@@ -309,7 +309,11 @@ main (int argc, char **argv)
@@ -309,7 +309,7 @@ main (int argc, char **argv)
debug_string = g_getenv ("GNOME_SESSION_DEBUG");
if (debug_string != NULL) {
+#if HAVE_RPMATCH
debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1;
+#else
- debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1;
+ debug = atoi (debug_string) == 1;
+#endif
}
error = NULL;