strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use --binary flag when applying patches with patch from git-bash

Browse source 
Change-Id: Idbd4ad7ad89dc727e2f0cf851c4c62f05d5b2a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166328
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2023-08-08 12:13:53 +02:00
parent 6e18734c5c
commit c1256034ff
6 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/breakpad/UnpackedTarball_breakpad.mk vendored
View file

@ -19,6 +19,12 @@ $(eval $(call gb_UnpackedTarball_set_tarball,breakpad,$(BREAKPAD_TARBALL)))
# external/breakpad/SIGSTKSZ.patch upstreamed at
# <https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3226470> "Adpat to SIGSTKSZ type
# in glibc 2.34":
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,breakpad,--binary))
endif
$(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/breakpad-use-correct-http-header.patch.1 \
external/breakpad/breakpad-wshadow.patch.1 \

5
external/coinmp/UnpackedTarball_coinmp.mk vendored
View file

@ -29,6 +29,11 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\
Osi \
))
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,coinmp,--binary))
endif
# * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at
# <https://list.coin-or.org/pipermail/coin-discuss/2020-February/003972.html> "[Coin-discuss]
# Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp":

5
external/lcms2/UnpackedTarball_lcms2.mk vendored
View file

@ -15,6 +15,11 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,lcms2))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,lcms2,--binary))
endif
# external/lcms2/0001-Added-missing-export.patch.1:
# backport of https://github.com/mm2/Little-CMS/commit/f7b3c637c20508655f8b49935a4b556d52937b69
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\

5
external/libtommath/UnpackedTarball_libtommath.mk vendored
View file

@ -13,6 +13,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,libtommath,--binary))
endif
$(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
))

5
external/python3/UnpackedTarball_python3.mk vendored
View file

@ -16,6 +16,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
PCbuild/pcbuild.sln \
))
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,python3,--binary))
endif
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \

5
external/skia/UnpackedTarball_skia.mk vendored
View file

@ -45,6 +45,11 @@ skia_patches := \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
ifneq ($(MSYSTEM),)
# use binary flag so patch from git-bash won't choke on mixed line-endings in patches
$(eval $(call gb_UnpackedTarball_set_patchflags,skia,--binary))
endif
$(eval $(call gb_UnpackedTarball_add_patches,skia,\
$(foreach patch,$(skia_patches),external/skia/$(patch)) \
))