5009617818
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=15
26 lines
1.5 KiB
Diff
26 lines
1.5 KiB
Diff
Index: solenv/inc/tg_ext.mk
|
|
===================================================================
|
|
--- solenv/inc/tg_ext.mk.orig
|
|
+++ solenv/inc/tg_ext.mk
|
|
@@ -199,12 +199,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_FOR_BUILD)"=="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
|