[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 12 commits - configure.ac connectivity/source download.lst i18npool/qa i18npool/source python3/ExternalPackage_python3.mk python3/i100492-freebsd.patch.1 python3/python-3.3.0-15833.patch.1 python3/python-3.3.0-aix.patch.1 python3/python-3.3.0-elf-rpath.patch.1 python3/python-3.3.0-ffi-clang.patch.1 python3/python-3.3.3-aix.patch.1 python3/python-3.3.3-elf-rpath.patch.1 python3/UnpackedTarball_python3.mk pyuno/source sc/inc sc/source sd/source sw/source vcl/unx
Kohei Yoshida
kohei.yoshida at collabora.com
Sat Jan 11 10:49:35 PST 2014
configure.ac | 2
connectivity/source/drivers/jdbc/CallableStatement.cxx | 4
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 5
download.lst | 2
i18npool/qa/cppunit/test_breakiterator.cxx | 19 +-
i18npool/source/breakiterator/xdictionary.cxx | 6
i18npool/source/localedata/data/ltg_LV.xml | 9
i18npool/source/localedata/data/lv_LV.xml | 9
python3/ExternalPackage_python3.mk | 14 -
python3/UnpackedTarball_python3.mk | 11 -
python3/i100492-freebsd.patch.1 | 2
python3/python-3.3.0-15833.patch.1 | 25 --
python3/python-3.3.0-aix.patch.1 | 156 -----------------
python3/python-3.3.0-elf-rpath.patch.1 | 13 -
python3/python-3.3.0-ffi-clang.patch.1 | 40 ----
python3/python-3.3.3-aix.patch.1 | 145 +++++++++++++++
python3/python-3.3.3-elf-rpath.patch.1 | 13 +
pyuno/source/loader/pythonloader.py | 2
sc/inc/scextopt.hxx | 7
sc/source/core/tool/interpr2.cxx | 11 -
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 3
sc/source/filter/xml/xmlimprt.hxx | 5
sc/source/filter/xml/xmltabi.cxx | 3
sc/source/ui/view/scextopt.cxx | 12 +
sc/source/ui/view/viewdata.cxx | 4
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 44 ++++
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 12 -
sw/source/core/layout/pagedesc.cxx | 11 -
vcl/unx/gtk/a11y/atkutil.cxx | 2
vcl/unx/gtk/a11y/atkwindow.cxx | 2
31 files changed, 317 insertions(+), 278 deletions(-)
New commits:
commit 6cd2fc41f37bf230c59996a4cd62e2525f37539c
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Jan 10 15:10:23 2014 -0500
fdo#73484: Ensure that we import all tab settings from Excel.
The old code would not import settings of the last sheet if maTabData was
not large enough before the loop begins. Enlarge maTabData ahead of time
to ensure we load all tab settings.
(cherry picked from commit 3e87471b6815a3cad48cab2ef81073bad5453c56)
Conflicts:
sc/inc/scextopt.hxx
Change-Id: I9093a93ef26ccba9fef06a8929d1d86311f5c55d
Reviewed-on: https://gerrit.libreoffice.org/7383
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 22e6ab6..80513f2 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -96,6 +96,13 @@ public:
/** Returns read access to the settings of a sheet, if extant; otherwise 0. */
const ScExtTabSettings* GetTabSettings( SCTAB nTab ) const;
+
+ /**
+ * @return index of the last sheet that has settings, or -1 if no tab
+ * settings are present.
+ */
+ SCTAB GetLastTab() const;
+
/** Returns read/write access to the settings of a sheet, may create a new struct. */
ScExtTabSettings& GetOrCreateTabSettings( SCTAB nTab );
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 39670ca..0a8031d 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -68,6 +68,8 @@ public:
const ScExtTabSettings* GetTabSettings( SCTAB nTab ) const;
ScExtTabSettings& GetOrCreateTabSettings( SCTAB nTab );
+ SCTAB GetLastTab() const;
+
private:
typedef ::boost::shared_ptr< ScExtTabSettings > ScExtTabSettingsRef;
typedef ::std::map< SCTAB, ScExtTabSettingsRef > ScExtTabSettingsMap;
@@ -109,6 +111,11 @@ ScExtTabSettings& ScExtTabSettingsCont::GetOrCreateTabSettings( SCTAB nTab )
return *rxTabSett;
}
+SCTAB ScExtTabSettingsCont::GetLastTab() const
+{
+ return maMap.empty() ? -1 : maMap.rbegin()->first;
+}
+
void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap )
{
maMap.clear();
@@ -183,6 +190,11 @@ const ScExtTabSettings* ScExtDocOptions::GetTabSettings( SCTAB nTab ) const
return mxImpl->maTabSett.GetTabSettings( nTab );
}
+SCTAB ScExtDocOptions::GetLastTab() const
+{
+ return mxImpl->maTabSett.GetLastTab();
+}
+
ScExtTabSettings& ScExtDocOptions::GetOrCreateTabSettings( SCTAB nTab )
{
return mxImpl->maTabSett.GetOrCreateTabSettings( nTab );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 2bfc181..67ce9aa 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2468,6 +2468,10 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
pView->SetPendingRelTabBarWidth( rDocSett.mfTabBarWidth );
// sheet settings
+ SCTAB nLastTab = rDocOpt.GetLastTab();
+ if (static_cast<SCTAB>(maTabData.size()) <= nLastTab)
+ maTabData.resize(nLastTab+1);
+
for( SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabData.size()); ++nTab )
{
if( const ScExtTabSettings* pTabSett = rDocOpt.GetTabSettings( nTab ) )
commit fbb6e13f984c63a7d330c9b88356cdd6cc49799f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Oct 9 23:11:28 2013 +0200
Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2
Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7
Reviewed-on: https://gerrit.libreoffice.org/6244
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 2f8757e961d6156d529c2ab9131747071236f085)
Reviewed-on: https://gerrit.libreoffice.org/7362
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e1cb134..adeda2b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -86,7 +86,9 @@ atk_wrapper_focus_idle_handler (gpointer data)
#ifdef ENABLE_TRACING
fprintf(stderr, "notifying focus event for %p\n", atk_obj);
#endif
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify(atk_obj);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// #i93269#
// emit text_caret_moved event for <XAccessibleText> object,
// if cursor is inside the <XAccessibleText> object.
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index fd396c8..0bddf07 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,7 +122,9 @@ static gint
ooo_window_wrapper_clear_focus(gpointer)
{
SolarMutexGuard aGuard;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify( NULL );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
return FALSE;
}
commit 2712344013f0cbb1554ccf6209a9c9ecbfd57df0
Author: Rohit Deshmukh <rohit.deshmukh at synerzip.com>
Date: Fri Dec 6 15:42:53 2013 +0530
fdo#72219: Fix for corruption of symbols in docx
Issue:
OUString uses UTF-16, so for a Unicode surrogate character there are 2
values stored, not just 1.
So we are getting assert failure in "rtl_uString_iterateCodePoints" method.
erAck: Underlying cause was that the dictionary breakiterator misused
UTF-16 positions as Unicode code point positions.
Change-Id: I923485f56c2d879b63687adaea2b489a3479991c
Reviewed-on: https://gerrit.libreoffice.org/6955
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit d8fd15875901d584a4bbcc07c927fa20332e4841)
Reviewed-on: https://gerrit.libreoffice.org/7322
(cherry picked from commit 994d0c9e7aa8d1a7602e61b770991da980c1cde5)
Reviewed-on: https://gerrit.libreoffice.org/7324
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 41e4077..b4174ba 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -44,7 +44,7 @@ public:
#endif
void testKhmer();
void testJapanese();
-
+ void testChinese();
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
CPPUNIT_TEST(testGraphemeIteration);
@@ -60,6 +60,7 @@ public:
CPPUNIT_TEST(testKhmer);
#endif
CPPUNIT_TEST(testJapanese);
+ CPPUNIT_TEST(testChinese);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference<i18n::XBreakIterator> m_xBreak;
@@ -909,6 +910,22 @@ void TestBreakIterator::testJapanese()
}
}
+void TestBreakIterator::testChinese()
+{
+ lang::Locale aLocale;
+ aLocale.Language = "zh";
+ aLocale.Country = "CN";
+ i18n::Boundary aBounds;
+
+ {
+ const sal_Unicode CHINESE[] = { 0x6A35, 0x6A30, 0x69FE, 0x8919, 0xD867, 0xDEDB };
+
+ OUString aTest(CHINESE, SAL_N_ELEMENTS(CHINESE));
+ aBounds = m_xBreak->getWordBoundary(aTest, 4, aLocale,
+ i18n::WordType::DICTIONARY_WORD, true);
+ CPPUNIT_ASSERT(aBounds.startPos == 4 && aBounds.endPos == 6);
+ }
+}
void TestBreakIterator::setUp()
{
BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 72da09f..3b43fa3 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -383,9 +383,11 @@ Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, s
if (u_isWhitespace(ch))
i--;
}
+
boundary.endPos = boundary.startPos;
- rText.iterateCodePoints(&boundary.endPos, aCache.wordboundary[i]);
- rText.iterateCodePoints(&boundary.startPos, aCache.wordboundary[i-1]);
+ boundary.endPos += aCache.wordboundary[i];
+ boundary.startPos += aCache.wordboundary[i-1];
+
} else {
boundary.startPos = anyPos;
if (anyPos < len) rText.iterateCodePoints(&anyPos, 1);
commit ad0118eebe847ceac41f6617ffb91e99db09e190
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Jan 6 16:40:59 2014 +0100
fdo#37167 create statement before execute/wasNull/getBoolean
This populates "object" member variable.
The "createStatement" calls were removed in:
commit b9392a36645d8632b97ad79240f483b3a1683b61
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Apr 23 10:42:05 2009 +0000
CWS-TOOLING: integrate CWS dbaperf1
This was most probably in error since the call is not removed from the
other modified member functions in this commit and/or failed to
aaccount for the scenario of no parameter (and thus no setXXX call
before execute).
Change-Id: Ic0e7b7b64ea496791f32c1416aa7d4416f909616
Reviewed-on: https://gerrit.libreoffice.org/7280
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 7ab349f..50cce64 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -69,12 +69,16 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th
// -------------------------------------------------------------------------
sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLException, RuntimeException)
{
+ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+ createStatement(t.pEnv);
static jmethodID mID(NULL);
return callBooleanMethod( "wasNull", mID );
}
sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException)
{
+ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+ createStatement(t.pEnv);
static jmethodID mID(NULL);
return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
}
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 0458ad7..5f9dafe 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -96,6 +96,8 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
+ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+ createStatement(t.pEnv);
static jmethodID mID(NULL);
return callBooleanMethod( "execute", mID );
}
@@ -106,6 +108,9 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE );
+
+ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
+ createStatement(t.pEnv);
static jmethodID mID(NULL);
return callIntMethod("executeUpdate",mID);
}
commit b560e538c7fb64e753177c4da97b2380882d43d5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 12 10:39:06 2013 +0000
fix occasional crash on dragging and dropping pages in slidesorters
pages go into the cache, and sometimes they get deleted before the
cache gets processed. Remove deleted pages when they go away
Change-Id: I291072a8541f4ca36979e9914975d81cc23a9497
(cherry picked from commit abe9d1463282690313aaf91d2a54011d10b900b9)
(cherry picked from commit 026e9335d792c6557255f064960e0ef6d28728e0)
Reviewed-on: https://gerrit.libreoffice.org/7053
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 835787b..cdc2b57 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -94,6 +94,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext)
RequestQueue::~RequestQueue (void)
{
+ Clear();
}
@@ -120,7 +121,15 @@ void RequestQueue::AddRequest (
// order.
sal_Int32 nPriority (mpCacheContext->GetPriority(aKey));
Request aRequest (aKey, nPriority, eRequestClass);
- mpRequestQueue->insert(aRequest);
+
+ std::pair<Container::iterator,bool> ret = mpRequestQueue->insert(aRequest);
+ bool bInserted = ret.second == true;
+
+ if (bInserted)
+ {
+ SdrPage *pPage = const_cast<SdrPage*>(aRequest.maKey);
+ pPage->AddPageUser(*this);
+ }
SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
@@ -131,8 +140,11 @@ void RequestQueue::AddRequest (
#endif
}
-
-
+void RequestQueue::PageInDestruction(const SdrPage& rPage)
+{
+ //remove any requests pending for this page which is going away now
+ RemoveRequest(&rPage);
+}
bool RequestQueue::RemoveRequest (
CacheKey aKey)
@@ -152,7 +164,11 @@ bool RequestQueue::RemoveRequest (
mnMinimumPriority++;
else if (aRequestIterator->mnPriorityInClass == mnMaximumPriority-1)
mnMaximumPriority--;
+
+ SdrPage *pPage = const_cast<SdrPage*>(aRequestIterator->maKey);
+ pPage->RemovePageUser(*this);
mpRequestQueue->erase(aRequestIterator);
+
bRequestWasRemoved = true;
if (bRequestWasRemoved)
@@ -229,7 +245,10 @@ void RequestQueue::PopFront (void)
{
SSCD_SET_STATUS(maRequestQueue.begin()->mpData->GetPage(),NONE);
- mpRequestQueue->erase(mpRequestQueue->begin());
+ Container::const_iterator aIter(mpRequestQueue->begin());
+ SdrPage *pPage = const_cast<SdrPage*>(aIter->maKey);
+ pPage->RemovePageUser(*this);
+ mpRequestQueue->erase(aIter);
// Reset the priority counter if possible.
if (mpRequestQueue->empty())
@@ -256,6 +275,12 @@ void RequestQueue::Clear (void)
{
::osl::MutexGuard aGuard (maMutex);
+ for (Container::iterator aI = mpRequestQueue->begin(), aEnd = mpRequestQueue->end(); aI != aEnd; ++aI)
+ {
+ SdrPage *pPage = const_cast<SdrPage*>(aI->maKey);
+ pPage->RemovePageUser(*this);
+ }
+
mpRequestQueue->clear();
mnMinimumPriority = 0;
mnMaximumPriority = 1;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index 78a4627..088a135 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -24,7 +24,8 @@
#include "cache/SlsCacheContext.hxx"
#include "taskpane/SlideSorterCacheDisplay.hxx"
#include <drawdoc.hxx>
-#include "osl/mutex.hxx"
+#include <osl/mutex.hxx>
+#include <svx/sdrpageuser.hxx>
namespace sd { namespace slidesorter { namespace cache {
@@ -34,11 +35,11 @@ class RequestData;
/** The request queue stores requests that are described by the RequestData
sorted according to priority class and then priority.
*/
-class RequestQueue
+class RequestQueue : public sdr::PageUser
{
public:
RequestQueue (const SharedCacheContext& rpCacheContext);
- ~RequestQueue (void);
+ virtual ~RequestQueue();
/** Insert a request with highest or lowest priority in its priority
class. When the request is already present then it is first
@@ -99,6 +100,11 @@ public:
*/
::osl::Mutex& GetMutex (void);
+ /** Ensure we don't hand out a page deleted before anyone got a
+ chance to process it
+ */
+ virtual void PageInDestruction(const SdrPage& rPage);
+
private:
::osl::Mutex maMutex;
class Container;
commit 559b69a106b33e93e73f23a2be978c41f40b01d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 7 15:37:16 2014 +0100
No serviceNames attribute in Loader
Change-Id: I6cc001d18683fc412f0ec0b6a33054d6e745463f
(cherry picked from commit 431b49fbec68c17c7a486ef0f577107d3dd27e55)
Reviewed-on: https://gerrit.libreoffice.org/7294
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 3074d0f..1d1b7de 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -157,7 +157,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
return g_implementationName
def supportsService( self, ServiceName ):
- return ServiceName in self.serviceNames
+ return ServiceName in self.getSupportedServiceNames()
def getSupportedServiceNames( self ):
return g_supportedServices
commit b5dcedf68f7850cfbab1bfdd95f56ed19b0cf205
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Tue Jan 7 12:42:25 2014 -0200
Fix fdo#70807: Page Style method isInUse() broken
We need to check m_FirstMaster and m_FirstLeft too to verify is a style is used
Thanks a lot mst__ for pointing how to fix this!
Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8
Reviewed-on: https://gerrit.libreoffice.org/7295
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
(cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 05a24d1..1f7addb 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -156,13 +156,16 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
|*
*************************************************************************/
-
- // gets information from Modify
+// gets information from Modify
bool SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
{
if( !aMaster.GetInfo( rInfo ) )
- return false; // found
- return aLeft.GetInfo( rInfo );
+ return false; // found
+ if ( !aLeft.GetInfo( rInfo ) )
+ return false ;
+ if ( !m_FirstMaster.GetInfo( rInfo ) )
+ return false;
+ return m_FirstLeft.GetInfo( rInfo );
}
/*************************************************************************
commit b80b80423ea59e13f19182242aa7d49adc0f57a6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Dec 28 12:44:02 2013 +0100
read elements/attribs written to extension namespace
Related to validation errors with fdo#31296
Change-Id: I1b76e05a9996b1123db164629475a3f7b07dda69
Reviewed-on: https://gerrit.libreoffice.org/7222
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 28c3ace..3378541 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -828,6 +828,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
{ XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION },
+ { XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT },
{ XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS },
{ XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
@@ -856,6 +857,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
{
{ XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS },
{ XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS },
+ { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT },
+ { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT },
XML_TOKEN_MAP_END
};
pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap);
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 0957a9f..3fb584a 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -240,6 +240,7 @@ enum ScXMLTableTokens
XML_TOK_TABLE_ROW_GROUP,
XML_TOK_TABLE_HEADER_ROWS,
XML_TOK_TABLE_PROTECTION,
+ XML_TOK_TABLE_PROTECTION_EXT,
XML_TOK_TABLE_ROWS,
XML_TOK_TABLE_ROW,
XML_TOK_TABLE_SOURCE,
@@ -254,7 +255,9 @@ enum ScXMLTableTokens
enum ScXMLTokenProtectionTokens
{
XML_TOK_TABLE_SELECT_PROTECTED_CELLS,
- XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
+ XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS,
+ XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT,
+ XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
};
enum ScXMLTableRowsTokens
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index a1bc801..f15a602 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -286,6 +286,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
rLName, xAttrList );
break;
case XML_TOK_TABLE_PROTECTION:
+ case XML_TOK_TABLE_PROTECTION_EXT:
pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList );
break;
case XML_TOK_TABLE_ROW_GROUP:
@@ -454,9 +455,11 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
{
case XML_TOK_TABLE_SELECT_PROTECTED_CELLS:
+ case XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT:
bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE);
break;
case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS:
+ case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT:
bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE);
break;
default:
commit 6bf202d8fe083f32d1ced2e042c58fb675c026dc
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Dec 28 08:13:12 2013 +0100
only write new element and attributes in ODF 1.2 extended
Change-Id: I038f200f500ef1c6a0815b6332fb17bb2f62282a
Reviewed-on: https://gerrit.libreoffice.org/7221
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 0fbc692..4f97260 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2709,7 +2709,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe
AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE);
SvXMLElementExport aElemT(*this, sElemTab, true, true);
- if (pProtect && pProtect->isProtected())
+ if (pProtect && pProtect->isProtected() && getDefaultVersion() > SvtSaveOptions::ODFVER_012)
{
if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
commit c3292a7a99eb5ecd6d1784c0b754ee9455cec3cd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 12 12:37:43 2013 +0000
pages with equal Priority and Class getting dropped
Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715
(cherry picked from commit 9790588da4b2de455ffc7a2cc69f26539823c3da)
(cherry picked from commit be366ad7690b190c5ef4dc42311a4df6b7dcce4b)
Reviewed-on: https://gerrit.libreoffice.org/7054
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index d02bae1..835787b 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -40,9 +40,14 @@ public:
bool operator() (const Request& rRequest1, const Request& rRequest2)
{
if (rRequest1.meClass == rRequest2.meClass)
- return (rRequest1.mnPriorityInClass > rRequest2.mnPriorityInClass);
- else
- return (rRequest1.meClass < rRequest2.meClass);
+ {
+ if (rRequest1.mnPriorityInClass == rRequest2.mnPriorityInClass)
+ {
+ return rRequest1.maKey < rRequest2.maKey;
+ }
+ return rRequest1.mnPriorityInClass > rRequest2.mnPriorityInClass;
+ }
+ return rRequest1.meClass < rRequest2.meClass;
}
};
/** Request data is compared arbitrarily by their addresses in memory.
commit 0dce70407e27ccb6b6c8845a0d764b94cd4e556d
Author: Eike Rathke <erack at redhat.com>
Date: Thu Jan 2 21:53:36 2014 +0100
added "EEK" and "LVL" to EUROCONVERT(), "EUR" to [*-LV] locale data fdo#73239
This is a combination of 3 commits.
added Estonian "EEK" to EUROCONVERT(), fdo#73239
(cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf)
Conflicts:
sc/source/core/tool/interpr2.cxx
added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
(cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb)
added Latvian "LVL" to EUROCONVERT(), fdo#73239
(cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761)
Change-Id: I82085b6661c954b2afbf22b8b8ed5bd8c48cc50e
Reviewed-on: https://gerrit.libreoffice.org/7263
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/i18npool/source/localedata/data/ltg_LV.xml b/i18npool/source/localedata/data/ltg_LV.xml
index 12fe4b0..6765077 100644
--- a/i18npool/source/localedata/data/ltg_LV.xml
+++ b/i18npool/source/localedata/data/ltg_LV.xml
@@ -331,7 +331,14 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
+ <Currency default="true" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="true">
<CurrencyID>LVL</CurrencyID>
<CurrencySymbol>Ls</CurrencySymbol>
<BankSymbol>LVL</BankSymbol>
diff --git a/i18npool/source/localedata/data/lv_LV.xml b/i18npool/source/localedata/data/lv_LV.xml
index 456214d..68483e5 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -331,7 +331,14 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
+ <Currency default="true" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="true">
<CurrencyID>LVL</CurrencyID>
<CurrencySymbol>Ls</CurrencySymbol>
<BankSymbol>LVL</BankSymbol>
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a0f270d..14bba4f 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2625,8 +2625,11 @@ void ScInterpreter::ScHyperLink()
}
}
-
-bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
+/** Resources at the website of the European Commission:
+ http://ec.europa.eu/economy_finance/euro/adoption/conversion/
+ http://ec.europa.eu/economy_finance/euro/countries/
+ */
+static bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
{
struct ConvertInfo
{
@@ -2651,7 +2654,9 @@ bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
{ "SIT", 239.640, 2 },
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
- { "SKK", 30.1260, 2 }
+ { "SKK", 30.1260, 2 },
+ { "EEK", 15.6466, 2 },
+ { "LVL", 0.702804, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( aConvertTable[0] );
commit 87c0ffa1ed975592066e315a65c3c53b6a0bfa56
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 6 16:05:56 2014 +0100
fdo#73087: python3: upgrade to version 3.3.3
- drop obsolete/upstreamed patches:
python-3.3.0-ffi-clang.patch.1
python-3.3.0-15833.patch.1
one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)
Conflicts:
external/python3/python-3.3.0-aix.patch.1
external/python3/python-3.3.0-elf-rpath.patch.1
external/python3/python-3.3.3-aix.patch.1
external/python3/python-3.3.3-elf-rpath.patch.1
python3/ExternalPackage_python3.mk
python3/UnpackedTarball_python3.mk
python3/python-3.3.0-15833.patch.1
python3/python-3.3.0-aix.patch.1
python3/python-3.3.0-elf-rpath.patch.1
python3/python-3.3.0-ffi-clang.patch.1
Change-Id: I12f0f78a172067986b63455847015ea2430a084c
diff --git a/configure.ac b/configure.ac
index a2f03da..0788024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7572,7 +7572,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
diff --git a/download.lst b/download.lst
index ea91017..789221f 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 597062c..3cd2126 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -116,6 +116,13 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+ LO_lib/_sysconfigdata.py \
+))
+endif
+
# packages not shipped:
# dbm, sqlite3 - need some database stuff
# curses - need curses to build the C module
@@ -150,13 +157,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
Lib/plat-aix4/IN.py \
))
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
- Lib/_sysconfigdata.py \
-))
-endif
-
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 0d5fce5..9bf6961 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -22,27 +22,20 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/i100492-freebsd.patch.1 \
python3/python-3.3.0-i42553.patch.2 \
- python3/python-3.3.0-aix.patch.1 \
+ python3/python-3.3.3-aix.patch.1 \
python3/python-3.3.0-darwin.patch.1 \
python3/python-3.3.0-msvc2012.patch.1 \
python3/python-3.3.0-msvc-disable.patch.1 \
python3/python-3.3.0-msvc-x64.patch.1 \
python3/python-3.3.0-ssl.patch.1 \
python3/python-3.3.0-implicit-int.patch.1 \
- python3/python-3.3.0-ffi-clang.patch.1 \
python3/python-3.3.0-gcc-4.8.patch.1 \
python3/python-3.3.0-pythreadstate.patch.1 \
))
-ifneq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_patches,python3,\
- python3/python-3.3.0-15833.patch.1 \
-))
-endif
-
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
- python3/python-3.3.0-elf-rpath.patch.1 \
+ python3/python-3.3.3-elf-rpath.patch.1 \
))
endif
diff --git a/python3/i100492-freebsd.patch.1 b/python3/i100492-freebsd.patch.1
index d797ac1..7189a7e 100644
--- a/python3/i100492-freebsd.patch.1
+++ b/python3/i100492-freebsd.patch.1
@@ -22,7 +22,7 @@ FreeBSD porting fixes, patch by maho at openoffice.org
# on platforms known to behave badly.
- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5',
- 'os2emx')
+ 'os2emx', 'hp-ux11')
def _run_and_join(self, script):
--- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000
diff --git a/python3/python-3.3.0-15833.patch.1 b/python3/python-3.3.0-15833.patch.1
deleted file mode 100644
index 71cef94..0000000
--- a/python3/python-3.3.0-15833.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
---- a/Lib/importlib/_bootstrap.py
-+++ b/Lib/importlib/_bootstrap.py
-@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
- except FileExistsError:
- # Probably another Python process already created the dir.
- continue
-- except PermissionError:
-- # If can't get proper access, then just forget about writing
-- # the data.
-+ except OSError as exc:
-+ # Could be a permission error, read-only filesystem: just forget
-+ # about writing the data.
-+ _verbose_message('could not create {!r}: {!r}', parent, exc)
- return
- try:
- _write_atomic(path, data, _mode)
- _verbose_message('created {!r}', path)
-- except (PermissionError, FileExistsError):
-- # Don't worry if you can't write bytecode or someone is writing
-- # it at the same time.
-- pass
-+ except OSError as exc:
-+ # Same as above: just don't write the bytecode.
-+ _verbose_message('could not create {!r}: {!r}', path, exc)
diff --git a/python3/python-3.3.0-ffi-clang.patch.1 b/python3/python-3.3.0-ffi-clang.patch.1
deleted file mode 100644
index 0dcbc42..0000000
--- a/python3/python-3.3.0-ffi-clang.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-fix clang build problem:
-
-python3/Modules/_ctypes/libffi/src/x86/sysv.S:389:17: error: invalid variant ´rel´
-Patch by: Rafael Avila de Espindola <respindola at mozilla dot com>
-https://417179.bugs.gentoo.org/attachment.cgi?id=313299
-
-diff -ru python3.old/Modules/_ctypes/libffi/configure.ac python3/Modules/_ctypes/libffi/configure.ac
---- python3.old/Modules/_ctypes/libffi/configure.ac 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/_ctypes/libffi/configure.ac 2012-11-27 16:12:44.421564130 +0100
-@@ -303,10 +303,10 @@
- if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
- AC_CACHE_CHECK([assembler supports pc related relocs],
- libffi_cv_as_x86_pcrel, [
-- libffi_cv_as_x86_pcrel=yes
-+ libffi_cv_as_x86_pcrel=no
- echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-- libffi_cv_as_x86_pcrel=no
-+ if $CC $CFLAGS -c conftest.s > /dev/null; then
-+ libffi_cv_as_x86_pcrel=yes
- fi
- ])
- if test "x$libffi_cv_as_x86_pcrel" = xyes; then
-diff -ru python3.old/Modules/_ctypes/libffi/configure python3/Modules/_ctypes/libffi/configure
---- python3.old/Modules/_ctypes/libffi/configure 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/_ctypes/libffi/configure 2012-11-27 16:12:44.420564130 +0100
-@@ -14322,10 +14322,10 @@
- $as_echo_n "(cached) " >&6
- else
-
-- libffi_cv_as_x86_pcrel=yes
-+ libffi_cv_as_x86_pcrel=no
- echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-- libffi_cv_as_x86_pcrel=no
-+ if $CC $CFLAGS -c conftest.s > /dev/null; then
-+ libffi_cv_as_x86_pcrel=yes
- fi
-
- fi
diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.3-aix.patch.1
similarity index 77%
rename from python3/python-3.3.0-aix.patch.1
rename to python3/python-3.3.3-aix.patch.1
index f8dceb2..f510a81 100644
--- a/python3/python-3.3.0-aix.patch.1
+++ b/python3/python-3.3.3-aix.patch.1
@@ -1,7 +1,7 @@
build with GCC on AIX
---- Python-3.3.0/configure 2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.0/configure 2012-11-28 09:06:23.037963934 +0000
+--- Python-3.3.3/configure 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.3/configure 2012-11-28 09:06:23.037963934 +0000
@@ -3426,8 +3426,6 @@
else
@@ -49,8 +49,8 @@ build with GCC on AIX
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.0/configure.ac 2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.0/configure.ac 2012-11-28 09:06:23.038963946 +0000
+--- Python-3.3.3/configure.ac 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.3/configure.ac 2012-11-28 09:06:23.038963946 +0000
@@ -545,8 +545,6 @@
without_gcc=$withval;;
esac], [
@@ -98,8 +98,8 @@ build with GCC on AIX
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.0/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
-+++ Python-3.3.0/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
+--- Python-3.3.3/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
++++ Python-3.3.3/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
@@ -493,14 +493,20 @@
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
@@ -130,21 +130,10 @@ build with GCC on AIX
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH="`pwd`${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"; \
+ export LIBPATH; LIBPATH="`pwd`${LIBPATH:+:$LIBPATH}"; \
export EXE; EXE="$(BUILDEXE)"; \
- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-
---- Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:05:45.889528418 +0000
-+++ Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:06:23.046964040 +0000
-@@ -16,7 +16,7 @@
- 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
- 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
- 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
-- 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
-+ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
- 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
- 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
- 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
---- Python-3.3.0/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
-+++ Python-3.3.0/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
+ if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
+ export PYTHON_FOR_BUILD; \
+--- Python-3.3.3/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
++++ Python-3.3.3/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
@@ -177,7 +177,7 @@
#_bisect _bisectmodule.c # Bisection algorithms
#_heapq _heapqmodule.c # Heap queue algorithm
diff --git a/python3/python-3.3.0-elf-rpath.patch.1 b/python3/python-3.3.3-elf-rpath.patch.1
similarity index 94%
rename from python3/python-3.3.0-elf-rpath.patch.1
rename to python3/python-3.3.3-elf-rpath.patch.1
index 0007d6b..33de913 100644
--- a/python3/python-3.3.0-elf-rpath.patch.1
+++ b/python3/python-3.3.3-elf-rpath.patch.1
@@ -9,5 +9,5 @@ set RPATH (only to be used on ELF platforms)
- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN
- platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
+ platform: $(BUILDPYTHON) pybuilddir.txt
$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
More information about the Libreoffice-commits
mailing list