diff --git a/mingw-w64-scite/0001-Use-POSIX-tools-in-makefiles.patch b/mingw-w64-scite/0001-Use-POSIX-tools-in-makefiles.patch index d0848b6942..b6418eeba7 100644 --- a/mingw-w64-scite/0001-Use-POSIX-tools-in-makefiles.patch +++ b/mingw-w64-scite/0001-Use-POSIX-tools-in-makefiles.patch @@ -12,23 +12,24 @@ diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile index cdf1aa1..0d4397e 100644 --- a/scintilla/gtk/makefile +++ b/scintilla/gtk/makefile -@@ -38,7 +38,7 @@ endif +@@ -54,7 +54,7 @@ endif ifdef windir CC = gcc -DEL = del /q +DEL = rm -f - COMPLIB=$(srcdir)\..\bin\scintilla.a else DEL = rm -f + endif diff --git a/scite/win32/makefile b/scite/win32/makefile index daffb70..e5ccb62 100644 --- a/scite/win32/makefile +++ b/scite/win32/makefile -@@ -15,24 +15,6 @@ WINDRES ?= windres +@@ -43,23 +43,9 @@ WINDRES ?= windres + ifndef CLANG CC = gcc endif - DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del) +- DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del) - COPY = $(if $(wildcard $(dir $(SHELL))cp.exe), $(dir $(SHELL))cp.exe -a, xcopy /Y) - VER = cmd /c ver - # Discover Windows version by running 'VER' command and parsing output @@ -37,19 +38,19 @@ index daffb70..e5ccb62 100644 - WINVER:=$(firstword $(WINVERWORDS)).$(lastword $(WINVERWORDS)) - # Windows NT 4 and Windows 2000 do not support themes so turn off -ifeq '$(WINVER)' '4.0' -- VERSION_DEFINES:=-DDISABLE_THEMES -DWIN_TARGET=0x0400 +- DEFINES += -DDISABLE_THEMES -DWIN_TARGET=0x0400 -else -ifeq '$(WINVER)' '5.00' -- VERSION_DEFINES:=-DDISABLE_THEMES +- DEFINES += -DDISABLE_THEMES -else -- UXLIB:=-luxtheme ++ DEL = rm -f ++ COPY = cp -a + LIBS += -luxtheme -endif -endif --else -- DEL = rm -f + else + DEL = rm -f COPY = cp -a - UXLIB:=-luxtheme - endif -- 2.3.0 diff --git a/mingw-w64-scite/0002-Prefix-library-names.patch b/mingw-w64-scite/0002-Prefix-library-names.patch index 1da8e3cd47..1cf7b76cdf 100644 --- a/mingw-w64-scite/0002-Prefix-library-names.patch +++ b/mingw-w64-scite/0002-Prefix-library-names.patch @@ -14,19 +14,15 @@ diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile index 0d4397e..026f358 100644 --- a/scintilla/gtk/makefile +++ b/scintilla/gtk/makefile -@@ -33,10 +33,10 @@ endif - - ifdef windir - DEL = rm -f --COMPLIB=$(srcdir)\..\bin\scintilla.a -+COMPLIB=$(srcdir)\..\bin\libScintillaGtk.a +@@ -58,7 +58,7 @@ endif else DEL = rm -f --COMPLIB=$(srcdir)/../bin/scintilla.a -+COMPLIB=$(srcdir)/../bin/libScintillaGtk.a endif +-COMPLIB=$(basedir)/bin/scintilla.a ++COMPLIB=$(basedir)/bin/libScintillaGtk.a - vpath %.h ../src ../include ../lexlib + vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib + vpath %.c $(srcdir) diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile index 806e585..7550b4a 100644 --- a/scintilla/win32/makefile @@ -46,15 +42,18 @@ diff --git a/scite/win32/SciTEWin.cxx b/scite/win32/SciTEWin.cxx index 22959cb..16c21a8 100644 --- a/scite/win32/SciTEWin.cxx +++ b/scite/win32/SciTEWin.cxx -@@ -2193,7 +2193,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) { - Scintilla_RegisterClasses(hInstance); +@@ -2273,9 +2273,9 @@ #else + #ifdef LOAD_SCINTILLA +- HMODULE hmod = ::LoadLibrary(TEXT("Scintilla.DLL")); ++ HMODULE hmod = ::LoadLibrary(TEXT("libScintilla.DLL")); + #else - HMODULE hmod = ::LoadLibrary(TEXT("SciLexer.DLL")); -+ HMODULE hmod = ::LoadLibrary(TEXT("libSciLexer.dll")); ++ HMODULE hmod = ::LoadLibrary(TEXT("libSciLexer.DLL")); + #endif if (hmod == NULL) ::MessageBox(NULL, TEXT("The Scintilla DLL could not be loaded. SciTE will now close"), - TEXT("Error loading Scintilla"), MB_OK | MB_ICONERROR); diff --git a/scite/win32/makefile b/scite/win32/makefile index e5ccb62..5125190 100644 --- a/scite/win32/makefile diff --git a/mingw-w64-scite/PKGBUILD b/mingw-w64-scite/PKGBUILD index 50c9e2298f..b4f748d6ee 100644 --- a/mingw-w64-scite/PKGBUILD +++ b/mingw-w64-scite/PKGBUILD @@ -4,7 +4,7 @@ _realname=scite pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-defaults") -pkgver=4.2.3 +pkgver=4.3.0 pkgrel=1 arch=('any') url='https://www.scintilla.org/SciTE.html' @@ -16,9 +16,9 @@ source=("https://www.scintilla.org/${_realname}${pkgver//./}.tgz" "0001-Use-POSIX-tools-in-makefiles.patch" "0002-Prefix-library-names.patch" "0003-Use-FHS.patch") -sha256sums=('7bd651008afe7fb7e2d0cbd28fd8f75803c64b5558f56aa68b035b3f994900b6' - '7b7a53aad1c5c8bade785b3f327780eb64fe999007604d97e214e00fb520ba91' - 'b3c855e9df9c0e48d78fb36a461ae060de589c1eda2115e68307221c65aa7d28' +sha256sums=('6401a2c25f8c2a1e0c06279e2f022722374a6aaf37d0b0acebce1a103fafe589' + 'df23e0fdc65a50645b274a85464d387a2e3f78cd6f6396b2c53978b1cb7f42b7' + 'ba2a58eee2986cd2c3e9b25a9f62b530a087b352fbc403ffcd283972e95dd135' 'ad3f4fa6e6e2ac9e20fbb3961682a9009788134081075ae9737f0b68a4284c30') prepare() {