[Libreoffice-commits] .: 2 commits - RepositoryFixes.mk

[Caolán McNamara]

 RepositoryFixes.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cebaf5903ef83b6bd4c5036d327a373ee1350f8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 16 13:32:51 2011 +0100

    this seems to be the normal pattern

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 38a8cf4..66162af 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -105,8 +105,6 @@ gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst nspr4:inspr4%,nspr4:nspr4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst nss3:inss3%,nss3:nss3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
@@ -128,6 +126,8 @@ gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
 gb_Library_NOILIBFILENAMES += icule icuuc \
     graphite2_off \
     msvcprt \
+    nspr4 \
+    nss3 \
     shlwapi \
     version \
 
commit 37d34ff4ba0f838abbfc59a3b6dccedcb6e01244
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 16 13:10:29 2011 +0100

    get these names right for windows (I think)

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bf6d4d0..38a8cf4 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -105,6 +105,8 @@ gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst nspr4:inspr4%,nspr4:nspr4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst nss3:inss3%,nss3:nss3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
@@ -114,8 +116,8 @@ gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(
 gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1%,xmlsec1-mscrypto:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec-mscrypto%,xmlsec-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))