[vlc-commits] Contribs: use more standard functions for qt4

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct  2 14:22:42 2012 +0200| [217e0cde51741f1cb5a3d0fa64cb71137496e839] | committer: Jean-Baptiste Kempf

Contribs: use more standard functions for qt4

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=217e0cde51741f1cb5a3d0fa64cb71137496e839
---

 contrib/src/qt4/chroot.patch       |    4 ++--
 contrib/src/qt4/cross.patch        |    8 ++++----
 contrib/src/qt4/imageformats.patch |    4 ++--
 contrib/src/qt4/rules.mak          |   12 ++++++------
 contrib/src/qt4/styles.patch       |    4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contrib/src/qt4/chroot.patch b/contrib/src/qt4/chroot.patch
index fd85060..6547ff0 100644
--- a/contrib/src/qt4/chroot.patch
+++ b/contrib/src/qt4/chroot.patch
@@ -1,7 +1,7 @@
 Fix build when using a 32-bit chroot with a x86_64 kernel
 Native tools would be built with -m64
---- configure.orig	2011-11-11 14:48:12.944666802 -0500
-+++ configure	2011-11-11 14:48:55.108875882 -0500
+--- qt4/configure.orig	2011-11-11 14:48:12.944666802 -0500
++++ qt4/configure	2011-11-11 14:48:55.108875882 -0500
 @@ -168,7 +168,7 @@
  #-------------------------------------------------------------------------------
  
diff --git a/contrib/src/qt4/cross.patch b/contrib/src/qt4/cross.patch
index 36c7ca5..3d0a453 100644
--- a/contrib/src/qt4/cross.patch
+++ b/contrib/src/qt4/cross.patch
@@ -1,5 +1,5 @@
---- mkspecs/win32-g++/qmake.conf.orig    2011-09-28 14:32:02.709958498 -0400
-+++ mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
+--- qt4/mkspecs/win32-g++/qmake.conf.orig    2011-09-28 14:32:02.709958498 -0400
++++ qt4/mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
 @@ -14,7 +14,7 @@
  QMAKE_EXT_OBJ           = .o
  QMAKE_EXT_RES           = _res.o
@@ -42,8 +42,8 @@
 +QMAKE_STRIP		= $(XSTRIP)
  QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
  load(qt_config)
---- configure.orig	2011-11-10 18:48:29.351058392 -0500
-+++ configure	2011-11-10 18:50:40.971711056 -0500
+--- qt4/configure.orig	2011-11-10 18:48:29.351058392 -0500
++++ qt4/configure	2011-11-10 18:50:40.971711056 -0500
 @@ -8255,11 +8255,13 @@
  fi
 
diff --git a/contrib/src/qt4/imageformats.patch b/contrib/src/qt4/imageformats.patch
index 3b96c92..19e2fc2 100644
--- a/contrib/src/qt4/imageformats.patch
+++ b/contrib/src/qt4/imageformats.patch
@@ -1,5 +1,5 @@
---- src/plugins/imageformats/imageformats.pro.orig	2011-11-10 18:56:04.617315921 -0500
-+++ src/plugins/imageformats/imageformats.pro	2011-11-10 18:56:39.269487754 -0500
+--- qt4/src/plugins/imageformats/imageformats.pro.orig	2011-11-10 18:56:04.617315921 -0500
++++ qt4/src/plugins/imageformats/imageformats.pro	2011-11-10 18:56:39.269487754 -0500
 @@ -1,8 +1,8 @@
  TEMPLATE = subdirs
  
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 0c28175..8c32718 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -21,12 +21,12 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
 
 qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(UNPACK)
-	cd qt-everywhere-opensource-src-$(QT4_VERSION) && \
-		patch -p0 < ../$(SRC)/qt4/cross.patch && \
-		patch -p0 < ../$(SRC)/qt4/styles.patch && \
-		patch -p0 < ../$(SRC)/qt4/chroot.patch && \
-		patch -p0 < ../$(SRC)/qt4/imageformats.patch
-	mv qt-everywhere-opensource-src-$(QT4_VERSION) $@ && touch $@
+	mv qt-everywhere-opensource-src-$(QT4_VERSION) qt-$(QT4_VERSION)
+	$(APPLY) $(SRC)/qt4/cross.patch
+	$(APPLY) $(SRC)/qt4/styles.patch
+	$(APPLY) $(SRC)/qt4/chroot.patch
+	$(APPLY) $(SRC)/qt4/imageformats.patch
+	$(MOVE)
 
 XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
 
diff --git a/contrib/src/qt4/styles.patch b/contrib/src/qt4/styles.patch
index 3ed800f..add2b75 100644
--- a/contrib/src/qt4/styles.patch
+++ b/contrib/src/qt4/styles.patch
@@ -1,5 +1,5 @@
---- configure.orig	2011-11-10 17:44:02.427883340 -0500
-+++ configure	2011-11-10 17:44:13.915940309 -0500
+--- qt4/configure.orig	2011-11-10 17:44:02.427883340 -0500
++++ qt4/configure	2011-11-10 17:44:13.915940309 -0500
 @@ -584,7 +584,7 @@
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"