From 1dafe496d146ab213898b1b42355890e5b3604db Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Tue, 26 Mar 2019 21:22:28 +0300 Subject: [PATCH] libreoffice:v.bump to 6.2.2.2 --- ...-combobox-in-format-cells-is-too-nar.patch | 85 ------------- office/libreoffice/libreoffice/pspec.xml | 120 +++++++++--------- 2 files changed, 63 insertions(+), 142 deletions(-) delete mode 100644 office/libreoffice/libreoffice/files/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch diff --git a/office/libreoffice/libreoffice/files/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch b/office/libreoffice/libreoffice/files/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch deleted file mode 100644 index 99bac2f233..0000000000 --- a/office/libreoffice/libreoffice/files/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 115f3749a737de337f6b456dcc84b6e3a6fdfc0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 21 Feb 2019 15:57:22 +0000 -Subject: [PATCH] menu of currency combobox in format-cells is too narrow - -we want the combobox to be narrower than it wants to be. To make that happen -we have only the option of shrinking the cell renderer of the combobox area. -And that is also used by the menu. - -Setting a small value of e.g. 1 works to let the combobox not request more -width than that, and the combobox will correctly render within the wider size -it actually gets. But then the menu is a min width menu, which is undesirable, -we want the menu to be as wide as it can be. - -So calculate what part of the combobox belongs to the cell area and set -the widest cell area we can within the overall combobox width, resulting -in the widest menu we can get. - -Change-Id: Ie3e9960a320a70471ac21d2a88f32632cafa951f -Reviewed-on: https://gerrit.libreoffice.org/68168 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna ---- - cui/source/tabpages/numfmt.cxx | 2 +- - vcl/unx/gtk3/gtk3gtkinst.cxx | 23 +++++++++++++++++------ - 2 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx -index b6a4a8ba4d5c..d202232b951d 100644 ---- a/cui/source/tabpages/numfmt.cxx -+++ b/cui/source/tabpages/numfmt.cxx -@@ -234,7 +234,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(TabPageParent pParent, - auto nWidth = approximate_char_width() * 26; - m_xLbCategory->set_size_request(nWidth, m_xLbCategory->get_height_rows(7)); - m_xLbFormat->set_size_request(nWidth, m_xLbFormat->get_height_rows(5)); -- m_xLbCurrency->set_size_request(1, -1); // width of 1, so real width will be that of its LbFormat sibling -+ m_xLbCurrency->set_size_request(nWidth, -1); // width of 1, so real width will be that of its LbFormat sibling - - // Initially remove the "Automatically" entry. - m_xLbCurrency->set_active(-1); // First ensure that nothing is selected. -diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index a9fdfd3615eb..e81f451f7fa0 100644 ---- a/vcl/unx/gtk3/gtk3gtkinst.cxx -+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx -@@ -6978,20 +6978,31 @@ public: - // tweak the cell render to get a narrower size to stick - GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox)); - GtkCellRenderer* cell = static_cast(cells->data); -- GtkRequisition size; -- gtk_cell_renderer_get_preferred_size(cell, m_pWidget, &size, nullptr); -- if (nWidth < size.width) -+ -+ if (nWidth != -1) - { - // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let -- // the popup menu render them in full, in the interim ellipse both -+ // the popup menu render them in full, in the interim ellipse both of them - g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); -- gtk_cell_renderer_set_fixed_size(cell, nWidth, size.height); -+ -+ // to find out how much of the width of the combobox belongs to the cell, set -+ // the cell and widget to the min cell width and see what the difference is -+ int min; -+ gtk_cell_renderer_get_preferred_width(cell, m_pWidget, &min, nullptr); -+ gtk_cell_renderer_set_fixed_size(cell, min, -1); -+ gtk_widget_set_size_request(m_pWidget, min, -1); -+ int nNonCellWidth = get_preferred_size().Width() - min; -+ -+ // now set the cell to the max width which it can be within the -+ // requested widget width -+ gtk_cell_renderer_set_fixed_size(cell, nWidth - nNonCellWidth, -1); - } - else - { - g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_NONE, nullptr); -- gtk_cell_renderer_set_fixed_size(cell, -1, size.height); -+ gtk_cell_renderer_set_fixed_size(cell, -1, -1); - } -+ - g_list_free(cells); - - gtk_widget_set_size_request(m_pWidget, nWidth, nHeight); --- -2.21.0 - diff --git a/office/libreoffice/libreoffice/pspec.xml b/office/libreoffice/libreoffice/pspec.xml index 2f6b433cef..b403c430e9 100644 --- a/office/libreoffice/libreoffice/pspec.xml +++ b/office/libreoffice/libreoffice/pspec.xml @@ -13,67 +13,66 @@ app:gui LibreOffice office suite LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office. - http://download.documentfoundation.org/libreoffice/src/6.2.1/libreoffice-6.2.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.1/libreoffice-dictionaries-6.2.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.1/libreoffice-help-6.2.1.2.tar.xz - http://download.documentfoundation.org/libreoffice/src/6.2.1/libreoffice-translations-6.2.1.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.2/libreoffice-6.2.2.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.2/libreoffice-dictionaries-6.2.2.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.2/libreoffice-help-6.2.2.2.tar.xz + http://download.documentfoundation.org/libreoffice/src/6.2.2/libreoffice-translations-6.2.2.2.tar.xz - http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz - http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz - http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2 - http://dev-www.libreoffice.org/src/collada2gltf-master-6258611a6a.tar.bz2 - http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 - http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz - http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz - http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz - http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip - http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz - https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz - https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz - http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz - http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz - http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz - http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz - http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz - http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz - http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2 - http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz - http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2 - http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2 - https://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz - http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2 - https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz - https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz - https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz - https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2 - https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz - https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz - https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz - https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz + http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz + http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2 + http://dev-www.libreoffice.org/src/collada2gltf-master-6258611a6a.tar.bz2 + http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 + http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz + http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz + http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz + http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip + http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz + https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz + https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz + http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz + http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz + http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz + http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz + http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz + http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz + http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2 + http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz + http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2 + http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2 + https://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz + http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2 + https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz + https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz + https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz + https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2 + https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz + https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz + https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz + https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf - http://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar - http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + http://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar + http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar make-pyuno-work-with-system-wide-module-install.diff - 0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch ant @@ -3963,10 +3962,17 @@ + + 2019-03-26 + 6.2.2.2 + Version Bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + - 2019-03-15 + 2019-03-12 6.2.1.2 - Version Bump to lastest stable version + Version Bump to stable version Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org