From ab65a489ce43add85a19867cbf57c252e08344df Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 4 Nov 2013 16:55:37 +0100 Subject: [PATCH] Qt5: use 'git apply' to apply patches One of the Qt5 patches is supposed to create symbolic links, which is not supported by GNU patch before version 2.7. Using 'git apply' to apply the patches solves this problem. Fixes #969. --- libports/ports/qt5.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libports/ports/qt5.mk b/libports/ports/qt5.mk index cb54ba57d..e9a894ce9 100644 --- a/libports/ports/qt5.mk +++ b/libports/ports/qt5.mk @@ -59,8 +59,9 @@ $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ).verified: $(DOWNLOAD_DIR)/$(QTSCRIPTCLASS $(CONTRIB_DIR)/$(QT5): $(DOWNLOAD_DIR)/$(QT5_TGZ).verified $(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QT5_TGZ) -C $(CONTRIB_DIR) $(VERBOSE)touch $(CONTRIB_DIR)/$(QT5) - $(VERBOSE)for p in $(PATCHES); do \ - patch -d $(CONTRIB_DIR)/$(QT5) -p1 -i ../../$(PATCHES_DIR)/$$p; done + $(VERBOSE)git init $(CONTRIB_DIR)/$(QT5) + $(VERBOSE)cd $(CONTRIB_DIR)/$(QT5) && for p in $(PATCHES); do \ + git apply ../../$(PATCHES_DIR)/$$p; done; $(CONTRIB_DIR)/$(QTSCRIPTCLASSIC): $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ).verified $(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) -C $(CONTRIB_DIR)