File solenv-carefull-patching-hack.diff of Package libreoffice-branding-upstream.627

Overview Repositories Revisions Requests Users Attributes Meta

File solenv-carefull-patching-hack.diff of Package libreoffice-branding-upstream.627

--- solenv/inc/tg_ext.mk.old	2012-03-27 18:22:01.000000000 +0200
+++ solenv/inc/tg_ext.mk	2012-03-30 17:40:51.000000000 +0200
@@ -188,12 +188,18 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA
     @echo no patch needed...
     $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
+    @echo patches available...
 .IF "$(GUI)"=="WNT"
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && echo "patches applied..."
+    $(DELAY) 2
+    $(COMMAND_ECHO)cd $(PACKAGE_DIR) &&  $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE           # "$(GUI)"=="WNT"
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && echo "patches applied..."
+    $(DELAY) 2
+    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE)
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
+    @echo patching finished...
 .IF "$(T_ADDITIONAL_FILES)"!=""
 .IF "$(GUI_FOR_BUILD)"=="WNT"
 # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds

Places

File solenv-carefull-patching-hack.diff of Package libreoffice-branding-upstream.627

Places