[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - configure.in patches/dev300 patches/Makefile.am patches/mono
René Engelhard
rene at kemper.freedesktop.org
Tue May 24 11:19:32 PDT 2011
configure.in | 1
patches/Makefile.am | 2
patches/dev300/debian-opt.diff | 6 +-
patches/dev300/gcj-32bit-runtime-path.diff | 6 +-
patches/dev300/mention-java-common-package.diff | 42 +++++++----------
patches/dev300/oosplash-etc-libreoffice-sofficerc.diff | 6 +-
patches/dev300/reportdesign-mention-package.diff | 34 ++-----------
patches/dev300/seamonkey-is-iceape.diff | 18 +++----
patches/mono/mono-build.diff | 9 ++-
9 files changed, 48 insertions(+), 76 deletions(-)
New commits:
commit 43612a09de99a32abf67881c57c73c5509c18037
Author: Rene Engelhard <rene at debian.org>
Date: Tue May 24 18:17:00 2011 +0000
make some Debian(Base)Only patches apply again
diff --git a/patches/dev300/debian-opt.diff b/patches/dev300/debian-opt.diff
index 4075123..8d433f4 100644
--- a/patches/dev300/debian-opt.diff
+++ b/patches/dev300/debian-opt.diff
@@ -21,9 +21,9 @@ Index: unxlngi.mk
# mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
+CDEFAULTOPT=-O2
- ARCH_FLAGS*=-mtune=pentiumpro
- .INCLUDE : unxlng.mk
- CDEFS+=-DX86
+ .IF "$(GCCNUMVER)" >= "000400050000"
+ ARCH_FLAGS*=-mtune=atom
+ .ELSE
--- solenv/inc/unxlngppc.mk (Revision 277719)
+++ solenv/inc/unxlngppc.mk (Arbeitskopie)
@@ -31,7 +31,7 @@
diff --git a/patches/dev300/gcj-32bit-runtime-path.diff b/patches/dev300/gcj-32bit-runtime-path.diff
index f071092..03199e8 100644
--- a/patches/dev300/gcj-32bit-runtime-path.diff
+++ b/patches/dev300/gcj-32bit-runtime-path.diff
@@ -1,6 +1,6 @@
--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx~ 2006-09-04 20:24:48.710718000 +0200
+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-09-04 20:37:56.620718000 +0200
-@@ -37,6 +37,11 @@
+@@ -33,6 +33,11 @@
#include "osl/thread.h"
#include "gnujre.hxx"
#include "util.hxx"
@@ -10,9 +10,9 @@
+#include <string.h>
+}
- using namespace rtl;
using namespace std;
-@@ -153,7 +158,18 @@
+ using namespace osl;
+@@ -180,7 +180,18 @@
return false;
if (!m_sJavaHome.getLength())
diff --git a/patches/dev300/mention-java-common-package.diff b/patches/dev300/mention-java-common-package.diff
index 766d0a0..85f159d 100644
--- a/patches/dev300/mention-java-common-package.diff
+++ b/patches/dev300/mention-java-common-package.diff
@@ -12,36 +12,30 @@
namespace svt
{
-@@ -184,6 +185,9 @@
- aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
-
+@@ -138,6 +138,7 @@
+ m_bJavaNotFound_Handled = true;
+ WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
+ String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
++ aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
aWarningBox.SetText( aTitle );
-+ String aText = String(aWarningBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aWarningBox.SetMessText( aText );
nResult = aWarningBox.Execute();
-
}
-@@ -256,6 +260,9 @@
- aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
-
- aQueryBox.SetText( aTitle );
-+ String aText = String(aQueryBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aQueryBox.SetMessText( aText );
- nResult = aQueryBox.Execute();
- if ( nResult == RET_YES )
- {
-@@ -297,6 +304,9 @@
- aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
-
+@@ -155,6 +156,7 @@
+ m_bInvalidSettings_Handled = true;
+ WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
+ String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
++ aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
+ aWarningBox.SetText( aTitle );
+ nResult = aWarningBox.Execute();
+ }
+@@ -196,6 +198,7 @@
+ m_bVMCreationFailure_Handled = true;
+ ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
+ String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
++ aTitle.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality and/or check your Java settings."));
aErrorBox.SetText( aTitle );
-+ String aText = String(aErrorBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aErrorBox.SetMessText( aText );
nResult = aErrorBox.Execute();
}
- else
--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig 2008-04-11 05:19:31.000000000 -0500
+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2009-03-05 19:54:38.000000000 -0600
@@ -111,6 +111,9 @@
diff --git a/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff b/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff
index beb9c14..b77995c 100644
--- a/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff
+++ b/patches/dev300/oosplash-etc-libreoffice-sofficerc.diff
@@ -1,11 +1,11 @@
--- desktop/unx/source/start.c-old 2007-10-20 17:48:31.000000000 +0200
+++ desktop/unx/source/start.c 2007-10-20 17:42:52.000000000 +0200
-@@ -456,12 +456,13 @@
+@@ -616,12 +616,13 @@
static void
- load_splash_defaults( rtl_uString *pAppPath, sal_Bool *pInhibitSplash )
+ load_splash_defaults( rtl_uString *pAppPath, sal_Bool *bNoDefaults )
{
- rtl_uString *pSettings = NULL, *pTmp = NULL;
-+ rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;;
++ rtl_uString *pSettings = NULL, *pTmp = NULL, *pEtcPath = NULL;
rtlBootstrapHandle handle;
/* costruct the sofficerc file location */
diff --git a/patches/dev300/reportdesign-mention-package.diff b/patches/dev300/reportdesign-mention-package.diff
index ba03d26..d81cf88 100644
--- a/patches/dev300/reportdesign-mention-package.diff
+++ b/patches/dev300/reportdesign-mention-package.diff
@@ -1,31 +1,9 @@
-Index: dbaccess/source/ui/dlg/ExtensionNotPresent.src
-===================================================================
---- dbaccess/source/ui/dlg/ExtensionNotPresent.src (Revision 274294)
-+++ dbaccess/source/ui/dlg/ExtensionNotPresent.src (Arbeitskopie)
-@@ -37,8 +37,8 @@
+--- dbaccess/source/ui/misc/dbumiscres.src-old 2011-05-24 19:52:49.000000000 +0200
++++ dbaccess/source/ui/misc/dbumiscres.src 2011-05-24 19:53:55.000000000 +0200
+@@ -96,5 +96,5 @@
String RID_STR_EXTENSION_NOT_PRESENT
{
- // #i96130# use hard coded name
-- Text [ en-US ] = "To open a report you require the extension Sunâ„¢ Report Builder.\n\nClick 'Download...' to download and install the extension.";
-- // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
-+ Text [ en-US ] = "To open a report you require the extension Sunâ„¢ Report Builder.\n\nor this, install the package 'openoffice.org-report-builder'.";
-+ // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nor this, install the package 'openoffice.org-report-builder'.";
+ // #i96130# use hard coded name
+- Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
++ Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder. For this, install the package 'libreoffice-report-builder'.";
};
- // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
- // String RID_STR_EXTENSION_NAME
-@@ -73,15 +73,6 @@
- // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
- };
-
-- PushButton PB_DOWNLOAD
-- {
-- Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ;
-- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-- DefButton = TRUE ;
-- TabStop = TRUE ;
-- Text [ en-US ] = "~Download..." ;
-- };
--
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
diff --git a/patches/dev300/seamonkey-is-iceape.diff b/patches/dev300/seamonkey-is-iceape.diff
index 10fccb6..5cc844e 100644
--- a/patches/dev300/seamonkey-is-iceape.diff
+++ b/patches/dev300/seamonkey-is-iceape.diff
@@ -1,14 +1,14 @@
--- configure.in-old 2008-05-03 23:27:00.000000000 +0200
+++ configure.in 2008-05-03 23:27:37.000000000 +0200
-@@ -795,7 +795,7 @@
- components cannot be built against a contemporary
- mozilla. The flavour used can be specified by
- --with-system-mozilla=<flavour>. Supported are:
-- libxul (default), xulrunner, firefox, seamonkey,
-+ libxul (default), xulrunner, firefox, iceape,
- mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-
+@@ -957,7 +957,7 @@
+ [Use mozilla already on system. Note that some components cannot be built
+ against a contemporary mozilla. The flavour used can be specified by
+ --with-system-mozilla=<flavour>. Supported are: libxul (default),
+- xulrunner, firefox, seamonkey, mozilla.]),
++ xulrunner, firefox, iceape, mozilla.]),
+ WITH_SYSTEM_MOZILLA=$withval ,
+ WITH_SYSTEM_MOZILLA=no)
+
@@ -4134,8 +4134,8 @@
MOZ_FLAVOUR=libxul
elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
commit f5543b16010aea45f5203744f6e06505eca5995f
Author: Rene Engelhard <rene at debian.org>
Date: Tue May 24 18:15:34 2011 +0000
fix patches/mono/mono-build.diff to apply
diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 4f65fee..672d1d2 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -126,13 +126,14 @@ diff --git configure.in configure.in
index 12fbec8..9c8aa00 100644
--- configure.in
+++ configure.in
-@@ -472,6 +472,10 @@ AC_ARG_ENABLE(extra-font,
- [Add extra font content.]),
+@@ -475,6 +475,11 @@
+ [Enable global menu support.]),
,)
+AC_ARG_ENABLE(mono,
-+[ --enable-mono Enables the compilation of the Mono bindings
-+],,)
++ AS_HELP_STRING([--enable-mono],
++ [Enables the compilation of the Mono bindings]),
++,)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
commit 40561def7c9a285b85604415dd891e3edf95bf3e
Author: Rene Engelhard <rene at debian.org>
Date: Tue May 24 18:15:15 2011 +0000
remove patches/ooxml from configure.in and patches/Makefile.am; gone
diff --git a/configure.in b/configure.in
index ab3b6c6..4f8b4c6 100755
--- a/configure.in
+++ b/configure.in
@@ -1868,7 +1868,6 @@ patches/dev300/Makefile
patches/hotfixes/Makefile
patches/vba/Makefile
patches/mono/Makefile
-patches/ooxml/Makefile
patches/postgresql/Makefile
patches/64bit/Makefile
po/Makefile
diff --git a/patches/Makefile.am b/patches/Makefile.am
index 59c1fc2..6053c12 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit dev300 hotfixes mono ooxml vba postgresql
+SUBDIRS=64bit dev300 hotfixes mono vba postgresql
EXTRA_DIST=README apply.pl.in $(wildcard *.diff)
More information about the Libreoffice-commits
mailing list