Date: Friday, April 22, 2011 @ 08:06:05 Author: andyrtr Revision: 120345
prepare 3.4 branch builds, add boost fix for gcc 4.6; switch to internal boost; install still broken Added: libreoffice/trunk/buildfix_boost.diff Modified: libreoffice/trunk/PKGBUILD Deleted: libreoffice/trunk/buildfix_kde4.diff libreoffice/trunk/buildfix_kde4_2.diff ----------------------+ PKGBUILD | 18 +++++++++--------- buildfix_boost.diff | 40 ++++++++++++++++++++++++++++++++++++++++ buildfix_kde4.diff | 30 ------------------------------ buildfix_kde4_2.diff | 34 ---------------------------------- 4 files changed, 49 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-22 11:25:38 UTC (rev 120344) +++ PKGBUILD 2011-04-22 12:06:05 UTC (rev 120345) @@ -63,9 +63,9 @@ http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 buildfix_i116795.diff - buildfix_kde4.diff - buildfix_kde4_2.diff + buildfix_boost.diff buildfix_ct2n.diff old-install-behaviour.diff) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -96,7 +96,8 @@ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) md5sums=('3b162daf1f68d8448fe2da774464b154' 'c6d5c8d049b71aedfa06e58ebfd1f66b' '5273abb776b01c8f6ab643d19cbd0b45' @@ -146,9 +147,9 @@ 'b4cae0700aa1c2aef7eb7f345365e6f1' '451ccf439a36a568653b024534669971' '90401bca927835b6fbae4a707ed187c8' + 'f02578f5218f217a9f20e9c30e119c6a' '0520d63c946e272ed3bdfc863fbdc42e' - '765cdd3c64b332e5c279b8ecd9663936' - '6eb230c49f747c0b9e74d0cfb0c8ef38' + 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' '4bd1a068a3065c5c59b01985247a875e') @@ -175,8 +176,7 @@ # buildfixes & bugfixes patch -Np1 -i ${srcdir}/buildfix_i116795.diff - patch -Np1 -i ${srcdir}/buildfix_kde4.diff - patch -Np1 -i ${srcdir}/buildfix_kde4_2.diff + patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np1 -i ${srcdir}/old-install-behaviour.diff @@ -202,7 +202,7 @@ # sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 fi - autoconf -v + autoconf -v -f ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" \ --with-unix-wrapper="libreoffice" \ --with-max-jobs=${MAKEFLAGS/-j/} \ @@ -253,7 +253,7 @@ --without-system-libtextcat\ --with-openldap\ --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ + --without-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mozilla\ Added: buildfix_boost.diff =================================================================== --- buildfix_boost.diff (rev 0) +++ buildfix_boost.diff 2011-04-22 12:06:05 UTC (rev 120345) @@ -0,0 +1,40 @@ +From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara <caol...@redhat.com> +Date: Tue, 05 Apr 2011 14:07:02 +0000 +Subject: silence some more of that annoying gcc#47679 + +--- +diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch +index 1c804aa..9b33a5f 100644 +--- a/boost/boost.gcc47679.patch ++++ b/boost/boost.gcc47679.patch +@@ -36,3 +36,26 @@ + template <int MaxDigits> + inline bool allow_more_digits(std::size_t i) + { ++--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 ++@@ -31,6 +31,8 @@ ++ ++ #include "boost/optional/optional_fwd.hpp" ++ +++#include <string.h> +++ ++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) ++ // VC6.0 has the following bug: ++ // When a templated assignment operator exist, an implicit conversion ++@@ -114,6 +116,11 @@ ++ ++ public: ++ +++ aligned_storage() +++ { +++ memset(&dummy_, 0, sizeof(dummy_)); +++ } +++ ++ void const* address() const { return &dummy_.data[0]; } ++ void * address() { return &dummy_.data[0]; } ++ } ; +-- +cgit v0.8.3-6-g21f6 + Deleted: buildfix_kde4.diff =================================================================== --- buildfix_kde4.diff 2011-04-22 11:25:38 UTC (rev 120344) +++ buildfix_kde4.diff 2011-04-22 12:06:05 UTC (rev 120345) @@ -1,30 +0,0 @@ -From ea898caa151fb8e94b6bdb00b1008b6da98fddad Mon Sep 17 00:00:00 2001 -From: Katarina Machalkova <kmachalk...@suse.cz> -Date: Thu, 07 Apr 2011 11:11:00 +0000 -Subject: Removed duplicate code block (mis-merge, prolly) - -This fixes build with --enable-kde4 ---- -diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index 7757014..ca435c8 100644 ---- a/vcl/unx/kde4/KDEXLib.cxx -+++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -219,16 +219,6 @@ static bool qt_event_filter( void* m ) - return false; - } - --static bool ( *old_qt_event_filter )( void* ); --static bool qt_event_filter( void* m ) --{ -- if( old_qt_event_filter != NULL && old_qt_event_filter( m )) -- return true; -- if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) -- return true; -- return false; --} -- - void KDEXLib::setupEventLoop() - { - old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); --- -cgit v0.8.3-6-g21f6 Deleted: buildfix_kde4_2.diff =================================================================== --- buildfix_kde4_2.diff 2011-04-22 11:25:38 UTC (rev 120344) +++ buildfix_kde4_2.diff 2011-04-22 12:06:05 UTC (rev 120345) @@ -1,34 +0,0 @@ -From 5dbb3b7b920045156e998ea2f0a93a870b93f09c Mon Sep 17 00:00:00 2001 -From: Katarina Machalkova <kmachalk...@suse.cz> -Date: Thu, 07 Apr 2011 11:28:50 +0000 -Subject: Fixed more build breakages with --enable-kde4 - ---- -diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx -index 4809b1f..5c787bb 100644 ---- a/vcl/source/gdi/gdimtf.cxx -+++ b/vcl/source/gdi/gdimtf.cxx -@@ -439,8 +439,6 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, sal_uLong nPos ) - - rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); - -- rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); -- - if( nPos > nObjCount ) - nPos = nObjCount; - -diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx -index 6cf466d..3b9a13c 100644 ---- a/vcl/unx/kde4/KDESalGraphics.cxx -+++ b/vcl/unx/kde4/KDESalGraphics.cxx -@@ -433,8 +433,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - const int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); - QRect rect( 0, 0, width, widgetRect.height()); - clipRegion = new QRegion( widgetRect.x(), widgetRect.y(), width, widgetRect.height()); -- XRectangle xRect = { widgetRect.x(), widgetRect.y(), width, widgetRect.height() }; -- XUnionRectWithRegion( &xRect, pTempClipRegion, pTempClipRegion ); - - QStyleOption option; - option.state = QStyle::State_Horizontal; --- -cgit v0.8.3-6-g21f6