diff options
| author | adam <adam@pkgsrc.org> | 2015-10-29 14:48:04 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2015-10-29 14:48:04 +0000 |
| commit | 4e12e0373017cf6cd7d156b42f29a873ed55b841 (patch) | |
| tree | 1ee91d2a5a6160910d500bc84a456cb966c0c817 /x11 | |
| parent | d998b7fb8993b7a91a0ee8a652e095cb41571485 (diff) | |
| download | pkgsrc-4e12e0373017cf6cd7d156b42f29a873ed55b841.tar.gz | |
Fix cmakes on Darwin, part 2
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index ee399468f46..24c5610508b 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2015/10/28 15:52:11 adam Exp $ +$NetBSD: distinfo,v 1.27 2015/10/29 14:48:04 adam Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 @@ -6,7 +6,7 @@ SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 SHA1 (patch-configure) = 7ad9c130af98ffcb703e7be924c46f4cc4be4613 -SHA1 (patch-mkspecs_features_create__cmake.prf) = 46c1b3d16803a6b62d873bce2f743ab5e29774c8 +SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf index a70bb5aefaf..571536fc863 100644 --- a/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf +++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf @@ -1,17 +1,26 @@ -$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.1 2015/10/28 15:52:11 adam Exp $ +$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.2 2015/10/29 14:48:04 adam Exp $ Fix for shared libraries naming on Darwin. ---- mkspecs/features/create_cmake.prf.orig 2015-10-28 08:15:14.000000000 +0000 +--- mkspecs/features/create_cmake.prf.orig 2015-10-13 04:35:32.000000000 +0000 +++ mkspecs/features/create_cmake.prf +@@ -147,7 +147,7 @@ contains(CONFIG, plugin) { + } + } else { + mac { +- isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib ++ isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so + else: CMAKE_PlUGIN_EXT = .a + + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} @@ -213,8 +213,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX} CMAKE_BUILD_IS_FRAMEWORK = "true" } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib - CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib -+ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$QT_MAJOR_VERSION.dylib -+ CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$QT_MAJOR_VERSION.dylib ++ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$${QT_MAJOR_VERSION}.dylib ++ CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QT_MAJOR_VERSION}.dylib } } } else:win32 { |