summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2016-03-29 18:51:11 +0200
committerMartchus2016-03-29 18:51:11 +0200
commitf1e7edb5061451f002dc8f5c7477770c3c2ff40f (patch)
tree3907ef2be7778cc95bf6f0f392703d6705cf73b8
parentdabae9421ba89f01d529aa1d7f53836ac72377fb (diff)
downloadaur-f1e7edb5061451f002dc8f5c7477770c3c2ff40f.tar.gz
fixed qt5main patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--qt5-fix-implib-ext.patch5
-rw-r--r--qt5-rename-qtmain-to-qt5main.patch18
4 files changed, 23 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a0bb97272ff..4163ca7ddcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Mar 28 17:51:43 UTC 2016
+# Tue Mar 29 16:50:58 UTC 2016
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
pkgver = 5.6.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.qt.io/
arch = i686
arch = x86_64
@@ -55,7 +55,7 @@ pkgbase = mingw-w64-qt5-base
md5sums = 9916ded318f21afbe8388f0b9822062b
md5sums = bc99c4cc6998295d76f37ed681c20d47
md5sums = 4fe6523dd1c34398df3aa5a8763530cc
- md5sums = 22be0aa7fc36c5d08b3b41f0eccf7479
+ md5sums = f32a768e1acb9785c79c8e93aa266db2
md5sums = 3bd322551924543553a2bf81b4419a09
md5sums = 30fa9ddf8d842b1392e8d63868940657
md5sums = 99bb9f51ec684803768f36e407baf486
@@ -67,7 +67,7 @@ pkgbase = mingw-w64-qt5-base
md5sums = d0eb81aef1a21c65813fe4ddabbc4206
md5sums = 87cbd116c75ced1b075bf266f2455d50
md5sums = 62d2977e57fccf1f16d7ea6bf06d3279
- md5sums = 207420d43e997d1d41ef9684ef7fb715
+ md5sums = 83139869355c2d46921adb25e47cf0fa
pkgname = mingw-w64-qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index abdace4a648..e9acc4fa98d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
diff --git a/qt5-fix-implib-ext.patch b/qt5-fix-implib-ext.patch
index fd9167a0652..65612d721fe 100644
--- a/qt5-fix-implib-ext.patch
+++ b/qt5-fix-implib-ext.patch
@@ -42,7 +42,7 @@ index 6d5764f..77e910b 100644
QMAKE_EXTENSION_STATICLIB = a
-QMAKE_LIB_EXTENSIONS = a dll.a
+QMAKE_EXTENSION_IMPORTLIB = dll.a
-
+
QMAKE_LIBS =
QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
@@ -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
-
diff --git a/qt5-rename-qtmain-to-qt5main.patch b/qt5-rename-qtmain-to-qt5main.patch
index f65ad31ecaa..e81082f21ab 100644
--- a/qt5-rename-qtmain-to-qt5main.patch
+++ b/qt5-rename-qtmain-to-qt5main.patch
@@ -2,19 +2,31 @@
+++ qtbase-opensource-src-5.2.1/src/winmain/winmain.pro 2014-04-29 18:51:18.737512221 +0200
@@ -2,7 +2,7 @@
!win32:error("$$_FILE_ is intended only for Windows!")
-
+
TEMPLATE = lib
-TARGET = qtmain
+TARGET = qt5main
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 @@
mingw:DEFINES += QT_NEEDS_QMAIN
-
+
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
- isEqual(entryLib, -lqtmain) {
+ isEqual(entryLib, -lqt5main): {