Replace -std=c++98 with -std=c++11 (from upstream).

This commit is contained in:
ajacoutot 2015-09-24 10:35:54 +00:00
parent a884987356
commit 59cb8aeb4b
2 changed files with 48 additions and 17 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.61 2015/08/15 11:13:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.62 2015/09/24 10:35:54 ajacoutot Exp $
COMMENT= sytem monitor for GNOME
COMMENT= sytem monitor for GNOME
GNOME_PROJECT= gnome-system-monitor
GNOME_VERSION= 3.16.0
REVISION= 2
GNOME_PROJECT= gnome-system-monitor
GNOME_VERSION= 3.16.0
REVISION= 3
CATEGORIES= sysutils
CATEGORIES= sysutils
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -19,24 +19,30 @@ WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 gtkmm-3.0 gtop-2.0
WANTLIB += harfbuzz kvm m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs
WANTLIB += rsvg-2 sigc-2.0 stdc++ xcb xcb-render xcb-shm xml2
WANTLIB += rsvg-2 sigc-2.0 xcb xcb-render xcb-shm xml2
WANTLIB += z epoxy lzma
MODULES= devel/dconf \
devel/gettext \
x11/gnome
MODULES= devel/dconf \
devel/gettext \
x11/gnome
LIB_DEPENDS= devel/libgtop2>=2.30.0 \
x11/gnome/librsvg \
x11/gtk3mm
# c++11
MODULES += gcc4
MODGCC4_ARCHS= *
MODGCC4_LANGS= c++
LIB_DEPENDS= devel/libgtop2>=2.30.0 \
x11/gnome/librsvg \
x11/gtk3mm
# share/polkit-1/actions/org.gnome.gnome-system-monitor.policy
RUN_DEPENDS += sysutils/polkit
RUN_DEPENDS += sysutils/polkit
# polkit(8) almost always needs to know the "active" session
RUN_DEPENDS += sysutils/consolekit
RUN_DEPENDS += sysutils/consolekit
MODGNOME_TOOLS += desktop-file-utils yelp
CONFIGURE_ARGS= --disable-systemd
MODGNOME_TOOLS= desktop-file-utils yelp
CONFIGURE_ARGS= --disable-systemd
.include <bsd.port.mk>

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-configure,v 1.6 2015/09/24 10:35:54 ajacoutot Exp $
From e5d3ac014d7acc73c5f508a937c5656ffa8f08ad Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw@src.gnome.org>
Date: Sat, 1 Aug 2015 13:50:04 +0800
Subject: build: Replace -std=c++98 with -std=c++11
From 258ea1153bd5e7f54351fad025d8a994b21dd9be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@gmail.com>
Date: Sun, 2 Aug 2015 06:38:47 +0200
Subject: We don't need anymore the CFLAGS gnu89. Compilers are modern enough.
--- configure.orig Wed Sep 23 13:55:04 2015
+++ configure Wed Sep 23 13:55:25 2015
@@ -16272,9 +16272,8 @@ $as_echo "yes" >&6; }
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-Wnested-externs -Wpointer-arith \
-Wcast-align -Wsign-compare \
- -std=gnu89 \
$CFLAGS"
- CXXFLAGS="-Wall -std=c++98 $CXXFLAGS"
+ CXXFLAGS="-Wall -std=c++11 $CXXFLAGS"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }