* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2016-03-19 21:39 Andreas Hüttel
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Hüttel @ 2016-03-19 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 4e7232e960937b8271242c1877edaabae54c23c9
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 15:19:12 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 21:39:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e7232e9
app-office/libreoffice: Drop obsolete 4.4 patches
Package-Manager: portage-2.2.27
.../libreoffice-4.3.5.2-remove-bashisms.patch | 38 ----
.../libreoffice-4.4.0.3-telepathy-build-fix.patch | 40 ----
...reoffice-4.4.1.2-add-kde4-open-url-script.patch | 56 ------
...-4.4.4.3-cleanup-IsNativeControlSupported.patch | 212 ---------------------
.../libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch | 76 --------
...ibreoffice-4.4.4.3-improve-KDE4FilePicker.patch | 193 -------------------
...ffice-4.4.5.2-fix-KDE4-listbox-regression.patch | 80 --------
7 files changed, 695 deletions(-)
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 370b4aa..0000000
--- 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.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 2833385..0000000
--- 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 d4c4d28..0000000
--- 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.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
deleted file mode 100644
index 7cb33b9..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-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;
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
deleted file mode 100644
index 2247781..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
deleted file mode 100644
index d0350e4..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-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();
diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
deleted file mode 100644
index f4ee985..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2018-05-28 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-05-28 21:12 UTC (permalink / raw
To: gentoo-commits
commit: ca3a121d4a1235ab6aa5ba9a8421fd1ec43da773
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 21:08:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 28 21:10:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3a121d
app-office/libreoffice: Disable more test
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../libreoffice-6.0.3.2-disable-flaky-tests.patch | 37 ++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
index 03421c5e12b..b25e4fc3ae5 100644
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
@@ -214,3 +214,40 @@ index 4d65beeb90c4..f3d71501c41a 100644
DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
{
+--- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
+@@ -114,7 +114,7 @@
+ /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
+ void testODFBrokenDsigGPG();
+ /// Test loading an encrypted ODF document
+- void testODFEncryptedGPG();
++// void testODFEncryptedGPG();
+ #endif
+ CPPUNIT_TEST_SUITE(SigningTest);
+ CPPUNIT_TEST(testDescription);
+@@ -143,7 +143,7 @@
+ CPPUNIT_TEST(testODFUntrustedGoodGPG);
+ CPPUNIT_TEST(testODFBrokenStreamGPG);
+ CPPUNIT_TEST(testODFBrokenDsigGPG);
+- CPPUNIT_TEST(testODFEncryptedGPG);
++// CPPUNIT_TEST(testODFEncryptedGPG);
+ #endif
+ CPPUNIT_TEST_SUITE_END();
+
+@@ -743,14 +743,14 @@
+ CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
+ }
+
+-void SigningTest::testODFEncryptedGPG()
++/*void SigningTest::testODFEncryptedGPG()
+ {
+ createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
+ SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+ CPPUNIT_ASSERT(pBaseModel);
+ SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+ CPPUNIT_ASSERT(pObjectShell);
+-}
++}*/
+
+ #endif
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2019-01-16 16:30 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 8b8159552149ecfff420bb0ba86d5474096ae785
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 16:23:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 16:23:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b815955
app-office/libreoffice: Fix build with <poppler-0.73
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
index eb6d597c195..fb9112bc398 100644
--- a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
@@ -59,7 +59,7 @@ index da021a2a..443e757 100644
typedef std::vector< Output_t > OutputBuffer;
+#if !POPPLER_CHECK_VERSION(0, 73, 0)
-+static_assert(std::is_same_v<Guchar, unsigned char>, "unexpected typedef");
++static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
+#endif
+
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2020-10-18 16:23 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-10-18 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 6a41f1fea474953d8ce4084237b5fc39e3310c01
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 16:23:36 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 16:23:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a41f1fe
app-office/libreoffice: Drop unused patches
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-5.4-system-pyuno.patch | 42 ----------------------
.../files/libreoffice-6.4.2.2-poppler-0.86.patch | 15 --------
2 files changed, 57 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
deleted file mode 100644
index 83b56d1a192..00000000000
--- a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/desktop/scripts/soffice.sh
-+++ a/desktop/scripts/soffice.sh
-@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then
- exit 1;
- fi
-
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "$(uname -s)" in
- NetBSD|OpenBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
---- a/pyuno/source/module/uno.py
-+++ a/pyuno/source/module/uno.py
-@@ -16,11 +16,16 @@
- # 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 pyuno
- import sys
- import traceback
- import warnings
-
-+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"
-+
- # since on Windows sal3.dll no longer calls WSAStartup
- import socket
-
---- a/pyuno/source/officehelper.py
-+++ a/pyuno/source/officehelper.py
-@@ -45,7 +45,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-6.4.2.2-poppler-0.86.patch b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
deleted file mode 100644
index c56ba89ade5..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index e9c2a407c279..16ad04bf660a 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
- if (!(pAction && pAction->getKind() == actionURI))
- return;
-
--#if POPPLER_CHECK_VERSION(0, 72, 0)
-+#if POPPLER_CHECK_VERSION(0, 86, 0)
-+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
-+#elif POPPLER_CHECK_VERSION(0, 72, 0)
- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
- #else
- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2020-11-08 8:45 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-11-08 8:45 UTC (permalink / raw
To: gentoo-commits
commit: 7c65a378db49480d81bbeae7ccf2f31676b52931
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 08:43:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 08:44:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c65a378
app-office/libreoffice: remove unused patch
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18152
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice-7.0.3.1-fix-non-pdfium-build.patch | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
deleted file mode 100644
index 0361cd4c483..00000000000
--- a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5f3f17a9c64e33fb787a79dc94d902147da77d71 Mon Sep 17 00:00:00 2001
-From: Noel Grandin <noelgrandin@gmail.com>
-Date: Sat, 19 Sep 2020 20:38:29 +0200
-Subject: fix non-pdfium build
-
-Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
-Tested-by: Jenkins
-Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
----
- vcl/source/filter/ipdf/pdfread.cxx | 2 +-
- xmlsecurity/source/pdfio/pdfdocument.cxx | 12 +++++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
-index 39c2933be8d5..a9b079a75bc3 100644
---- a/vcl/source/filter/ipdf/pdfread.cxx
-+++ b/vcl/source/filter/ipdf/pdfread.cxx
-@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
- (void)rBitmaps;
- (void)nFirstPage;
- (void)nPages;
-- (void)fResolutionDPI;
-+ (void)pSizeHint;
- return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }
---
-cgit v1.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2021-11-11 11:55 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-11-11 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 72403c50c9fdc902179e55132a02f3e9f492c873
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Nov 10 17:04:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 11:55:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72403c50
app-office/libreoffice: remove unused patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22885
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ce-7.1.6.2-KF5-fix-double-buffer-graphics.patch | 310 ---------------------
1 file changed, 310 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch b/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch
deleted file mode 100644
index 36ed138f2a3..00000000000
--- a/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From ec23228a3a2fc4e8868f7f04b838313be59ad719 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Sun, 11 Apr 2021 17:40:26 +0200
-Subject: tdf#143796 Qt5/KF5 fix double-buffer graphics
-
-This is a squashed commit for:
-
-"Qt5/KF5 get rid of unneeded own grahics handling"
-"tdf#143334 Qt5 don't reset buffer on style change"
-"tdf#144008 Qt5/Kf5 create frames in the GUI thread"
-
-commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89
-commit ec77a2ed0283cb3446f6e352fc329afd3dfb785c
-commit 923b30aa27ceb377d6a540c012000e89ce5db31e
-
-The first commit exposed the same problem to kf5, the 2nd patch is
-the real fix and the 3rd partly a regression for kf5 from the 1st
-commit but also an additional bugfix for qt5.
-
-Change-Id: I84b8dd106a35a5c2fda08a525f657b0b733a5cb7
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121795
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
-Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
----
- vcl/inc/qt5/Qt5Frame.hxx | 8 +-------
- vcl/inc/qt5/Qt5Instance.hxx | 1 +
- vcl/qt5/Qt5Frame.cxx | 34 ++++++++++++----------------------
- vcl/qt5/Qt5Instance.cxx | 18 +++++++++++++++---
- vcl/unx/kf5/KF5SalFrame.cxx | 24 ------------------------
- vcl/unx/kf5/KF5SalFrame.hxx | 6 ------
- vcl/unx/kf5/KF5SalInstance.cxx | 16 +++++++++++++---
- vcl/unx/kf5/KF5SalInstance.hxx | 1 +
- 8 files changed, 43 insertions(+), 65 deletions(-)
-
-diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
-index 54a721e03730..9b6e3811c3bb 100644
---- a/vcl/inc/qt5/Qt5Frame.hxx
-+++ b/vcl/inc/qt5/Qt5Frame.hxx
-@@ -77,17 +77,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
- std::unique_ptr<QImage> m_pQImage;
- std::unique_ptr<Qt5Graphics> m_pQt5Graphics;
- UniqueCairoSurface m_pSurface;
-- std::unique_ptr<Qt5SvpGraphics> m_pOurSvpGraphics;
-- // in base class, this ptr is the same as m_pOurSvpGraphic
-- // in derived class, it can point to a derivative
-- // of Qt5SvpGraphics (which the derived class then owns)
-- Qt5SvpGraphics* m_pSvpGraphics;
-+ std::unique_ptr<Qt5SvpGraphics> m_pSvpGraphics;
- DamageHandler m_aDamageHandler;
- QRegion m_aRegion;
- bool m_bNullRegion;
-
- bool m_bGraphicsInUse;
-- bool m_bGraphicsInvalid;
- SalFrameStyleFlags m_nStyle;
- Qt5Frame* m_pParent;
- PointerStyle m_ePointerStyle;
-@@ -144,7 +139,6 @@ public:
- void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth,
- sal_Int32 nExtentsHeight) const;
-
-- void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics);
- virtual SalGraphics* AcquireGraphics() override;
- virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
-
-diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
-index d73a59de51c1..a2372e58f8c9 100644
---- a/vcl/inc/qt5/Qt5Instance.hxx
-+++ b/vcl/inc/qt5/Qt5Instance.hxx
-@@ -82,6 +82,7 @@ protected:
- virtual Qt5FilePicker*
- createPicker(css::uno::Reference<css::uno::XComponentContext> const& context,
- QFileDialog::FileMode);
-+ bool useCairo() const { return m_bUseCairo; }
-
- public:
- explicit Qt5Instance(std::unique_ptr<QApplication>& pQApp, bool bUseCairo = false);
-diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
-index b398e9a5cf3b..d39d1729c812 100644
---- a/vcl/qt5/Qt5Frame.cxx
-+++ b/vcl/qt5/Qt5Frame.cxx
-@@ -104,10 +104,8 @@ sal_Int32 screenNumber(const QScreen* pScreen)
- Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
- : m_pTopLevel(nullptr)
- , m_bUseCairo(bUseCairo)
-- , m_pSvpGraphics(nullptr)
- , m_bNullRegion(true)
- , m_bGraphicsInUse(false)
-- , m_bGraphicsInvalid(false)
- , m_ePointerStyle(PointerStyle::Arrow)
- , m_pDragSource(nullptr)
- , m_pDropTarget(nullptr)
-@@ -288,17 +286,6 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExten
- 1 / devicePixelRatioF()));
- }
-
--void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
--{
-- QSize aSize = m_pQWidget->size() * devicePixelRatioF();
-- m_pSvpGraphics = pQt5SvpGraphics;
-- m_pSurface.reset(
-- cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
-- m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(aSize.width(), aSize.height()));
-- cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
-- nullptr);
--}
--
- SalGraphics* Qt5Frame::AcquireGraphics()
- {
- if (m_bGraphicsInUse)
-@@ -308,24 +295,28 @@ SalGraphics* Qt5Frame::AcquireGraphics()
-
- if (m_bUseCairo)
- {
-- if (!m_pOurSvpGraphics || m_bGraphicsInvalid)
-+ if (!m_pSvpGraphics)
- {
-- m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
-- InitQt5SvpGraphics(m_pOurSvpGraphics.get());
-- m_bGraphicsInvalid = false;
-+ QSize aSize = m_pQWidget->size() * devicePixelRatioF();
-+ m_pSvpGraphics.reset(new Qt5SvpGraphics(this));
-+ m_pSurface.reset(
-+ cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
-+ m_pSvpGraphics->setSurface(m_pSurface.get(),
-+ basegfx::B2IVector(aSize.width(), aSize.height()));
-+ cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(),
-+ &m_aDamageHandler, nullptr);
- }
-- return m_pOurSvpGraphics.get();
-+ return m_pSvpGraphics.get();
- }
- else
- {
-- if (!m_pQt5Graphics || m_bGraphicsInvalid)
-+ if (!m_pQt5Graphics)
- {
- m_pQt5Graphics.reset(new Qt5Graphics(this));
- m_pQImage.reset(
- new QImage(m_pQWidget->size() * devicePixelRatioF(), Qt5_DefaultFormat32));
- m_pQImage->fill(Qt::transparent);
- m_pQt5Graphics->ChangeQImage(m_pQImage.get());
-- m_bGraphicsInvalid = false;
- }
- return m_pQt5Graphics.get();
- }
-@@ -335,7 +326,7 @@ void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph)
- {
- (void)pSalGraph;
- if (m_bUseCairo)
-- assert(pSalGraph == m_pOurSvpGraphics.get());
-+ assert(pSalGraph == m_pSvpGraphics.get());
- else
- assert(pSalGraph == m_pQt5Graphics.get());
- m_bGraphicsInUse = false;
-@@ -1145,7 +1136,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
- style.SetShadowColor(toColor(pal.color(QPalette::Disabled, QPalette::WindowText)));
- style.SetDarkShadowColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
-
-- m_bGraphicsInvalid = true;
- rSettings.SetStyleSettings(style);
- }
-
-diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
-index ca1f914dd707..bceae35e9016 100644
---- a/vcl/qt5/Qt5Instance.cxx
-+++ b/vcl/qt5/Qt5Instance.cxx
-@@ -252,13 +252,21 @@ void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater();
-
- SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
- {
-- return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
-+ SalFrame* pRet(nullptr);
-+ RunInMainThread([&, this]() { pRet = new Qt5Frame(nullptr, nStyle, useCairo()); });
-+ assert(pRet);
-+ return pRet;
- }
-
- SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
- {
- assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
-- return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo);
-+
-+ SalFrame* pRet(nullptr);
-+ RunInMainThread(
-+ [&, this]() { pRet = new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, useCairo()); });
-+ assert(pRet);
-+ return pRet;
- }
-
- void Qt5Instance::DestroyFrame(SalFrame* pFrame)
-@@ -273,7 +281,11 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
- SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, bool bShow)
- {
- assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
-- return new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow);
-+
-+ SalObject* pRet(nullptr);
-+ RunInMainThread([&]() { pRet = new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow); });
-+ assert(pRet);
-+ return pRet;
- }
-
- void Qt5Instance::DestroyObject(SalObject* pObject)
-diff --git a/vcl/unx/kf5/KF5SalFrame.cxx b/vcl/unx/kf5/KF5SalFrame.cxx
-index 1aa0b9008de7..8f14594586d2 100644
---- a/vcl/unx/kf5/KF5SalFrame.cxx
-+++ b/vcl/unx/kf5/KF5SalFrame.cxx
-@@ -45,7 +45,6 @@
-
- KF5SalFrame::KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nState, bool bUseCairo)
- : Qt5Frame(pParent, nState, bUseCairo)
-- , m_bGraphicsInUse(false)
- {
- }
-
-@@ -162,27 +161,4 @@ void KF5SalFrame::UpdateSettings(AllSettings& rSettings)
- rSettings.SetStyleSettings(style);
- }
-
--SalGraphics* KF5SalFrame::AcquireGraphics()
--{
-- if (m_bGraphicsInUse)
-- return nullptr;
--
-- m_bGraphicsInUse = true;
--
-- if (!m_pKF5Graphics)
-- {
-- m_pKF5Graphics.reset(new Qt5SvpGraphics(this));
-- Qt5Frame::InitQt5SvpGraphics(m_pKF5Graphics.get());
-- }
--
-- return m_pKF5Graphics.get();
--}
--
--void KF5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph)
--{
-- (void)pSalGraph;
-- assert(pSalGraph == m_pKF5Graphics.get());
-- m_bGraphicsInUse = false;
--}
--
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/vcl/unx/kf5/KF5SalFrame.hxx b/vcl/unx/kf5/KF5SalFrame.hxx
-index f757535c2f35..d0fdd91978e6 100644
---- a/vcl/unx/kf5/KF5SalFrame.hxx
-+++ b/vcl/unx/kf5/KF5SalFrame.hxx
-@@ -28,15 +28,9 @@ class QWidget;
-
- class KF5SalFrame : public Qt5Frame
- {
--private:
-- std::unique_ptr<Qt5SvpGraphics> m_pKF5Graphics;
-- bool m_bGraphicsInUse;
--
- public:
- KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo);
-
-- virtual SalGraphics* AcquireGraphics() override;
-- virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
- virtual void UpdateSettings(AllSettings& rSettings) override;
- };
-
-diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
-index 5b95ff8df572..d9d7747fe647 100644
---- a/vcl/unx/kf5/KF5SalInstance.cxx
-+++ b/vcl/unx/kf5/KF5SalInstance.cxx
-@@ -40,11 +40,21 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr<QApplication>& pQApp)
- pSVData->maAppData.mxToolkitName = OUString("kf5");
- }
-
--SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState)
-+SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
- {
- SalFrame* pRet(nullptr);
-- RunInMainThread([&pRet, pParent, nState]() {
-- pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nState, true);
-+ RunInMainThread([&, this]() { pRet = new KF5SalFrame(nullptr, nStyle, useCairo()); });
-+ assert(pRet);
-+ return pRet;
-+}
-+
-+SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
-+{
-+ assert(!pParent || dynamic_cast<KF5SalFrame*>(pParent));
-+
-+ SalFrame* pRet(nullptr);
-+ RunInMainThread([&, this]() {
-+ pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nStyle, useCairo());
- });
- assert(pRet);
- return pRet;
-diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx
-index 5dd306da5231..b951df59ab33 100644
---- a/vcl/unx/kf5/KF5SalInstance.hxx
-+++ b/vcl/unx/kf5/KF5SalInstance.hxx
-@@ -28,6 +28,7 @@ class KF5SalInstance final : public Qt5Instance
- QFileDialog::FileMode) override;
-
- SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override;
-+ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags nStyle) override;
-
- public:
- explicit KF5SalInstance(std::unique_ptr<QApplication>& pQApp);
---
-cgit v1.2.1
-
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2022-05-09 0:01 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-05-09 0:01 UTC (permalink / raw
To: gentoo-commits
commit: d9101ddf57435043ca5d01567d482269e69e7a78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 00:00:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 9 00:01:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9101ddf
app-office/libreoffice: fix version check in Poppler 22.04.0 patch
On a machine with Poppler 22.03.0 still, it failed, as it tried
to take the new branch.
Bug: https://bugs.gentoo.org/843311
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
index 7879f87a516b..39cb13bbc7d6 100644
--- a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
@@ -1,6 +1,8 @@
https://bugs.gentoo.org/843311
https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd0366eae81b03bfa89689ec73c6f7
+(sam: adapt version check to 22.4.0)
+
From: Sam James <sam@gentoo.org>
Date: Sun, 8 May 2022 21:20:25 +0000
Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
@@ -11,7 +13,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
{
// TODO(P3): Unfortunately, need to read stream twice, since
// we must write byte count to stdout before
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+#else
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
@@ -19,7 +21,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
if( pBuf )
{
aNewFont.isEmbedded = true;
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
gfree(pBuf);
+#endif
}
@@ -30,7 +32,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
int nSize = 0;
- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+#else
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
@@ -41,14 +43,14 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
// ---sync point--- see SYNC STREAMS above
fflush(stdout);
-
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
+#else
+ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
+#endif
{
- gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ gfree(pBuf);
+#endif
exit(1); // error
@@ -56,7 +58,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
// ---sync point--- see SYNC STREAMS above
fflush(g_binary_out);
- gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+ gfree(pBuf);
+#endif
}
@@ -66,7 +68,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
{
assert(state);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
GfxFont *gfxFont = state->getFont();
+#else
+ GfxFont *gfxFont = state->getFont().get();
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2022-05-14 9:16 Conrad Kostecki
0 siblings, 0 replies; 10+ messages in thread
From: Conrad Kostecki @ 2022-05-14 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 43e3bd8432b411bb62052a75d50f1f5ea0011844
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 09:15:24 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat May 14 09:15:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e3bd84
app-office/libreoffice: rename confd/initd script
Closes: https://bugs.gentoo.org/844145
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-office/libreoffice/files/{soffice.confd => libreoffice.confd} | 0
app-office/libreoffice/files/{soffice.initd => libreoffice.initd} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/app-office/libreoffice/files/soffice.confd b/app-office/libreoffice/files/libreoffice.confd
similarity index 100%
rename from app-office/libreoffice/files/soffice.confd
rename to app-office/libreoffice/files/libreoffice.confd
diff --git a/app-office/libreoffice/files/soffice.initd b/app-office/libreoffice/files/libreoffice.initd
similarity index 100%
rename from app-office/libreoffice/files/soffice.initd
rename to app-office/libreoffice/files/libreoffice.initd
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2022-11-08 16:11 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-11-08 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 86ec990a4f5073f451c5a895ac8e70cc2f7721cd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 8 06:19:14 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 16:10:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ec990a
app-office/libreoffice: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28185
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice-7.2.6.2-poppler-22.03.0.patch | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch
deleted file mode 100644
index be4a39993ddb..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001
-From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
-Date: Wed, 2 Mar 2022 12:58:09 +0000
-Subject: [PATCH] upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index ad6320139..e5f6d9c68 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -138,6 +138,15 @@ int main(int argc, char **argv)
- _setmode( _fileno( g_binary_out ), _O_BINARY );
- #endif
-
-+#if POPPLER_CHECK_VERSION(22, 3, 0)
-+ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
-+ GooString(pOwnerPasswordStr),
-+ GooString(pUserPasswordStr) );
-+
-+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
-+ GooString(pOwnerPasswordStr),
-+ GooString(pUserPasswordStr) );
-+#else
- PDFDoc aDoc( pFileName,
- pOwnerPasswordStr,
- pUserPasswordStr );
-@@ -145,6 +154,7 @@ int main(int argc, char **argv)
- PDFDoc aErrDoc( pErrFileName,
- pOwnerPasswordStr,
- pUserPasswordStr );
-+#endif
-
- // Check various permissions for aDoc.
- PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/
@ 2023-03-14 8:22 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2023-03-14 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 2d0e516b4339f63ae46fe6159590a99c845ed07b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 13 17:07:17 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 08:22:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0e516b
app-office/libreoffice: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30091
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice-7.4.5.1-fix-webdav-upload.patch | 107 ---------------------
1 file changed, 107 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
deleted file mode 100644
index 9b70f62c7d19..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 30ca48f4dc0e65a3798e6b21574bc80f6d4953fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= <nemeth@numbertext.org>
-Date: Wed, 25 Jan 2023 12:08:14 +0100
-Subject: tdf#152493 ucb WebDAV: fix upload using HTTP 1.0 fallback
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix broken libcurl upload to Vibe 4.0.6 WebDAV server
-using HTTP 1.0 fallback.
-
-Regression from commit 023ebf17898db4bca63129f079fd90b5cf76c1a9
-"ucb: remove --with-webdav=neon" (Neon had no such upload
-problem).
-
-HTTP 1.0 fallback found by Pál Zoltán Kochis.
-Fallback for CURLE_UNSUPPORTED_PROTOCOL
-suggested by Michael Stahl. Thanks for their and
-Attila Bakos' help.
-
-Michael Stahl's comment: "'HTTP/0.9' in the [curl] error
-message is very misleading: it simply means that a header
-was expected but there was no header, so what is received
-is interpreted as body.
-
-Note: the HTTP/1.0 works because it does not use the
-'Expect: 100-continue' so there should be no intermediate
-100 Continue response from the server at all - instead
-libcurl directly sends the XML document for the PROPFIND
-and the server sends the response, and the problem does
-not occur."
-
-Co-authored-by: Michael Stahl <michael.stahl@allotropia.de>
-
-Change-Id: I8bd79154de14b6425e0324f4d8f6e64512c08264
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146067
-Tested-by: László Németh <nemeth@numbertext.org>
-Reviewed-by: László Németh <nemeth@numbertext.org>
----
- ucb/source/ucp/webdav-curl/CurlSession.cxx | 24 ++++++++++++++++++++++++
- ucb/source/ucp/webdav-curl/DAVException.hxx | 1 +
- 2 files changed, 25 insertions(+)
-
-diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-index 0f06363ce68f..bb1d4689a53c 100644
---- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
-+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-@@ -964,6 +964,8 @@ auto CurlProcessor::ProcessRequestImpl(
- "curl_easy_perform failed: " << GetErrorString(rc, rSession.m_ErrorBuffer));
- switch (rc)
- {
-+ case CURLE_UNSUPPORTED_PROTOCOL:
-+ throw DAVException(DAVException::DAV_UNSUPPORTED);
- case CURLE_COULDNT_RESOLVE_PROXY:
- throw DAVException(
- DAVException::DAV_HTTP_LOOKUP,
-@@ -1250,6 +1252,7 @@ auto CurlProcessor::ProcessRequest(
- }
- }
- bool isRetry(false);
-+ bool isFallbackHTTP10(false);
- int nAuthRequests(0);
- int nAuthRequestsProxy(0);
-
-@@ -1473,6 +1476,27 @@ auto CurlProcessor::ProcessRequest(
- }
- }
- }
-+ else if (rException.getError() == DAVException::DAV_UNSUPPORTED)
-+ {
-+ // tdf#152493 libcurl can't handle "Transfer-Encoding: chunked"
-+ // in HTTP/1.1 100 Continue response.
-+ // workaround: if HTTP/1.1 didn't work, try HTTP/1.0
-+ // (but fallback only once - to prevent infinite loop)
-+ if (isFallbackHTTP10)
-+ {
-+ throw DAVException(DAVException::DAV_HTTP_ERROR);
-+ }
-+ isFallbackHTTP10 = true;
-+ // note: this is not reset - future requests to this URI use it!
-+ auto rc = curl_easy_setopt(rSession.m_pCurl.get(), CURLOPT_HTTP_VERSION,
-+ CURL_HTTP_VERSION_1_0);
-+ if (rc != CURLE_OK)
-+ {
-+ throw DAVException(DAVException::DAV_HTTP_ERROR);
-+ }
-+ SAL_INFO("ucb.ucp.webdav.curl", "attempting fallback to HTTP/1.0");
-+ isRetry = true;
-+ }
- if (!isRetry)
- {
- throw; // everything else: re-throw
-diff --git a/ucb/source/ucp/webdav-curl/DAVException.hxx b/ucb/source/ucp/webdav-curl/DAVException.hxx
-index 84dba895485c..759e43f25f8e 100644
---- a/ucb/source/ucp/webdav-curl/DAVException.hxx
-+++ b/ucb/source/ucp/webdav-curl/DAVException.hxx
-@@ -130,6 +130,7 @@ class DAVException : public std::exception
- DAV_SESSION_CREATE, // session creation error,
- // mData = server[:port]
- DAV_INVALID_ARG, // invalid argument
-+ DAV_UNSUPPORTED, // internal to CurlSession
-
- DAV_LOCK_EXPIRED, // DAV lock expired
-
---
-cgit v1.2.1
-
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-03-14 8:22 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-19 21:39 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2018-05-28 21:12 Andreas Sturmlechner
2019-01-16 16:30 Andreas Sturmlechner
2020-10-18 16:23 Andreas Sturmlechner
2020-11-08 8:45 Andreas Sturmlechner
2021-11-11 11:55 Andreas Sturmlechner
2022-05-09 0:01 Sam James
2022-05-14 9:16 Conrad Kostecki
2022-11-08 16:11 Andreas Sturmlechner
2023-03-14 8:22 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox