[Libreoffice-commits] .: 2 commits - libxmlsec/xmlsec1-mingw32.patch solenv/gbuild

[Libreoffice Gerrit user]

 libxmlsec/xmlsec1-mingw32.patch  |    4 ++--
 solenv/gbuild/UnpackedTarball.mk |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit dfe4dec45fd9fc346614a30aed11a1b3ad117c58
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 10:17:48 2012 +0100

    fix patch to apply after gbuild changes

diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch
index 8aa8644..720af73 100644
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@ -140,7 +140,7 @@
  };
  
 +#ifndef __MINGW32__
- /** 
+ /**
   * xmlSecNssTransformKWAes128GetKlass:
   *
 @@ -1160,6 +1161,7 @@
@@ -156,7 +156,7 @@
  };
  
 +#ifndef __MINGW32__
- /** 
+ /**
   * xmlSecNssTransformKWDes3GetKlass:
   * 
 @@ -1208,6 +1211,7 @@
commit 083ef62d1342d1c4418d568ebb3f189debcc3851
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 10:17:00 2012 +0100

    files need to be added before patches are applied
    
    xmlsec1-mingw32.patch patches keywrapers.c

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 046c7d1..6e0fa28 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -131,6 +131,10 @@ $(call gb_Output_announce,$(2),$(true),PAT,2)
 $(call gb_Helper_abbreviate_dirs,\
 	( \
 		cd $(3) && \
+		$(if $(UNPACKED_FILES),\
+			mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) && \
+			$(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) && \
+		) \
 		$(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTOUNIX,$(file)) && ) \
 		$(if $(UNPACKED_PATCHES),\
 			for p in $(UNPACKED_PATCHES); do \
@@ -141,10 +145,6 @@ $(call gb_Helper_abbreviate_dirs,\
 			done && \
 		) \
 		$(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \
-		$(if $(UNPACKED_FILES),\
-			mkdir -p $(sort $(dir $(UNPACKED_DESTFILES))) && \
-			$(call gb_UnpackedTarball__copy_files,$(UNPACKED_FILES),$(UNPACKED_DESTFILES)) && \
-		) \
 		$(if $(UNPACKED_SUBDIRS),\
 			cp -rf $(UNPACKED_SUBDIRS) $(gb_EXTERNAL_HEADERS_DIR) && \
 		) \