fixed qt5main patch
This commit is contained in:
parent
a597210261
commit
e26a96509a
|
@ -8,7 +8,7 @@
|
|||
|
||||
pkgname=mingw-w64-qt5-base-opengl
|
||||
pkgver=5.6.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A cross-platform application and UI framework (mingw-w64, OpenGL)"
|
||||
arch=(i686 x86_64)
|
||||
url="https://www.qt.io/"
|
||||
|
@ -61,7 +61,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'9916ded318f21afbe8388f0b9822062b'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'22be0aa7fc36c5d08b3b41f0eccf7479'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
'30fa9ddf8d842b1392e8d63868940657'
|
||||
'99bb9f51ec684803768f36e407baf486'
|
||||
|
@ -73,7 +73,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'd0eb81aef1a21c65813fe4ddabbc4206'
|
||||
'87cbd116c75ced1b075bf266f2455d50'
|
||||
'62d2977e57fccf1f16d7ea6bf06d3279'
|
||||
'207420d43e997d1d41ef9684ef7fb715')
|
||||
'83139869355c2d46921adb25e47cf0fa')
|
||||
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
|
||||
|
||||
# Helper functions for the split builds
|
||||
|
|
|
@ -82,6 +82,3 @@ index 6d5764f..77e910b 100644
|
|||
project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
|
||||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
1.9.0
|
||||
|
||||
|
|
|
@ -9,7 +9,19 @@
|
|||
DESTDIR = $$QT.core.libs
|
||||
|
||||
CONFIG += static
|
||||
--- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200
|
||||
+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200
|
||||
@@ -203,8 +203,8 @@
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
|
||||
|
||||
mingw {
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
|
||||
|
||||
!isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_STATIC_WINDOWS_BUILD = "true"
|
||||
--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.orig 2014-07-05 14:18:23.211155781 +0200
|
||||
+++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf 2014-07-05 14:18:46.045390147 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
pkgname=mingw-w64-qt5-base-static
|
||||
pkgver=5.6.0
|
||||
pkgrel=1
|
||||
pkgrel=1 # not updated because the latest changes are not relevant for the static variant
|
||||
pkgdesc="A cross-platform application and UI framework (mingw-w64, static)"
|
||||
arch=(i686 x86_64)
|
||||
url="https://www.qt.io/"
|
||||
|
@ -61,7 +61,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'9916ded318f21afbe8388f0b9822062b'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'22be0aa7fc36c5d08b3b41f0eccf7479'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
'30fa9ddf8d842b1392e8d63868940657'
|
||||
'99bb9f51ec684803768f36e407baf486'
|
||||
|
@ -73,7 +73,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'd0eb81aef1a21c65813fe4ddabbc4206'
|
||||
'87cbd116c75ced1b075bf266f2455d50'
|
||||
'62d2977e57fccf1f16d7ea6bf06d3279'
|
||||
'207420d43e997d1d41ef9684ef7fb715')
|
||||
'83139869355c2d46921adb25e47cf0fa')
|
||||
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
|
||||
|
||||
# Helper functions for the split builds
|
||||
|
|
|
@ -82,6 +82,3 @@ index 6d5764f..77e910b 100644
|
|||
project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
|
||||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
1.9.0
|
||||
|
||||
|
|
|
@ -9,7 +9,19 @@
|
|||
DESTDIR = $$QT.core.libs
|
||||
|
||||
CONFIG += static
|
||||
--- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200
|
||||
+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200
|
||||
@@ -203,8 +203,8 @@
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
|
||||
|
||||
mingw {
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
|
||||
|
||||
!isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_STATIC_WINDOWS_BUILD = "true"
|
||||
--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.orig 2014-07-05 14:18:23.211155781 +0200
|
||||
+++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf 2014-07-05 14:18:46.045390147 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
pkgname=mingw-w64-qt5-base
|
||||
pkgver=5.6.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
|
||||
arch=(i686 x86_64)
|
||||
url="https://www.qt.io/"
|
||||
|
@ -61,7 +61,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'9916ded318f21afbe8388f0b9822062b'
|
||||
'bc99c4cc6998295d76f37ed681c20d47'
|
||||
'4fe6523dd1c34398df3aa5a8763530cc'
|
||||
'22be0aa7fc36c5d08b3b41f0eccf7479'
|
||||
'f32a768e1acb9785c79c8e93aa266db2'
|
||||
'3bd322551924543553a2bf81b4419a09'
|
||||
'30fa9ddf8d842b1392e8d63868940657'
|
||||
'99bb9f51ec684803768f36e407baf486'
|
||||
|
@ -73,7 +73,7 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
|
|||
'd0eb81aef1a21c65813fe4ddabbc4206'
|
||||
'87cbd116c75ced1b075bf266f2455d50'
|
||||
'62d2977e57fccf1f16d7ea6bf06d3279'
|
||||
'207420d43e997d1d41ef9684ef7fb715')
|
||||
'83139869355c2d46921adb25e47cf0fa')
|
||||
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
|
||||
|
||||
# Helper functions for the split builds
|
||||
|
|
|
@ -82,6 +82,3 @@ index 6d5764f..77e910b 100644
|
|||
project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
|
||||
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
||||
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|
||||
--
|
||||
1.9.0
|
||||
|
||||
|
|
|
@ -9,7 +9,19 @@
|
|||
DESTDIR = $$QT.core.libs
|
||||
|
||||
CONFIG += static
|
||||
--- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200
|
||||
+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200
|
||||
@@ -203,8 +203,8 @@
|
||||
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
|
||||
|
||||
mingw {
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
|
||||
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
|
||||
+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
|
||||
|
||||
!isEmpty(CMAKE_STATIC_TYPE) {
|
||||
CMAKE_STATIC_WINDOWS_BUILD = "true"
|
||||
--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.orig 2014-07-05 14:18:23.211155781 +0200
|
||||
+++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf 2014-07-05 14:18:46.045390147 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
|
|
Loading…
Reference in New Issue