[Libreoffice-commits] core.git: 2 commits - external/firebird

2014-07-03 Thread Norbert Thiebaud 
 external/firebird/ExternalProject_firebird.mk   |1 
 external/firebird/UnpackedTarball_firebird.mk   |1 
 external/firebird/firebird-no-open-temp-on-shutdown.patch.1 |  359 
 3 files changed, 361 insertions(+)

New commits:
commit 4cf0e29ccf5191b7ba4ed84750108e5361bcde38
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Jul 3 16:19:00 2014 +0200

Revert firebird: enable-debug cause trouble due to a lifecycle management 
issue

This reverts commit 814818c3451fa32900c011278e2e5b62e3518eb0.
Upstream patched the underlying cause

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index d25c667..6e3f582 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
+   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
 $(if $(filter WNT,$(OS)),\
commit c39f77fcbe3def727190def1c568c3b47aa8c3c3
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Jul 3 17:31:45 2014 +0200

firebird: backport upstream patch to avoid life cycle issues

with temp files...

Change-Id: I3c76baa38c6854600fbfd1dd48c554ff8716969e

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 77e691c..8f06102 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-c++11.patch.1 \
external/firebird/firebird-c++11replfn.patch.0 \
+   external/firebird/firebird-no-open-temp-on-shutdown.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-no-open-temp-on-shutdown.patch.1 
b/external/firebird/firebird-no-open-temp-on-shutdown.patch.1
new file mode 100644
index 000..5ce748c
--- /dev/null
+++ b/external/firebird/firebird-no-open-temp-on-shutdown.patch.1
@@ -0,0 +1,359 @@
+Only in firebird: Makefile
+Only in firebird: build.log
+diff -ur firebird.org/builds/posix/Makefile.in.client.gfix 
firebird/builds/posix/Makefile.in.client.gfix
+--- firebird.org/builds/posix/Makefile.in.client.gfix  2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.client.gfix  2014-07-03 
13:45:17.0 +0200
+@@ -39,7 +39,8 @@
+ @SET_MAKE@
+ 
+ 
+-GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp 
common/UtilSvc.cpp
++GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp 
common/UtilSvc.cpp \
++   $(OS_SPECIFIC_Sources)
+ 
+ GFIX_Files = alice_meta.epp alice.cpp exe.cpp tdr.cpp aliceMain.cpp
+ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
+diff -ur firebird.org/builds/posix/Makefile.in.client.util 
firebird/builds/posix/Makefile.in.client.util
+--- firebird.org/builds/posix/Makefile.in.client.util  2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.client.util  2014-07-03 
13:45:17.0 +0200
+@@ -90,7 +90,7 @@
+   $(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
+ 
+ 
+-FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
++FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp 
$(OS_SPECIFIC_Sources)
+ FBGUARD_Files =  guard.cpp util.cpp
+ FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files)) 
$(FBGUARD_Other_Sources)
+ FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename 
$(FBGUARD_Sources $(FBCLASSES_ClientObjects)
+diff -ur firebird.org/builds/posix/Makefile.in.embed.gfix 
firebird/builds/posix/Makefile.in.embed.gfix
+--- firebird.org/builds/posix/Makefile.in.embed.gfix   2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.embed.gfix   2014-07-03 
13:54:55.0 +0200
+@@ -43,7 +43,8 @@
+alice.cpp exe.cpp tdr.cpp aliceMain.cpp
+ 
+ GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp \
+-common/UtilSvc.cpp
++common/UtilSvc.cpp \
++$(OS_SPECIFIC_Sources)
+ 
+ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
+ GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename 
$(GFIX_Sources
+Only in

[Libreoffice-commits] core.git: 2 commits - external/firebird sw/source

2014-01-02 Thread Caolán McNamara 
 external/firebird/ExternalProject_firebird.mk |1 +
 sw/source/core/unocore/unoidx.cxx |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit 49e6016d4ecd531d279fb644d129c983e65dc3b8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jan 2 16:05:42 2014 +

enable firebird --enable-debug

Change-Id: I329edd1356fd36ffd0afd3b4d1d7b0403430d6db

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 97db740..cb3e35d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
+   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
 $(if $(filter WNT,$(OS)),\
commit f65568118fc1ac71c22a3084e0a1bdd315a91006
Author: Steve Yin stev...@apache.org
Date:   Thu Jan 2 10:46:03 2014 +

Resolves: #i119568# The page number of the docx in the TOC is not correct

(cherry picked from commit 875f8fb79613875296139a6cbdbae265a92d7a32)

Conflicts:
sw/source/core/unocore/unoidx.cxx

Change-Id: Ie5c66c8226284413419a5b4c105e9529cf8cadf7

diff --git a/sw/source/core/unocore/unoidx.cxx 
b/sw/source/core/unocore/unoidx.cxx
index 6dd8bb9..3ecbe75 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -55,6 +55,7 @@
 #include ndtxt.hxx
 #include docsh.hxx
 #include chpfld.hxx
+#include editsh.hxx
 #include SwStyleNameMapper.hxx
 #include comphelper/servicehelper.hxx
 #include comphelper/string.hxx
@@ -1230,6 +1231,20 @@ throw (beans::UnknownPropertyException, 
lang::WrappedTargetException,
 OSL_FAIL(SwXDocumentIndex::removeVetoableChangeListener(): not 
implemented);
 }
 
+void lcl_CalcLayout(SwDoc *pDoc)
+{
+SwViewShell *pViewShell = 0;
+SwEditShell* pEditShell = pDoc ? pDoc-GetEditShell(pViewShell) : 0;
+if (pEditShell)
+{
+pEditShell-CalcLayout();
+}
+else if (pViewShell)
+{
+pViewShell-CalcLayout();
+}
+}
+
 // XRefreshable
 void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException)
 {
@@ -1246,6 +1261,10 @@ void SAL_CALL SwXDocumentIndex::refresh() throw 
(uno::RuntimeException)
  static_cast ::cppu::OWeakObject*(this));
 }
 pTOXBase-Update();
+
+// the insertion of TOC will affect the document layout
+lcl_CalcLayout(m_pImpl-m_pDoc);
+
 // page numbers
 pTOXBase-UpdatePageNum();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits