From 58cf7efd4629b58d70c4a1b9c1b6d69c59526d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Mon, 20 Mar 2023 07:57:36 +0100 Subject: [PATCH] qscintilla: update to 2.13.4 (#30158) --- ports/qscintilla/fix-static.patch | 6 +++--- ports/qscintilla/portfile.cmake | 10 +++++----- ports/qscintilla/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/q-/qscintilla.json | 5 +++++ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ports/qscintilla/fix-static.patch b/ports/qscintilla/fix-static.patch index 1c0569d47d..ab1cf546d0 100644 --- a/ports/qscintilla/fix-static.patch +++ b/ports/qscintilla/fix-static.patch @@ -16,9 +16,9 @@ index 8d0acd2..2246442 100644 -!CONFIG(staticlib) { +!CONFIG(static) { DEFINES += QSCINTILLA_MAKE_DLL - } - DEFINES += SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES -@@ -82,7 +82,7 @@ qsci.files = ../qsci + + # Comment this in to build a dynamic library supporting multiple +@@ -86,7 +86,7 @@ qsci.files = ../qsci INSTALLS += qsci features.path = $$[QT_HOST_DATA]/mkspecs/features diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index e239dcc375..07ea7faa0c 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz" - FILENAME "QScintilla-2.12.0.tar.gz" - SHA512 9bdaba5c33c1b11ccad83eb1fda72142758afc50c955a62d5a8ff102b41d4b67d897bf96ce0540e16bc5a7fae2ce1acbf06931d5f0ae6768759c9ff072c03daa + URLS "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.4/QScintilla_src-2.13.4.tar.gz" + FILENAME "QScintilla-2.13.4.tar.gz" + SHA512 591379f4d48a6de1bc61db93f6c0d1c48b6830a852679b51e27debb866524c320e2db27d919baf32576c2bf40bba62e38378673a86f22db9839746e26b0f77cd ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES fix-static.patch diff --git a/ports/qscintilla/vcpkg.json b/ports/qscintilla/vcpkg.json index 8e822764c2..fb558bd61c 100644 --- a/ports/qscintilla/vcpkg.json +++ b/ports/qscintilla/vcpkg.json @@ -1,10 +1,9 @@ { "name": "qscintilla", - "version": "2.12.0", - "port-version": 1, + "version": "2.13.4", "description": "QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)", "homepage": "https://www.riverbankcomputing.com/software/qscintilla", - "supports": "!(windows & (arm | arm64))", + "license": "GPL-3.0-or-later", "dependencies": [ { "name": "qt5-base", diff --git a/versions/baseline.json b/versions/baseline.json index 4b58ecd6f3..50d0ecd2b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6329,8 +6329,8 @@ "port-version": 3 }, "qscintilla": { - "baseline": "2.12.0", - "port-version": 1 + "baseline": "2.13.4", + "port-version": 0 }, "qt": { "baseline": "6.4.2", diff --git a/versions/q-/qscintilla.json b/versions/q-/qscintilla.json index 936299c8b7..75e97b7a17 100644 --- a/versions/q-/qscintilla.json +++ b/versions/q-/qscintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7698a4b73e3ed54fd0cf66cf9e754317763750cb", + "version": "2.13.4", + "port-version": 0 + }, { "git-tree": "63f2d1f0287a6d61b5c85b428920b0fbe102adec", "version": "2.12.0",