diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2015-04-11 21:20:57 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2015-04-11 21:20:57 +0000 |
| commit | 16b6d2491b1f524fcc73af69fbc38616fb60bc5c (patch) | |
| tree | 24bf675ac00429f5d998a119aaa303cfa8a19050 /app-office | |
| parent | Bump SLOT dep dev-java/cglib:2.2 to :3 wrt bug 546288. Drop ppc ppc64 and x86... (diff) | |
| download | gentoo-2-16b6d2491b1f524fcc73af69fbc38616fb60bc5c.tar.gz gentoo-2-16b6d2491b1f524fcc73af69fbc38616fb60bc5c.tar.bz2 gentoo-2-16b6d2491b1f524fcc73af69fbc38616fb60bc5c.zip | |
Remove old
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0B08240A96F66571)
Diffstat (limited to 'app-office')
24 files changed, 25 insertions, 4645 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 6b4ebc4c4091..5c5f9b3973b4 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.629 2015/04/11 20:43:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.630 2015/04/11 21:20:57 dilfridge Exp $ + + 11 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org> + -libreoffice-4.3.5.2.ebuild, -libreoffice-4.3.6.2.ebuild, + -libreoffice-4.3.9999.ebuild, -libreoffice-4.4.0.3.ebuild, + -files/libreoffice-3.7-system-pyuno.patch, + -files/libreoffice-4.1.3.2-kde-calchang.patch, + -files/libreoffice-4.1.3.2-kde-recursiverepaint.patch, + -files/libreoffice-4.1.4.2-curl-config.patch, + -files/libreoffice-4.2.0.4-curl-config.patch, + -files/libreoffice-4.2.3.3-kde4-startup.patch, + -files/libreoffice-4.2.3.3-kde4-timer-mutex.patch, + -files/libreoffice-4.2.6.3-jpeg9.patch, + -files/libreoffice-4.2.8.2-boost-1.56.0.patch, + -files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch, + -files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch, + -files/libreoffice-4.3.1.2-implement--with-system-gltf.patch, + -files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch, + -files/libreoffice-4.3.4.1-boost-1.56.0.patch, + -files/libreoffice-4.3.5.2-DPI.patch, + -files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch, + -files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch, + -files/libreoffice-4.3.5.2-system-opencollada.patch, + -files/libreoffice-9999-curl-config.patch: + Remove old 11 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org> libreoffice-4.4.1.2.ebuild, libreoffice-4.4.2.2.ebuild, diff --git a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch deleted file mode 100644 index fe93728c289c..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index a259bf6..672fa23 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index 4ff2606..6a05eed 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # -+import os - import sys - -+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 99d3b03..704edab 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch deleted file mode 100644 index 8cf3a2b34928..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 95f60222e75486336b6569afa8f34d60b51c94ad Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Thu, 21 Nov 2013 12:40:57 +0100 -Subject: [PATCH] fdo#67011: Run Display::Yield through KDEXLib::Yield. - -Drag'n'Drop is handled in a second thread, which tries to "yield -the display" while the main Qt thread probably is already -yielding. Both need the YieldMutex, which freezes the application -until the D'n'D thread times out. - -Trying to yield the display throught the application yield -results in a recursive loop. - -So this catches and breaks the recursion, but just inside the Qt -thread, so other processes can "yield on the display", instead -of simply disabling the Display::Yield. - -Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f -Reviewed-on: https://gerrit.libreoffice.org/6750 -Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> -Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> ---- - vcl/unx/kde4/KDESalDisplay.cxx | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx -index 21440fc..ee330e7 100644 ---- a/vcl/unx/kde4/KDESalDisplay.cxx -+++ b/vcl/unx/kde4/KDESalDisplay.cxx -@@ -25,6 +25,8 @@ - #include <assert.h> - #include <unx/saldata.hxx> - -+#include <qthread.h> -+ - SalKDEDisplay* SalKDEDisplay::selfptr = NULL; - - SalKDEDisplay::SalKDEDisplay( Display* pDisp ) -@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay() - - void SalKDEDisplay::Yield() - { -- if( DispatchInternalEvent() ) -+ // We yield the display throught the main Qt thread. -+ // Actually this Yield may call the Display::Yield, which results in an -+ // unlimited cycle. -+ static bool break_cyclic_yield_recursion = false; -+ bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() ); -+ -+ if( DispatchInternalEvent() || break_cyclic_yield_recursion ) - return; - -+ if( is_qt_gui_thread ) -+ break_cyclic_yield_recursion = true; -+ - DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == - osl::Thread::getCurrentIdentifier(), - "will crash soon since solar mutex not locked in SalKDEDisplay::Yield" ); - -- XEvent event; -- XNextEvent( pDisp_, &event ); -- if( checkDirectInputEvent( &event )) -- return; -- qApp->x11ProcessEvent( &event ); -+ static_cast<KDEXLib*>(GetXLib())->Yield( true, false ); -+ -+ if( is_qt_gui_thread ) -+ break_cyclic_yield_recursion = false; - } - - // HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because --- -1.8.5.1 - diff --git a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch deleted file mode 100644 index 7067c019a33d..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch +++ /dev/null @@ -1,141 +0,0 @@ -Minor modification for libreoffice-4.1: in line 137, reset Q_EMIT to -emit... dilfridge@gentoo.org - -From 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -Date: Fri, 15 Nov 2013 13:42:15 +0000 -Subject: Rewrite Qt4 based nested yield mutex locking. - -The Qt event loop may start a nested event loop, when checking for -clipboard and Drag'n'Drop events. - -Previously this was handled by running this nested yield loop -inside the main glib loop using - qApp->clipboard()->property( "useEventLoopWhenWaiting" ); - -But this results in nested paint events which crash LO: - QWidget::repaint: Recursive repaint detected - -To prevend yield mutex deadlocks, check for nested event loops -and always release the yield lock before starting the nested Yield -event loop. - -This fixes fdo#69002. - -Change-Id: I7e827abd3489783053ec7123372742a32555875d -Reviewed-on: https://gerrit.libreoffice.org/6685 -Reviewed-by: Michael Meeks <michael.meeks@collabora.com> -Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> -Tested-by: Thorsten Behrens <thb@documentfoundation.org> ---- -diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx -index ee4a6e3..cb20be4 100644 ---- a/vcl/unx/kde4/KDE4FilePicker.cxx -+++ b/vcl/unx/kde4/KDE4FilePicker.cxx -@@ -58,6 +58,8 @@ - - #undef Region - -+#include "generic/geninst.h" -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::ui::dialogs; - using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -@@ -253,28 +255,16 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() - _dialog->setFilter(_filter); - _dialog->filterWidget()->setEditable(false); - -- // At this point, SolarMutex is held. Opening the KDE file dialog here -- // can lead to QClipboard asking for clipboard contents. If LO core -- // is the owner of the clipboard content, this will block for 5 seconds -- // and timeout, since the clipboard thread will not be able to acquire -- // SolarMutex and thus won't be able to respond. If the event loops -- // are properly integrated and QClipboard can use a nested event loop -- // (see the KDE VCL plug), then this won't happen, but otherwise -- // simply release the SolarMutex here. The KDE file dialog does not -- // call back to the core, so this should be safe (and if it does, -- // SolarMutex will need to be re-acquired). -- long mutexrelease = 0; -- if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool()) -- mutexrelease = Application::ReleaseSolarMutex(); -- //block and wait for user input -+ // We're entering a nested loop. -+ // Release the yield mutex to prevent deadlocks. - int result = _dialog->exec(); -+ - // HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings - // (such as the auto-extension flag), but that doesn't update KGlobal::config() - // (which is probably a KDE bug), so force reading the new configuration, - // otherwise the next opening of the dialog would use the old settings. - KGlobal::config()->reparseConfiguration(); -- if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool()) -- Application::AcquireSolarMutex( mutexrelease ); -+ - if( result == KFileDialog::Accepted) - return ExecutableDialogResults::OK; - -diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index 8e0eb67..67d7a4d 100644 ---- a/vcl/unx/kde4/KDEXLib.cxx -+++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -225,9 +225,6 @@ void KDEXLib::setupEventLoop() - eventLoopType = GlibEventLoop; - old_gpoll = g_main_context_get_poll_func( NULL ); - g_main_context_set_poll_func( NULL, gpoll_wrapper ); -- // set QClipboard to use event loop, otherwise the main thread will hold -- // SolarMutex locked, which will prevent the clipboard thread from answering -- m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); - return; - } - #endif -@@ -244,9 +241,6 @@ void KDEXLib::setupEventLoop() - eventLoopType = QtUnixEventLoop; - QInternal::callFunction( QInternal::GetUnixSelectFunction, reinterpret_cast< void** >( &qt_select )); - QInternal::callFunction( QInternal::SetUnixSelectFunction, reinterpret_cast< void** >( lo_select )); -- // set QClipboard to use event loop, otherwise the main thread will hold -- // SolarMutex locked, which will prevent the clipboard thread from answering -- m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); - return; - } - #endif -@@ -300,6 +294,9 @@ void KDEXLib::socketNotifierActivated( int fd ) - - void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) - { -+ // Nested yield loop counter. -+ static int loop_depth = 0; -+ - if( eventLoopType == LibreOfficeEventLoop ) - { - if( qApp->thread() == QThread::currentThread()) -@@ -310,13 +307,24 @@ void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) - } - return SalXLib::Yield( bWait, bHandleAllCurrentEvents ); - } -+ - // if we are the main thread (which is where the event processing is done), - // good, just do it -- if( qApp->thread() == QThread::currentThread()) -+ if( qApp->thread() == QThread::currentThread()) { -+ // Release the yield lock before entering a nested loop. -+ if (loop_depth > 0) -+ SalYieldMutexReleaser aReleaser; -+ loop_depth++; - processYield( bWait, bHandleAllCurrentEvents ); -- else -- { // if this deadlocks, event processing needs to go into a separate thread -- // or some other solution needs to be found -+ loop_depth--; -+ } -+ else { -+ // we were called from another thread; -+ // release the yield lock to prevent deadlock. -+ SalYieldMutexReleaser aReleaser; -+ -+ // if this deadlocks, event processing needs to go into a separate -+ // thread or some other solution needs to be found - emit processYieldSignal( bWait, bHandleAllCurrentEvents ); - } - } --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch b/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch deleted file mode 100644 index cf76277deebd..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- libreoffice-4.1.4.2.orig/configure.ac 2013-12-10 17:11:21.000000000 +0100 -+++ libreoffice-4.1.4.2/configure.ac 2014-01-25 12:15:02.000000000 +0100 -@@ -7965,39 +7965,32 @@ - AC_MSG_RESULT([external]) - SYSTEM_CURL=YES - -- curl_version="" -- if test "$cross_compiling" = "yes"; then -- dnl At least the OBS mingw32-libcurl-devel package -- dnl comes with a proper .pc file -- PKG_CHECK_MODULES(CURL, libcurl,, [:]) -- if test -n "$CURL_PKG_ERRORS"; then -- AC_MSG_RESULT([no]) -- else -- curl_version=`$PKG_CONFIG --modversion libcurl` -- fi -- fi -- if test -z "$curl_version"; then -+ AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) -+ -+ # First try PKGCONFIG and then fall back -+ PKG_CHECK_MODULES(CURL, libcurl >= 7.13.1,, [:]) -+ -+ if test -n "$CURL_PKG_ERRORS"; then - AC_PATH_PROG(CURLCONFIG, curl-config) - if test -z "$CURLCONFIG"; then -- AC_MSG_ERROR([install the libcurl development package]) -+ AC_MSG_ERROR([curl developement files not found]) - fi - CURL_LIBS=`$CURLCONFIG --libs` - CURL_CFLAGS=`$CURLCONFIG --cflags` - curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'` -- fi - -- AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) -+ case $curl_version in -+ dnl brackets doubled below because Autoconf uses them as m4 quote characters, -+ dnl so they need to be doubled to end up in the configure script -+ 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -+ ;; -+ *) -+ AC_MSG_ERROR([no, you have $curl_version]) -+ ;; -+ esac -+ fi - -- case $curl_version in -- dnl brackets doubled below because Autoconf uses them as m4 quote characters, -- dnl so they need to be doubled to end up in the configure script -- 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -- AC_MSG_RESULT([yes, you have $curl_version]) -- ;; -- *) -- AC_MSG_ERROR([no, you have $curl_version]) -- ;; -- esac -+ AC_MSG_RESULT([yes]) - - libo_MINGW_CHECK_DLL([libcurl]) - libo_MINGW_TRY_DLL([libintl]) diff --git a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch b/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch deleted file mode 100644 index e07f5ad92f1b..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/configure.ac 2014-01-27 22:35:34.000000000 +0100 -+++ b/configure.ac 2014-02-02 23:27:50.911033565 +0100 -@@ -8606,39 +8606,31 @@ - AC_MSG_RESULT([external]) - SYSTEM_CURL=YES - -- curl_version="" -- if test "$cross_compiling" = "yes"; then -- dnl At least the OBS mingw32-libcurl-devel package -- dnl comes with a proper .pc file -- PKG_CHECK_MODULES(CURL, libcurl,, [:]) -- if test -n "$CURL_PKG_ERRORS"; then -- AC_MSG_RESULT([no]) -- else -- curl_version=`$PKG_CONFIG --modversion libcurl` -- fi -- fi -- if test -z "$curl_version"; then -+ AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) -+ -+ # First try PKGCONFIG and then fall back -+ PKG_CHECK_MODULES(CURL, libcurl >= 7.13.1,, [:]) -+ -+ if test -n "$CURL_PKG_ERRORS"; then - AC_PATH_PROG(CURLCONFIG, curl-config) - if test -z "$CURLCONFIG"; then -- AC_MSG_ERROR([install the libcurl development package]) -+ AC_MSG_ERROR([curl development files not found]) - fi - CURL_LIBS=`$CURLCONFIG --libs` - CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g") - curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'` -- fi -- -- AC_MSG_CHECKING([whether libcurl is >= 7.13.1]) - -- case $curl_version in -- dnl brackets doubled below because Autoconf uses them as m4 quote characters, -- dnl so they need to be doubled to end up in the configure script -- 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -- AC_MSG_RESULT([yes, you have $curl_version]) -- ;; -- *) -- AC_MSG_ERROR([no, you have $curl_version]) -- ;; -- esac -+ case $curl_version in -+ dnl brackets doubled below because Autoconf uses them as m4 quote characters, -+ dnl so they need to be doubled to end up in the configure script -+ 7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -+ ;; -+ *) -+ AC_MSG_ERROR([no, you have $curl_version]) -+ ;; -+ esac -+ fi -+ AC_MSG_RESULT([yes]) - - libo_MINGW_CHECK_DLL([libcurl]) - libo_MINGW_TRY_DLL([libintl]) diff --git a/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-startup.patch b/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-startup.patch deleted file mode 100644 index 4f47abe29dd6..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-startup.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe Mon Sep 17 00:00:00 2001 -From: Luboš Luňák <l.lunak@collabora.com> -Date: Tue, 25 Mar 2014 11:20:16 +0000 -Subject: prevent KDE/Qt from interfering with the session manager - -I occassionally get lockups in IceProcessMessages() called from QtCore, -I'm actually not exactly sure why, as theoretically two connections -from one app shouldn't be a problem, but since LO does its own -session handling, there's no need to the KDE/Qt code to be involved, -so prevent it from connecting to the session manager altogether. - -Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b ---- -diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index 820d39a..e4900a7 100644 ---- a/vcl/unx/kde4/KDEXLib.cxx -+++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -166,8 +166,23 @@ void KDEXLib::Init() - - KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData ); - -+ // LO does its own session management, so prevent KDE/Qt from interfering -+ // (QApplication::disableSessionManagement(false) wouldn't quite do, -+ // since that still actually connects to the session manager, it just -+ // won't save the application data on session shutdown). -+ char* session_manager = NULL; -+ if( getenv( "SESSION_MANAGER" ) != NULL ) -+ { -+ session_manager = strdup( getenv( "SESSION_MANAGER" )); -+ unsetenv( "SESSION_MANAGER" ); -+ } - m_pApplication = new VCLKDEApplication(); -- kapp->disableSessionManagement(); -+ if( session_manager != NULL ) -+ { -+ setenv( "SESSION_MANAGER", session_manager, 1 ); -+ free( session_manager ); -+ } -+ - KApplication::setQuitOnLastWindowClosed(false); - - #if KDE_HAVE_GLIB -diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx -index 412ee34..4ce0b2c 100644 ---- a/vcl/unx/kde4/VCLKDEApplication.hxx -+++ b/vcl/unx/kde4/VCLKDEApplication.hxx -@@ -21,22 +21,14 @@ - - #define Region QtXRegion - --#include <QSessionManager> -- - #include <kapplication.h> - - #undef Region - --/* #i59042# override KApplications method for session management -- * since it will interfere badly with our own. -- */ - class VCLKDEApplication : public KApplication - { - public: - VCLKDEApplication(); -- -- virtual void commitData(QSessionManager&) {}; -- - virtual bool x11EventFilter(XEvent* event); - }; - --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch b/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch deleted file mode 100644 index 1b2b0efc7472..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.3.3-kde4-timer-mutex.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/vcl/unx/kde4/KDEXLib.cxx 2014-04-08 13:46:25.000000000 +0200 -+++ b/vcl/unx/kde4/KDEXLib.cxx 2014-04-14 07:17:30.000000000 +0200 -@@ -67,13 +67,9 @@ - eventLoopType( LibreOfficeEventLoop ), - m_bYieldFrozen( false ) - { -- // the timers created here means they belong to the main thread. -- // As the timeoutTimer runs the LO event queue, which may block on a dialog, -- // the timer has to use a Qt::QueuedConnection, otherwise the nested event -- // loop will detect the blocking timer and drop it from the polling -- // freezing LO X11 processing. -- connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated()), Qt::QueuedConnection ); -- connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated()), Qt::QueuedConnection ); -+ // the timers created here means they belong to the main thread -+ connect( &timeoutTimer, SIGNAL( timeout()), this, SLOT( timeoutActivated())); -+ connect( &userEventTimer, SIGNAL( timeout()), this, SLOT( userEventActivated())); - - // QTimer::start() can be called only in its (here main) thread, so this will - // forward between threads if needed diff --git a/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch b/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch deleted file mode 100644 index b72012b6b6bf..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a96a0ae362070d8e99587c6d658c1e11895c717c Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org> -Date: Thu, 18 Sep 2014 22:43:35 +0200 -Subject: [PATCH] type conversion fixes for jpeg-9 compatibility - -backport of 867aa217e6bcb543ea61c61f10088042d632bd07 from libreoffice-4-3 branch ---- - vcl/source/filter/jpeg/JpegReader.cxx | 6 +++--- - vcl/source/filter/jpeg/JpegWriter.cxx | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx -index 89f9028..9014d00 100644 ---- a/vcl/source/filter/jpeg/JpegReader.cxx -+++ b/vcl/source/filter/jpeg/JpegReader.cxx -@@ -71,7 +71,7 @@ extern "C" void init_source (j_decompress_ptr cinfo) - * but we don't clear the input buffer. - * This is correct behavior for reading a series of images from one source. - */ -- source->start_of_file = sal_True; -+ source->start_of_file = TRUE; - } - - long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) -@@ -119,9 +119,9 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) - - source->pub.next_input_byte = source->buffer; - source->pub.bytes_in_buffer = nbytes; -- source->start_of_file = sal_False; -+ source->start_of_file = FALSE; - -- return sal_True; -+ return TRUE; - } - - extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) -diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx -index 102eb4d..ba2f788 100644 ---- a/vcl/source/filter/jpeg/JpegWriter.cxx -+++ b/vcl/source/filter/jpeg/JpegWriter.cxx -@@ -86,7 +86,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) - destination->pub.next_output_byte = destination->buffer; - destination->pub.free_in_buffer = BUFFER_SIZE; - -- return sal_True; -+ return TRUE; - } - - extern "C" void term_destination (j_compress_ptr cinfo) --- -2.1.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch b/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch deleted file mode 100644 index 6485aff2f6ed..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch +++ /dev/null @@ -1,187 +0,0 @@ -Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master -by Mark Wright, gienah@gentoo.org - - ---- libreoffice-4.2.6.3-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-09-14 22:25:51.323259895 +1000 -@@ -402,11 +402,12 @@ - ::basegfx::computeSetDifference( aUncoveredAreas, - rUpdateArea.maTotalBounds, - ::basegfx::B2DRange( rDestRect ) ); -+ SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface()); - ::std::for_each( aUncoveredAreas.begin(), - aUncoveredAreas.end(), - ::boost::bind( &repaintBackground, - boost::cref(pCompositingCairo), -- boost::cref(mpOwningSpriteCanvas->getBufferSurface()), -+ boost::cref(surface), - _1 ) ); - - cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); ---- libreoffice-4.2.6.3-orig/canvas/source/vcl/spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/canvas/source/vcl/spritecanvashelper.cxx 2014-09-14 22:25:51.323721613 +1000 -@@ -573,12 +573,12 @@ - - // repaint all affected sprites on top of background into - // VDev. -+ ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) ); - ::std::for_each( rSortedUpdateSprites.begin(), - rSortedUpdateSprites.end(), - ::boost::bind( &spriteRedrawStub2, - ::boost::ref( maVDev.get() ), -- ::boost::cref( -- ::vcl::unotools::b2DPointFromPoint(aOutputPosition)), -+ ::boost::cref( outPos ), - _1 ) ); - - // flush to screen ---- libreoffice-4.2.6.3-orig/dbaccess/source/ui/tabledesign/TableController.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/dbaccess/source/ui/tabledesign/TableController.cxx 2014-09-14 22:28:42.327186979 +1000 -@@ -1393,7 +1393,8 @@ - setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); - if(!isEditable()) - { -- ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True ))); -+ sal_Bool t( sal_True ); -+ ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); - } - m_bNew = sal_False; - // be notified when the table is in disposing ---- libreoffice-4.2.6.3-orig/oox/source/drawingml/table/tablecell.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/oox/source/drawingml/table/tablecell.cxx 2014-09-14 22:25:51.325066244 +1000 -@@ -117,9 +117,9 @@ - if (rTableStylePart.getTextColor().isUsed()) - aTextCharProps.maCharColor = rTableStylePart.getTextColor(); - if( rTableStylePart.getTextBoldStyle().is_initialized() ) -- aTextCharProps.moBold = rTableStylePart.getTextBoldStyle(); -+ aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle(); - if( rTableStylePart.getTextItalicStyle().is_initialized() ) -- aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle(); -+ aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle(); - } - - void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) ---- libreoffice-4.2.6.3-orig/reportdesign/source/core/api/ReportDefinition.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/reportdesign/source/core/api/ReportDefinition.cxx 2014-09-14 22:25:51.326473733 +1000 -@@ -1623,8 +1623,9 @@ - m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage); - } - // notify our container listeners -+ OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this); - m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>( -- ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage))); -+ ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage))); - } - // ----------------------------------------------------------------------------- - uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException) ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/activities/activitybase.hxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/activities/activitybase.hxx 2014-09-14 22:25:51.326839852 +1000 -@@ -111,7 +111,7 @@ - ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const - { return mpAttributeLayer; } - -- bool isRepeatCountValid() const { return maRepeats; } -+ bool isRepeatCountValid() const { return bool(maRepeats); } - double getRepeatCount() const { return *maRepeats; } - bool isAutoReverse() const { return mbAutoReverse; } - ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-09-14 22:25:51.327321898 +1000 -@@ -398,11 +398,12 @@ - { - // new sprite pos, transformation might have changed: - maSpriteRectangle = calcSpriteRectangle( maViews.front().first ); -+ ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() ); - - // reposition sprites - for_each_sprite( boost::bind( &cppcanvas::Sprite::move, - _1, -- boost::cref(maSpriteRectangle.getMinimum())) ); -+ boost::cref( rectMin )) ); - - // sprites changed, need screen update - mrScreenUpdater.notifyUpdate(); ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/appletshape.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/appletshape.cxx 2014-09-14 22:25:51.327829537 +1000 -@@ -148,12 +148,13 @@ - void AppletShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( AppletShape::getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( - &ViewAppletShape::resize, - _1, -- ::boost::cref( AppletShape::getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - // --------------------------------------------------------------------- -@@ -252,11 +253,12 @@ - - bool AppletShape::implStartIntrinsicAnimation() - { -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( &ViewAppletShape::startApplet, - _1, -- ::boost::cref( getBounds() ))); -+ ::boost::cref( bounds ))); - mbIsPlaying = true; - - return true; ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/drawshape.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/drawshape.cxx 2014-09-14 22:25:51.328463497 +1000 -@@ -168,6 +168,7 @@ - } - - // redraw all view shapes, by calling their update() method -+ ViewShape::RenderArgs renderArgs( getViewRenderArgs() ); - if( ::std::count_if( maViewShapes.begin(), - maViewShapes.end(), - ::boost::bind<bool>( -@@ -178,8 +179,7 @@ - // the extra mem_fn. WTF. - _1, - ::boost::cref( mpCurrMtf ), -- ::boost::cref( -- getViewRenderArgs() ), -+ ::boost::cref( renderArgs ), - nUpdateFlags, - isVisible() ) ) - != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) ) ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/mediashape.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/mediashape.cxx 2014-09-14 22:25:51.328874055 +1000 -@@ -125,12 +125,13 @@ - void MediaShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewMediaShapes.begin(), - maViewMediaShapes.end(), - ::boost::bind( - &ViewMediaShape::resize, - _1, -- ::boost::cref( getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - // --------------------------------------------------------------------- ---- libreoffice-4.2.6.3-orig/slideshow/source/engine/unoviewcontainer.cxx 2014-08-23 00:22:41.000000000 +1000 -+++ libreoffice-4.2.6.3/slideshow/source/engine/unoviewcontainer.cxx 2014-09-14 22:25:51.329303003 +1000 -@@ -45,11 +45,12 @@ - const UnoViewVector::iterator aEnd( maViews.end() ); - - // already added? -+ uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView()); - if( ::std::find_if( maViews.begin(), - aEnd, - ::boost::bind( - ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), -- ::boost::cref( rView->getUnoView() ), -+ ::boost::cref( xView ), - ::boost::bind( - &UnoView::getUnoView, - _1 ) ) ) != aEnd ) diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch deleted file mode 100644 index d7166f375a3b..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 6d239ee19a4b1d9068fbd04b5a692c859142f613 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com> -Date: Fri, 29 Aug 2014 14:14:31 +0200 -Subject: [PATCH] Handle collada libraries seperately: --disable-collada - -Depends on gltf support. - -(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507) - -Conflicts: - config_host.mk.in - sd/source/ui/func/fuinsert.cxx - -Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca -Reviewed-on: https://gerrit.libreoffice.org/11193 -Tested-by: Rene Engelhard <rene@debian.org> -Reviewed-by: Rene Engelhard <rene@debian.org> ---- - RepositoryExternal.mk | 6 +++++- - avmedia/Library_avmedia.mk | 5 +---- - avmedia/source/framework/modeltools.cxx | 9 ++++++--- - config_host.mk.in | 1 + - config_host/config_features.h.in | 5 +++++ - configure.ac | 23 +++++++++++++++++++---- - include/avmedia/modeltools.hxx | 4 ++++ - sd/source/ui/func/fuinsert.cxx | 9 +++++++++ - 8 files changed, 50 insertions(+), 12 deletions(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index b42dce2..cd99108 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3324,6 +3324,8 @@ endef - - endif # SYSTEN_LIBGLTF - -+ifeq ($(ENABLE_COLLADA),TRUE) -+ - define gb_LinkTarget__use_opencollada_parser - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ -@@ -3354,7 +3356,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ - ) - endef - --endif -+endif # ENABLE_COLLADA -+ -+endif # ENABLE_GLTF - - ### Jars ############################################################ - -diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk -index 184c66c..7cc08fa 100644 ---- a/avmedia/Library_avmedia.mk -+++ b/avmedia/Library_avmedia.mk -@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ - )) - endif - --ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE))) -+ifeq ($(ENABLE_COLLADA),TRUE) - $(eval $(call gb_Library_set_warnings_not_errors,avmedia)) - - ifeq ($(OS),LINUX) -@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\ - png \ - )) - --$(eval $(call gb_Library_add_defs,avmedia,\ -- -DENABLE_COLLADA2GLTF \ --)) - endif - - $(eval $(call gb_Library_add_exception_objects,avmedia,\ -diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx -index 6119cb7..8c4251e 100644 ---- a/avmedia/source/framework/modeltools.cxx -+++ b/avmedia/source/framework/modeltools.cxx -@@ -29,7 +29,9 @@ - #include <boost/foreach.hpp> - #include <boost/optional.hpp> - --#ifdef ENABLE_COLLADA2GLTF -+#include <config_features.h> -+ -+#if HAVE_FEATURE_COLLADA - #include <COLLADA2GLTFWriter.h> - #include <GLTFAsset.h> - #endif -@@ -42,7 +44,7 @@ using namespace boost::property_tree; - - namespace avmedia { - --#ifdef ENABLE_COLLADA2GLTF -+#if HAVE_FEATURE_COLLADA - - static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL) - { -@@ -242,7 +244,8 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, - const OUString& rSourceURL, OUString& o_rEmbeddedURL) - { - OUString sSource = rSourceURL; --#ifdef ENABLE_COLLADA2GLTF -+ -+#if HAVE_FEATURE_COLLADA - if( !rSourceURL.endsWithIgnoreAsciiCase(".json") ) - KmzDae2Gltf(rSourceURL, sSource); - #endif -diff --git a/config_host.mk.in b/config_host.mk.in -index aec0fa5..36a6866 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -109,6 +109,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ - export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ - export ENABLE_CMIS=@ENABLE_CMIS@ - export ENABLE_COINMP=@ENABLE_COINMP@ -+export ENABLE_COLLADA=@ENABLE_COLLADA@ - export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ - export ENABLE_CUPS=@ENABLE_CUPS@ - export ENABLE_CURL=@ENABLE_CURL@ -diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in -index 3fd1da5..f87ee27 100644 ---- a/config_host/config_features.h.in -+++ b/config_host/config_features.h.in -@@ -142,4 +142,9 @@ - */ - #define HAVE_FEATURE_GLTF 0 - -+/* -+ * Whether we have COLLADA support. -+ */ -+#define HAVE_FEATURE_COLLADA 0 -+ - #endif -diff --git a/configure.ac b/configure.ac -index 63e067b..b6e8124 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1395,6 +1395,10 @@ AC_ARG_ENABLE(gltf, - AS_HELP_STRING([--disable-gltf], - [Determines whether to build libraries related to glTF 3D model rendering.])) - -+AC_ARG_ENABLE(collada, -+ AS_HELP_STRING([--disable-collada], -+ [Disable collada support (Rendering 3D models stored in *.dae and *.kmz format).])) -+ - dnl =================================================================== - dnl Optional Packages (--with/without-) - dnl =================================================================== -@@ -10572,10 +10576,6 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And - else - BUILD_TYPE="$BUILD_TYPE LIBGLTF" - fi -- # otherwise build fails in collada2gltf external because of std::shared_ptr -- if test "$have_std_shared_ptr" = "yes"; then -- BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" -- fi - else - AC_MSG_RESULT([no]) - fi -@@ -10584,6 +10584,21 @@ AC_SUBST(SYSTEM_LIBGLTF) - AC_SUBST(LIBGLTF_CFLAGS) - AC_SUBST(LIBGLTF_LIBS) - -+dnl =================================================================== -+dnl Check whether to enable COLLADA support -+dnl =================================================================== -+AC_MSG_CHECKING([whether to enable COLLADA support]) -+ENABLE_COLLADA= -+if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE" -a "$have_std_shared_ptr" = "yes"; then -+ AC_MSG_RESULT([yes]) -+ ENABLE_COLLADA=TRUE -+ AC_DEFINE(HAVE_FEATURE_COLLADA,1) -+ BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" -+else -+ AC_MSG_RESULT([no]) -+fi -+AC_SUBST(ENABLE_COLLADA) -+ - # pdf import? - AC_MSG_CHECKING([whether to build the PDF import feature]) - ENABLE_PDFIMPORT= -diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx -index ed2de44..526b240 100644 ---- a/include/avmedia/modeltools.hxx -+++ b/include/avmedia/modeltools.hxx -@@ -11,9 +11,13 @@ - #include <com/sun/star/frame/XModel.hpp> - #include <avmedia/avmediadllapi.h> - -+#include <config_features.h> -+ - namespace avmedia { - -+#if HAVE_FEATURE_COLLADA - bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput); -+#endif - - bool AVMEDIA_DLLPUBLIC Embed3DModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, -diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx -index cd03700..9c1c4ad 100644 ---- a/sd/source/ui/func/fuinsert.cxx -+++ b/sd/source/ui/func/fuinsert.cxx -@@ -789,10 +789,19 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) - sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); - - aDlg.SetTitle( "Insert 3D Model" ); -+ -+#if HAVE_FEATURE_COLLADA - aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz" ); -+#else -+ aDlg.AddFilter( "All supported formats", "*.json" ); -+#endif -+ - aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" ); -+ -+#if HAVE_FEATURE_COLLADA - aDlg.AddFilter( "DAE - COLLADA", "*.dae" ); - aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz" ); -+#endif - - OUString sURL; - if( aDlg.Execute() == ERRCODE_NONE ) --- -2.1.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch deleted file mode 100644 index 68942e54b13b..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch +++ /dev/null @@ -1,98 +0,0 @@ -From d85f513934bb5735a2c0c343fbe7dc2b9c11af3e Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Wed, 6 Aug 2014 00:03:21 +0200 -Subject: [PATCH] implement --with-system-coinmp - -Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658 ---- - RepositoryExternal.mk | 15 +++++++++++++++ - config_host.mk.in | 3 +++ - configure.ac | 16 ++++++++++++++-- - 3 files changed, 32 insertions(+), 2 deletions(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index a9c9e53..1961829 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -2250,6 +2250,8 @@ endif # ENABLE_LPSOLVE - - ifneq ($(ENABLE_COINMP),) - -+ifneq ($(SYSTEM_COINMP),TRUE) -+ - define gb_LinkTarget__use_coinmp - $(call gb_LinkTarget_use_package,$(1),coinmp) - ifeq ($(COM),MSC) -@@ -2279,6 +2281,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ - coinmp \ - )) - -+else # SYSTEM_COINMP -+ -+define gb_LinkTarget__use_coinmp -+$(call gb_LinkTarget_set_include,$(1),\ -+ $$(INCLUDE) \ -+ $(COINMP_CFLAGS) \ -+) -+$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS)) -+ -+endef -+ -+endif -+ - else - - gb_LinkTarget__use_coinmp := -diff --git a/config_host.mk.in b/config_host.mk.in ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -109,6 +109,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ - export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ - export ENABLE_CMIS=@ENABLE_CMIS@ - export ENABLE_COINMP=@ENABLE_COINMP@ -+export SYSTEM_COINMP=@SYSTEM_COINMP@ -+export COINMP_CFLAGS=@COINMP_CFLAGS@ -+export COINMP_LIBS=@COINMP_LIBS@ - export ENABLE_COLLADA=@ENABLE_COLLADA@ - export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ - export ENABLE_CUPS=@ENABLE_CUPS@ -diff --git a/configure.ac b/configure.ac -index e91773f..3aadd12 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1867,6 +1867,11 @@ AC_ARG_WITH(system-lpsolve, - [Use lpsolve already on system.]),, - [with_system_lpsolve="$with_system_libs"]) - -+AC_ARG_WITH(system-coinmp, -+ AS_HELP_STRING([--with-system-coinmp], -+ [Use CoinMP already on system.]),, -+ [with_system_coinmp="$with_system_libs"]) -+ - AC_ARG_WITH(system-liblangtag, - AS_HELP_STRING([--with-system-liblangtag], - [Use liblangtag library already on system.]),, -@@ -9661,12 +9666,19 @@ AC_MSG_CHECKING([whether to build with CoinMP]) - if test "$enable_coinmp" != "no"; then - ENABLE_COINMP=TRUE - AC_MSG_RESULT([yes]) -- # Should we check for system CoinMP ? How to do that ? -- BUILD_TYPE="$BUILD_TYPE COINMP" -+ if test "$with_system_coinmp" = "yes"; then -+ SYSTEM_COINMP=TRUE -+ PKG_CHECK_MODULES( COINMP, coinmp ) -+ else -+ BUILD_TYPE="$BUILD_TYPE COINMP" -+ fi - else - AC_MSG_RESULT([no]) - fi - AC_SUBST(ENABLE_COINMP) -+AC_SUBST(SYSTEM_COINMP) -+AC_SUBST(COINMP_CFLAGS) -+AC_SUBST(COINMP_LIBS) - - ENABLE_LPSOLVE= - AC_MSG_CHECKING([whether to build with lpsolve]) --- -1.7.1 diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch deleted file mode 100644 index cf208b7e2144..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Tue, 5 Aug 2014 20:05:35 +0200 -Subject: [PATCH] implement --with-system-gltf - -Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82 -(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb) ---- - RepositoryExternal.mk | 18 ++++++++++++++++++ - avmedia/source/opengl/oglframegrabber.hxx | 4 ++++ - avmedia/source/opengl/oglplayer.hxx | 4 ++++ - avmedia/source/opengl/oglwindow.hxx | 4 ++++ - config_host.mk.in | 3 +++ - configure.ac | 15 ++++++++++++++- - 6 files changed, 47 insertions(+), 1 deletion(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index ff50598..b42dce2 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3281,6 +3281,8 @@ endif # DESKTOP - - ifeq ($(ENABLE_GLTF),TRUE) - -+ifneq ($(SYSTEM_LIBGLTF),TRUE) -+ - define gb_LinkTarget__use_libgltf - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \ -@@ -3306,6 +3308,22 @@ $(call gb_ExternalProject_use_external_project,$(1),libgltf) - - endef - -+else # SYSTEM_LIBGLTF -+ -+define gb_LinkTarget__use_libgltf -+$(call gb_LinkTarget_set_include,$(1),\ -+ $$(INCLUDE) \ -+ $(LIBGLTF_CFLAGS) \ -+) -+$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) -+$(call gb_LinkTarget_add_defs,$(1),\ -+ -DSYSTEM_LIBGLTF \ -+) -+ -+endef -+ -+endif # SYSTEN_LIBGLTF -+ - define gb_LinkTarget__use_opencollada_parser - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ -diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx -index 5beb15b..0d38224 100644 ---- a/avmedia/source/opengl/oglframegrabber.hxx -+++ b/avmedia/source/opengl/oglframegrabber.hxx -@@ -14,7 +14,11 @@ - #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/media/XFrameGrabber.hpp> - -+#ifdef SYSTEM_LIBGLTF -+#include <libgltf/libgltf.h> -+#else - #include <libgltf.h> -+#endif - - namespace avmedia { namespace ogl { - -diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx -index 03ad515..52aa395 100644 ---- a/avmedia/source/opengl/oglplayer.hxx -+++ b/avmedia/source/opengl/oglplayer.hxx -@@ -14,7 +14,11 @@ - #include <cppuhelper/basemutex.hxx> - #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/media/XPlayer.hpp> -+#ifdef SYSTEM_LIBGLTF -+#include <libgltf/libgltf.h> -+#else - #include <libgltf.h> -+#endif - #include <vcl/opengl/OpenGLContext.hxx> - #include <vcl/timer.hxx> - -diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx -index a68f667..ae86083 100644 ---- a/avmedia/source/opengl/oglwindow.hxx -+++ b/avmedia/source/opengl/oglwindow.hxx -@@ -17,7 +17,11 @@ - #include <com/sun/star/media/XPlayerWindow.hpp> - #include <com/sun/star/media/ZoomLevel.hpp> - -+#ifdef SYSTEM_LIBGLTF -+#include <libgltf/libgltf.h> -+#else - #include <libgltf.h> -+#endif - #include <vcl/opengl/OpenGLContext.hxx> - #include <vcl/syschild.hxx> - -diff --git a/config_host.mk.in b/config_host.mk.in -index b7e5b6c..aec0fa5 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ - export ENABLE_ORCUS=@ENABLE_ORCUS@ - export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ - export ENABLE_GLTF=@ENABLE_GLTF@ -+export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@ -+export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@ -+export LIBGLTF_LIBS=@LIBGLTF_LIBS@ - export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ - export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ - export ENABLE_GTK3=@ENABLE_GTK3@ -diff --git a/configure.ac b/configure.ac -index 02791ca..63e067b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1552,6 +1552,11 @@ AC_ARG_WITH(system-jpeg, - [Use jpeg already on system.]),, - [with_system_jpeg=auto]) - -+AC_ARG_WITH(system-libgltf, -+ AS_HELP_STRING([--with-system-libgltf], -+ [Use libgltf already on system.]),, -+ [with_system_libgltf=auto]) -+ - AC_ARG_WITH(system-clucene, - AS_HELP_STRING([--with-system-clucene], - [Use clucene already on system.]),, -@@ -10561,7 +10566,12 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And - ENABLE_GLTF=TRUE - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FEATURE_GLTF,1) -- BUILD_TYPE="$BUILD_TYPE LIBGLTF" -+ if test "$with_system_libgltf" = "yes"; then -+ SYSTEM_LIBGLTF=TRUE -+ PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 ) -+ else -+ BUILD_TYPE="$BUILD_TYPE LIBGLTF" -+ fi - # otherwise build fails in collada2gltf external because of std::shared_ptr - if test "$have_std_shared_ptr" = "yes"; then - BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" -@@ -10570,6 +10580,9 @@ else - AC_MSG_RESULT([no]) - fi - AC_SUBST(ENABLE_GLTF) -+AC_SUBST(SYSTEM_LIBGLTF) -+AC_SUBST(LIBGLTF_CFLAGS) -+AC_SUBST(LIBGLTF_LIBS) - - # pdf import? - AC_MSG_CHECKING([whether to build the PDF import feature]) --- -2.1.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch deleted file mode 100644 index aa73be42c6c4..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch +++ /dev/null @@ -1,400 +0,0 @@ -From d431986bd49081581e86444af124d1d2ce90a407 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com> -Date: Fri, 29 Aug 2014 22:41:26 +0200 -Subject: [PATCH] Upgrade libgltf to 0.0.1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -News in this version: -- Solve some limitations of walkthrough mode (fdo#81425) -- Multisampling (better rendering quality, mainly at the edges) -- Better error handling (no crash in case of invalid input file) - -Reviewed-on: https://gerrit.libreoffice.org/11179 -Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> -Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> - -Conflicts: - download.lst - external/libgltf/UnpackedTarball_libgltf.mk - external/libgltf/pathces/append_shader_version.patch - external/libgltf/pathces/missing_include.patch - vcl/source/opengl/OpenGLContext.cxx - -Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 -Reviewed-on: https://gerrit.libreoffice.org/11194 -Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> -Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> ---- - RepositoryExternal.mk | 8 ----- - avmedia/source/opengl/oglframegrabber.hxx | 4 --- - avmedia/source/opengl/oglplayer.cxx | 16 ++++++++-- - avmedia/source/opengl/oglplayer.hxx | 6 ++-- - avmedia/source/opengl/oglwindow.cxx | 36 +++++++++++---------- - avmedia/source/opengl/oglwindow.hxx | 6 +--- - configure.ac | 2 +- - download.lst | 4 +-- - external/libgltf/ExternalProject_libgltf.mk | 2 ++ - external/libgltf/UnpackedTarball_libgltf.mk | 2 -- - .../libgltf/pathces/append_shader_version.patch | 37 ---------------------- - external/libgltf/pathces/missing_include.patch | 11 ------- - include/vcl/opengl/OpenGLContext.hxx | 2 ++ - vcl/source/opengl/OpenGLContext.cxx | 5 +++ - 14 files changed, 48 insertions(+), 93 deletions(-) - delete mode 100644 external/libgltf/pathces/append_shader_version.patch - delete mode 100644 external/libgltf/pathces/missing_include.patch - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index cd99108..f194fcb 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3303,11 +3303,6 @@ $(call gb_LinkTarget_use_external_project,$(1),libgltf) - - endef - --define gb_ExternalProject__use_libgltf --$(call gb_ExternalProject_use_external_project,$(1),libgltf) -- --endef -- - else # SYSTEM_LIBGLTF - - define gb_LinkTarget__use_libgltf -@@ -3316,9 +3311,6 @@ $(call gb_LinkTarget_set_include,$(1),\ - $(LIBGLTF_CFLAGS) \ - ) - $(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) --$(call gb_LinkTarget_add_defs,$(1),\ -- -DSYSTEM_LIBGLTF \ --) - - endef - -diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx -index 0d38224..5beb15b 100644 ---- a/avmedia/source/opengl/oglframegrabber.hxx -+++ b/avmedia/source/opengl/oglframegrabber.hxx -@@ -14,11 +14,7 @@ - #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/media/XFrameGrabber.hpp> - --#ifdef SYSTEM_LIBGLTF --#include <libgltf/libgltf.h> --#else - #include <libgltf.h> --#endif - - namespace avmedia { namespace ogl { - -diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx -index a052dc9..d2e600b 100644 ---- a/avmedia/source/opengl/oglplayer.cxx -+++ b/avmedia/source/opengl/oglplayer.cxx -@@ -269,6 +269,12 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c - return uno::Reference< media::XPlayerWindow >(); - } - -+ if( !m_aContext.supportMultiSampling() ) -+ { -+ SAL_WARN("avmedia.opengl", "Context does not support multisampling!"); -+ return uno::Reference< media::XPlayerWindow >(); -+ } -+ - if( !lcl_CheckOpenGLRequirements() ) - { - SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!"); -@@ -287,7 +293,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c - releaseInputFiles(); - if( nRet != 0 ) - { -- SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); -+ SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); - return uno::Reference< media::XPlayerWindow >(); - } - // The background color is white by default, but we need to separate the -@@ -309,6 +315,12 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() - return uno::Reference< media::XFrameGrabber >(); - } - -+ if( !m_aContext.supportMultiSampling() ) -+ { -+ SAL_WARN("avmedia.opengl", "Context does not support multisampling!"); -+ return uno::Reference< media::XFrameGrabber >(); -+ } -+ - if( !lcl_CheckOpenGLRequirements() ) - { - SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!"); -@@ -324,7 +336,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() - releaseInputFiles(); - if( nRet != 0 ) - { -- SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); -+ SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); - return uno::Reference< media::XFrameGrabber >(); - } - glClearColor(0.5f, 0.5f, 0.5f, 0.5f); -diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx -index 52aa395..465ed6b 100644 ---- a/avmedia/source/opengl/oglplayer.hxx -+++ b/avmedia/source/opengl/oglplayer.hxx -@@ -14,11 +14,9 @@ - #include <cppuhelper/basemutex.hxx> - #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/media/XPlayer.hpp> --#ifdef SYSTEM_LIBGLTF --#include <libgltf/libgltf.h> --#else -+ - #include <libgltf.h> --#endif -+ - #include <vcl/opengl/OpenGLContext.hxx> - #include <vcl/timer.hxx> - -diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx -index a770ff5..1092483 100644 ---- a/avmedia/source/opengl/oglwindow.cxx -+++ b/avmedia/source/opengl/oglwindow.cxx -@@ -23,7 +23,6 @@ OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEve - , meZoomLevel( media::ZoomLevel_ORIGINAL ) - , m_aLastMousePos(Point(0,0)) - , m_bIsOrbitMode( false ) -- , m_fCameraDistance(0.0) - { - } - -@@ -267,15 +266,15 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) - glm::vec3 vMove = vView-vEye; - vMove = glm::normalize(vMove); - vMove *= 25.0f; -- glm::vec3 vStrafe = glm::cross(vView-vEye, vUp); -+ glm::vec3 vStrafe = glm::cross(vMove, vUp); - vStrafe = glm::normalize(vStrafe); - vStrafe *= 25.0f; -- glm::vec3 vMup = glm::cross(vView-vEye,glm::vec3(1.0f,0.0f,0.0f) ); -- vMup = glm::normalize(vMup); -- vMup *= 25.0f; -+ glm::vec3 vMup = vUp * 25.0f; - - if( !m_bIsOrbitMode ) - { -+ if(nCode == KEY_E)vMoveBy += vMup*(0.0005f*fModelSize); -+ if(nCode == KEY_Q)vMoveBy -= vMup*(0.0005f*fModelSize); - if(nCode == KEY_W)vMoveBy += vMove*(0.0005f*fModelSize); - if(nCode == KEY_S)vMoveBy -= vMove*(0.0005f*fModelSize); - if(nCode == KEY_A)vMoveBy -= vStrafe*(0.0005f*fModelSize); -@@ -283,15 +282,24 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) - } - else - { -- if(nCode == KEY_E)vMoveBy += vMove*(0.0005f*fModelSize); -- if(nCode == KEY_Q)vMoveBy -= vMove*(0.0005f*fModelSize); -+ bool bZoomIn = false; -+ bool bZoomOut = false; -+ if(nCode == KEY_E) -+ { -+ vMoveBy += vMove*(0.0005f*fModelSize); -+ bZoomIn = true; -+ } -+ if(nCode == KEY_Q) -+ { -+ vMoveBy -= vMove*(0.0005f*fModelSize); -+ bZoomOut = true; -+ } - - // Limit zooming in orbit mode -- m_fCameraDistance += vMoveBy.z; -- if ((m_fCameraDistance < 0.5 * fModelSize && vMoveBy.z < 0.0 ) || -- (m_fCameraDistance > 2 * fModelSize && vMoveBy.z > 0.0 )) -+ float fCameraDistFromModelGlobe = glm::length(vEye + vMoveBy - vView) - fModelSize / 2.0f; -+ if ((fCameraDistFromModelGlobe < 0.5 * fModelSize && bZoomIn ) || -+ (fCameraDistFromModelGlobe > 2 * fModelSize && bZoomOut )) - { -- m_fCameraDistance -= vMoveBy.z; - vMoveBy = glm::vec3(0.0); - } - } -@@ -333,12 +341,6 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) - { - gltf_orbit_mode_start(&m_rHandle); - m_bIsOrbitMode = true; -- // Set default camera distance -- glm::vec3 vEye; -- glm::vec3 vView; -- glm::vec3 vUp; -- gltf_get_camera_pos(&m_rHandle, &vEye,&vView,&vUp); -- m_fCameraDistance = vEye.z - gltf_get_model_center_pos(&m_rHandle)->z - (gltf_get_model_size(&m_rHandle)/2.0); - } - } - else if(nCode == KEY_F) -diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx -index ae86083..8b15813 100644 ---- a/avmedia/source/opengl/oglwindow.hxx -+++ b/avmedia/source/opengl/oglwindow.hxx -@@ -17,11 +17,8 @@ - #include <com/sun/star/media/XPlayerWindow.hpp> - #include <com/sun/star/media/ZoomLevel.hpp> - --#ifdef SYSTEM_LIBGLTF --#include <libgltf/libgltf.h> --#else - #include <libgltf.h> --#endif -+ - #include <vcl/opengl/OpenGLContext.hxx> - #include <vcl/syschild.hxx> - -@@ -77,7 +74,6 @@ private: - com::sun::star::media::ZoomLevel meZoomLevel; - Point m_aLastMousePos; - bool m_bIsOrbitMode; -- double m_fCameraDistance; - }; - - } // namespace ogl -diff --git a/configure.ac b/configure.ac -index b6e8124..9cd589b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10572,7 +10572,7 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And - AC_DEFINE(HAVE_FEATURE_GLTF,1) - if test "$with_system_libgltf" = "yes"; then - SYSTEM_LIBGLTF=TRUE -- PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 ) -+ PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] ) - else - BUILD_TYPE="$BUILD_TYPE LIBGLTF" - fi -diff --git a/download.lst b/download.lst -index bc2b383..f413a57 100644 ---- a/download.lst -+++ b/download.lst -@@ -87,8 +87,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip - export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 - export LIBEOT_TARBALL := libeot-0.01.tar.bz2 - export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 --export LIBGLTF_MD5SUM := ca5436e916bfe70694adfe2607782786 --export LIBGLTF_TARBALL := libgltf-0.0.0.tar.bz2 -+export LIBGLTF_MD5SUM := 03821c9c827e647fb5fedb12496e0067 -+export LIBGLTF_TARBALL := libgltf-0.0.1.tar.bz2 - export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 - export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz -diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk -index 548487b..62e25a3 100644 ---- a/external/libgltf/ExternalProject_libgltf.mk -+++ b/external/libgltf/ExternalProject_libgltf.mk -@@ -63,6 +63,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : - export CPPFLAGS='$(libgltf_CPPFLAGS)' \ - && export PKG_CONFIG="" \ - && ./configure \ -+ --disable-shared \ -+ --enable-static \ - --with-pic \ - --disable-debug \ - --disable-werror \ -diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk -index 42c821b..176c1d1 100644 ---- a/external/libgltf/UnpackedTarball_libgltf.mk -+++ b/external/libgltf/UnpackedTarball_libgltf.mk -@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary)) - $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1)) - - $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ -- external/libgltf/pathces/missing_include.patch \ -- external/libgltf/pathces/append_shader_version.patch \ - )) - - # vim: set noet sw=4 ts=4: -diff --git a/external/libgltf/pathces/append_shader_version.patch b/external/libgltf/pathces/append_shader_version.patch -deleted file mode 100644 -index 27f0cc6..0000000 ---- a/external/libgltf/pathces/append_shader_version.patch -+++ /dev/null -@@ -1,37 +0,0 @@ --diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp ----- libgltf.org/src/Shaders.cpp 2014-08-18 09:19:48.323955939 +0200 --+++ libgltf/src/Shaders.cpp 2014-08-18 09:20:46.711953465 +0200 --@@ -11,6 +11,7 @@ -- -- #include <GL/glew.h> -- #include <cstdio> --+#include <cstring> -- -- namespace libgltf -- { --@@ -166,7 +167,24 @@ -- unsigned int shaderId) -- { -- GLint iGLSize = iSize; --- glShaderSource(shaderId, 1, &pShader, &iGLSize); --+ if( strstr(pShader,"#version") == 0 ) --+ { --+ const GLchar* aSources[] = { --+ "#version 130\n", --+ pShader, --+ }; --+ --+ const GLint aSizes[] = { --+ strlen("#version 130\n"), --+ iGLSize, --+ }; --+ --+ glShaderSource(shaderId, 2, &aSources[0], &aSizes[0]); --+ } --+ else --+ { --+ glShaderSource(shaderId, 1, &pShader, &iGLSize); --+ } -- glCompileShader(shaderId); -- int iStatus = 0; -- glGetShaderiv(shaderId, GL_COMPILE_STATUS, &iStatus); -diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/pathces/missing_include.patch -deleted file mode 100644 -index 8b05224..0000000 ---- a/external/libgltf/pathces/missing_include.patch -+++ /dev/null -@@ -1,11 +0,0 @@ --diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp ----- libgltf.org/src/Shaders.cpp 2014-08-05 11:40:30.387537876 +0200 --+++ libgltf/src/Shaders.cpp 2014-08-05 11:41:13.887536123 +0200 --@@ -10,6 +10,7 @@ -- #include "Shaders.h" -- -- #include <GL/glew.h> --+#include <cstdio> -- -- namespace libgltf -- { -diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx -index 8a7eb55..f1e0bd2 100644 ---- a/include/vcl/opengl/OpenGLContext.hxx -+++ b/include/vcl/opengl/OpenGLContext.hxx -@@ -166,6 +166,8 @@ public: - return mbInitialized; - } - -+ bool supportMultiSampling() const; -+ - static SystemWindowData generateWinData(Window* pParent); - private: - SAL_DLLPRIVATE bool initWindow(); -diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx -index 974f913..338edc3 100644 ---- a/vcl/source/opengl/OpenGLContext.cxx -+++ b/vcl/source/opengl/OpenGLContext.cxx -@@ -833,4 +833,9 @@ void OpenGLContext::show() - m_pWindow->Show(); - } - -+bool OpenGLContext::supportMultiSampling() const -+{ -+ return m_aGLWin.bMultiSampleSupported; -+} -+ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ --- -2.1.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch b/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch deleted file mode 100644 index 1926a3417c70..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch +++ /dev/null @@ -1,187 +0,0 @@ -Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master -by Mark Wright, gienah@gentoo.org - - ---- libreoffice-4.3.1.2-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-09-20 15:09:49.269841950 +1000 -@@ -402,11 +402,12 @@ - ::basegfx::computeSetDifference( aUncoveredAreas, - rUpdateArea.maTotalBounds, - ::basegfx::B2DRange( rDestRect ) ); -+ SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface()); - ::std::for_each( aUncoveredAreas.begin(), - aUncoveredAreas.end(), - ::boost::bind( &repaintBackground, - boost::cref(pCompositingCairo), -- boost::cref(mpOwningSpriteCanvas->getBufferSurface()), -+ boost::cref(surface), - _1 ) ); - - cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); ---- libreoffice-4.3.1.2-orig/canvas/source/vcl/spritecanvashelper.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/canvas/source/vcl/spritecanvashelper.cxx 2014-09-20 15:09:49.270404983 +1000 -@@ -573,12 +573,12 @@ - - // repaint all affected sprites on top of background into - // VDev. -+ ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) ); - ::std::for_each( rSortedUpdateSprites.begin(), - rSortedUpdateSprites.end(), - ::boost::bind( &spriteRedrawStub2, - ::boost::ref( maVDev.get() ), -- ::boost::cref( -- ::vcl::unotools::b2DPointFromPoint(aOutputPosition)), -+ ::boost::cref( outPos ), - _1 ) ); - - // flush to screen ---- libreoffice-4.3.1.2-orig/dbaccess/source/ui/tabledesign/TableController.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/dbaccess/source/ui/tabledesign/TableController.cxx 2014-09-20 15:12:36.829360633 +1000 -@@ -1392,7 +1392,8 @@ - setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); - if(!isEditable()) - { -- ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True ))); -+ sal_Bool t( sal_True ); -+ ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); - } - m_bNew = false; - // be notified when the table is in disposing ---- libreoffice-4.3.1.2-orig/oox/source/drawingml/table/tablecell.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/oox/source/drawingml/table/tablecell.cxx 2014-09-20 15:09:49.272005355 +1000 -@@ -117,9 +117,9 @@ - if (rTableStylePart.getTextColor().isUsed()) - aTextCharProps.maCharColor = rTableStylePart.getTextColor(); - if( rTableStylePart.getTextBoldStyle().is_initialized() ) -- aTextCharProps.moBold = rTableStylePart.getTextBoldStyle(); -+ aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle(); - if( rTableStylePart.getTextItalicStyle().is_initialized() ) -- aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle(); -+ aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle(); - } - - void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) ---- libreoffice-4.3.1.2-orig/reportdesign/source/core/api/ReportDefinition.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/reportdesign/source/core/api/ReportDefinition.cxx 2014-09-20 15:09:49.273376564 +1000 -@@ -1612,8 +1612,9 @@ - m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage); - } - // notify our container listeners -+ OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this); - m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>( -- ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage))); -+ ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage))); - } - - uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception) ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/activities/activitybase.hxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/activities/activitybase.hxx 2014-09-20 15:09:49.273965661 +1000 -@@ -111,7 +111,7 @@ - ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const - { return mpAttributeLayer; } - -- bool isRepeatCountValid() const { return maRepeats; } -+ bool isRepeatCountValid() const { return bool(maRepeats); } - double getRepeatCount() const { return *maRepeats; } - bool isAutoReverse() const { return mbAutoReverse; } - ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-09-20 15:09:49.274529920 +1000 -@@ -400,11 +400,12 @@ - { - // new sprite pos, transformation might have changed: - maSpriteRectangle = calcSpriteRectangle( maViews.front().first ); -+ ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() ); - - // reposition sprites - for_each_sprite( boost::bind( &cppcanvas::Sprite::move, - _1, -- boost::cref(maSpriteRectangle.getMinimum())) ); -+ boost::cref( rectMin )) ); - - // sprites changed, need screen update - mrScreenUpdater.notifyUpdate(); ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/appletshape.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/appletshape.cxx 2014-09-20 15:09:49.275052955 +1000 -@@ -148,12 +148,13 @@ - void AppletShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( AppletShape::getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( - &ViewAppletShape::resize, - _1, -- ::boost::cref( AppletShape::getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - -@@ -252,11 +253,12 @@ - - bool AppletShape::implStartIntrinsicAnimation() - { -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewAppletShapes.begin(), - maViewAppletShapes.end(), - ::boost::bind( &ViewAppletShape::startApplet, - _1, -- ::boost::cref( getBounds() ))); -+ ::boost::cref( bounds ))); - mbIsPlaying = true; - - return true; ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/drawshape.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/drawshape.cxx 2014-09-20 15:09:49.275701062 +1000 -@@ -168,6 +168,7 @@ - } - - // redraw all view shapes, by calling their update() method -+ ViewShape::RenderArgs renderArgs( getViewRenderArgs() ); - if( ::std::count_if( maViewShapes.begin(), - maViewShapes.end(), - ::boost::bind<bool>( -@@ -178,8 +179,7 @@ - // the extra mem_fn. WTF. - _1, - ::boost::cref( mpCurrMtf ), -- ::boost::cref( -- getViewRenderArgs() ), -+ ::boost::cref( renderArgs ), - nUpdateFlags, - isVisible() ) ) - != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) ) ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/mediashape.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/mediashape.cxx 2014-09-20 15:09:49.276133048 +1000 -@@ -125,12 +125,13 @@ - void MediaShape::implViewsChanged() - { - // resize all ViewShapes -+ ::basegfx::B2DRectangle bounds( getBounds() ); - ::std::for_each( maViewMediaShapes.begin(), - maViewMediaShapes.end(), - ::boost::bind( - &ViewMediaShape::resize, - _1, -- ::boost::cref( getBounds())) ); -+ ::boost::cref( bounds )) ); - } - - ---- libreoffice-4.3.1.2-orig/slideshow/source/engine/unoviewcontainer.cxx 2014-08-26 14:07:49.000000000 +1000 -+++ libreoffice-4.3.1.2/slideshow/source/engine/unoviewcontainer.cxx 2014-09-20 15:09:49.276489737 +1000 -@@ -45,11 +45,12 @@ - const UnoViewVector::iterator aEnd( maViews.end() ); - - // already added? -+ uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView()); - if( ::std::find_if( maViews.begin(), - aEnd, - ::boost::bind( - ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), -- ::boost::cref( rView->getUnoView() ), -+ ::boost::cref( xView ), - ::boost::bind( - &UnoView::getUnoView, - _1 ) ) ) != aEnd ) diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch deleted file mode 100644 index 776ba39c0f25..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch +++ /dev/null @@ -1,57 +0,0 @@ -Merged upstream commits for bug 523822: - -a2d4bd6864e108a11d6ca2b69de5ebce265102dc "Refactor DPI settings validity check" -1964870db4ad1e4334e8fc5050795469dc1fb05e "[PATCH] Fallback DPI detection on X11" - -diff -u b/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx ---- b/vcl/unx/generic/app/saldisp.cxx -+++ b/vcl/unx/generic/app/saldisp.cxx -@@ -120,6 +120,12 @@ - return nBits; - } - -+// check if the resolution is sane -+static bool sal_ValidDPI(long nDPI) -+{ -+ return (nDPI >= 50) && (nDPI <= 500); -+} -+ - static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) - { - int nInfos; -@@ -555,7 +561,7 @@ - const OString aValStr( pValStr ); - const long nDPI = (long) aValStr.toDouble(); - // guard against insane resolution -- if( (nDPI >= 50) && (nDPI <= 500) ) -+ if( sal_ValidDPI(nDPI) ) - { - aResolution_ = Pair( nDPI, nDPI ); - bExactResolution = true; -@@ -569,7 +575,25 @@ - } - if( bExactResolution == false ) - { -- aResolution_ = Pair( 96, 96 ); -+ /* if Xft.dpi is not set, try and find the DPI from the -+ * reported screen sizes and resolution. If there are multiple -+ * screens, just fall back to the default 96x96 -+ */ -+ long xDPI = 96; -+ long yDPI = 96; -+ if (m_aScreens.size() == 1) { -+ xDPI = (long)round(DisplayWidth(pDisp_, 0)*25.4/DisplayWidthMM(pDisp_, 0)); -+ yDPI = (long)round(DisplayHeight(pDisp_, 0)*25.4/DisplayHeightMM(pDisp_, 0)); -+ // if either is invalid set it equal to the other -+ if (!sal_ValidDPI(xDPI) && sal_ValidDPI(yDPI)) -+ xDPI = yDPI; -+ if (!sal_ValidDPI(yDPI) && sal_ValidDPI(xDPI)) -+ yDPI = xDPI; -+ // if both are invalid, reset them to the default -+ if (!sal_ValidDPI(xDPI) && !sal_ValidDPI(yDPI)) -+ xDPI = yDPI = 96; -+ } -+ aResolution_ = Pair( xDPI, yDPI ); - } - - nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4; diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch deleted file mode 100644 index c7422d233410..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com> -Date: Mon, 3 Nov 2014 10:01:52 +0100 -Subject: [PATCH] Detect KDE5 and fallback to KDE4UI there - -Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360 -Reviewed-on: https://gerrit.libreoffice.org/12209 -Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> -Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> ---- - vcl/unx/generic/desktopdetect/desktopdetector.cxx | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx -index 163d48e..e1f253d 100644 ---- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx -+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx -@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay ) - return false; - } - -+static bool is_kde5_desktop( Display* pDisplay ) -+{ -+ if ( NULL != getenv( "KDE_FULL_SESSION" ) ) -+ { -+ OUString aVer( "5" ); -+ -+ const char *pVer = getenv( "KDE_SESSION_VERSION" ); -+ if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) -+ return true; -+ } -+ -+ if ( KDEVersion( pDisplay ) == 5 ) -+ return true; -+ -+ return false; -+} -+ - extern "C" - { - -@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() - - if ( aOver.equalsIgnoreAsciiCase( "tde" ) ) - return DESKTOP_TDE; -+ if ( aOver.equalsIgnoreAsciiCase( "kde5" ) ) -+ return DESKTOP_KDE4; - if ( aOver.equalsIgnoreAsciiCase( "kde4" ) ) - return DESKTOP_KDE4; - if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) -@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() - - // these guys can be slower, with X property fetches, - // round-trips etc. and so are done later. -+ else if ( is_kde5_desktop( pDisplay ) ) -+ ret = DESKTOP_KDE4; - else if ( is_kde4_desktop( pDisplay ) ) - ret = DESKTOP_KDE4; - else if ( is_gnome_desktop( pDisplay ) ) --- -2.2.1 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch deleted file mode 100644 index 41b2bdd86301..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ec8beb2fa279b8d7b1efbd9f5414895b17dfbe8b Mon Sep 17 00:00:00 2001 -From: Katarina Behrens <bubli@bubli.org> -Date: Fri, 5 Sep 2014 14:11:15 +0200 -Subject: [PATCH] fdo#82681: return IsUserDefined w/o negation - -when the predicate is called StyleSheetIsUserDefinedPredicate - -Returning negation thereof somewhere, somehow, corrupts one of -SfxItem pools. Thus, invalid read happens and crashes Impress -and Draw. - -Now the loop in SdStyleSheetPool::UpdateStdNames does nothing -(it iterates through user-defined styles, but its body does -something for non-user-defined styles), so more investigation -here is needed. - -This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1 - -Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57 -(cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093) -Signed-off-by: Andras Timar <andras.timar@collabora.com> ---- - sd/source/core/stlpool.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx -index 17ca4f0..c98dff7 100644 ---- a/sd/source/core/stlpool.cxx -+++ b/sd/source/core/stlpool.cxx -@@ -943,7 +943,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate - - bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE - { -- return !sheet.IsUserDefined(); -+ return sheet.IsUserDefined(); - } - }; - } --- -2.2.1 - diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch deleted file mode 100644 index 098680da63d9..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch +++ /dev/null @@ -1,157 +0,0 @@ -From f24c60870531689d95c056037e48cd29ad1d17bb Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 20 Oct 2014 14:21:22 +0200 -Subject: [PATCH] allow to build with system opencollada - -Change-Id: I6101099c57d429987e06bca0652c843f4a94f8cc ---- - Makefile.fetch | 2 +- - RepositoryExternal.mk | 16 ++++++++++++++++ - config_host.mk.in | 4 +++- - configure.ac | 35 +++++++++++++++++++++++++++++++++++ - external/Module_external.mk | 2 +- - 5 files changed, 56 insertions(+), 3 deletions(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index e8ccf5b..18b12be 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -184,7 +184,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) - $(call fetch_Optional,NSS,NSS_TARBALL) \ - $(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \ - $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ -- $(call fetch_Optional,COLLADA2GLTF,OPENCOLLADA_TARBALL) \ -+ $(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \ - $(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \ - $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ - $(call fetch_Optional,ORCUS,ORCUS_TARBALL) \ -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index 5277aea..911dab1 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3371,6 +3371,20 @@ endif # SYSTEN_LIBGLTF - - ifeq ($(ENABLE_COLLADA),TRUE) - -+ifeq ($(SYSTEM_OPENCOLLADA),TRUE) -+ -+define gb_LinkTarget__use_opencollada_parser -+$(call gb_LinkTarget_set_include,$(1),\ -+ $$(INCLUDE) \ -+ $(OPENCOLLADA_CFLAGS) \ -+) -+ -+$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS)) -+ -+endef -+ -+else # !SYSTEM_OPENCOLLADA -+ - define gb_LinkTarget__use_opencollada_parser - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ -@@ -3385,6 +3399,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ - ) - endef - -+endif # SYSTEM_OPENCOLLADA -+ - define gb_LinkTarget__use_collada2gltf - $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf) \ -diff --git a/config_host.mk.in b/config_host.mk.in -index 0fefbb0..738c80c 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -431,7 +431,8 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ - export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@ - export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ - export OOO_VENDOR=@OOO_VENDOR@ --export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -+export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@ -+export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@ - export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ - export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ - export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ -@@ -558,6 +559,7 @@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ - export SYSTEM_NSS=@SYSTEM_NSS@ - export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ - export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ -+export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@ - export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ - export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ - export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ -diff --git a/configure.ac b/configure.ac -index 17feb1a..5d2198b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1641,6 +1641,11 @@ AC_ARG_WITH(system-ucpp, - [Use ucpp already on system.]),, - []) - -+AC_ARG_WITH(system-opencollada, -+ AS_HELP_STRING([--with-system-opencollada], -+ [Use openCOLLADA already on system.]),, -+ [with_system_opencollada=no]) -+ - AC_ARG_WITH(system-openldap, - AS_HELP_STRING([--with-system-openldap], - [Use the OpenLDAP LDAP SDK already on system.]),, -@@ -10342,11 +10347,41 @@ if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then - AC_MSG_RESULT([yes]) - ENABLE_COLLADA=TRUE - AC_DEFINE(HAVE_FEATURE_COLLADA,1) -+ AC_MSG_CHECKING([which OPENCOLLADA to use]) -+ if test "$with_system_opencollada" = "yes"; then -+ AC_MSG_RESULT([external]) -+ SYSTEM_OPENCOLLADA=TRUE -+ AS_IF([test -n "$OPENCOLLADA_CFLAGS"],[],[AC_MSG_ERROR([export OPENCOLLADA_CFLAGS])]) -+ AS_IF([test -n "$OPENCOLLADA_LIBS"],[],[AC_MSG_ERROR([export OPENCOLLADA_LIBS])]) -+ AC_LANG_PUSH([C++]) -+ save_CXXFLAGS=$CXXFLAGS -+ save_CPPFLAGS=$CPPFLAGS -+ CXXFLAGS="$CXXFLAGS $OPENCOLLADA_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $OPENCOLLADA_CFLAGS" -+ AC_CHECK_HEADERS( -+ COLLADABU.h \ -+ COLLADAFW.h \ -+ COLLADASaxFWLLoader.h \ -+ GeneratedSaxParser.h, -+ [], -+ [AC_MSG_ERROR([openCOLLADA headers not found. Install openCOLLADA])], -+ []) -+ CXXFLAGS=$save_CXXFLAGS -+ CPPFLAGS=$save_CPPFLAGS -+ AC_LANG_POP([C++]) -+ OPENCOLLADA_CFLAGS=$(printf '%s' "$OPENCOLLADA_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") -+ else -+ AC_MSG_RESULT([internal]) -+ BUILD_TYPE="$BUILD_TYPE OPENCOLLADA" -+ fi - BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" - else - AC_MSG_RESULT([no]) - fi - AC_SUBST(ENABLE_COLLADA) -+AC_SUBST([OPENCOLLADA_CFLAGS]) -+AC_SUBST([OPENCOLLADA_LIBS]) -+AC_SUBST([SYSTEM_OPENCOLLADA]) - - # pdf import? - AC_MSG_CHECKING([whether to build the PDF import feature]) -diff --git a/external/Module_external.mk b/external/Module_external.mk -index c95ea20..688e335 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -75,7 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,NEON,neon) \ - $(call gb_Helper_optional,NSS,nss) \ - $(call gb_Helper_optional,ODFGEN,libodfgen) \ -- $(call gb_Helper_optional,COLLADA2GLTF,opencollada) \ -+ $(call gb_Helper_optional,OPENCOLLADA,opencollada) \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ - $(call gb_Helper_optional,ORCUS,liborcus) \ --- -2.2.1 - diff --git a/app-office/libreoffice/files/libreoffice-9999-curl-config.patch b/app-office/libreoffice/files/libreoffice-9999-curl-config.patch deleted file mode 100644 index 25ff20fd8c6f..000000000000 --- a/app-office/libreoffice/files/libreoffice-9999-curl-config.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c1727287731dd0bd19ce36f58c1ce29a2a8603b3 Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal <tomas.chvatal@gmail.com> -Date: Sat, 25 Jan 2014 11:44:27 +0100 -Subject: [PATCH] Use pkgconfig to detect curl first, then fallback to curl-config. - -Change-Id: I3666c4d0298a76062a24ad8ae1c319f3480a9290 ---- - -diff --git a/configure.ac b/configure.ac -index 93c39d3..fb51308 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8661,39 +8661,31 @@ - AC_MSG_RESULT([external]) - SYSTEM_CURL=YES - -- curl_version="" -- if test "$cross_compiling" = "yes"; then -- dnl At least the OBS mingw32-libcurl-devel package -- dnl comes with a proper .pc file -- PKG_CHECK_MODULES(CURL, libcurl,, [:]) -- if test -n "$CURL_PKG_ERRORS"; then -- AC_MSG_RESULT([no]) -- else -- curl_version=`$PKG_CONFIG --modversion libcurl` -- fi -- fi -- if test -z "$curl_version"; then -+ AC_MSG_CHECKING([whether libcurl is >= 7.19.4]) -+ -+ # First try PKGCONFIG and then fall back -+ PKG_CHECK_MODULES(CURL, libcurl >= 7.19.4,, [:]) -+ -+ if test -n "$CURL_PKG_ERRORS"; then - AC_PATH_PROG(CURLCONFIG, curl-config) - if test -z "$CURLCONFIG"; then -- AC_MSG_ERROR([install the libcurl development package]) -+ AC_MSG_ERROR([curl developement files not found]) - fi - CURL_LIBS=`$CURLCONFIG --libs` - CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g") - curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'` -+ -+ case $curl_version in -+ dnl brackets doubled below because Autoconf uses them as m4 quote characters, -+ dnl so they need to be doubled to end up in the configure script -+ 7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -+ ;; -+ *) -+ AC_MSG_ERROR([no, you have $curl_version]) -+ ;; -+ esac - fi -- -- AC_MSG_CHECKING([whether libcurl is >= 7.19.4]) -- -- case $curl_version in -- dnl brackets doubled below because Autoconf uses them as m4 quote characters, -- dnl so they need to be doubled to end up in the configure script -- 7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*) -- AC_MSG_RESULT([yes, you have $curl_version]) -- ;; -- *) -- AC_MSG_ERROR([no, you have $curl_version]) -- ;; -- esac -+ AC_MSG_RESULT([yes]) - - libo_MINGW_CHECK_DLL([libcurl]) - libo_MINGW_TRY_DLL([libintl]) diff --git a/app-office/libreoffice/libreoffice-4.3.5.2.ebuild b/app-office/libreoffice/libreoffice-4.3.5.2.ebuild deleted file mode 100644 index 47a690f7f5b8..000000000000 --- a/app-office/libreoffice/libreoffice-4.3.5.2.ebuild +++ /dev/null @@ -1,622 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.5.2.ebuild,v 1.6 2015/02/22 10:16:33 mgorny Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - http://download.documentfoundation.org/libreoffice/old/${PV}/ -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -# Help is used for the image generator -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" - -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -# Unpackaged separate extensions: -# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? -# hunart: only on ooo extensions -> fubared download path somewhere on sf -# numbertext, typo, validator, watch-window: ^^ -# oooblogger: no homepage or anything -# Extensions that need extra work: -for lo_xt in ${LO_EXTS}; do - IUSE+=" libreoffice_extensions_${lo_xt}" -done -unset lo_xt - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" - -# FIXME: collada? ( media-libs/opencollada ) -# how to configure system-collada? -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.1 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.3.0 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - dev-cpp/libcmis:0.4 - dev-db/unixODBC - >=dev-libs/boost-1.46:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - >=dev-libs/liborcus-0.7.0 - >=dev-libs/librevenge-0.0.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/glew-1.10 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.1.0 - >=media-libs/libfreehand-0.1.0 - >=media-libs/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - bluetooth? ( net-wireless/bluez ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( - virtual/glu - virtual/opengl - ) - postgres? ( >=dev-db/postgresql-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="~app-office/libreoffice-l10n-${PV}" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - media-libs/glm - net-misc/npapi-sdk - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - - # from 4.3 branch - "${FILESDIR}/${PN}-4.3.5.2-return-IsUserDefined-w-o-negation.patch" # bug 524770 - - # from 4.4 branch - "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" - "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 - "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" - "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" - - # from master branch - - # submitted - "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - - # Ensure pg version but we have to be sure the pg is installed (first - # install on clean system) - if use postgres && has_version dev-db/postgresql; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/officehelper.py || die - # sed in the tests - sed -i \ - -e 's#all : build unitcheck#all : build#g' \ - solenv/gbuild/Module.mk || die - sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ - Makefile.in || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - " - - use libreoffice_extensions_scripting-beanshell && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - use libreoffice_extensions_scripting-javascript && \ - java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # FIXME: $(use_with collada system-opencollada) - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-mergelibs \ - --disable-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-online-update \ - --disable-systray \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-parallelism=${jbs} \ - --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable coinmp) \ - $(use_enable collada) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gltf) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # symlink the nsplugin to proper location - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-4.3.6.2.ebuild b/app-office/libreoffice/libreoffice-4.3.6.2.ebuild deleted file mode 100644 index d0e72268a362..000000000000 --- a/app-office/libreoffice/libreoffice-4.3.6.2.ebuild +++ /dev/null @@ -1,623 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.6.2.ebuild,v 1.2 2015/02/22 10:16:33 mgorny Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - http://download.documentfoundation.org/libreoffice/old/${PV}/ -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -# Help is used for the image generator -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" - -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -# Unpackaged separate extensions: -# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? -# hunart: only on ooo extensions -> fubared download path somewhere on sf -# numbertext, typo, validator, watch-window: ^^ -# oooblogger: no homepage or anything -# Extensions that need extra work: -for lo_xt in ${LO_EXTS}; do - IUSE+=" libreoffice_extensions_${lo_xt}" -done -unset lo_xt - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -# FIXME: collada? ( media-libs/opencollada ) -# how to configure system-collada? -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.1 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.3.0 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.4* - dev-db/unixODBC - >=dev-libs/boost-1.46:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - >=dev-libs/liborcus-0.7.0 - >=dev-libs/librevenge-0.0.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/glew-1.10 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4:0= - >=media-libs/libcdr-0.1.0 - >=media-libs/libfreehand-0.1.0 - >=media-libs/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - bluetooth? ( net-wireless/bluez ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( - virtual/glu - virtual/opengl - ) - postgres? ( >=dev-db/postgresql-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - media-libs/glm - net-misc/npapi-sdk - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - - # from 4.4 branch - "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" - "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 - "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" - "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" - "${FILESDIR}/${PN}-4.3.5.2-DPI.patch" - - # from master branch - - # submitted - "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - - # Ensure pg version but we have to be sure the pg is installed (first - # install on clean system) - if use postgres && has_version dev-db/postgresql; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - git-r3_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/officehelper.py || die - # sed in the tests - sed -i \ - -e 's#all : build unitcheck#all : build#g' \ - solenv/gbuild/Module.mk || die - sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ - Makefile.in || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - " - - use libreoffice_extensions_scripting-beanshell && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - use libreoffice_extensions_scripting-javascript && \ - java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # FIXME: $(use_with collada system-opencollada) - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-mergelibs \ - --disable-online-update \ - --disable-systray \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-parallelism=${jbs} \ - --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable coinmp) \ - $(use_enable collada) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gltf) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624 and probably more - addpredict /dev/dri - addpredict /dev/nvidiactl - - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # symlink the nsplugin to proper location - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild deleted file mode 100644 index 80f60e0c2970..000000000000 --- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.19 2015/04/03 22:12:56 dilfridge Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - http://download.documentfoundation.org/libreoffice/old/${PV}/ -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -# Help is used for the image generator -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" - -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -# Unpackaged separate extensions: -# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? -# hunart: only on ooo extensions -> fubared download path somewhere on sf -# numbertext, typo, validator, watch-window: ^^ -# oooblogger: no homepage or anything -# Extensions that need extra work: -for lo_xt in ${LO_EXTS}; do - IUSE+=" libreoffice_extensions_${lo_xt}" -done -unset lo_xt - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -# FIXME: collada? ( media-libs/opencollada ) -# how to configure system-collada? -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.1 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.3.0 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.4* - dev-db/unixODBC - >=dev-libs/boost-1.46:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - >=dev-libs/liborcus-0.7.0 - >=dev-libs/librevenge-0.0.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/glew-1.10 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4:0= - >=media-libs/libcdr-0.1.0 - >=media-libs/libfreehand-0.1.0 - >=media-libs/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - bluetooth? ( net-wireless/bluez ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - opengl? ( - virtual/glu - virtual/opengl - ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - media-libs/glm - net-misc/npapi-sdk - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - - # from 4.4 branch - "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" - "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 - "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" - "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" - "${FILESDIR}/${PN}-4.3.5.2-DPI.patch" - - # from master branch - "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454 -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - - # Ensure pg version but we have to be sure the pg is installed (first - # install on clean system) - if use postgres && has_version dev-db/postgresql; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - git-r3_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i scripting/source/pyprov/officehelper.py || die - # sed in the tests - sed -i \ - -e 's#all : build unitcheck#all : build#g' \ - solenv/gbuild/Module.mk || die - sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ - Makefile.in || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") - - # recheck that there is some value in jobs - [[ -z ${jbs} ]] && jbs="1" - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - " - - use libreoffice_extensions_scripting-beanshell && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - use libreoffice_extensions_scripting-javascript && \ - java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # FIXME: $(use_with collada system-opencollada) - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-mergelibs \ - --disable-online-update \ - --disable-systray \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-parallelism=${jbs} \ - --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable coinmp) \ - $(use_enable collada) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gltf) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624 and probably more - addpredict /dev/dri - addpredict /dev/nvidiactl - - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # symlink the nsplugin to proper location - # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} diff --git a/app-office/libreoffice/libreoffice-4.4.0.3.ebuild b/app-office/libreoffice/libreoffice-4.4.0.3.ebuild deleted file mode 100644 index d461ee3b5080..000000000000 --- a/app-office/libreoffice/libreoffice-4.4.0.3.ebuild +++ /dev/null @@ -1,613 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild,v 1.4 2015/02/23 11:34:32 dilfridge Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - http://dev-builds.libreoffice.org/pre-releases/src - http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - http://download.documentfoundation.org/libreoffice/old/${PV}/ -" -EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" -ADDONS_URI="http://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="LibreOffice, a full office productivity suite" -HOMEPAGE="http://www.libreoffice.org" -SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# Split modules following git/tarballs -# Core MUST be first! -# Help is used for the image generator -MODULES="core help" -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - for mod in ${MODULES}; do - if [[ ${mod} == core ]]; then - SRC_URI+=" ${i}/${P}.tar.xz" - else - SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" - fi - done - unset mod - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code -ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" -ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" -ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino -ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" - -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -# Unpackaged separate extensions: -# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? -# hunart: only on ooo extensions -> fubared download path somewhere on sf -# numbertext, typo, validator, watch-window: ^^ -# oooblogger: no homepage or anything -# Extensions that need extra work: -for lo_xt in ${LO_EXTS}; do - IUSE+=" libreoffice_extensions_${lo_xt}" -done -unset lo_xt - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libabw-0.1.0 - >=app-text/libexttextcat-3.2 - >=app-text/libebook-0.1.1 - >=app-text/libetonyek-0.1.1 - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.4 - >=app-text/libodfgen-0.1.0 - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.3.0 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - >=dev-libs/boost-1.55:= - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - >=dev-libs/liborcus-0.7.0 - >=dev-libs/librevenge-0.0.1 - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 - >=dev-libs/redland-1.0.16 - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/glew-1.10 - >=media-libs/harfbuzz-0.9.18:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.1.0 - >=media-libs/libfreehand-0.1.0 - media-libs/libpagemaker - >=media-libs/libvisio-0.1.0 - >=net-misc/curl-7.21.4 - net-libs/neon - net-nds/openldap - sci-mathematics/lpsolve - virtual/jpeg:0 - >=x11-libs/cairo-1.10.0[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - virtual/opengl - bluetooth? ( net-wireless/bluez ) - coinmp? ( sci-libs/coinor-mp ) - collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) - cups? ( net-print/cups ) - dbus? ( >=dev-libs/dbus-glib-0.92 ) - eds? ( gnome-extra/evolution-data-server ) - firebird? ( >=dev-db/firebird-2.5 ) - gltf? ( media-libs/libgltf ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( >=x11-libs/gtk+-3.2:3 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - dev-java/tomcat-servlet-api:3.0 - ) - mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) - postgres? ( >=dev-db/postgresql-9.0[kerberos] ) - telepathy? ( - dev-libs/glib:2 - >=net-libs/telepathy-glib-0.18.0 - >=x11-libs/gtk+-2.24:2 - ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="~app-office/libreoffice-l10n-${PV}" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" -fi - -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - dev-util/cppunit - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-0.10.3:= - media-libs/glm - net-misc/npapi-sdk - >=sys-apps/findutils-4.4.2 - sys-devel/bison - sys-apps/coreutils - sys-devel/flex - sys-devel/gettext - >=sys-devel/make-3.82 - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-libs/libXt - x11-libs/libXtst - x11-proto/randrproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - java? ( - >=virtual/jdk-1.6 - >=dev-java/ant-core-1.7 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-4.4-system-pyuno.patch" - - # from 4.4 branch - "${FILESDIR}/${PN}-4.4.0.3-gcc-4.9-Os-link-failure.patch" # bug 538348 - - # from master branch - "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" -) - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - collada? ( gltf ) - gnome? ( gtk ) - eds? ( gnome ) - telepathy? ( gtk ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -CHECKREQS_MEMORY="512M" -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - local pgslot - - if [[ ${MERGE_TYPE} != binary ]]; then - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - ; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - - # Ensure pg version but we have to be sure the pg is installed (first - # install on clean system) - if use postgres && has_version dev-db/postgresql; then - pgslot=$(postgresql-config show) - if [[ ${pgslot//.} < 90 ]] ; then - eerror "PostgreSQL slot must be set to 9.0 or higher." - eerror " postgresql-config set 9.0" - die "PostgreSQL slot is not set to 9.0 or higher." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - python-single-r1_pkg_setup - - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup -} - -src_unpack() { - local mod mod2 dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" - - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - for mod in ${MODULES}; do - [[ ${mod} == core ]] && continue - unpack "${PN}-${mod}-${PV}.tar.xz" - done - else - for mod in ${MODULES}; do - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" - EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${P}" - [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" - EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack - if [[ ${mod} != core ]]; then - mod2=${mod} - # mapping does not match on help - [[ ${mod} == help ]] && mod2="helpcontent2" - mkdir -p "${S}/${mod2}/" || die - mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die - rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" - fi - done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH - fi -} - -src_prepare() { - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use collada; then - export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" - export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" - fi - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - base_src_prepare - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - -i pyuno/source/module/uno.py \ - -i pyuno/source/officehelper.py || die - # sed in the tests - sed -i \ - -e 's#all : build unitcheck#all : build#g' \ - solenv/gbuild/Module.mk || die - sed -i \ - -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ - -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ - Makefile.in || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die - fi -} - -src_configure() { - local java_opts - local internal_libs - local lo_ext - local ext_opts - - # sane: just sane.h header that is used for scan in writer, not - # linked or anything else, worthless to depend on - # vigra: just uses templates from there - # it is serious pain in the ass for packaging - # should be replaced by boost::gil if someone interested - internal_libs+=" - --without-system-sane - --without-system-vigra - " - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" - else - ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" - fi - done - - if use java; then - # hsqldb: system one is too new - java_opts=" - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home=$(java-config --jdk-home 2>/dev/null) - --with-jvm-path="${EPREFIX}/usr/lib/" - " - - use libreoffice_extensions_scripting-beanshell && \ - java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" - - use libreoffice_extensions_scripting-javascript && \ - java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) - " - fi - fi - - # system headers/libs/...: enforce using system packages - # --enable-cairo: ensure that cairo is always required - # --enable-graphite: disabling causes build breakages - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --disable-gnome-vfs: old gnome virtual fs support - # --disable-kdeab: kde3 adressbook - # --disable-kde: kde3 support - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ - --with-system-headers \ - --with-system-libs \ - --with-system-jars \ - --with-system-dicts \ - --enable-cairo-canvas \ - --enable-graphite \ - --enable-largefile \ - --enable-mergelibs \ - --enable-neon \ - --enable-python=system \ - --enable-randr \ - --enable-randr-link \ - --enable-release-build \ - --disable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-online-update \ - --disable-systray \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ - --enable-extension-integration \ - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ - --with-external-tar="${DISTDIR}" \ - --with-lang="" \ - --with-parallelism=$(makeopts_jobs) \ - --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-fonts \ - --without-myspell-dicts \ - --without-help \ - --with-helppack-integration \ - --without-sun-templates \ - $(use_enable bluetooth sdremote-bluetooth) \ - $(use_enable coinmp) \ - $(use_enable collada) \ - $(use_enable cups) \ - $(use_enable debug) \ - $(use_enable dbus) \ - $(use_enable eds evolution2) \ - $(use_enable firebird firebird-sdbc) \ - $(use_enable gltf) \ - $(use_enable gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gstreamer gstreamer-1-0) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mariadb-connector) \ - $(use_enable odk) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable vlc) \ - $(use_with coinmp system-coinmp) \ - $(use_with collada system-opencollada) \ - $(use_with gltf system-libgltf) \ - $(use_with java) \ - $(use_with mysql system-mysql-cppconn) \ - $(use_with odk doxygen) \ - ${internal_libs} \ - ${java_opts} \ - ${ext_opts} -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624 and probably more - addpredict /dev/dri - addpredict /dev/nvidiactl - - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=icon-themes/galaxy/res/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." - ) - - local target - use test && target="build" || target="build-nocheck" - - # this is not a proper make script - make ${target} || die -} - -src_test() { - make unitcheck || die - make slowcheck || die -} - -src_install() { - # This is not Makefile so no buildserver - make DESTDIR="${D}" distro-pack-install -o build -o check || die - - # Fix bash completion placement - newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"/etc/ || die - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} - fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files for support to old installs that can't parse mime - rm -rf "${ED}"/usr/share/mimelnk/ - - # FIXME: Hack add missing file - insinto /usr/$(get_libdir)/${PN}/program - doins "${S}"/instdir/program/libsaxlo.so - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - use java || \ - ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' -} - -pkg_postrm() { - kde4-base_pkg_postrm -} |