[Libreoffice-commits] .: liborcus/UnpackedTarball_orcus.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 11 06:39:11 PDT 2012


 liborcus/UnpackedTarball_orcus.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e31e8a13b859d182a8e4719a1037c27d12ef63bc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 11 15:36:44 2012 +0200

    orcus: use gb_UnpackedTarball_fix_end_of_line so patch applies
    
    Change-Id: I455ae6cb2b99253c1a66d8d4ddab3ba5e1e9fb80

diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 6846f22..030eebd 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -21,9 +21,12 @@ orcus_patches += liborcus_0.1.0-configure.patch
 # fix MinGW build
 orcus_patches += liborcus_0.1.0-mingw.patch
 # disable boost "auto lib" in MSVC build
-# for some reason (CRLF in file?) this patch doesn't want to apply on unix...
 orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
 
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
+	vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,orcus,\
 	$(foreach patch,$(orcus_patches),liborcus/$(patch)) \
 ))


More information about the Libreoffice-commits mailing list