From c257c6ad5e5014f60a5529af4399436da1f13f3c29b1830cf1f06b4a0572e039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 27 Nov 2018 09:35:57 +0000 Subject: [PATCH 1/5] Accepting request 652127 from LibreOffice:6.1 - bsc#882383 - LO-L3: Chart in PPTX lacks color and is too large * bsc882383.patch OBS-URL: https://build.opensuse.org/request/show/652127 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=727 --- bsc882383.patch | 38 ++++++++++++++++++++++++++++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ 3 files changed, 47 insertions(+) create mode 100644 bsc882383.patch diff --git a/bsc882383.patch b/bsc882383.patch new file mode 100644 index 0000000..cd11305 --- /dev/null +++ b/bsc882383.patch @@ -0,0 +1,38 @@ +From 7ff2bfbf8af599bb7536721e6c221486519d7e42 Mon Sep 17 00:00:00 2001 +From: Tamas Bunth +Date: Mon, 26 Nov 2018 07:19:41 +0100 +Subject: [PATCH] Put text label outside of the pie if.. + +performLabelBestFitInnerPlacement fails. + +Change-Id: Ic84e8b42e02da2023b22a9406c44d462170c5305 +Reviewed-on: https://gerrit.libreoffice.org/64015 +Tested-by: Jenkins +Reviewed-by: Tamás Bunth +(cherry picked from commit 3339c730f8c9a6088a2e8b335185f1bf0b232216) +--- + +diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx +index f3f1ef3..3cc4dc3 100644 +--- a/chart2/source/view/charttypes/PieChart.cxx ++++ b/chart2/source/view/charttypes/PieChart.cxx +@@ -1590,7 +1590,18 @@ + + if( !performLabelBestFitInnerPlacement(rShapeParam, rPieLabelInfo) ) + { +- // TODO ++ // If it does not fit inside, let's put it outside ++ PolarLabelPositionHelper aPolarPosHelper(m_pPosHelper.get(),m_nDimension,m_xLogicTarget,m_pShapeFactory); ++ auto eAlignment = LABEL_ALIGN_CENTER; ++ awt::Point aScreenPosition2D( ++ aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment, css::chart::DataLabelPlacement::OUTSIDE ++ , rShapeParam.mfUnitCircleStartAngleDegree, rShapeParam.mfUnitCircleWidthAngleDegree ++ , rShapeParam.mfUnitCircleInnerRadius, rShapeParam.mfUnitCircleOuterRadius, rShapeParam.mfLogicZ+0.5, 0 )); ++ basegfx::B2IVector aTranslationVector = rPieLabelInfo.aFirstPosition - rPieLabelInfo.aOrigin; ++ aTranslationVector.setLength(150); ++ aScreenPosition2D.X += aTranslationVector.getX(); ++ aScreenPosition2D.Y += aTranslationVector.getY(); ++ rPieLabelInfo.xLabelGroupShape->setPosition(aScreenPosition2D); + } + } + diff --git a/libreoffice.changes b/libreoffice.changes index af2bf6c..991f8fe 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 26 14:38:54 UTC 2018 - andras.timar@collabora.com + +- bsc#882383 - LO-L3: Chart in PPTX lacks color and is too large + * bsc882383.patch + ------------------------------------------------------------------- Mon Nov 12 08:50:57 UTC 2018 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index 91767e3..b428a0b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -108,6 +108,8 @@ Patch6: 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch Patch7: bsc1110348.patch # Bug 1112112 - LO-L3: [PPTX] SmartArt: Basic rendering of several list types Patch8: bsc1112112.patch +# Bug 882383 - LO-L3: Chart in PPTX lacks color and is too large +Patch9: bsc882383.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -956,6 +958,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) From 0015ab6c920f8b16117e4af284b9b138f442d75b63ee63da2fdd719a02284c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 28 Nov 2018 12:52:13 +0000 Subject: [PATCH 2/5] - Install also C++ libreofficekit headers bsc#1117195 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=728 --- libreoffice.changes | 5 +++++ libreoffice.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 991f8fe..7669136 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal + +- Install also C++ libreofficekit headers bsc#1117195 + ------------------------------------------------------------------- Mon Nov 26 14:38:54 UTC 2018 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index b428a0b..6541b00 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -1303,7 +1303,7 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/ # Libreofficekit headers mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ -install -m 0644 include/LibreOfficeKit/*.h %{buildroot}%{_includedir}/LibreOfficeKit/ +install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/ %else # remove files that are not supposed to be installed with disabled libreofficekit rm -rf %{buildroot}%{_libdir}/libreoffice/share/libreofficekit/ From 849eaef483f959162300548decd904dbe11af1fffc40e1d4480d16c91c1a5ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 29 Nov 2018 08:32:47 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=729 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 6541b00..f5fed3d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1432,7 +1432,7 @@ exit 0 %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir %dir %{_includedir}/LibreOfficeKit -%{_includedir}/LibreOfficeKit/*.h +%{_includedir}/LibreOfficeKit/* %endif %files glade From 91326e7f01d3c27e0ff0239c746835d1582af3d501836c292748a17f5385c1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 2 Dec 2018 09:08:50 +0000 Subject: [PATCH 4/5] Accepting request 652815 from home:jdelvare:branches:LibreOffice:Factory - bsc#1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document * bsc1117300.patch OBS-URL: https://build.opensuse.org/request/show/652815 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=730 --- bsc1117300.patch | 34 ++++++++++++++++++++++++++++++++++ libreoffice.changes | 7 +++++++ libreoffice.spec | 3 +++ 3 files changed, 44 insertions(+) create mode 100644 bsc1117300.patch diff --git a/bsc1117300.patch b/bsc1117300.patch new file mode 100644 index 0000000..a8a979a --- /dev/null +++ b/bsc1117300.patch @@ -0,0 +1,34 @@ +From 4846848941241f92b32bcffef3489736d1baffec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 8 Nov 2018 09:58:58 +0000 +Subject: Resolves: tdf#119790 for gtk3 save and restore typed name on changing filter + +Change-Id: I17c3d154144b13ce401b0e4afe84c91a2fe98d8e +Reviewed-on: https://gerrit.libreoffice.org/63076 +Tested-by: Jenkins +Reviewed-by: Christian Lohmaier +--- + vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +index 16a845eabe81..75458dae1a13 100644 +--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx ++++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +@@ -807,7 +807,16 @@ uno::Sequence SAL_CALL SalGtkFilePicker::getSelectedFiles() + } + } + if( bChangeFilter && bExtensionTypedIn ) ++ { ++#if GTK_CHECK_VERSION(3,0,0) ++ gchar* pCurrentName = gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_pDialog)); ++ setCurrentFilter( aNewFilter ); ++ gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_pDialog), pCurrentName); ++ g_free(pCurrentName); ++#else + setCurrentFilter( aNewFilter ); ++#endif ++ } + } + } + diff --git a/libreoffice.changes b/libreoffice.changes index 7669136..481e520 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com + +- bsc#1117300 - [DATA LOSS] Saving a new document can silently + overwrite an existing document + * bsc1117300.patch + ------------------------------------------------------------------- Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index f5fed3d..2a54137 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -110,6 +110,8 @@ Patch7: bsc1110348.patch Patch8: bsc1112112.patch # Bug 882383 - LO-L3: Chart in PPTX lacks color and is too large Patch9: bsc882383.patch +# Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document +Patch10: bsc1117300.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -959,6 +961,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) From fb120df753e9aa7d1d8db2477d7b729566f7445586c1d1fe819b45e496554956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Dec 2018 09:38:10 +0000 Subject: [PATCH 5/5] Accepting request 653528 from home:adamm:branches:LibreOffice:Factory - boost_1_69.patch: Fix compilation with Boost 1.69 OBS-URL: https://build.opensuse.org/request/show/653528 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=731 --- boost_1_69.patch | 13 +++++++++++++ libreoffice.changes | 5 +++++ libreoffice.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 boost_1_69.patch diff --git a/boost_1_69.patch b/boost_1_69.patch new file mode 100644 index 0000000..ede9994 --- /dev/null +++ b/boost_1_69.patch @@ -0,0 +1,13 @@ +Index: libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx +=================================================================== +--- libreoffice-6.1.3.2.orig/sfx2/source/appl/shutdownicon.cxx ++++ libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx +@@ -141,7 +141,7 @@ bool LoadModule() + #endif // ENABLE_QUICKSTART_APPLET + } + assert(!boost::logic::indeterminate(loaded)); +- return loaded; ++ return (bool)loaded; + } + + } diff --git a/libreoffice.changes b/libreoffice.changes index 481e520..648e360 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -5,6 +5,11 @@ Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com overwrite an existing document * bsc1117300.patch +------------------------------------------------------------------- +Thu Nov 29 10:10:00 UTC 2018 - adam.majer@suse.de + +- boost_1_69.patch: Fix compilation with Boost 1.69 + ------------------------------------------------------------------- Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 2a54137..d9eb88b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -112,6 +112,7 @@ Patch8: bsc1112112.patch Patch9: bsc882383.patch # Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document Patch10: bsc1117300.patch +Patch11: boost_1_69.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -962,6 +963,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch990 -p1 # Disable some of the failing tests (some are random)