subject:"\[Libreoffice\-commits\] .\: RepositoryFixes.mk"

[Libreoffice-commits] .: RepositoryFixes.mk

2012-09-11 Thread Libreoffice Gerrit user

 RepositoryFixes.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ac0511b3c146cdbf7836bb306a19433259a899f
Author: David Tardon dtar...@redhat.com
Date:   Tue Sep 11 07:39:09 2012 +0200

rename orcus lib on mingw to fix build

Change-Id: I5d58db337c056d4cea7e3b493e3653ef929e7bca

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 79f9fc4..6beb818 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -92,6 +92,7 @@ gb_Library_FILENAMES := $(patsubst 
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
 gb_Library_FILENAMES := $(patsubst 
xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 
+gb_StaticLibrary_FILENAMES := $(patsubst 
orcus:liborcus%,orcus:liborcus-0.2%,$(gb_StaticLibrary_FILENAMES))
 
 # Libraries not provided by mingw(-w64), available only in the Windows
 # SDK. So if these actually are liked with somewhere, we can't
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk

2012-09-10 Thread Libreoffice Gerrit user

 RepositoryFixes.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 77984435c6bd6e455c5c33061ba6ee6cb2938886
Author: Michael Stahl mst...@redhat.com
Date:   Mon Sep 10 14:08:26 2012 +0200

libxslt: mangle exslt library name for WNT

Change-Id: I15869eb6e2d0f3ced2654a344a9fff041a092fbe

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 60cf457..73e48a7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -89,6 +89,7 @@ gb_Library_FILENAMES := $(patsubst 
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT)
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 
 
@@ -124,6 +125,7 @@ gb_Library_FILENAMES := $(patsubst 
xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Lib
 gb_Library_FILENAMES := $(patsubst 
xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk

2012-09-10 Thread Libreoffice Gerrit user

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

New commits:
commit ebc6b4118ead8319676d863d6e3cf3623a2a4942
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 10 15:00:51 2012 +0200

Keep lexicographical sorting intact

Change-Id: I943f2bb9703e18e456f2b53a399f590d76beb9b0

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 73e48a7..79f9fc4 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -83,13 +83,13 @@ gb_StaticLibrary_FILENAMES := $(patsubst 
png:png%,png:libpng%,$(gb_StaticLibrary
 
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst 
crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
 
 
@@ -114,6 +114,7 @@ gb_Library_FILENAMES := $(patsubst 
cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_
 gb_Library_FILENAMES := $(patsubst 
crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
db47:idb47%,db47:libdb47%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt%,$(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 
package2:ipackage2%,package2:ipackage%,$(gb_Library_FILENAMES))
@@ -125,7 +126,6 @@ gb_Library_FILENAMES := $(patsubst 
xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Lib
 gb_Library_FILENAMES := $(patsubst 
xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst 
exslt:iexslt%,exslt:libexslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk

2012-09-09 Thread Libreoffice Gerrit user

 RepositoryFixes.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e6812db65e7e17d49d52ecb287fc80271a479022
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sun Sep 9 14:15:44 2012 +0200

fix libpng name for Windows

Change-Id: Idb0e3892ab2f3c1712f98fb9a1d4e4745686f202

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 829967f..60cf457 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -79,6 +79,7 @@ gb_Library_FILENAMES := $(patsubst 
curl:icurl%,curl:libcurl%,$(gb_Library_FILENA
 gb_Library_FILENAMES := $(patsubst 
npsoplugin:inpsoplugin%,npsoplugin:npsoplugin%,$(gb_Library_FILENAMES))
 
 gb_StaticLibrary_FILENAMES := $(patsubst 
graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst 
png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES))
 
 ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst 
crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk solenv/gbuild

2012-06-15 Thread Stephan Bergmann

 RepositoryFixes.mk   |4 ++--
 solenv/gbuild/platform/macosx.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fa2006828ff69509e1ead755af906dcd35a992bf
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 15 16:46:44 2012 +0200

Fix pyuno.so name on Mac OS X

...which also needs a change to the logic that symlinks *.jnilib to 
*.dylib, as
that would have symlinked pyuno.so onto itself (as it contains no .dylib).  
(And
while we are at that, anyway, also only store relative paths in the 
symlinks.)

Change-Id: I6f3e9effc4d185df935795958cc84e60e862a424

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 45833b9..12108f3 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -44,8 +44,8 @@ gb_Library_FILENAMES := $(patsubst 
store:libuno_store%,store:libstore%,$(gb_Libr
 gb_Library_FILENAMES := $(patsubst 
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
 ifeq ($(OS),MACOSX)
-# libpyuno_wrapper.so = pyuno.dyn
-gb_Library_FILENAMES := $(patsubst 
pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.dyn,$(gb_Library_FILENAMES))
+# libpyuno_wrapper.dylib = pyuno.so
+gb_Library_FILENAMES := $(patsubst 
pyuno_wrapper:libpyuno_wrapper.dylib,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
 else
 # libpyuno_wrapper.so = pyuno.so
 gb_Library_FILENAMES := $(patsubst 
pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 984ec6a..425c7d6 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -236,7 +236,7 @@ $(call gb_Helper_abbreviate_dirs,\
 $(LAYER) $(1) ) \
$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1))  \
-   ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \
+   ln -sf $(notdir $(1)) $(basename $(1)).jnilib ) \
rm -f $${DYLIB_FILE})
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk

2012-02-20 Thread Tor Lillqvist

 RepositoryFixes.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 31826318dfd2f4c38d6bf34f957fe51edc0a2b14
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 20 11:15:02 2012 +0200

Shared libraries must in practice be called lib*.so on Android

Otherwise the package creating code (part of the SDK) won't include
them and/or the package installation code (on the OS itself) won't
unpack them. (They just silently skip the file.)

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2493897..b1cb18f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -40,7 +40,9 @@ gb_Library_FILENAMES := $(patsubst 
log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$
 gb_Library_FILENAMES := $(patsubst 
purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst 
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+ifneq ($(OS),ANDROID)
 gb_Library_FILENAMES := $(patsubst 
unoexceptionprotector:libuno%,unoexceptionprotector:uno%,$(gb_Library_FILENAMES))
+endif
 gb_Library_FILENAMES := $(patsubst 
unsafe_uno:libunsafe_uno%,unsafe_uno:libunsafe_uno_uno%,$(gb_Library_FILENAMES))
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryFixes.mk

[Libreoffice-commits] .: RepositoryFixes.mk

[Libreoffice-commits] .: RepositoryFixes.mk

[Libreoffice-commits] .: RepositoryFixes.mk

[Libreoffice-commits] .: RepositoryFixes.mk solenv/gbuild

[Libreoffice-commits] .: RepositoryFixes.mk

6 matches

Site Navigation

Mail list logo

Footer information