[qscintilla] Update to 2.11.4 (#10511)

* update qscintilla to 2.11.4

* Update portfile.cmake

* for CI test

* undo

* add !osx support

* fix osx build error

* Update ci.baseline.txt

* Update ci.baseline.txt

* [ci.baseline.txt] Revert line endings change

* [qscintilla] Restore vcpkg_copy_pdbs()

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

4 files changed, 40 insertions, 15 deletions

diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL
index de1622354..0c8fea940 100644
--- a/ports/qscintilla/CONTROL
+++ b/ports/qscintilla/CONTROL
@@ -1,5 +1,5 @@
 Source: qscintilla
-Version: 2.10-11
-Homepage: https://sourceforge.net/projects/pyqt
+Version: 2.11.4-1
+Homepage: https://www.riverbankcomputing.com/software/qscintilla
 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)
-Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
+Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows)
\ No newline at end of file
diff --git a/ports/qscintilla/fix-static.patch b/ports/qscintilla/fix-static.patch
new file mode 100644
index 000000000..f3a4a616d
--- /dev/null
+++ b/ports/qscintilla/fix-static.patch
@@ -0,0 +1,29 @@
+diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro

+index 075079c32..8ff8678b6 100644

+--- a/Qt4Qt5/qscintilla.pro

++++ b/Qt4Qt5/qscintilla.pro

+@@ -37,13 +37,13 @@ CONFIG(debug, debug|release) {

+     TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}

+ }

+ 

+-macx:!CONFIG(staticlib) {

++macx:!CONFIG(static) {

+     QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)

+ }

+ 

+ INCLUDEPATH += . ../include ../lexlib ../src

+ 

+-!CONFIG(staticlib) {

++!CONFIG(static) {

+     DEFINES += QSCINTILLA_MAKE_DLL

+ }

+ DEFINES += SCINTILLA_QT SCI_LEXER INCLUDE_DEPRECATED_FEATURES

+@@ -90,7 +90,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {

+ } else {

+     features.path = $$[QT_INSTALL_DATA]/mkspecs/features

+ }

+-CONFIG(staticlib) {

++CONFIG(static) {

+     features.files = $$PWD/features_staticlib/qscintilla2.prf

+ } else {

+     features.files = $$PWD/features/qscintilla2.prf

diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake
index d34d5517c..8ef897290 100644
--- a/ports/qscintilla/portfile.cmake
+++ b/ports/qscintilla/portfile.cmake
@@ -1,23 +1,21 @@
-include(vcpkg_common_functions)
-
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10/QScintilla_gpl-2.10.zip"
-    FILENAME "QScintilla_gpl-2.10.zip"
-    SHA512 7c580cfee03af1056f530af756a0ff9cc2396a5419fa23aecc66a6bc8809a4fb154788956220bb0b068a5c214d571c053271c3906d6d541196fbbf7c6dbec917
+    URLS "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz"
+    FILENAME "QScintilla-2.11.4.tar.gz"
+    SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES
+        fix-static.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
 
 # Add python3 to path
-get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
-vcpkg_add_to_path(PREPEND ${PYTHON_PATH})
-vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
-vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin)
+get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path(${PYTHON3_PATH})
 
 vcpkg_configure_qmake(
     SOURCE_PATH ${SOURCE_PATH}/Qt4Qt5
@@ -42,5 +40,4 @@ file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci)
 vcpkg_copy_pdbs()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/qscintilla)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/qscintilla/LICENSE ${CURRENT_PACKAGES_DIR}/share/qscintilla/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index efc30be81..761c6613e 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1461,7 +1461,6 @@ qhull:x64-uwp=ignore
 qpid-proton:arm-uwp=fail

 qpid-proton:x64-uwp=fail

 qpid-proton:x64-windows-static=fail

-qscintilla:x64-linux=fail

 qt5-activeqt:x64-linux=fail

 qt5-activeqt:x64-osx=fail

 qt5-macextras:x64-linux=fail