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

grantlee-qt5: unbreak with ports-gcc

Browse Source 
Remove '-ansi' from cxxflags as it implies c++98 with gcc,
and grantlee wants c++11.

OK rsadowski@
This commit is contained in:
cwen 2019-09-22 09:10:55 +00:00
parent e53b913ead
commit d01dcddbd4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/grantlee-qt5/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:51:12 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2019/09/22 09:10:55 cwen Exp $
COMMENT = template and text document library for Qt5
VERSION = 5.1.0
PKGNAME = grantlee-qt5-${VERSION}
DISTNAME = grantlee-${VERSION}
REVISION = 1
REVISION = 2
SHARED_LIBS += Grantlee_Templates 0.0 # 5.1
SHARED_LIBS += Grantlee_TextDocument 0.0 # 5.1

13
x11/grantlee-qt5/patches/patch-CMakeLists_txt
View File

@ -1,4 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/08/14 05:23:08 rsadowski Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2019/09/22 09:10:55 cwen Exp $
Hunk #2: ports-gcc fix because with it, -ansi means -std=c++98, and
grantlee wants c++11
Index: CMakeLists.txt
--- CMakeLists.txt.orig
@ -20,6 +22,15 @@ Index: CMakeLists.txt
set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
@@ -56,7 +56,7 @@ endif()
if (CMAKE_COMPILER_IS_GNUCXX)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ")
if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
# Needed on 64 bit
@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of libr
set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )