summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------dictionaries0
-rw-r--r--external/python3/python-3.3.3-py17797.patch.134
m---------helpcontent20
-rw-r--r--postprocess/CustomTarget_registry.mk35
m---------translations0
-rw-r--r--vcl/quartz/ctlayout.cxx6
6 files changed, 47 insertions, 28 deletions
diff --git a/dictionaries b/dictionaries
-Subproject a2bcaea4b328260a5a15cf7cb23f8fde0a8760b
+Subproject 657e53790c53668fcc0558a5f16e8ec6962c2fe
diff --git a/external/python3/python-3.3.3-py17797.patch.1 b/external/python3/python-3.3.3-py17797.patch.1
index 3c43fb120713..d4f7ab8a95ca 100644
--- a/external/python3/python-3.3.3-py17797.patch.1
+++ b/external/python3/python-3.3.3-py17797.patch.1
@@ -3,39 +3,57 @@ http://connect.microsoft.com/VisualStudio/feedback/details/785119/
Visual Studio 2012 changed return value for fileno function that breaks
when python tries to check/setup stdin/out/err
+GetStdHandle on Windows XP behaves contrary to the documentation...
diff -ur python3.org/Python/pythonrun.c python3/Python/pythonrun.c
---- python3.org/Python/pythonrun.c 2014-05-19 19:06:01.305362400 +0200
-+++ python3/Python/pythonrun.c 2014-05-19 19:07:13.649079800 +0200
-@@ -1083,7 +1083,11 @@
+--- python3.org/Python/pythonrun.c 2014-05-24 16:36:20.361672900 +0200
++++ python3/Python/pythonrun.c 2014-05-24 16:37:38.424159100 +0200
+@@ -1036,7 +1036,15 @@
+ int status = 0, fd;
+ PyObject * encoding_attr;
+ char *encoding = NULL, *errors;
+-
++#ifdef MS_WINDOWS
++ OSVERSIONINFOEX osvi;
++ BOOL bIsWindowsXP;
++
++ ZeroMemory(&osvi, sizeof(osvi));
++ osvi.dwOSVersionInfoSize = sizeof(osvi);
++ GetVersionEx(&osvi);
++ bIsWindowsXP = (osvi.dwMajorVersion < 6);
++#endif
+ /* Hack to avoid a nasty recursion issue when Python is invoked
+ in verbose mode: pre-import the Latin-1 and UTF-8 codecs */
+ if ((m = PyImport_ImportModule("encodings.utf_8")) == NULL) {
+@@ -1084,7 +1092,11 @@
* and fileno() may point to an invalid file descriptor. For example
* GUI apps don't have valid standard streams by default.
*/
+#ifdef MS_WINDOWS
-+ if (!is_valid_fd(fd) || GetStdHandle(STD_INPUT_HANDLE) == NULL) {
++ if (!is_valid_fd(fd) || GetStdHandle(STD_INPUT_HANDLE) == NULL || bIsWindowsXP) {
+#else
if (!is_valid_fd(fd)) {
+#endif
std = Py_None;
Py_INCREF(std);
}
-@@ -1098,7 +1102,11 @@
+@@ -1099,7 +1111,11 @@
/* Set sys.stdout */
fd = fileno(stdout);
+#ifdef MS_WINDOWS
-+ if (!is_valid_fd(fd) || GetStdHandle(STD_OUTPUT_HANDLE) == NULL) {
++ if (!is_valid_fd(fd) || GetStdHandle(STD_OUTPUT_HANDLE) == NULL || bIsWindowsXP) {
+#else
if (!is_valid_fd(fd)) {
+#endif
std = Py_None;
Py_INCREF(std);
}
-@@ -1114,7 +1122,11 @@
+@@ -1115,7 +1131,11 @@
#if 1 /* Disable this if you have trouble debugging bootstrap stuff */
/* Set sys.stderr, replaces the preliminary stderr */
fd = fileno(stderr);
+#ifdef MS_WINDOWS
-+ if (!is_valid_fd(fd) || GetStdHandle(STD_ERROR_HANDLE) == NULL) {
++ if (!is_valid_fd(fd) || GetStdHandle(STD_ERROR_HANDLE) == NULL || bIsWindowsXP) {
+#else
if (!is_valid_fd(fd)) {
+#endif
diff --git a/helpcontent2 b/helpcontent2
-Subproject e64fa5fd6666d03819f3a38272940f461324056
+Subproject 1eb40dbbf1b8219654405ef283c54c93a7d57a1
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 1eb591ba3929..0bc71a98b730 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -595,27 +595,28 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- $(call gb_Helper_abbreviate_dirs, \
- echo '<list>' > $@ \
- && ( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) -name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
- && echo '</list>' >> $@ \
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
+ -name *.xcu -size +0c \
+ | awk 'BEGIN{print "<list>"} \
+ {print "<filename>"$$0"</filename>"} \
+ END {print "</list>"}' > $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo '<list>' > $@ \
- && $(call gb_Helper_abbreviate_dirs, \
- (find $(call gb_XcuResTarget_get_target,registry/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
- $(foreach driver,$(postprocess_DRIVERS), \
- && (find $(call gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
- ) \
- ) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
- && (find $(call gb_XcuResTarget_get_target,updchk/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \
- ) \
- ) \
- && echo '</list>' >> $@
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,registry/$*/)\
+ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+ $(foreach driver,$(postprocess_DRIVERS),\
+ $(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
+ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+ $(call gb_XcuResTarget_get_target,updchk/$*/))\
+ -name *.xcu \
+ | awk 'BEGIN{print "<list>"} \
+ {print "<filename>"$$0"</filename>"} \
+ END {print "</list>"}' > $@ \
+ )
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
diff --git a/translations b/translations
-Subproject 5259da8c28e483881a8a3f276fc4fd7179baafa
+Subproject 39ff11eb8b0055c7ed703e9b85e4906d2846428
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 0b29673cbf42..0c317c4f9cc7 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -172,7 +172,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// - CoreText handles spaces specially (in particular at the text end)
if( mnTrailingSpaceCount )
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
// don't recreate line layout here, because this can lead to problems
// (looks like internal issues inside early CoreText versions)
mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
@@ -218,7 +218,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth - mfTrailingSpaceWidth );
#else
CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, nPixelWidth);
@@ -235,7 +235,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
}
CFRelease( mpCTLine );
mpCTLine = pNewCTLine;
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
mfCachedWidth = nPixelWidth;
#else
mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-18 14:19:46 +0000