simplify maintenance of custom qt-patches during deployment

generic patches now reside in deploy/qt-patches/all
while 4.8 patches are now in deploy/qt-patches/4.8

all *.patch files in these folders are applied during deployment

http://code.google.com/p/phantomjs/issues/detail?id=197
http://code.google.com/p/phantomjs/issues/detail?id=142
1.5
Milian Wolff 2012-02-28 14:35:28 +01:00 committed by Ariya Hidayat
parent 9943ae541b
commit a0ef8cb898
8 changed files with 12 additions and 9 deletions

View File

@ -135,6 +135,14 @@ extract_qt() {
mv $DEPLOY_DIR/qt-everywhere-opensource-src-$QT_VERSION $QT_FOLDER
}
apply_patches() {
for p in $(ls $@); do
echo
echo "applying patch: $p"
patch -p1 < $p
done
}
patch_qt() {
pushd $QT_FOLDER
echo "Patching Qt"
@ -144,10 +152,7 @@ patch_qt() {
fi
if [ $QT_VERSION = 4.8.0 ] ; then
patch -p1 < ../qt48_enable_debugger.patch
patch -p1 < ../qt48_fix_inspector.patch
patch -p1 < ../qt48_headless_and_pdf_fixes.patch
patch -p1 < ../qt48_enable_file_input_click.patch
apply_patches ../qt-patches/4.8/*.patch
# Build in lighthose mode for an x-less build
if [[ "$QT_HEADLESS" == "1" && "$DISABLE_HEADLESS" != "1" ]] ; then
@ -156,9 +161,7 @@ patch_qt() {
fi
fi
patch configure ../allow-static-qtwebkit.patch
patch -p1 < ../qapplication_skip_qtmenu.patch
patch -p1 < ../disable_quicktime_video.patch
apply_patches ../qt-patches/all/*.patch
# Tests don't build well with -static, but we don't need to build them
rm -rf src/3rdparty/webkit/Source/WebKit/qt/tests

View File

@ -1,5 +1,5 @@
--- configure 2011-03-29 22:16:21.000000000 -0700
+++ configure.new 2011-08-21 22:11:16.000000000 -0700
--- a/configure 2011-03-29 22:16:21.000000000 -0700
+++ b/configure 2011-08-21 22:11:16.000000000 -0700
@@ -7160,13 +7160,6 @@ if [ "$CFG_GUI" = "no" ]; then
canBuildWebKit="no"
fi