diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2019-12-21 04:23:09 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-20 12:23:09 -0800 |
| commit | 0548f8a50c44a00ee463e6fe8eef7807078b5006 (patch) | |
| tree | 4f1c234cce80c75637fc7ea93b8f469c270c6bd2 | |
| parent | ea6dba0cd9b01b007c5463d0cdecce197b89fab0 (diff) | |
| download | vcpkg-0548f8a50c44a00ee463e6fe8eef7807078b5006.tar.gz vcpkg-0548f8a50c44a00ee463e6fe8eef7807078b5006.zip | |
[libqglviewer] update to 2.7.2 (#9186)
* [libqglviewer] update to 2.7.2
* [libqglviewer] Remove patch double quotes
| -rw-r--r-- | ports/libqglviewer/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libqglviewer/QGLViewer_remove_shared.patch | 13 | ||||
| -rw-r--r-- | ports/libqglviewer/macosx.patch | 22 | ||||
| -rw-r--r-- | ports/libqglviewer/portfile.cmake | 9 |
4 files changed, 5 insertions, 41 deletions
diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL index a80694a2f..352c7708e 100644 --- a/ports/libqglviewer/CONTROL +++ b/ports/libqglviewer/CONTROL @@ -1,4 +1,4 @@ Source: libqglviewer
-Version: 2.7.0-2 +Version: 2.7.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 deleted file mode 100644 index f339d81a5..000000000 --- a/ports/libqglviewer/QGLViewer_remove_shared.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 82aa057f4..000000000 --- a/ports/libqglviewer/macosx.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro -index 702925cb6..fc3cb7118 100644 ---- a/QGLViewer/QGLViewer.pro -+++ b/QGLViewer/QGLViewer.pro -@@ -214,7 +214,7 @@ macx|darwin-g++ { - include.files *= qglviewer.icns - - # Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -- QMAKE_MAC_SDK = macosx10.12 -+ #QMAKE_MAC_SDK = macosx10.12 - - lib_bundle { - FRAMEWORK_HEADERS.version = Versions -@@ -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 6f980c0ae..991f50d31 100644 --- a/ports/libqglviewer/portfile.cmake +++ b/ports/libqglviewer/portfile.cmake @@ -3,12 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GillesDebunne/libQGLViewer
- REF 781d914c003466b342b45d19266a9613fc0e7e0e - SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5
+ REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2 + SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8
HEAD_REF master
- PATCHES "use-default-config-on-all-platforms.patch"
- "QGLViewer_remove_shared.patch"
- "macosx.patch"
+ PATCHES
+ use-default-config-on-all-platforms.patch
)
vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro)
|