[libreoffice] 01/01: update patches to apply after masters boost:gettext'ization
Rene Engelhard
rene at moszumanska.debian.org
Fri Jul 21 10:01:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit e215490ac3f3f0acc8d101ab06ec0c7e2e2f1b75
Author: Rene Engelhard <rene at debian.org>
Date: Fri Jul 21 12:01:26 2017 +0200
update patches to apply after masters boost:gettext'ization
---
changelog | 2 +-
patches/debian-hardened-buildflags-CPPFLAGS.diff | 2 +-
patches/help-msg-add-package-info.diff | 26 ++++++-------
patches/mention-java-common-package.diff | 47 +++++++++---------------
patches/reportdesign-mention-package.diff | 24 ++++++------
patches/rsc-no-error-about-unknown-switch.diff | 23 ------------
patches/series | 1 -
7 files changed, 45 insertions(+), 80 deletions(-)
diff --git a/changelog b/changelog
index 555ccab..c538b37 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170717-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170721-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 29e0570..8134150 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -32,7 +32,7 @@
if test $_os = iOS -o $_os = Android; then
--- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200
+++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200
-@@ -70,6 +70,7 @@
+@@ -76,6 +76,7 @@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPUNAME=@CPUNAME@
export CDEFAULTOPT=@CDEFAULTOPT@
diff --git a/patches/help-msg-add-package-info.diff b/patches/help-msg-add-package-info.diff
index 3f37be7..dbfb32a 100644
--- a/patches/help-msg-add-package-info.diff
+++ b/patches/help-msg-add-package-info.diff
@@ -1,13 +1,13 @@
-diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
-index 21c5f9175f2e..cbd28e5b538b 100644
---- a/sfx2/source/appl/app.src
-+++ b/sfx2/source/appl/app.src
-@@ -220,7 +220,7 @@ String RID_STR_NOAUTOSTARTHELPAGENT
-
- String RID_STR_HLPFILENOTEXIST
- {
-- Text [ en-US ] = "The help file for this topic is not installed." ;
-+ Text [ en-US ] = "The help file for this topic is not installed. Please install the libreoffice-help-en-us package or the locale specific help package libreoffice-help-<language-code>." ;
- };
-
- String STR_QUICKSTART_EXIT
+diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
+index 1b0ea6ccb2ff..630f4330552a 100644
+--- a/include/sfx2/strings.hrc
++++ b/include/sfx2/strings.hrc
+@@ -132,7 +132,7 @@
+ #define STR_GID_CONTROLS NC_("STR_GID_CONTROLS", "Controls")
+ #define STR_QUITAPP NC_("STR_QUITAPP", "E~xit %PRODUCTNAME")
+ #define RID_STR_HELP NC_("RID_STR_HELP", "Help")
+-#define RID_STR_HLPFILENOTEXIST NC_("RID_STR_HLPFILENOTEXIST", "The help file for this topic is not installed.")
++#define RID_STR_HLPFILENOTEXIST NC_("RID_STR_HLPFILENOTEXIST", "The help file for this topic is not installed. Please install the libreoffice-help-en-us package or the locale specific help package libreoffice-help-<language-code>.")
+ #define STR_QUICKSTART_EXIT NC_("STR_QUICKSTART_EXIT", "Exit Quickstarter")
+ #define STR_QUICKSTART_TIP NC_("STR_QUICKSTART_TIP", "%PRODUCTNAME %PRODUCTVERSION Quickstarter")
+ #define STR_QUICKSTART_FILEOPEN NC_("STR_QUICKSTART_FILEOPEN", "Open Document...")
diff --git a/patches/mention-java-common-package.diff b/patches/mention-java-common-package.diff
index eea754e..e096f43 100644
--- a/patches/mention-java-common-package.diff
+++ b/patches/mention-java-common-package.diff
@@ -12,34 +12,23 @@ index 718902caba6f..3c8499b5a42c 100644
return false;
}
else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
-diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
-index 60d7c720ebeb..588f034f1f74 100644
---- a/svtools/source/java/javaerror.src
-+++ b/svtools/source/java/javaerror.src
-@@ -21,7 +21,7 @@
+diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
+index f9dc617f4313..874b0400cbc5 100644
+--- a/include/svtools/strings.hrc
++++ b/include/svtools/strings.hrc
+@@ -279,12 +279,12 @@
- String STR_WARNING_JAVANOTFOUND
- {
-- Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.";
-+ Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE (and libreoffice-java-common) and restart %PRODUCTNAME.";
- };
+ #define STR_SVT_DEFAULT_SERVICE_LABEL NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
- String STR_WARNING_JAVANOTFOUND_MAC
-@@ -36,7 +36,7 @@ String STR_WARNING_INVALIDJAVASETTINGS_MAC
-
- String STR_WARNING_INVALIDJAVASETTINGS
- {
-- Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.";
-+ Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME. Maybe you also need to install libreoffice-java-common";
- };
-
- String STR_ERROR_JVMCREATIONFAILED_MAC
-@@ -46,7 +46,7 @@ String STR_ERROR_JVMCREATIONFAILED_MAC
-
- String STR_ERROR_JVMCREATIONFAILED
- {
-- Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.";
-+ Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced or install libreoffice-java-common if not already installed.";
- };
-
- String STR_WARNING_JAVANOTFOUND_TITLE
+-#define STR_WARNING_JAVANOTFOUND NC_("STR_WARNING_JAVANOTFOUND", "PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.")
++#define STR_WARNING_JAVANOTFOUND NC_("STR_WARNING_JAVANOTFOUND", "PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE i(and libreoffice-java-common) and restart %PRODUCTNAME.")
+ #define STR_WARNING_JAVANOTFOUND_MAC NC_("STR_WARNING_JAVANOTFOUND_MAC", "PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.")
+ #define STR_WARNING_INVALIDJAVASETTINGS_MAC NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
+-#define STR_WARNING_INVALIDJAVASETTINGS NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
++#define STR_WARNING_INVALIDJAVASETTINGS NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME. Maybe you also need to install libreoffice-java-common.")
+ #define STR_ERROR_JVMCREATIONFAILED_MAC NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced.")
+-#define STR_ERROR_JVMCREATIONFAILED NC_("STR_ERROR_JVMCREATIONFAILED", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.")
++#define STR_ERROR_JVMCREATIONFAILED NC_("STR_ERROR_JVMCREATIONFAILED", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced or install libreoffice-java-common if not already installed.")
+ #define STR_WARNING_JAVANOTFOUND_TITLE NC_("STR_WARNING_JAVANOTFOUND_TITLE", "JRE Required")
+ #define STR_WARNING_INVALIDJAVASETTINGS_TITLE NC_("STR_WARNING_INVALIDJAVASETTINGS_TITLE", "Select JRE")
+ #define STR_ERROR_JVMCREATIONFAILED_TITLE NC_("STR_ERROR_JVMCREATIONFAILED_TITLE", "JRE is Defective")
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
index c2b3116..9b5277d 100644
--- a/patches/reportdesign-mention-package.diff
+++ b/patches/reportdesign-mention-package.diff
@@ -1,13 +1,13 @@
-diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
-index 974b36e..2f42c27 100644
---- a/dbaccess/source/ui/misc/dbumiscres.src
-+++ b/dbaccess/source/ui/misc/dbumiscres.src
-@@ -86,7 +86,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
- String RID_STR_EXTENSION_NOT_PRESENT
- {
- // #i96130# use hard coded name
-- Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature.";
-+ Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature. For this, install the package 'libreoffice-report-builder'.";
- };
+diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
+index 47068f43d09e..1f8b9a2331b6 100644
+--- a/dbaccess/inc/strings.hrc
++++ b/dbaccess/inc/strings.hrc
+@@ -349,7 +349,7 @@
+ #define STR_WARNINGS_DURING_CONNECT NC_("STR_WARNINGS_DURING_CONNECT", "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.")
+ #define STR_NAMED_OBJECT_ALREADY_EXISTS NC_("STR_NAMED_OBJECT_ALREADY_EXISTS", "The name '$#$' already exists.\nPlease enter another name." )
+ // #i96130# use hard coded name
+-#define RID_STR_EXTENSION_NOT_PRESENT NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Oracle Report Builder feature.")
++#define RID_STR_EXTENSION_NOT_PRESENT NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Oracle Report Builder feature. For this, install the package 'libreoffice-report-builder'.")
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+ #define STR_COULDNOTCREATE_DRIVERMANAGER NC_("STR_COULDNOTCREATE_DRIVERMANAGER", "Cannot connect to the SDBC driver manager (#servicename#).")
+ #define STR_NOREGISTEREDDRIVER NC_("STR_NOREGISTEREDDRIVER", "A driver is not registered for the URL #connurl#.")
diff --git a/patches/rsc-no-error-about-unknown-switch.diff b/patches/rsc-no-error-about-unknown-switch.diff
deleted file mode 100644
index c0677e4..0000000
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
-index c5a9fd7..62aa8ab 100644
---- a/rsc/source/parser/erscerr.cxx
-+++ b/rsc/source/parser/erscerr.cxx
-@@ -389,7 +389,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
- void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
- const char * pMessage )
- {
-- if( ERR_USAGE != rError.GetError() ){
-+ if( ERR_USAGE != rError.GetError() && ERR_UNKNOWNSW != rError.GetError() ){
- nErrors++;
- ErrorFormat( rError, nullptr, aId );
- WriteError( rError, pMessage );
-@@ -398,7 +398,8 @@ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
- else
- WriteError( rError, pMessage );
-
-- exit( 1 );
-+ if( ERR_UNKNOWNSW != rError.GetError() )
-+ exit( 1 );
- }
-
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/patches/series b/patches/series
index da5c7da..eef9da6 100644
--- a/patches/series
+++ b/patches/series
@@ -23,7 +23,6 @@ lo-xlate-lang-update.diff
build-connectivitytools.diff
odk-no-dot.diff
hppa-is-32bit.diff
-rsc-no-error-about-unknown-switch.diff
no-packagekit-per-default.diff
system-officeotron-and-odfvalidator.diff
no-openssl.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list