summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Nader <adrien@notk.org>2015-01-14 23:20:52 +0100
committerAdrien Nader <adrien@notk.org>2015-01-14 23:20:52 +0100
commitde870d82fe47dc8d5f2d8717fccd6582107db07a (patch)
tree6d9fa7a0f171b098367000568d17c751756bb953
parentad338ff95f19e799ffdabbfcc95a196f3f966234 (diff)
build/{Windows,Native_toolchain}: add qt patch for relocation.
-rw-r--r--build/native_toolchain.ml2
-rw-r--r--build/windows.ml3
2 files changed, 3 insertions, 2 deletions
diff --git a/build/native_toolchain.ml b/build/native_toolchain.ml
index 35edb8b..73cf1e9 100644
--- a/build/native_toolchain.ml
+++ b/build/native_toolchain.ml
@@ -68,7 +68,7 @@ let qt = add ("qt", Some "native")
~dir:"slackware64-current/l"
~dependencies:[]
~version:"5.3.1"
- ~build:1
+ ~build:4
~sources:[
"qt-everywhere-opensource-src-${VERSION}.tar.xz", "66b33ea66eb05a864e7ae417179ea24c8a45ec10";
"Qt.pc", "";
diff --git a/build/windows.ml b/build/windows.ml
index 6f92b11..5a98b2d 100644
--- a/build/windows.ml
+++ b/build/windows.ml
@@ -883,12 +883,13 @@ let do_adds builder =
(* giflib (* Qt never uses the sytem one! *) *)
]
~version:"5.3.1"
- ~build:3
+ ~build:4
~sources:[
"qt-everywhere-opensource-src-${VERSION}.tar.xz", "66b33ea66eb05a864e7ae417179ea24c8a45ec10";
"0001-configure-use-pkg-config-for-libpng.patch", "";
"0002-Use-widl-instead-of-midl.-Also-set-QMAKE_DLLTOOL-to-.patch", "";
"0003-Tell-qmake-to-use-pkg-config.patch", "";
+ "0001-QCoreApplication-ibraryPaths-discovers-plugpath-rela.patch", "";
"Qt.pc", "";
"qt.fix.broken.gif.crash.diff.gz", "";
"qt.mysql.h.diff.gz", "";