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

Sync patches with upstream:

Browse Source 
FindQt4: search for versioned qmake names first before general qmake
(upstream git commit 8de3f22e8fe9e798b63eb00e35eee6404748d3bd)

FindSDL: fix bad variable expansion
(upstream git commit fd329307b2ee76abaa41e25a300902a2fb983895)
This commit is contained in:
dcoppa 2015-01-08 16:58:00 +00:00
parent 9ffb13eaac
commit f8ca00b39a
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.117 2014/12/31 11:06:02 dcoppa Exp $
# $OpenBSD: Makefile,v 1.118 2015/01/08 16:58:00 dcoppa Exp $
DPB_PROPERTIES =parallel
@ -11,6 +11,7 @@ COMMENT = portable build system
VER = 3.1.0
DISTNAME = cmake-${VER}
REVISION = 0
CATEGORIES = devel

13
devel/cmake/patches/patch-Modules_FindQt4_cmake
View File

@ -1,6 +1,13 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.23 2014/12/31 11:06:02 dcoppa Exp $
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.24 2015/01/08 16:58:00 dcoppa Exp $
commit 8de3f22e8fe9e798b63eb00e35eee6404748d3bd
Author: Rolf Eike Beer <eike@sf-mail.de>
Date: Wed Jan 7 23:42:35 2015 +0100
FindQt4: search for versioned qmake names first before general qmake
--- Modules/FindQt4.cmake.orig Mon Dec 15 14:07:43 2014
+++ Modules/FindQt4.cmake Thu Dec 18 06:34:41 2014
+++ Modules/FindQt4.cmake Thu Jan 8 10:39:46 2015
@@ -522,7 +522,12 @@ endfunction()
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
@ -9,7 +16,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v 1.23 2014/12/31 11:06:02 dcoppa Exp $
+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ set(_QT4_QMAKE_NAMES qmake4)
+else()
+ set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
+ set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
+endif()
+
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)

14
devel/cmake/patches/patch-Modules_FindSDL_cmake
View File

@ -1,9 +1,13 @@
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.7 2014/09/11 14:45:13 dcoppa Exp $
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.8 2015/01/08 16:58:00 dcoppa Exp $
Fix CMake warning
commit fd329307b2ee76abaa41e25a300902a2fb983895
Author: Rolf Eike Beer <eike@sf-mail.de>
Date: Wed Jan 7 23:46:56 2015 +0100
--- Modules/FindSDL.cmake.orig Thu Jul 31 17:03:56 2014
+++ Modules/FindSDL.cmake Wed Sep 3 08:10:09 2014
FindSDL: fix bad variable expansion
--- Modules/FindSDL.cmake.orig Mon Dec 15 14:07:43 2014
+++ Modules/FindSDL.cmake Thu Jan 8 10:38:20 2015
@@ -96,6 +96,11 @@ else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()
@ -21,7 +25,7 @@ Fix CMake warning
if(NOT SDL_BUILDING_LIBRARY)
- if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ if(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
+ if(NOT SDL_INCLUDE_DIR MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't