The following commit has been merged in the debian-experimental-3.5 branch:
commit 426f128218d986ecd8416d37012960eb5142b70d
Author: Rene Engelhard <r...@debian.org>
Date: Tue Mar 27 23:21:52 2012 +0200
update to 3.5.2 rc2
diff --git a/changelog b/changelog
index 60eccb4..9629a91 100644
--- a/changelog
+++ b/changelog
@@ -1,16 +1,14 @@
-libreoffice (1:3.5.1-2) UNRELEASED; urgency=low
+libreoffice (1:3.5.2~rc2-1) UNRELEASED; urgency=low
- * debian/patches/fix-for-kdelibs-enum.diff: backport build fix for
- KDE 4.8 from libreoffice-3-5
- * debian/patches/glib-single-include.patch: fix gvfs build for
- glib >= 2.32, thanks Michael Biebl (closes: #665574)
+ * new upstream release candidate
+ - fixes gvfs build for glib (closes: #665574)
* debian/rules:
- make make check failure abort again
* debian/rules, debian/uno-libs3.symbols:
- add ure dependency for stuff linked to uno-libs3, too
- -- Rene Engelhard <r...@debian.org> Tue, 27 Mar 2012 18:04:15 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 27 Mar 2012 23:03:32 +0200
libreoffice (1:3.5.1-1) experimental; urgency=low
diff --git a/patches/bibliography-no-crash-if-no-base.diff
b/patches/bibliography-no-crash-if-no-base.diff
deleted file mode 100644
index 71ba6fb..0000000
--- a/patches/bibliography-no-crash-if-no-base.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 33ef1ffbd15994ec71be99d38c0d5171c63344a2 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michael...@canonical.com>
-Date: Tue, 06 Mar 2012 17:16:35 +0000
-Subject: lp#527938, debian#602953, fdo#33266, i#105408: do not crash on
clicking bibliography when base isnt installed
-
-Signed-off-by: Michael Meeks <michael.me...@suse.com>
-
-From 285b3a4fe0b5b21abe061dfb664800b7e537471e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caol...@redhat.com>
-Date: Fri, 09 Mar 2012 14:09:30 +0000
-Subject: Fix tools->bibliography database, brown paper bag over head commit :-)
-
-(cherry picked from commit bd1088567bafa6293ffecf5331a9016b6d0438e3)
-
-Signed-off-by: Miklos Vajna <vmik...@suse.cz>
----
-diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
-index c80c81e..9159124 100644
---- a/extensions/source/bibliography/bibload.cxx
-+++ b/extensions/source/bibliography/bibload.cxx
-@@ -54,6 +54,7 @@
- #include <com/sun/star/text/BibliographyDataField.hpp>
- #include <com/sun/star/form/XLoadListener.hpp>
- #include <com/sun/star/frame/XLayoutManager.hpp>
-+#include <com/sun/star/uno/XAggregation.hpp>
- #include <toolkit/awt/vclxwindow.hxx>
- #include <vcl/window.hxx>
- #include <vcl/edit.hxx>
-@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw
(::com::sun::star::uno::RuntimeExcep
- }
-
- // -----------------------------------------------------------------------
-+namespace
-+{
-+ // lp#527938, debian#602953, fdo#33266, i#105408
-+ static bool lcl_isBaseAvailable()
-+ {
-+ Reference< XMultiServiceFactory > xMgr =
comphelper::getProcessServiceFactory();
-+ Reference< XAggregation > xAggregate = Reference< XAggregation >(
xMgr->createInstance(C2U("com.sun.star.sdbc.RowSet")), UNO_QUERY);
-+ return xAggregate.is();
-+ }
-+}
- void BibliographyLoader::load(const Reference< XFrame > & rFrame, const
rtl::OUString& rURL,
- const Sequence< PropertyValue >& rArgs,
- const Reference< XLoadEventListener > & rListener) throw
(::com::sun::star::uno::RuntimeException)
- {
-- //!
-+ // lp#527938, debian#602953, fdo#33266, i#105408
-+ // make sure we actually can instanciate services from base first
-+ if(!lcl_isBaseAvailable())
-+ return;
-
- SolarMutexGuard aGuard;
-+
- m_pBibMod = OpenBibModul();
-
- String aURLStr( rURL );
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/fix-for-kdelibs-enum.diff
b/patches/fix-for-kdelibs-enum.diff
deleted file mode 100644
index 58d1442..0000000
--- a/patches/fix-for-kdelibs-enum.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-03-18
19:37:44.435636499 +0000
-+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-03-18
20:04:04.263552525 +0000
-@@ -60,6 +60,8 @@
- #undef SETTINGS_MOUSE
- #define LO_SETTINGS_LOCALE SETTINGS_LOCALE
- #undef SETTINGS_LOCALE
-+#define LO_SETTINGS_STYLE SETTINGS_STYLE
-+#undef SETTINGS_STYLE
-
- #include <kfiledialog.h>
- #include <kwindowsystem.h>
-@@ -77,6 +79,8 @@
- #undef LO_SETTINGS_MOUSE
- #define SETTINGS_LOCALE LO_SETTINGS_LOCALE
- #undef LO_SETTINGS_LOCALE
-+#define SETTINGS_STYLE LO_SETTINGS_STYLE
-+#undef LO_SETTINGS_STYLE
-
- using namespace ::com::sun::star;
-
diff --git a/patches/fix-quickstart-shutdown.diff
b/patches/fix-quickstart-shutdown.diff
deleted file mode 100644
index a2887c4..0000000
--- a/patches/fix-quickstart-shutdown.diff
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/framework/inc/services/desktop.hxx
b/framework/inc/services/desktop.hxx
-index ac51f25..530d615 100644
---- a/framework/inc/services/desktop.hxx
-+++ b/framework/inc/services/desktop.hxx
-@@ -339,6 +339,10 @@ class Desktop : // interfaces
- virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
- throw (css::uno::RuntimeException);
-
-+ // we need this wrapped terminate()-call to terminate even the
QuickStarter
-+ // non-virtual and non-UNO for now
-+ bool SAL_CALL terminateQuickstarterToo()
-+ throw( css::uno::RuntimeException );
-
//-------------------------------------------------------------------------------------------------------------
- // protected methods
-
//-------------------------------------------------------------------------------------------------------------
-diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
-index eccd010..7050adb 100644
---- a/framework/source/services/desktop.cxx
-+++ b/framework/source/services/desktop.cxx
-@@ -401,6 +401,36 @@ sal_Bool SAL_CALL Desktop::terminate()
- return bTerminate;
- }
-
-+namespace
-+{
-+ class QuickstartSuppressor
-+ {
-+ Desktop* const m_pDesktop;
-+ css::uno::Reference< css::frame::XTerminateListener >
m_xQuickLauncher;
-+ public:
-+ QuickstartSuppressor(Desktop* const pDesktop,
css::uno::Reference< css::frame::XTerminateListener > xQuickLauncher)
-+ : m_pDesktop(pDesktop)
-+ , m_xQuickLauncher(xQuickLauncher)
-+ {
-+ SAL_INFO("fwk", "temporary removing Quickstarter");
-+ if(m_xQuickLauncher.is())
-+ m_pDesktop->removeTerminateListener(m_xQuickLauncher);
-+ }
-+ ~QuickstartSuppressor()
-+ {
-+ SAL_INFO("fwk", "readding Quickstarter");
-+ if(m_xQuickLauncher.is())
-+ m_pDesktop->addTerminateListener(m_xQuickLauncher);
-+ }
-+ };
-+}
-+
-+bool SAL_CALL Desktop::terminateQuickstarterToo()
-+ throw( css::uno::RuntimeException )
-+{
-+ QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
-+ return terminate();
-+}
-
-
//=============================================================================
- void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference<
css::frame::XTerminateListener >& xListener )
-diff --git a/framework/source/services/sessionlistener.cxx
b/framework/source/services/sessionlistener.cxx
-index 524a14c..f171653 100644
---- a/framework/source/services/sessionlistener.cxx
-+++ b/framework/source/services/sessionlistener.cxx
-@@ -30,6 +30,7 @@
- // my own includes
-
- #include <services/sessionlistener.hxx>
-+#include <services/desktop.hxx>
- #include <threadhelp/readguard.hxx>
- #include <threadhelp/resetableguard.hxx>
- #include <protocols.h>
-@@ -136,10 +137,12 @@ SessionListener::SessionListener(const
css::uno::Reference< css::lang::XMultiSer
- , m_bAllowUserInteractionOnQuit( sal_False )
- , m_bTerminated( sal_False )
- {
-+ SAL_INFO("fwk", "SessionListener::SessionListener");
- }
-
- SessionListener::~SessionListener()
- {
-+ SAL_INFO("fwk", "SessionListener::~SessionListener");
- if (m_rSessionManager.is())
- {
- css::uno::Reference< XSessionManagerListener> me(this);
-@@ -149,6 +152,7 @@ SessionListener::~SessionListener()
-
- void SessionListener::StoreSession( sal_Bool bAsync )
- {
-+ SAL_INFO("fwk", "SessionListener::StoreSession");
- ResetableGuard aGuard(m_aLock);
- try
- {
-@@ -182,6 +186,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
-
- void SessionListener::QuitSessionQuietly()
- {
-+ SAL_INFO("fwk", "SessionListener::QuitSessionQuietly");
- ResetableGuard aGuard(m_aLock);
- try
- {
-@@ -206,11 +211,13 @@ void SessionListener::QuitSessionQuietly()
-
- void SAL_CALL SessionListener::disposing(const
com::sun::star::lang::EventObject&) throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::disposing");
- }
-
- void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::initialize");
-
- OUString
aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
- if (args.getLength() > 0)
-@@ -242,6 +249,7 @@ void SAL_CALL SessionListener::initialize(const Sequence<
Any >& args)
- void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
- throw (css::uno::RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::statusChanged");
- if
(event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")))
- {
- if (event.FeatureDescriptor.compareToAscii("update")==0)
-@@ -262,6 +270,7 @@ void SAL_CALL SessionListener::statusChanged(const
FeatureStateEvent& event)
- sal_Bool SAL_CALL SessionListener::doRestore()
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::doRestore");
- ResetableGuard aGuard(m_aLock);
- m_bRestored = sal_False;
- try {
-@@ -288,6 +297,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
- void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool
/*bCancelable*/ )
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::doSave");
- if (bShutdown)
- {
- m_bSessionStoreRequested = sal_True; // there is no need to protect
it with mutex
-@@ -304,6 +314,7 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown,
sal_Bool /*bCancelabl
- void SAL_CALL SessionListener::approveInteraction( sal_Bool
bInteractionGranted )
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::approveInteraction");
- // do AutoSave as the first step
- ResetableGuard aGuard(m_aLock);
-
-@@ -316,7 +327,19 @@ void SAL_CALL SessionListener::approveInteraction(
sal_Bool bInteractionGranted
- StoreSession( sal_False );
-
- css::uno::Reference< css::frame::XDesktop > xDesktop(
m_xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
-- m_bTerminated = xDesktop->terminate();
-+ // honestly: how many implementations of XDesktop will we ever
have?
-+ // so casting this directly to the implementation
-+ Desktop* pDesktop(dynamic_cast<Desktop*>(xDesktop.get()));
-+ if(pDesktop)
-+ {
-+ SAL_INFO("fwk", "XDesktop is a framework::Desktop -- good.");
-+ m_bTerminated = pDesktop->terminateQuickstarterToo();
-+ }
-+ else
-+ {
-+ SAL_WARN("fwk", "XDesktop is not a framework::Desktop -- this
should never happen.");
-+ m_bTerminated = xDesktop->terminate();
-+ }
-
- if ( m_rSessionManager.is() )
- {
-@@ -345,6 +368,7 @@ void SAL_CALL SessionListener::approveInteraction(
sal_Bool bInteractionGranted
- void SessionListener::shutdownCanceled()
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::shutdownCanceled");
- // set the state back
- m_bSessionStoreRequested = sal_False; // there is no need to protect it
with mutex
- }
-@@ -352,6 +376,7 @@ void SessionListener::shutdownCanceled()
- void SessionListener::doQuit()
- throw (RuntimeException)
- {
-+ SAL_INFO("fwk", "SessionListener::doQuit");
- if ( m_bSessionStoreRequested && !m_bTerminated )
- {
- // let the session be closed quietly in this case
diff --git a/patches/glib-single-include.patch
b/patches/glib-single-include.patch
deleted file mode 100644
index 50535fa..0000000
--- a/patches/glib-single-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ucb/source/ucp/gvfs/gvfs_content.hxx
-+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
-@@ -35,7 +35,7 @@
- #include <com/sun/star/ucb/XContentCreator.hpp>
- #include <ucbhelper/contenthelper.hxx>
-
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <libgnomevfs/gnome-vfs-ops.h>
- #include <libgnomevfs/gnome-vfs-directory.h>
-
diff --git a/patches/prevent-sax-obsolete-dir.diff
b/patches/prevent-sax-obsolete-dir.diff
deleted file mode 100644
index 3fb5d0d..0000000
--- a/patches/prevent-sax-obsolete-dir.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 4572e00ec358f507e64cbab9d9f3430ea6f97d51 Mon Sep 17 00:00:00 2001
-From: Matúš Kukan <matus.ku...@gmail.com>
-Date: Wed, 04 Jan 2012 22:06:57 +0000
-Subject: sax: this had to be accidentally added when merging
-
----
-diff --git a/sax/prj/build.lst b/sax/prj/build.lst
-index 940ef70..34e520f 100644
---- a/sax/prj/build.lst
-+++ b/sax/prj/build.lst
-@@ -1,4 +1,2 @@
- ax sax : offapi cppuhelper EXPAT:expat comphelper
LIBXSLT:libxslt NULL
- ax sax\prj
nmake - all ax_prj NULL
--
--ax sax\test nmake -
all ax_test NULL
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/pyuno_fix_python2.diff b/patches/pyuno_fix_python2.diff
deleted file mode 100644
index 5d80574..0000000
--- a/patches/pyuno_fix_python2.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-From 82bf2998cb243f3269e39de8daee56cb6bc04550 Mon Sep 17 00:00:00 2001
-From: David Bolen <db3l....@gmail.com>
-Date: Wed, 07 Mar 2012 10:13:52 +0000
-Subject: fdo#46926: fix UNO struct comparison in Python 2
-
-This requires setting a rich comparison flag in Python 2, while Python 3
-uses rich comparison by default.
-(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
-(cherry picked from commit 387389b644b91808fdee74846b2d855382f48ed7)
-
-Signed-off-by: Caolán McNamara <caol...@redhat.com>
-
-From fc290187f08981c734d1f2d3f6649c94e3ac6f99 Mon Sep 17 00:00:00 2001
-From: David Bolen <db3l....@gmail.com>
-Date: Wed, 07 Mar 2012 10:07:42 +0000
-Subject: fdo#46859: adapt string type checks to work with both Python 2 and 3
-
-(regression from a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe)
-(cherry picked from commit 4634cbc237239da771e0f6a81f78171ecec726ba)
-
-Signed-off-by: Caolán McNamara <caol...@redhat.com>
-
-From 94541ebd9eb95a47f40bac95f5f6982a562e5a4d Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mst...@redhat.com>
-Date: Fri, 09 Mar 2012 10:28:28 +0000
-Subject: fdo#46926: fix the fix for Python 3
-
-Thanks to Maxime de Roucy for the hint that the "cmpfunc" type doesn't exist.
-(cherry picked from commit 06484b6946ac6a974c24af6624fb75bbe298c1e8)
-
-Signed-off-by: Caolán McNamara <caol...@redhat.com>
-
-diff -u b/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
---- b/pyuno/source/module/pyuno.cxx
-+++ b/pyuno/source/module/pyuno.cxx
-@@ -641,9 +641,16 @@
- {
- raisePyExceptionWithAny( makeAny( e ) );
- }
-- return Py_False;
-+ return (op == Py_EQ ? Py_False : Py_True);
- }
-
-+/* Python 2 has a tp_flags value for rich comparisons. Python 3 does not (on
by default) */
-+#ifdef Py_TPFLAGS_HAVE_RICHCOMPARE
-+#define TP_FLAGS (Py_TPFLAGS_HAVE_RICHCOMPARE)
-+#else
-+#define TP_FLAGS 0
-+#endif
-+
- static PyTypeObject PyUNOType =
- {
- PyVarObject_HEAD_INIT( &PyType_Type, 0 )
-@@ -654,7 +661,7 @@
- (printfunc) 0,
- (getattrfunc) PyUNO_getattr,
- (setattrfunc) PyUNO_setattr,
-- 0,
-+ /* this type does not exist in Python 3: (cmpfunc) */ 0,
- (reprfunc) PyUNO_repr,
- 0,
- 0,
-@@ -665,7 +672,7 @@
- (getattrofunc)0,
- (setattrofunc)0,
- NULL,
-- 0,
-+ TP_FLAGS,
- NULL,
- (traverseproc)0,
- (inquiry)0,
diff --git a/patches/series b/patches/series
index ef35c68..d62d428 100644
--- a/patches/series
+++ b/patches/series
@@ -30,9 +30,3 @@ move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
-fix-quickstart-shutdown.diff
-bibliography-no-crash-if-no-base.diff
-pyuno_fix_python2.diff
-prevent-sax-obsolete-dir.diff
-fix-for-kdelibs-enum.diff
-glib-single-include.patch
diff --git a/rules b/rules
index 97fc83a..7d0db62 100755
--- a/rules
+++ b/rules
@@ -63,9 +63,9 @@ export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.1.2 libreoffice-3.5.1.2
-GIT_TAG=libreoffice-3.5.1.2
-GIT_BRANCH=tag-libreoffice-3.5.1.2
+# use ./g checkout -b tag-libreoffice-3.5.2.2 libreoffice-3.5.2.2
+GIT_TAG=libreoffice-3.5.2.2
+GIT_BRANCH=tag-libreoffice-3.5.2.2
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sd09c-0002nh...@vasks.debian.org
