AUX libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch 7615 SHA256 a1c0a663966e306270d17fc63f0f2b5c62585eaa46b6c5c0e9becf7c30acd60b SHA512 ff607595107edc33d903b0bb010c36b4d17ca7d3a907fc151c32757255993f5cade5581376d89855727173ccc2c1e619f0af15e7773e0dcd98937325a82c6211 WHIRLPOOL 4e6dfa1704e6d48a681a3346801ab099085d141248be999e186ee55d15fca3f7554bb76ef5a118766a929ee74d4a802dc2ab9f3d1b46b7106a394e8dfbd73d10

AUX libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch 2725 SHA256 c6f71a016d92405de995d731e1dbb7b40f6af9989096744a69a52de176645fb0 SHA512 5800219accbd9bbfcd66841ff1b1a338faddec33bfc73d1c958126ff53b7d3dbf410622d74597d98ad925af07a66eee23e076b436f73d5076c0f9b439f99cefd WHIRLPOOL 6cdbf5266d96fb37dc542f6c07c034badbe38f1a9cb2b39aa402d0b70d407f074f278209aecb3e4dfb6246b1cf97389d7ed7a59ccbbc9a2de0dc74d18519fae6

AUX libreoffice-4.4.4.3-improve-KDE4FilePicker.patch 5764 SHA256 3cb715491fbd91abdeb99477d19417bfc299376ec4532d5ef8826d4b9e001eee SHA512 11a860f9fb227e04e8f1d66ad54072d0117d6506a1e4d66a11876999a17bbac67b550f90cc8cf128d8cc81600eafa8bbcc49907657ccced2cbbf133c5acbe31c WHIRLPOOL 3f8bf68815132b0c436e8656d83208c4d5c30f45c069a33f6de28c54ccc3d7f2fe90413e3be34594cd0383ec9a448dd4ce2b0cca719f834d8671ddec22c47b5b

AUX libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch 3719 SHA256 d20df249f1773391aba12763fa9f7a247b9ba030fd358535fef2b5d7b45ce2ca SHA512 36600bebc040a4d50aa4abb628bb1a6d974332ec58e02f5034c4f3419d730a0db2b38a0c84374901cc5fde19ef8d2c716d88356bf4b372649536e3e665063c00 WHIRLPOOL e85716e1cf531df4cd86cfbd9e7f759aeba5cc79a825cac801d90c54a1a8c817a3ce5be1c41db39d2340f99e206d7bb271e11d4c4e84c7226d3ef7945171caba

Merged upstream commits:

88e16529fc7b0e312b68e38295348c93b437aad8	"tdf#92110 KDE4: cleanup IsNativeControlSupported"

57792314c7b05f71c66834ee47bfaa09003df765	"tdf#92115 KDE4: better listbox theming"

diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx

--- b/vcl/unx/kde4/KDESalGraphics.cxx

+++ b/vcl/unx/kde4/KDESalGraphics.cxx

@@ -85,47 +85,43 @@

 bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )

 {

-    if (type == CTRL_PUSHBUTTON) return true;

-

-    if (type == CTRL_MENUBAR) return true;

-

-    if (type == CTRL_MENU_POPUP) return true;

-

-    if (type == CTRL_EDITBOX) return true;

-

-    if (type == CTRL_COMBOBOX) return true;

-

-    if (type == CTRL_TOOLBAR) return true;

-

-    if (type == CTRL_CHECKBOX) return true;

-

-    if (type == CTRL_LISTBOX) return true;

-

-    if (type == CTRL_LISTNODE) return true;

-

-    if (type == CTRL_FRAME) return true;

-

-    if (type == CTRL_SCROLLBAR) return true;

-

-    if (type == CTRL_WINDOW_BACKGROUND) return true;

-

-    if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;

-

-    // no spinbuttons for KDE, paint spinbox complete

-    //if (type == CTRL_SPINBUTTONS) return true;

-

-    if (type == CTRL_GROUPBOX) return true;

-

-    if (type == CTRL_FIXEDLINE) return true;

-

-    if (type == CTRL_TOOLTIP) return true;

+    switch (type)

+    {

+        case CTRL_PUSHBUTTON:

+        case CTRL_RADIOBUTTON:

+        case CTRL_CHECKBOX:

+        case CTRL_TOOLTIP:

+        case CTRL_PROGRESS:

+        case CTRL_LISTNODE:

+            return (part == PART_ENTIRE_CONTROL);

+

+        case CTRL_MENUBAR:

+        case CTRL_MENU_POPUP:

+        case CTRL_EDITBOX:

+        case CTRL_COMBOBOX:

+        case CTRL_TOOLBAR:

+        case CTRL_FRAME:

+        case CTRL_SCROLLBAR:

+        case CTRL_WINDOW_BACKGROUND:

+        case CTRL_GROUPBOX:

+        case CTRL_FIXEDLINE:

+            return true;

+

+        case CTRL_LISTBOX:

+            return (part == PART_ENTIRE_CONTROL

+                 || part == PART_SUB_EDIT

+                 || part == PART_WINDOW

+                 || part == PART_BUTTON_DOWN);

-    if (type == CTRL_RADIOBUTTON) return true;

+        case CTRL_SPINBOX:

+            return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);

-    if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )

-        return true;

+        case CTRL_SLIDER:

+            return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA);

-    if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true;

+        default:

+            break;

+    }

     return false;

 }

@@ -221,15 +217,15 @@

                                         const ImplControlValue& value,

                                         const OUString& )

 {

-    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))

-        lastPopupRect = QRect();

-

-    // put not implemented types here

-    if (type == CTRL_SPINBUTTONS)

-    {

+    bool nativeSupport = IsNativeControlSupported( type, part );

+    if( ! nativeSupport ) {

+        assert( ! nativeSupport && "drawNativeControl called without native support!" );

         return false;

     }

+    if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))

+        lastPopupRect = QRect();

+

     bool returnVal = true;

     QRect widgetRect = region2QRect(rControlRegion);

@@ -414,24 +410,26 @@

     }

     else if (type == CTRL_LISTBOX)

     {

-        if( part == PART_WINDOW )

-        {

-            lcl_drawFrame( QStyle::PE_Frame, m_image,

-                           vclStateValue2StateFlag(nControlState, value) );

-        }

-        else

-        {

-            QStyleOptionComboBox option;

-            if (part == PART_SUB_EDIT)

-            {

+        QStyleOptionComboBox option;

+        switch (part) {

+            case PART_WINDOW:

+                lcl_drawFrame( QStyle::PE_Frame, m_image,

+                               vclStateValue2StateFlag(nControlState, value) );

+                break;

+            case PART_SUB_EDIT:

                 draw( QStyle::CE_ComboBoxLabel, &option, m_image,

                       vclStateValue2StateFlag(nControlState, value) );

-            }

-            else

-            {

+                break;

+            case PART_ENTIRE_CONTROL:

+                draw( QStyle::CC_ComboBox, &option, m_image,

+                      vclStateValue2StateFlag(nControlState, value) );

+                break;

+            case PART_BUTTON_DOWN:

+                m_image->fill( Qt::transparent );

+                option.subControls = QStyle::SC_ComboBoxArrow;

                 draw( QStyle::CC_ComboBox, &option, m_image,

                       vclStateValue2StateFlag(nControlState, value) );

-            }

+                break;

         }

     }

     else if (type == CTRL_LISTNODE)

@@ -652,6 +650,12 @@

                                              const OUString&,

                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )

 {

+    bool nativeSupport = IsNativeControlSupported( type, part );

+    if( ! nativeSupport ) {

+        assert( ! nativeSupport && "drawNativeControl called without native support!" );

+        return false;

+    }

+

     bool retVal = false;

     QRect boundingRect = region2QRect( controlRegion );

@@ -733,8 +737,6 @@

             {

                 case PART_ENTIRE_CONTROL:

                 {

-                    int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;

-

                     // find out the minimum size that should be used

                     // assume contents is a text ling

                     int nHeight = QApplication::fontMetrics().height();

@@ -747,8 +749,10 @@

                     // FIXME: why this difference between comboboxes and listboxes ?

                     // because a combobox has a sub edit and that is positioned

                     // inside the outer bordered control ?

-                    if( type == CTRL_COMBOBOX )

+                    if( type == CTRL_COMBOBOX ) {

+                        int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;

                         contentRect.adjust(-size,-size,size,size);

+                    }

                     retVal = true;

                     break;

                 }

@@ -761,13 +765,22 @@

                     retVal = true;

                     break;

                 case PART_SUB_EDIT:

+                {

                     contentRect = QApplication::style()->subControlRect(

                         QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );

-                    contentRect.translate( boundingRect.left(), boundingRect.top() );

+                    int hmargin = QApplication::style()->pixelMetric(

+                            QStyle::PM_FocusFrameHMargin, &styleOption);

+                    int vmargin = QApplication::style()->pixelMetric(

+                            QStyle::PM_FocusFrameVMargin, &styleOption);

+

+                    contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );

+                    contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );

+                    boundingRect = contentRect;

                     retVal = true;

                     break;

+                }

                 case PART_WINDOW:

                     retVal = true;

                     break;

From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001

From: Juergen Funk <juergen.funk_ml@cib.de>

Date: Fri, 3 Jul 2015 08:33:03 +0200

Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Fixing follow

 - The order of calling: first should be set the filter, after

   that can be set the current filter

 - change the function from "setCurrentFilter" to "setCurrentItem"

   When you set the filter over "setCurrentFilter" you need the full

   search string "extention|description" e.g. "*.docx|Microsoft Word.."

 - Not need the escape of slash (with that can not find

   "Microsoft Word 2007/2010 XML (.docx))"

Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54

Reviewed-on: https://gerrit.libreoffice.org/16721

Tested-by: Jenkins <ci@libreoffice.org>

Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe)

Reviewed-on: https://gerrit.libreoffice.org/16890

Reviewed-by: Caolán McNamara <caolanm@redhat.com>

Tested-by: Caolán McNamara <caolanm@redhat.com>

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx

index 4615bd4..a638955 100644

--- a/vcl/unx/kde4/KDE4FilePicker.cxx

+++ b/vcl/unx/kde4/KDE4FilePicker.cxx

@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()

     _dialog->clearFilter();

     _dialog->setFilter(_filter);

+

+    if(!_currentFilter.isNull())

+        _dialog->filterWidget()->setCurrentItem(_currentFilter);

+

     _dialog->filterWidget()->setEditable(false);

     VCLKDEApplication::preDialogSetup();

@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )

         return Q_EMIT setCurrentFilterSignal( title );

     }

-    QString t = toQString(title);

-    t.replace("/", "\\/");

-    _dialog->filterWidget()->setCurrentFilter(t);

+    _currentFilter = toQString(title);

 }

 OUString SAL_CALL KDE4FilePicker::getCurrentFilter()

@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )

     }

     _filter.clear();

+    _currentFilter.clear();

     // parameter checking

     uno::Any arg;

diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx

index 98e9af6..ff3a8602 100644

--- a/vcl/unx/kde4/KDE4FilePicker.hxx

+++ b/vcl/unx/kde4/KDE4FilePicker.hxx

@@ -66,6 +66,8 @@ protected:

     //running filter string to add to dialog

     QString _filter;

+    // string to set the current filter

+    QString _currentFilter;

     //mapping of SAL control ID's to created custom controls

     QHash<sal_Int16, QWidget*> _customWidgets;

-- 

cgit v0.10.2

Merged upstream commits:

6fc55b9abd783b624241d56e34751ea495adbd7d	"KDE4: actually apply file dialog operation mode"

b613270a730ace29dd1b16b29be2222b34f34a5d	"KDE4: improve default load and save dialog titles"

2b999dd6da5a90db66afe852a007fab8c62ffaec	"vcl: kde4: loplugin:staticmethods"

3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57	"tdf#92353 FileSave: Not confirmed for overwrite a file (unix)"

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,6 @@

 #endif

     setMultiSelectionMode( false );

-    //default mode

-    _dialog->setOperationMode(KFileDialog::Opening);

     // XExecutableDialog functions

     connect( this, SIGNAL( setTitleSignal( const OUString & ) ),

@@ -202,7 +201,6 @@

         SalYieldMutexReleaser aReleaser;

         return Q_EMIT cleanupProxySignal();

     }

-    delete _resMgr;

     delete _dialog;

 }

@@ -524,6 +522,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 +548,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 +597,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 +726,23 @@

                     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;

+        _dialog->setConfirmOverwrite( true );

+        break;

+    default:

+        break;

+    }

+

+    _dialog->setCaption(getResString(resId));

 }

 void SAL_CALL KDE4FilePicker::cancel()

diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx

--- b/vcl/unx/kde4/KDE4FilePicker.hxx

+++ b/vcl/unx/kde4/KDE4FilePicker.hxx

@@ -41,8 +41,6 @@

 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 @@

     ::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 @@

     //add a custom control widget to the file dialog

     void addCustomControl(sal_Int16 controlId);

+    static QString getResString( sal_Int16 aRedId );

+

 private Q_SLOTS:

     void cleanupProxy();

     void checkProtocol();

From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001

From: Jan-Marek Glogowski <glogow@fbihome.de>

Date: Thu, 30 Jul 2015 18:10:03 +0200

Subject: tdf#92903 KDE4: fix listbox regression from 92115

So at least in case of the CTRL_LISTBOX, getNativeControlRegion is

called for a type and part unsupported by IsNativeControlSupported.

For whatever reason, this results in broken listboxes drawn in

Base's "Table Design" dialog, when selecting "field type", which

draws the listbox on top of the cell.

To make it worse, it seems the listbox is actually drawn to a

smaller space then the actual requirement. Appearently it seems to

use the content rect, instead of the bounding rect.

So in addition to fixing the drawing, this patch increases the

listbox bounding rect, which looks too large in normal dialogs, but

makes the Base's listbox better readable.

Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0

Reviewed-on: https://gerrit.libreoffice.org/17438

Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx

index 3e79e1e..eeb741f 100644

--- a/vcl/unx/kde4/KDESalGraphics.cxx

+++ b/vcl/unx/kde4/KDESalGraphics.cxx

@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par

             return true;

         case CTRL_LISTBOX:

-            return (part == PART_ENTIRE_CONTROL

-                 || part == PART_SUB_EDIT

-                 || part == PART_WINDOW

-                 || part == PART_BUTTON_DOWN);

+            return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);

         case CTRL_SPINBOX:

             return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);

@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,

                                              const OUString&,

                                              Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )

 {

-    bool nativeSupport = IsNativeControlSupported( type, part );

-    if( ! nativeSupport ) {

-        assert( ! nativeSupport && "drawNativeControl called without native support!" );

-        return false;

-    }

-

     bool retVal = false;

     QRect boundingRect = region2QRect( controlRegion );

@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,

                         int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;

                         contentRect.adjust(-size,-size,size,size);

                     }

+                    else {

+                        int hmargin = QApplication::style()->pixelMetric(

+                                QStyle::PM_FocusFrameHMargin, &styleOption);

+                        int vmargin = QApplication::style()->pixelMetric(

+                                QStyle::PM_FocusFrameVMargin, &styleOption);

+                        boundingRect.translate( -hmargin, -vmargin );

+                        boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin );

+                    }

                     retVal = true;

                     break;

                 }

@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,

                     contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );

                     contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );

-                    boundingRect = contentRect;

                     retVal = true;

                     break;

-- 

cgit v0.10.2

# Copyright 1999-2015 Gentoo Foundation

# Distributed under the terms of the GNU General Public License v2

# $Id$

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 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 versionator ${SCM_ECLASS}

unset SCM_ECLASS

DESCRIPTION="LibreOffice, a full office productivity suite"

HOMEPAGE="http://www.libreoffice.org"

SRC_URI="branding? ( https://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"

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*

	>=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*

	>=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/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 )

	kde? ( $(add_kdeapps_dep kioclient) )

	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.11.2:=

	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 master branch

	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454

	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"

	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"

	"${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"

	"${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"

	"${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"

	"${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"

	"${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"

	"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.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_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)

	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)