Mercurial > mxe-octave

changeset 5922:78901dc12b99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update to v2.13.0 * src/qscintilla-1-fixes.patch: update patch * src/qscintilla.mk: update naming, update version, checksum
author John Donoghue <john.donoghue@ieee.org>
date Sat, 16 Oct 2021 14:40:27 -0400
parents 68a66a57f70f
children ca137ab73946
files src/qscintilla-1-fixes.patch src/qscintilla.mk
diffstat 2 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/qscintilla-1-fixes.patch	Fri Oct 15 13:34:30 2021 -0400
+++ b/src/qscintilla-1-fixes.patch	Sat Oct 16 14:40:27 2021 -0400
@@ -1,8 +1,8 @@
-diff -ur QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro
---- QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro	2019-02-26 13:51:51.426342211 -0500
-+++ QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro	2019-02-26 13:52:39.639554334 -0500
-@@ -23,7 +23,7 @@
- !win32:VERSION = 15.0.0
+diff -ur QScintilla_src-2.13.0.orig/src/qscintilla.pro QScintilla_src-2.13.0/src/qscintilla.pro
+--- QScintilla_src-2.13.0.orig/src/qscintilla.pro	2021-10-16 14:29:45.588604124 -0400
++++ QScintilla_src-2.13.0/src/qscintilla.pro	2021-10-16 14:30:15.765967678 -0400
+@@ -21,7 +21,7 @@
+ !win32:VERSION = 15.1.0
  
  TEMPLATE = lib
 -CONFIG += qt warn_off thread exceptions hide_symbols
@@ -10,4 +10,3 @@
  
  CONFIG(debug, debug|release) {
      mac: {
-Only in QScintilla_gpl-2.11.1/Qt4Qt5: qscintilla.pro.orig
--- a/src/qscintilla.mk	Fri Oct 15 13:34:30 2021 -0400
+++ b/src/qscintilla.mk	Sat Oct 16 14:40:27 2021 -0400
@@ -3,10 +3,10 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.11.6
-$(PKG)_CHECKSUM := fe010886e59996b53e38811f67993262220c8ae5
-$(PKG)_SUBDIR   := QScintilla-$($(PKG)_VERSION)
-$(PKG)_FILE     := QScintilla-$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 2.13.0
+$(PKG)_CHECKSUM := 219eb146f7e3dd17b5fa8c735b851cb70a30977c
+$(PKG)_SUBDIR   := QScintilla_src-$($(PKG)_VERSION)
+$(PKG)_FILE     := QScintilla_src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.riverbankcomputing.com/static/Downloads/QScintilla/$($(PKG)_VERSION)/$($(PKG)_FILE)
 
 
@@ -24,7 +24,7 @@
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.riverbankcomputing.com/software/qscintilla/download' | \
-        $(SED) -n 's,.*QScintilla-\([0-9][^>]*\)\.zip.*,\1,p' | \
+        $(SED) -n 's,.*QScintilla_src-\([0-9][^>]*\)\.zip.*,\1,p' | \
         head -n 1 
 endef
 
@@ -43,7 +43,7 @@
 endif
 
 define $(PKG)_BUILD
-    cd '$(1)/Qt4Qt5' && \
+    cd '$(1)/src' && \
       '$(MXE_QMAKE)' -makefile \
         $($(PKG)_QMAKE_SPEC_OPTION) \
         QMAKE_UIC='$(MXE_UIC)' \
@@ -53,13 +53,13 @@
 
     if [ $(MXE_SYSTEM) = msvc ]; then \
         mkdir -p '$(3)' && \
-        cd '$(1)/Qt4Qt5' && \
+        cd '$(1)/src' && \
         env -u MAKE -u MAKEFLAGS nmake && \
         env -u MAKE -u MAKEFLAGS nmake \
             INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \
     else \
-        $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
-        $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
+        $(MAKE) -C '$(1)/src' -j '$(JOBS)' && \
+        $(MAKE) -C '$(1)/src' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
     fi
 
     if [ $(MXE_SYSTEM) = mingw ]; then \