[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Apr 4 05:13:30 PDT 2011
patches/dev300/link-as-needed.diff | 64 ++++++++---------
patches/dev300/win32-prebuilt-writingaids-zip.diff | 77 ++++++++++-----------
2 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 2902107477fab12e8c7a86ede8acde4b0ddb568b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Apr 4 15:13:08 2011 +0300
Make link-as-needed.diff apply again
diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff
index 35633b5..9cadaa5 100644
--- a/patches/dev300/link-as-needed.diff
+++ b/patches/dev300/link-as-needed.diff
@@ -1,5 +1,5 @@
---- configure.in.old 2010-07-29 16:48:44.000000000 +0200
-+++ configure.in 2010-07-29 16:50:30.000000000 +0200
+--- configure.in
++++ configure.in
@@ -1650,6 +1650,26 @@ AC_SUBST(HAVE_LD_HASH_STYLE)
AC_SUBST(WITH_LINKER_HASH_STYLE)
@@ -24,11 +24,11 @@
+AC_SUBST(HAVE_WORKING_LD_AS_NEEDED)
+
+dnl ===================================================================
- dnl Test the Compaq compiler for OSF1
+ dnl Check whether there's a Perl version available.
dnl ===================================================================
- if test "$_os" = "OSF1"; then
---- cui/util/makefile.mk.old 2010-07-22 13:28:05.000000000 +0200
-+++ cui/util/makefile.mk 2010-07-29 16:50:30.000000000 +0200
+ if test -z "$with_perl_home"; then
+--- cui/util/makefile.mk
++++ cui/util/makefile.mk
@@ -73,7 +73,6 @@ SHL1STDLIBS= \
$(I18NISOLANGLIB) \
$(COMPHELPERLIB) \
@@ -49,19 +49,19 @@
.ENDIF # WNT
# ------------------------------------------------------------------------------
---- set_soenv.in.old 2010-07-29 16:48:44.000000000 +0200
-+++ set_soenv.in 2010-07-29 16:50:30.000000000 +0200
+--- set_soenv.in
++++ set_soenv.in
@@ -1779,6 +1779,8 @@ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_H
ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
+ToFile( "HAVE_WORKING_LD_AS_NEEDED",
+ "@HAVE_WORKING_LD_AS_NEEDED@","e" );
+ ToFile( "HAVE_CXX0X", "@HAVE_CXX0X@", "e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "USE_CCACHE", "@USE_CCACHE@", "e" );
- ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
---- solenv/inc/unxbsdi.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxbsdi.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxbsdi.mk
++++ solenv/inc/unxbsdi.mk
@@ -104,6 +104,9 @@ DYNAMIC = -Wl,-Bdynamic
LINK*=gcc
# default linker flags
@@ -72,8 +72,8 @@
# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic
---- solenv/inc/unxbsdi2.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxbsdi2.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxbsdi2.mk
++++ solenv/inc/unxbsdi2.mk
@@ -124,6 +124,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
@@ -84,8 +84,8 @@
# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic
---- solenv/inc/unxfbsd.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxfbsd.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxfbsd.mk
++++ solenv/inc/unxfbsd.mk
@@ -146,6 +146,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
@@ -95,7 +95,7 @@
+.ENDIF
# linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic
--- solenv/inc/unxgcc.mk
+++ solenv/inc/unxgcc.mk
@@ -158,6 +158,9 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,comb
@@ -107,9 +107,9 @@
+.ENDIF
# linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
---- solenv/inc/unxmacx.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxmacx.mk 2010-07-29 16:50:30.000000000 +0200
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic \
+--- solenv/inc/unxmacx.mk
++++ solenv/inc/unxmacx.mk
@@ -210,6 +210,10 @@ LINKFLAGSRUNPATH_BOXT=
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
@@ -121,8 +121,8 @@
# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
.IF "$(GUIBASE)" == "aqua"
LINKFLAGS+=-lobjc
---- solenv/inc/unxsogi.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxsogi.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxsogi.mk
++++ solenv/inc/unxsogi.mk
@@ -78,6 +78,10 @@ LINK*=$(CXX)
LINKC*=$(CC)
@@ -134,8 +134,8 @@
LINKFLAGSAPPGUI=-Wl,-export-dynamic
LINKFLAGSSHLGUI=-shared
LINKFLAGSAPPCUI=-Wl,-export-dynamic
---- solenv/inc/unxsoli4.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxsoli4.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxsoli4.mk
++++ solenv/inc/unxsoli4.mk
@@ -140,6 +140,9 @@ LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
@@ -146,8 +146,8 @@
LINKCFLAGS=-w -mt -z combreloc -norunpath
# -z text force fatal error if non PIC code is linked into shared library. Such code
---- solenv/inc/unxsols4.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxsols4.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxsols4.mk
++++ solenv/inc/unxsols4.mk
@@ -146,6 +146,9 @@ LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
@@ -158,11 +158,11 @@
LINKCFLAGS=-w -mt -z combreloc -norunpath
# -z text force fatal error if non PIC code is linked into shared library. Such code
---- solenv/inc/unxsolu4.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ solenv/inc/unxsolu4.mk 2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxsolu4.mk
++++ solenv/inc/unxsolu4.mk
@@ -141,6 +141,9 @@ LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../.
LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
+ LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
+.IF "$(HAVE_WORKING_LD_AS_NEEDED)" == "TRUE"
+LINKFLAGS += -Wl,--as-needed
@@ -170,14 +170,14 @@
# -z text force fatal error if non PIC code is linked into shared library. Such code
# would be expensive on startup
---- unodevtools/source/skeletonmaker/makefile.mk.old 2010-06-21 14:49:59.000000000 +0200
-+++ unodevtools/source/skeletonmaker/makefile.mk 2010-07-29 16:50:30.000000000 +0200
+--- unodevtools/source/skeletonmaker/makefile.mk
++++ unodevtools/source/skeletonmaker/makefile.mk
@@ -49,8 +49,9 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \
APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
$(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
--APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
-- $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
+-APP1STDLIBS = $(UNODEVTOOLSLIBST) $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
+- $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
+APP1STDLIBS =\
+ $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\
+ $(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB)
commit 1996bf6cf51910662f315643de3c63d831acaf79
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Apr 4 15:03:47 2011 +0300
Make win32-prebuilt-writingaids-zip.diff apply again
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index a833350..c97c883 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,44 +1,45 @@
--- dictionaries/prj/build.lst
+++ dictionaries/prj/build.lst
-@@ -1,37 +1,3 @@
--di dictionaries : soltools mythes NULL
-+di dictionaries : NULL
+@@ -1,39 +1,3 @@
+ di dictionaries : sal soltools mythes NULL
di dictionaries usr1 - all di_mkout NULL
--di dictionaries\af_ZA nmake - all di_af_ZA NULL
--di dictionaries\ca nmake - all di_ca NULL
--di dictionaries\cs_CZ nmake - all di_cs_CZ NULL
--di dictionaries\da_DK nmake - all di_da_DK NULL
--di dictionaries\de_AT nmake - all di_de_AT NULL
--di dictionaries\de_CH nmake - all di_de_CH NULL
--di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH NULL
--di dictionaries\en nmake - all di_en NULL
--di dictionaries\es_ES nmake - all di_es_ES NULL
--di dictionaries\et_EE nmake - all di_et_EE NULL
--di dictionaries\fr_FR nmake - all di_fr_FR NULL
--di dictionaries\gl nmake - all di_gl NULL
--di dictionaries\he_IL nmake - all di_he_IL NULL
--di dictionaries\hr_HR nmake - all di_hr_HR NULL
--di dictionaries\hu_HU nmake - all di_hu_HU NULL
--di dictionaries\it_IT nmake - all di_it_IT NULL
--di dictionaries\ku_TR nmake - all di_ku_TR NULL
--di dictionaries\lt_LT nmake - all di_lt_LT NULL
--di dictionaries\ne_NP nmake - all di_ne_NP NULL
--di dictionaries\nl_NL nmake - all di_nl_NL NULL
--di dictionaries\no nmake - all di_no NULL
--di dictionaries\oc_FR nmake - all di_oc_FR NULL
--di dictionaries\pl_PL nmake - all di_pl_PL NULL
--di dictionaries\pt_BR nmake - all di_pt_BR NULL
--di dictionaries\ro nmake - all di_ro NULL
--di dictionaries\ru_RU nmake - all di_ru_RU NULL
--di dictionaries\sk_SK nmake - all di_sk_SK NULL
--di dictionaries\sl_SI nmake - all di_sl_SI NULL
--di dictionaries\sr nmake - all di_sr NULL
--di dictionaries\sv_SE nmake - all di_sv_SE NULL
--di dictionaries\sw_TZ nmake - all di_sw_TZ NULL
--di dictionaries\th_TH nmake - all di_th_TH NULL
--di dictionaries\uk_UA nmake - all di_uk_UA NULL
--di dictionaries\vi nmake - all di_vi NULL
--di dictionaries\zu_ZA nmake - all di_zu_ZA NULL
+-di dictionaries\source nmake - all di_src NULL
+-di dictionaries\af_ZA nmake - all di_af_ZA di_src NULL
+-di dictionaries\br_FR nmake - all di_br_FR di_src NULL
+-di dictionaries\ca nmake - all di_ca di_src NULL
+-di dictionaries\cs_CZ nmake - all di_cs_CZ di_src NULL
+-di dictionaries\da_DK nmake - all di_da_DK di_src NULL
+-di dictionaries\de_AT nmake - all di_de_AT di_src NULL
+-di dictionaries\de_CH nmake - all di_de_CH di_src NULL
+-di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH di_src NULL
+-di dictionaries\en nmake - all di_en di_src NULL
+-di dictionaries\es_ES nmake - all di_es_ES di_src NULL
+-di dictionaries\et_EE nmake - all di_et_EE di_src NULL
+-di dictionaries\fr_FR nmake - all di_fr_FR di_src NULL
+-di dictionaries\gl nmake - all di_gl di_src NULL
+-di dictionaries\he_IL nmake - all di_he_IL di_src NULL
+-di dictionaries\hr_HR nmake - all di_hr_HR di_src NULL
+-di dictionaries\hu_HU nmake - all di_hu_HU di_src NULL
+-di dictionaries\it_IT nmake - all di_it_IT di_src NULL
+-di dictionaries\ku_TR nmake - all di_ku_TR di_src NULL
+-di dictionaries\lt_LT nmake - all di_lt_LT di_src NULL
+-di dictionaries\ne_NP nmake - all di_ne_NP di_src NULL
+-di dictionaries\nl_NL nmake - all di_nl_NL di_src NULL
+-di dictionaries\no nmake - all di_no di_src NULL
+-di dictionaries\oc_FR nmake - all di_oc_FR di_src NULL
+-di dictionaries\pl_PL nmake - all di_pl_PL di_src NULL
+-di dictionaries\pt_BR nmake - all di_pt_BR di_src NULL
+-di dictionaries\ro nmake - all di_ro di_src NULL
+-di dictionaries\ru_RU nmake - all di_ru_RU di_src NULL
+-di dictionaries\sk_SK nmake - all di_sk_SK di_src NULL
+-di dictionaries\sl_SI nmake - all di_sl_SI di_src NULL
+-di dictionaries\sr nmake - all di_sr di_src NULL
+-di dictionaries\sv_SE nmake - all di_sv_SE di_src NULL
+-di dictionaries\sw_TZ nmake - all di_sw_TZ di_src NULL
+-di dictionaries\th_TH nmake - all di_th_TH di_src NULL
+-di dictionaries\uk_UA nmake - all di_uk_UA di_src NULL
+-di dictionaries\vi nmake - all di_vi di_src NULL
+-di dictionaries\zu_ZA nmake - all di_zu_ZA di_src NULL
+di dictionaries\prebuilt nmake - all di_diclst NULL
--- dictionaries/prj/d.lst
+++ dictionaries/prj/d.lst
More information about the Libreoffice-commits
mailing list