repo cleanup...drop old ebuilds, drop ebuilds already in portage tree

11 files changed, 0 insertions, 821 deletions

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 fe93728c..00000000
--- 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 8cf3a2b3..00000000
--- 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 7067c019..00000000
--- 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.2.0.4-curl-config.patch b/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch
deleted file mode 100644
index e07f5ad9..00000000
--- 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.6.3-jpeg9.patch b/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch
deleted file mode 100644
index b72012b6..00000000
--- 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.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
deleted file mode 100644
index 370b4aaa..00000000
--- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Sun, 4 Jan 2015 15:33:35 +0100
-Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
- sh=dash users
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original patch by Rémi Cardona <remi@gentoo.org>
-
-Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
-Reviewed-on: https://gerrit.libreoffice.org/13731
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8aa33d0..5dbe640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11483,9 +11483,8 @@ test_font_map()
-     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
- 
-     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
--    while true ; do
-+    while test "$#" -ge 1 ; do
-         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
--        test -n "$MAPPING" || break
-         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
-     done
-     if test $TESTEXPR
--- 
-2.3.0
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
deleted file mode 100644
index 1cf8e192..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4-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/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
-index 99d3b03..704edab 100755
---- a/pyuno/source/officehelper.py
-+++ b/pyuno/source/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.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
deleted file mode 100644
index 0f39688e..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Sat, 14 Feb 2015 00:17:06 +0100
-Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
-
-A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
-fails because of these undefined symbols:
-
-> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
- \\bWindowListenerMultiplexer::acquire
-         U non-virtual thunk to WindowListenerMultiplexer::acquire()
-
-They should probably be generated inline.  Work around by out-lining the
-definition of the methods.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
-
-Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
-(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
-Reviewed-on: https://gerrit.libreoffice.org/14509
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-
-diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
-index e048e75..b212dff 100644
---- a/include/toolkit/helper/macros.hxx
-+++ b/include/toolkit/helper/macros.hxx
-@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
- public: \
-     ClassName( ::cppu::OWeakObject& rSource ); \
-     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
--    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
--    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
-+    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
-     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- 
- 
-@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
- public: \
-     ClassName( ::cppu::OWeakObject& rSource ); \
-     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
--    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
--    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
-+    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
-     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- 
- 
-@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
-     : ListenerMultiplexerBase( rSource ) \
- { \
- } \
-+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
-+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
- ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
- { \
-     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
-diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
-index 797fad2..b109c5f 100644
---- a/toolkit/source/helper/listenermultiplexer.cxx
-+++ b/toolkit/source/helper/listenermultiplexer.cxx
-@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
- {
- }
- 
-+void SAL_CALL EventListenerMultiplexer::acquire() throw ()
-+{
-+    return ListenerMultiplexerBase::acquire();
-+}
-+void SAL_CALL EventListenerMultiplexer::release() throw ()
-+{
-+    return ListenerMultiplexerBase::release();
-+}
-+
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
- {
--- 
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
deleted file mode 100644
index 2833385a..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 11 Jan 2015 13:08:37 +0100
-Subject: OSL_ENSURE was not declared in this scope
-
-Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
-
-diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
-index 86986fc..df4a63f 100644
---- a/tubes/source/conference.cxx
-+++ b/tubes/source/conference.cxx
-@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
- 
- void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
- {
--    OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
-+    SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
-     if (mpChannel)
-         g_object_unref( mpChannel);
-     if (mpAccount)
-@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
- {
-     INFO_LOGGER( "TeleConference::offerTube");
- 
--    OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
-+    SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
-     if (!mpChannel)
-         return false;
- 
-@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
- {
-     INFO_LOGGER( "TeleConference::setTube");
- 
--    OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
-+    SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
- 
-     pImpl->mpTube = pTube;
- 
--- 
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
deleted file mode 100644
index d4c4d28b..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Wed, 26 Nov 2014 13:35:42 +0100
-Subject: Add kde4-open-url script
-
-Adds a KDE4 specific URL processing script.
-
-Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
-
-diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
-index c5e4978..162bcc5 100644
---- a/shell/Package_scripts_kde.mk
-+++ b/shell/Package_scripts_kde.mk
-@@ -9,6 +9,12 @@
- 
- $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
- 
-+ifeq ($(ENABLE_KDE),TRUE)
- $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-+endif
-+
-+ifeq ($(ENABLE_KDE4),TRUE)
-+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-+endif
- 
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
-new file mode 100755
-index 0000000..e5b8125
---- /dev/null
-+++ b/shell/source/unix/misc/kde4-open-url.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+# This file incorporates work covered by the following license notice:
-+#
-+#   Licensed to the Apache Software Foundation (ASF) under one or more
-+#   contributor license agreements. See the NOTICE file distributed
-+#   with this work for additional information regarding copyright
-+#   ownership. The ASF licenses this file to you under the Apache
-+#   License, Version 2.0 (the "License"); you may not use this file
-+#   except in compliance with the License. You may obtain a copy of
-+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+#
-+
-+# use kde-open or xdg-open if available, falling back to our own open-url
-+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
-+exit 0
--- 
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
deleted file mode 100644
index 61e036ee..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d	"KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d	"KDE4: improve default load and save dialog titles"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
- 
- #include "generic/geninst.h"
- 
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
- 
- KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
-     : KDE4FilePicker_Base(_helperMutex)
--    , _resMgr( ResMgr::CreateResMgr("fps_office") )
-     , allowRemoteUrls( false )
- {
-     _extraControls = new QWidget();
-@@ -128,8 +129,7 @@
- #endif
- 
-     setMultiSelectionMode( false );
--    //default mode
--    _dialog->setOperationMode(KFileDialog::Opening);
-+    _dialog->setConfirmOverwrite( true );
- 
-     // XExecutableDialog functions
-     connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +202,6 @@
-         SalYieldMutexReleaser aReleaser;
-         return Q_EMIT cleanupProxySignal();
-     }
--    delete _resMgr;
-     delete _dialog;
- }
- 
-@@ -524,6 +523,24 @@
-     return toOUString(label);
- }
- 
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+    QString aResString;
-+
-+    if( aRedId < 0 )
-+        return aResString;
-+
-+    try
-+    {
-+        aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+    }
-+    catch(...)
-+    {
-+    }
-+
-+    return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
-     QWidget* widget = 0;
-@@ -532,37 +549,37 @@
-     switch (controlId)
-     {
-         case CHECKBOX_AUTOEXTENSION:
--            resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+            resId = STR_FPICKER_AUTO_EXTENSION;
-             break;
-         case CHECKBOX_PASSWORD:
--            resId = STR_SVT_FILEPICKER_PASSWORD;
-+            resId = STR_FPICKER_PASSWORD;
-             break;
-         case CHECKBOX_FILTEROPTIONS:
--            resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+            resId = STR_FPICKER_FILTER_OPTIONS;
-             break;
-         case CHECKBOX_READONLY:
--            resId = STR_SVT_FILEPICKER_READONLY;
-+            resId = STR_FPICKER_READONLY;
-             break;
-         case CHECKBOX_LINK:
--            resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+            resId = STR_FPICKER_INSERT_AS_LINK;
-             break;
-         case CHECKBOX_PREVIEW:
--            resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+            resId = STR_FPICKER_SHOW_PREVIEW;
-             break;
-         case CHECKBOX_SELECTION:
--            resId = STR_SVT_FILEPICKER_SELECTION;
-+            resId = STR_FPICKER_SELECTION;
-             break;
-         case PUSHBUTTON_PLAY:
--            resId = STR_SVT_FILEPICKER_PLAY;
-+            resId = STR_FPICKER_PLAY;
-             break;
-         case LISTBOX_VERSION:
--            resId = STR_SVT_FILEPICKER_VERSION;
-+            resId = STR_FPICKER_VERSION;
-             break;
-         case LISTBOX_TEMPLATE:
--            resId = STR_SVT_FILEPICKER_TEMPLATES;
-+            resId = STR_FPICKER_TEMPLATES;
-             break;
-         case LISTBOX_IMAGE_TEMPLATE:
--            resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+            resId = STR_FPICKER_IMAGE_TEMPLATE;
-             break;
-         case LISTBOX_VERSION_LABEL:
-         case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +598,7 @@
-         case CHECKBOX_PREVIEW:
-         case CHECKBOX_SELECTION:
-         {
--            QString label;
--
--            if (_resMgr && resId != -1)
--            {
--                OUString s(ResId(resId, *_resMgr).toString());
--                label = toQString(s);
--                label.replace("~", "&");
--            }
--
--            widget = new QCheckBox(label, _extraControls);
-+            widget = new QCheckBox(getResString(resId), _extraControls);
- 
-             // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
-             // code, but the checkbox is hidden and ignored
-@@ -719,8 +727,22 @@
-                     1 );
-     }
- 
--    _dialog->setOperationMode(operationMode);
--    _dialog->setConfirmOverwrite(true);
-+    _dialog->setOperationMode( operationMode );
-+
-+    sal_Int16 resId = -1;
-+    switch (_dialog->operationMode())
-+    {
-+    case KFileDialog::Opening:
-+        resId = STR_FPICKER_OPEN;
-+        break;
-+    case KFileDialog::Saving:
-+        resId = STR_FPICKER_SAVE;
-+        break;
-+    default:
-+        break;
-+    }
-+
-+    _dialog->setCaption(getResString(resId));
- }
- 
- void SAL_CALL KDE4FilePicker::cancel()
-only in patch2:
-unchanged:
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@ class KFileDialog;
- class QWidget;
- class QLayout;
- 
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- <   ::com::sun::star::ui::dialogs::XFilePicker2
- ,   ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@ protected:
- 
-     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
- 
--    ResMgr *_resMgr;
--
-     //the dialog to display
-     KFileDialog* _dialog;
- 
-@@ -225,6 +221,8 @@ private:
-     //add a custom control widget to the file dialog
-     void addCustomControl(sal_Int16 controlId);
- 
-+    QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
-     void cleanupProxy();
-     void checkProtocol();