3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 02:11:58 +08:00
Code Issues Projects Releases Wiki Activity

[qwt] update to 6.3.0 (#38647)

Browse Source 
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [ ] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
This commit is contained in:
مهدي شينون (Mehdi Chinoune) 2024-05-09 20:40:16 +01:00 committed by GitHub
parent 022e486108
commit dd5050046b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ports/qwt/config.patch
View File

@ -1,8 +1,8 @@
diff --git a/designer/designer.pro b/designer/designer.pro diff --git a/designer/designer.pro b/designer/designer.pro
index fa4d8c7fd..ce3f82081 100644 index fa4d8c7fd..ce3f82081 100644
--- a/designer/designer.pro --- a/designer/designer.pro
+++ b/designer/designer.pro +++ b/designer/designer.pro
@@ -23,8 +23,8 @@ CONFIG( debug_and_release ) { @@ -23,8 +23,8 @@ CONFIG( debug_and_release ) {
message("debug_and_release: building the Qwt designer plugin in release mode only") message("debug_and_release: building the Qwt designer plugin in release mode only")
@ -13,11 +13,11 @@ index fa4d8c7fd..ce3f82081 100644
} }
contains(QWT_CONFIG, QwtDesigner ) { contains(QWT_CONFIG, QwtDesigner ) {
diff --git a/qwtbuild.pri b/qwtbuild.pri diff --git a/qwtbuild.pri b/qwtbuild.pri
index 9306b6ed0..5b51218b6 100644 index 9306b6ed0..5b51218b6 100644
--- a/qwtbuild.pri --- a/qwtbuild.pri
+++ b/qwtbuild.pri +++ b/qwtbuild.pri
@@ -54,12 +54,12 @@ win32 { @@ -54,12 +54,12 @@ win32 {
# might need a debug version. # might need a debug version.
# Enable debug_and_release + build_all if you want to build both. # Enable debug_and_release + build_all if you want to build both.
@ -33,28 +33,28 @@ index 9306b6ed0..5b51218b6 100644
VER_MAJ = $${QWT_VER_MAJ} VER_MAJ = $${QWT_VER_MAJ}
VER_MIN = $${QWT_VER_MIN} VER_MIN = $${QWT_VER_MIN}
diff --git a/qwtconfig.pri b/qwtconfig.pri diff --git a/qwtconfig.pri b/qwtconfig.pri
index 7da1485a0..b69b5ca71 100644 index 7da1485a0..b69b5ca71 100644
--- a/qwtconfig.pri --- a/qwtconfig.pri
+++ b/qwtconfig.pri +++ b/qwtconfig.pri
@@ -19,18 +19,19 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT} @@ -19,18 +19,19 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
unix { unix {
- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-dev - QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
+ # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-dev + # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
# QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-dev-qt-$$QT_VERSION # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
} }
win32 { win32 {
- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-dev - QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-dev + # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-dev-qt-$$QT_VERSION # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
} }
-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc -QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/doc +QWT_INSTALL_DOCS = $$[QT_INSTALL_DOCS]/doc
-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include -QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt +QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib -QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
+QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS] +QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
@ -62,7 +62,7 @@ index 7da1485a0..b69b5ca71 100644
###################################################################### ######################################################################
# Designer plugin # Designer plugin
@@ -42,7 +43,7 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib @@ -42,7 +43,7 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
# runtime environment of designer/creator. # runtime environment of designer/creator.
###################################################################### ######################################################################
@ -71,7 +71,7 @@ index 7da1485a0..b69b5ca71 100644
# linux distributors often organize the Qt installation # linux distributors often organize the Qt installation
# their way and QT_INSTALL_PREFIX doesn't offer a good # their way and QT_INSTALL_PREFIX doesn't offer a good
@@ -63,7 +64,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer @@ -63,7 +64,7 @@ QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
# with every Qt upgrade. # with every Qt upgrade.
###################################################################### ######################################################################
@ -80,7 +80,7 @@ index 7da1485a0..b69b5ca71 100644
# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features # QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
###################################################################### ######################################################################
@@ -72,7 +73,7 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features @@ -72,7 +73,7 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
# it will be a static library. # it will be a static library.
###################################################################### ######################################################################
@ -89,7 +89,7 @@ index 7da1485a0..b69b5ca71 100644
###################################################################### ######################################################################
# QwtPlot enables all classes, that are needed to use the QwtPlot # QwtPlot enables all classes, that are needed to use the QwtPlot
@@ -114,7 +115,7 @@ QWT_CONFIG += QwtOpenGL @@ -114,7 +115,7 @@ QWT_CONFIG += QwtOpenGL
# Otherwise you have to build it from the designer directory. # Otherwise you have to build it from the designer directory.
###################################################################### ######################################################################
@ -98,7 +98,7 @@ index 7da1485a0..b69b5ca71 100644
###################################################################### ######################################################################
# Compile all Qwt classes into the designer plugin instead # Compile all Qwt classes into the designer plugin instead
@@ -137,7 +138,7 @@ win32 { @@ -137,7 +138,7 @@ win32 {
# Otherwise you have to build them from the examples directory. # Otherwise you have to build them from the examples directory.
###################################################################### ######################################################################
@ -107,7 +107,7 @@ index 7da1485a0..b69b5ca71 100644
###################################################################### ######################################################################
# The playground is primarily intended for the Qwt development # The playground is primarily intended for the Qwt development
@@ -148,14 +149,14 @@ QWT_CONFIG += QwtExamples @@ -148,14 +149,14 @@ QWT_CONFIG += QwtExamples
# Otherwise you have to build them from the playground directory. # Otherwise you have to build them from the playground directory.
###################################################################### ######################################################################
@ -124,21 +124,11 @@ index 7da1485a0..b69b5ca71 100644
###################################################################### ######################################################################
# When Qt has been built as framework qmake wants # When Qt has been built as framework qmake wants
@@ -171,8 +172,4 @@ macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) { diff --git a/src/src.pro b/src/src.pro
# Create and install pc files for pkg-config index 762e4c49b..d70a1b62b 100644
# See http://www.freedesktop.org/wiki/Software/pkg-config/ --- a/src/src.pro
###################################################################### +++ b/src/src.pro
- @@ -49,27 +50,27 @@ contains(QWT_CONFIG, QwtFramework) {
-unix {
-
- QWT_CONFIG += QwtPkgConfig
-}
+# QWT_CONFIG += QwtPkgConfig # Qt6 has no pkgconfig files
diff --git a/src/src.pro b/src/src.pro
index 762e4c49b..d70a1b62b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -49,27 +50,27 @@ contains(QWT_CONFIG, QwtFramework) {
include ( $${PWD}/src.pri ) include ( $${PWD}/src.pri )
# Install directives # Install directives
@ -167,7 +157,7 @@ index 762e4c49b..d70a1b62b 100644
QMAKE_PKGCONFIG_NAME = Qwt$${QWT_VER_MAJ} QMAKE_PKGCONFIG_NAME = Qwt$${QWT_VER_MAJ}
QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
@@ -82,14 +81,14 @@ contains(QWT_CONFIG, QwtPkgConfig) { @@ -82,14 +81,14 @@ contains(QWT_CONFIG, QwtPkgConfig) {
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME} QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}

13
ports/qwt/portfile.cmake
View File

@ -1,8 +1,9 @@
vcpkg_from_git( vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
URL "https://git.code.sf.net/p/qwt/git" REPO qwt/qwt
REF "907846e0e981b216349156ee83b13208faae2934" REF ${VERSION}
FETCH_REF qwt-6.2 FILENAME "qwt-${VERSION}.zip"
SHA512 4008c3e4dace0f18e572b473a51a293bb896abbd62b9c5f0a92734b2121923d2e2cbf67c997b84570a13bf4fdd7669b56497c82fbae35049ed856b2f0a65e475
PATCHES PATCHES
config.patch config.patch
fix_dll_install.patch fix_dll_install.patch
@ -24,6 +25,10 @@ vcpkg_qmake_configure(
vcpkg_qmake_install() vcpkg_qmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Qt6 pkg-config files not installed https://github.com/microsoft/vcpkg/issues/25988
# vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()

2
ports/qwt/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "qwt", "name": "qwt",
"version-date": "2023-05-12", "version": "6.3.0",
"description": "Widgets library for technical applications", "description": "Widgets library for technical applications",
"homepage": "https://sourceforge.net/projects/qwt", "homepage": "https://sourceforge.net/projects/qwt",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -7517,7 +7517,7 @@
"port-version": 0 "port-version": 0
}, },
"qwt": { "qwt": {
"baseline": "2023-05-12", "baseline": "6.3.0",
"port-version": 0 "port-version": 0
}, },
"qwtw": { "qwtw": {

5
versions/q-/qwt.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0790b160a3437533b20a9f7eca6b41868f236b5e",
"version": "6.3.0",
"port-version": 0
},
{ {
"git-tree": "a1e2a09246f114b613350042641546934ea0ff27", "git-tree": "a1e2a09246f114b613350042641546934ea0ff27",
"version-date": "2023-05-12", "version-date": "2023-05-12",