diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2020-02-19 03:00:20 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2020-02-19 03:00:20 +0000 |
| commit | 41936113d597007c9c1b931dabc557f10bff7c31 (patch) | |
| tree | 9a0c353a833a4cc4b083402a54ed5df442792d7a /audio/musescore/patches | |
| parent | 07d5b682320bcf3ba1bdccfdfd12e36f76c30576 (diff) | |
| download | pkgsrc-41936113d597007c9c1b931dabc557f10bff7c31.tar.gz | |
musescore: build fix for MacOS X (with pkgsrc's defaults)
Diffstat (limited to 'audio/musescore/patches')
| -rw-r--r-- | audio/musescore/patches/patch-CMakeLists.txt | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/audio/musescore/patches/patch-CMakeLists.txt b/audio/musescore/patches/patch-CMakeLists.txt index 988f9cbfd06..9338523f3d8 100644 --- a/audio/musescore/patches/patch-CMakeLists.txt +++ b/audio/musescore/patches/patch-CMakeLists.txt @@ -1,12 +1,24 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/16 23:22:08 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2020/02/19 03:00:21 gutteridge Exp $ Never compress man pages. Use CMAKE_INSTALL_MANDIR. ---- CMakeLists.txt.orig 2019-07-06 09:44:00.000000000 +0000 +Use the correct macro for pkg-config invocation. +https://github.com/musescore/MuseScore/pull/5732 + +--- CMakeLists.txt.orig 2020-02-06 21:10:58.000000000 +0000 +++ CMakeLists.txt -@@ -663,7 +663,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE +@@ -385,7 +385,7 @@ endif(BUILD_FOR_WINSTORE) + + if (USE_SYSTEM_FREETYPE) + if (APPLE) +- PKGCONFIG (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP) ++ PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP) + if (FREETYPE_INCLUDE_DIRS) + STRING(REGEX REPLACE "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) + STRING(REGEX REPLACE "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR}) +@@ -683,7 +683,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE # Compress man pages if gzip is installed (don't on OpenBSD) # Note: Compressing man pages is normal on Linux but not OpenBSD find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages (optional)." ) @@ -15,7 +27,7 @@ Use CMAKE_INSTALL_MANDIR. message(STATUS "Found 'gzip'. Man pages will be compressed.") set(MAN_TARGET ${MAN_BUILD}) set(MAN_EXTENSION ${MAN_EXTENSION}.gz) -@@ -680,7 +680,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE +@@ -700,7 +700,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE COMMAND echo "Man pages have been compressed ready for installation." VERBATIM ) @@ -24,7 +36,7 @@ Use CMAKE_INSTALL_MANDIR. if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") message(STATUS "System is OpenBSD: Man pages will not be compressed.") else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -@@ -690,9 +690,9 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE +@@ -710,9 +710,9 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE COMMAND echo "Man pages will be installed uncompressed." VERBATIM ) @@ -36,7 +48,7 @@ Use CMAKE_INSTALL_MANDIR. # Create symlink alias for man pages so `man musescore` = `man mscore` find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." ) if (LN_EXECUTABLE) -@@ -703,7 +703,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE +@@ -723,7 +723,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}" COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}' ) |