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

Fix after protobuf 3.6.0 update (now needs C++ 11).

Browse Source 
from jca
This commit is contained in:
tb 2018-07-10 10:55:07 +00:00
parent 0ca0cc2a5d
commit 8e7bdaad64
5 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/clementine/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.33 2018/06/29 22:16:08 espie Exp $
# $OpenBSD: Makefile,v 1.34 2018/07/10 10:55:07 tb Exp $
COMMENT = Qt4-based featureful music player
V = 1.2.3
DISTNAME = clementine-${V}
CATEGORIES = audio x11
REVISION = 12
REVISION = 13
HOMEPAGE = http://clementine-player.org/
@ -32,6 +32,7 @@ WANTLIB += plist
MODULES = devel/cmake x11/qt4
COMPILER = base-clang ports-gcc
CXXFLAGS += -std=c++11
BUILD_DEPENDS = devel/boost \
devel/cmake>=2.8.10.2p3 \

16
audio/clementine/patches/patch-ext_clementine-tagreader_CMakeLists_txt Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-ext_clementine-tagreader_CMakeLists_txt,v 1.1 2018/07/10 10:55:07 tb Exp $
Respect CXXFLAGS
Index: ext/clementine-tagreader/CMakeLists.txt
--- ext/clementine-tagreader/CMakeLists.txt.orig
+++ ext/clementine-tagreader/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclement
include_directories(${CMAKE_SOURCE_DIR}/src)
include_directories(${CMAKE_BINARY_DIR}/src)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "--std=c++0x -U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})

20
audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt
View File

@ -1,6 +1,20 @@
$OpenBSD: patch-ext_libclementine-common_CMakeLists_txt,v 1.4 2013/12/12 11:13:39 zhuk Exp $
--- ext/libclementine-common/CMakeLists.txt.orig Sun Oct 20 05:37:02 2013
+++ ext/libclementine-common/CMakeLists.txt Sun Oct 20 05:38:11 2013
$OpenBSD: patch-ext_libclementine-common_CMakeLists_txt,v 1.5 2018/07/10 10:55:07 tb Exp $
1. Respect CXXFLAGS
2. Switch Clementine to FindBacktrace.cmake
Index: ext/libclementine-common/CMakeLists.txt
--- ext/libclementine-common/CMakeLists.txt.orig
+++ ext/libclementine-common/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
+set(CMAKE_CXX_FLAGS "--std=c++0x ${CMAKE_CXX_FLAGS}")
set(SOURCES
core/closure.cpp
@@ -33,3 +33,11 @@ target_link_libraries(libclementine-common
${TAGLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}

12
audio/clementine/patches/patch-src_CMakeLists_txt
View File

@ -1,13 +1,15 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2014/10/01 20:52:48 dcoppa Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.4 2018/07/10 10:55:07 tb Exp $
1. -Wno-unused-private-field -Wno-unknown-warning-option dont exist on gcc 4.8
2. FIX BUG 4401: No namespaces for DBus interfaces, from upstream.
--- src/CMakeLists.txt.orig Wed Apr 23 12:16:44 2014
+++ src/CMakeLists.txt Wed Oct 1 16:35:16 2014
2. Respect CXXFLAGS
3. FIX BUG 4401: No namespaces for DBus interfaces, from upstream.
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs --std=c++0x -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs --std=c++0x -U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
option(BUILD_WERROR "Build with -Werror" ON)

15
audio/clementine/patches/patch-tests_CMakeLists_txt Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-tests_CMakeLists_txt,v 1.1 2018/07/10 10:55:07 tb Exp $
Respect CXXFLAGS
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
+++ tests/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "-std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__ ${CMAKE_CXX_FLAGS}")
if(USE_SYSTEM_GMOCK)
include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})