diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-09-12 19:07:22 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-12 10:07:21 -0700 |
| commit | 96f4487c77fbf08518a9ee665612927c97ce8ebd (patch) | |
| tree | a7b610226f798bda208a6459f26afa9922fb5dde /ports/libqglviewer | |
| parent | ecfc714b9adbdf8bf6b394dd6b46d9c56ca993ea (diff) | |
| download | vcpkg-96f4487c77fbf08518a9ee665612927c97ce8ebd.tar.gz vcpkg-96f4487c77fbf08518a9ee665612927c97ce8ebd.zip | |
[Qt] Update to 5.12.4 (#7667)
* update to 5.12.4
* removed port qt5-modularscripts and split it functionality into more functions into qt5-base
* added qt_port_hashes.cmake for simpler upgrade.
* added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet
* qt_<config>.conf are now copied from the build dir instead from the port dir
* fixed freetype dependencies.
* cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore.
* introduced vcpkg_buildpath_length_warning
* changed directory layout of the qt5 installation executables and mkspecs a bit.
Diffstat (limited to 'ports/libqglviewer')
| -rw-r--r-- | ports/libqglviewer/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libqglviewer/QGLViewer_remove_shared.patch | 13 | ||||
| -rw-r--r-- | ports/libqglviewer/macosx.patch | 13 | ||||
| -rw-r--r-- | ports/libqglviewer/portfile.cmake | 2 |
4 files changed, 29 insertions, 1 deletions
diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL index add042b7e..a80694a2f 100644 --- a/ports/libqglviewer/CONTROL +++ b/ports/libqglviewer/CONTROL @@ -1,4 +1,4 @@ Source: libqglviewer
-Version: 2.7.0 +Version: 2.7.0-2 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
Build-Depends: qt5-base
diff --git a/ports/libqglviewer/QGLViewer_remove_shared.patch b/ports/libqglviewer/QGLViewer_remove_shared.patch new file mode 100644 index 000000000..f339d81a5 --- /dev/null +++ b/ports/libqglviewer/QGLViewer_remove_shared.patch @@ -0,0 +1,13 @@ +diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro +index f9afe8089..63f74736e 100644 +--- a/QGLViewer/QGLViewer.pro ++++ b/QGLViewer/QGLViewer.pro +@@ -7,7 +7,7 @@ + TEMPLATE = lib + TARGET = QGLViewer + VERSION = 2.7.0 +-CONFIG *= qt opengl warn_on shared thread create_prl rtti no_keywords ++CONFIG *= qt opengl warn_on thread create_prl rtti no_keywords + + QGL_HEADERS = \ + qglviewer.h \ diff --git a/ports/libqglviewer/macosx.patch b/ports/libqglviewer/macosx.patch new file mode 100644 index 000000000..206e85c1b --- /dev/null +++ b/ports/libqglviewer/macosx.patch @@ -0,0 +1,13 @@ +diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro +index 702925cb6..fc3cb7118 100644 +--- a/QGLViewer/QGLViewer.pro ++++ b/QGLViewer/QGLViewer.pro +@@ -224,7 +224,7 @@ macx|darwin-g++ { + QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+
+ # So that the path QGLViewer/*.h exists
+- QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
++ #QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
+
+ # Specific paths for the installation of the framework.
+ !isEmpty( LIB_DIR ) {
diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake index 7a7cc9fdf..6f980c0ae 100644 --- a/ports/libqglviewer/portfile.cmake +++ b/ports/libqglviewer/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5
HEAD_REF master
PATCHES "use-default-config-on-all-platforms.patch"
+ "QGLViewer_remove_shared.patch"
+ "macosx.patch"
)
vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro)
|