diff options
| author | nros <nros@pkgsrc.org> | 2019-12-05 17:56:15 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2019-12-05 17:56:15 +0000 |
| commit | 5ba3916ebcb89390c584a8df170e49aa7f35b7cf (patch) | |
| tree | 20554e7be468daba85468c8910476ada6670b6cd /misc/xygrib | |
| parent | d871c08524d28b20174c6252889bcb5f8f2a0100 (diff) | |
| download | pkgsrc-5ba3916ebcb89390c584a8df170e49aa7f35b7cf.tar.gz | |
Fix xygrib on OSX
Don't create app bundles on osx since this breaks installation as seen
in MacOSX bulk builds.
Diffstat (limited to 'misc/xygrib')
| -rw-r--r-- | misc/xygrib/distinfo | 4 | ||||
| -rw-r--r-- | misc/xygrib/patches/patch-CMakeLists.txt | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/misc/xygrib/distinfo b/misc/xygrib/distinfo index 26e5fe4be72..12eb2605216 100644 --- a/misc/xygrib/distinfo +++ b/misc/xygrib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2019/11/04 18:53:13 nros Exp $ +$NetBSD: distinfo,v 1.3 2019/12/05 17:56:15 nros Exp $ SHA1 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 8e3431ed6a5ef114d77ac57029129a26a381f696 RMD160 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 876e8a53b492b2e2ea0572e5b0cd31a2c04f505a @@ -12,4 +12,4 @@ SHA1 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = eb82eb192bb3d6d97ebb32a21fdf7 RMD160 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 1c47e3af9884e1a927b1e717f938178f12a17fa8 SHA512 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 6bb9362c87fec7633b0ad1fd3b8717408c0fffa36631db1d1a680928c724e8e49758c292cac164ad7a9773fd51a432d25628eecbaa1261f5f3c5ab6fc499fd01 Size (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 2487518 bytes -SHA1 (patch-CMakeLists.txt) = a206bc8c9f11a96a96a5e8aa001cc678189f4680 +SHA1 (patch-CMakeLists.txt) = f12e4cc04e94919a8ed5824df859b0573612ab02 diff --git a/misc/xygrib/patches/patch-CMakeLists.txt b/misc/xygrib/patches/patch-CMakeLists.txt index f8c2520decd..83d70620b0c 100644 --- a/misc/xygrib/patches/patch-CMakeLists.txt +++ b/misc/xygrib/patches/patch-CMakeLists.txt @@ -1,10 +1,11 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/04 18:53:13 nros Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2019/12/05 17:56:15 nros Exp $ * sanitze the names and dirs to search for libs and headers files * use PATH_SUFFIX fix to find openjpeg * install bins and data into the right directory * don't regenerate translations (no need for qttools dependecy) * don't install cmake files in the translation directory +* don't generate an app bundle on MacOS X * install icon and desktop files * install hi-res maps @@ -86,7 +87,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/04 18:53:13 nros Exp $ REQUIRED ) include_directories(${OPENJPEG_INCLUDE_DIR}) -@@ -212,22 +164,18 @@ include_directories(${PNG_INCLUDE_DIR}) +@@ -212,33 +164,30 @@ include_directories(${PNG_INCLUDE_DIR}) configure_file(cmake/Version.h.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/Version.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include) @@ -113,9 +114,15 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/04 18:53:13 nros Exp $ # Installation # macOS bundle parameters -@@ -241,4 +189,14 @@ set_target_properties(${PROJECT_NAME} PR - set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}") - set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "xyGrib.icns") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "${XYGRIB_VERSION}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${XYGRIB_VERSION}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}") +-set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors") # Install data -install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA}) +install(DIRECTORY data DESTINATION ${PREFIX_PKGDATA} |