diff --git a/.gitignore b/.gitignore index e54ba12..c3886a4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ /libreoffice-translations-3.6.2.1.tar.xz /libreoffice-translations-3.6.2.2.tar.xz /libreoffice-translations-3.6.3.2.tar.xz +/libreoffice-binfilter-3.6.4.1.tar.xz +/libreoffice-core-3.6.4.1.tar.xz +/libreoffice-help-3.6.4.1.tar.xz +/libreoffice-translations-3.6.4.1.tar.xz diff --git a/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch b/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch deleted file mode 100644 index 9c0fc27..0000000 --- a/0001-fdo-47157-adding-Keywords-to-.desktop-files.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65 Mon Sep 17 00:00:00 2001 -From: Marco Biscaro -Date: Sun, 26 Aug 2012 21:32:41 -0300 -Subject: [PATCH] fdo#47157 adding Keywords to .desktop files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Adding Keywords to .desktop files, following the suggestions in -https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0 - -Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d -Reviewed-on: https://gerrit.libreoffice.org/490 -Reviewed-by: Björn Michaelsen -Tested-by: Björn Michaelsen ---- - sysui/desktop/menus/base.desktop | 1 + - sysui/desktop/menus/calc.desktop | 1 + - sysui/desktop/menus/draw.desktop | 1 + - sysui/desktop/menus/impress.desktop | 1 + - sysui/desktop/menus/math.desktop | 1 + - sysui/desktop/menus/writer.desktop | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop -index 72cf467..578e5c7 100755 ---- a/sysui/desktop/menus/base.desktop -+++ b/sysui/desktop/menus/base.desktop -@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.bas - Name=%PRODUCTNAME Base - GenericName=Database Development - Comment=Manage databases, create queries and reports to track and manage your information by using Base. -+Keywords=Data;SQL; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] -diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop -index e9f3250..638b9e2 100755 ---- a/sysui/desktop/menus/calc.desktop -+++ b/sysui/desktop/menus/calc.desktop -@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op - Name=%PRODUCTNAME Calc - GenericName=Spreadsheet - Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. -+Keywords=Accounting;Stats;Chart;ods;xls;xlsx; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] -diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop -index 9511fd5..6d92845 100755 ---- a/sysui/desktop/menus/draw.desktop -+++ b/sysui/desktop/menus/draw.desktop -@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opend - Name=%PRODUCTNAME Draw - GenericName=Drawing Program - Comment=Create and edit drawings, flow charts, and logos by using Draw. -+Keywords=Vector;Schema;Diagram;odg; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] -diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop -index 2fb8650..d8ca703 100755 ---- a/sysui/desktop/menus/impress.desktop -+++ b/sysui/desktop/menus/impress.desktop -@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o - Name=%PRODUCTNAME Impress - GenericName=Presentation - Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. -+Keywords=Slideshow;odp;ppt;pptx; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] -diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop -index 867711d..4381a49 100755 ---- a/sysui/desktop/menus/math.desktop -+++ b/sysui/desktop/menus/math.desktop -@@ -10,6 +10,7 @@ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math - Name=%PRODUCTNAME Math - GenericName=Formula Editor - Comment=Create and edit scientific formulas and equations by using Math. -+Keywords=Equation; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] -diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop -index 888b382..f76ac4e 100755 ---- a/sysui/desktop/menus/writer.desktop -+++ b/sysui/desktop/menus/writer.desktop -@@ -9,6 +9,7 @@ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum - Name=%PRODUCTNAME Writer - GenericName=Word Processor - Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. -+Keywords=Text;Letter;CV;odt;doc;docx; - InitialPreference=5 - X-Ayatana-Desktop-Shortcuts=X-New - [X-New Shortcut Group] --- -1.7.11.7 - diff --git a/0001-fix-sdext-build-with-poppler-0.19.x.patch b/0001-fix-sdext-build-with-poppler-0.19.x.patch deleted file mode 100644 index 7998f43..0000000 --- a/0001-fix-sdext-build-with-poppler-0.19.x.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bb6a12caede53029ecb99810f2f58daae4e11af7 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard -Date: Wed, 31 Oct 2012 18:00:18 +0100 -Subject: [PATCH] fix sdext build with poppler >= 0.19.x - -Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a ---- - configure.ac | 3 --- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 +++- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 +++++--- - 3 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 77a9aa6..7adc487 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -489,7 +489,9 @@ void PDFOutDev::endPage() - printf("endPage\n"); - } - --#if POPPLER_CHECK_VERSION(0, 17, 0) -+#if POPPLER_CHECK_VERSION(0, 19, 0) -+void PDFOutDev::processLink(AnnotLink *link) -+#elif POPPLER_CHECK_VERSION(0, 17, 0) - void PDFOutDev::processLink(AnnotLink *link, Catalog *) - #else - void PDFOutDev::processLink(Link* link, Catalog*) -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 0a19b9a..e5e48fc 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -189,10 +189,12 @@ namespace pdfi - // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); - // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); - -- #if POPPLER_CHECK_VERSION(0, 17, 0) -- virtual void processLink(AnnotLink *link, Catalog *catalog); -- #else - //----- link borders -+ #if POPPLER_CHECK_VERSION(0, 19, 0) -+ virtual void processLink(AnnotLink *link); -+ #elif POPPLER_CHECK_VERSION(0, 17, 0) -+ virtual void processLink(AnnotLink *link, Catalog *catalog); -+ #else - virtual void processLink(Link *link, Catalog *catalog); - #endif - --- -1.7.11.7 - diff --git a/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch b/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch deleted file mode 100644 index 9d9fa49..0000000 --- a/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch +++ /dev/null @@ -1,55 +0,0 @@ -From fef1b6e42dc22d764140ea0f8e690225c697bb96 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Eike Rathke -Date: Fri, 26 Oct 2012 18:09:20 +0200 -Subject: [PATCH] resolved rhbz865058 retard overflow of internal table of - number formats -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -Due to an insane amount of ridiculous "user-defined" number formats the -internal table may overflow during import, stave off and increase the -number of available slots to another arbitrary limit. -(cherry picked from commit 075e9ca0b96f37b3561824c23af60872d6a9d80a) - -Conflicts: - - svl/inc/svl/zforlist.hxx - -Change-Id: I2fb85c83a65d6c5b3183aeb3a3bda88828473a3c -Reviewed-on: https://gerrit.libreoffice.org/951 -Reviewed-by: Markus Mohrhard -Tested-by: Markus Mohrhard ---- - svl/inc/svl/zforlist.hxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch" - -diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx -index 2dfa273..0a70557 100644 ---- a/svl/inc/svl/zforlist.hxx -+++ b/svl/inc/svl/zforlist.hxx -@@ -63,7 +63,7 @@ namespace rtl { - class OUString; - } - --#define SV_COUNTRY_LANGUAGE_OFFSET 5000 // Max count of formats per country/language -+#define SV_COUNTRY_LANGUAGE_OFFSET 10000 // Max count of formats per country/language - #define SV_MAX_ANZ_STANDARD_FORMATE 100 // Max count of builtin default formats per CL - - // Format types - ---------------erAck-patch-parts-- - - diff --git a/libreoffice.spec b/libreoffice.spec index 1b269fe..c8bc911 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 3.6.3 +%define libo_version 3.6.4 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -39,8 +39,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 8%{?libo_prerelease}%{?dist} +Version: %{libo_version}.1 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -170,28 +170,25 @@ Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch Patch7: libreoffice-installfix.patch Patch8: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch -Patch9: 0001-fix-sdext-build-with-poppler-0.19.x.patch -Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch -Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch -Patch13: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch -Patch14: 0001-Resolves-rhbz-855541-XIOError-handler-multithread-wo.patch -Patch15: 0001-tentative-initial-attempt-at-re-work-for-new-playbin.patch -Patch16: 0002-gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch -Patch17: 0003-make-avmedia-build-with-gstreamer-0.10.patch -Patch18: 0004-tweak-old-school-gstreamer-link-line.patch -Patch19: 0005-Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch -Patch20: 0006-gstreamer-various-fixes-for-1.0-and-cleanups.patch -Patch21: 0007-gstreamer-fix-leaking-pads.patch -Patch22: 0001-convert-java-XSL-transformer-into-extension.patch -Patch23: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch -Patch24: 0003-drop-saxon-based-XSLT-transformer.patch -Patch25: 0004-remove-all-traces-of-saxon.patch -Patch26: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch -Patch27: 0001-fdo-47157-adding-Keywords-to-.desktop-files.patch -Patch28: 0001-do-not-strip-install-set.patch -Patch29: 0001-Resolves-fdo-56198-collect-scrollbar-click-preferenc.patch +Patch9: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch +Patch10: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch +Patch11: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch +Patch12: 0001-Resolves-rhbz-855541-XIOError-handler-multithread-wo.patch +Patch13: 0001-tentative-initial-attempt-at-re-work-for-new-playbin.patch +Patch14: 0002-gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch +Patch15: 0003-make-avmedia-build-with-gstreamer-0.10.patch +Patch16: 0004-tweak-old-school-gstreamer-link-line.patch +Patch17: 0005-Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch +Patch18: 0006-gstreamer-various-fixes-for-1.0-and-cleanups.patch +Patch19: 0007-gstreamer-fix-leaking-pads.patch +Patch20: 0001-convert-java-XSL-transformer-into-extension.patch +Patch21: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch +Patch22: 0003-drop-saxon-based-XSLT-transformer.patch +Patch23: 0004-remove-all-traces-of-saxon.patch +Patch24: 0001-do-not-strip-install-set.patch +Patch25: 0001-Resolves-fdo-56198-collect-scrollbar-click-preferenc.patch #to-do, fix this on bigendian platforms -Patch30: 0001-disable-failing-check.patch +Patch26: 0001-disable-failing-check.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -794,27 +791,24 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch %patch7 -p1 -b .libreoffice-installfix.patch %patch8 -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch -%patch9 -p1 -b .fix-sdext-build-with-poppler-0.19.x.patch -%patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch -%patch11 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch -%patch13 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch -%patch14 -p1 -b .rhbz-855541-XIOError-handler-multithread-wo.patch -%patch15 -p1 -b .tentative-initial-attempt-at-re-work-for-new-playbin.patch -%patch16 -p1 -b .gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch -%patch17 -p1 -b .make-avmedia-build-with-gstreamer-0.10.patch -%patch18 -p1 -b .tweak-old-school-gstreamer-link-line.patch -%patch19 -p1 -b .Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch -%patch20 -p1 -b .gstreamer-various-fixes-for-1.0-and-cleanups.patch -%patch21 -p1 -b .gstreamer-fix-leaking-pads.patch -%patch22 -p1 -b .convert-java-XSL-transformer-into-extension.patch -%patch23 -p1 -b .rework-selection-of-transformer-for-an-XSLT-filter.patch -%patch24 -p1 -b .drop-saxon-based-XSLT-transformer.patch -%patch25 -p1 -b .remove-all-traces-of-saxon.patch -%patch26 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch -%patch27 -p1 -b .fdo-47157-adding-Keywords-to-.desktop-files.patch -%patch28 -p1 -b .do-not-strip-install-set.patch -%patch29 -p1 -b .fdo-56198-collect-scrollbar-click-preferenc.patch -%patch30 -p1 -b .disable-failing-check.patch +%patch9 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch +%patch10 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch +%patch11 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch +%patch12 -p1 -b .rhbz-855541-XIOError-handler-multithread-wo.patch +%patch13 -p1 -b .tentative-initial-attempt-at-re-work-for-new-playbin.patch +%patch14 -p1 -b .gstreamer-make-gstreamer-1.0-and-0.10-dual-compile.patch +%patch15 -p1 -b .make-avmedia-build-with-gstreamer-0.10.patch +%patch16 -p1 -b .tweak-old-school-gstreamer-link-line.patch +%patch17 -p1 -b .Don-t-fail-configure-with-older-gstreamer-plugins-ba.patch +%patch18 -p1 -b .gstreamer-various-fixes-for-1.0-and-cleanups.patch +%patch19 -p1 -b .gstreamer-fix-leaking-pads.patch +%patch20 -p1 -b .convert-java-XSL-transformer-into-extension.patch +%patch21 -p1 -b .rework-selection-of-transformer-for-an-XSLT-filter.patch +%patch22 -p1 -b .drop-saxon-based-XSLT-transformer.patch +%patch23 -p1 -b .remove-all-traces-of-saxon.patch +%patch24 -p1 -b .do-not-strip-install-set.patch +%patch25 -p1 -b .fdo-56198-collect-scrollbar-click-preferenc.patch +%patch26 -p1 -b .disable-failing-check.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2043,6 +2037,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sun Nov 18 2012 David Tardon - 1:3.6.4.1-1 +- 3.6.4 rc1 + * Wed Nov 14 2012 Caolán McNamara - 1:3.6.3.2-8 - Resolves: rhbz#872815 ogltrans effects still suboptimal diff --git a/sources b/sources index 4384dba..c431b5c 100644 --- a/sources +++ b/sources @@ -8,7 +8,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -80439aafc2250cc878f503062f864b80 libreoffice-binfilter-3.6.3.2.tar.xz -17ccf623caa77dc135d5343a51fa1ddd libreoffice-core-3.6.3.2.tar.xz -94a8d18009f8e0e4ae80dc34c43604d7 libreoffice-help-3.6.3.2.tar.xz -f76c4439c211f229d49e5fb10ca2ba73 libreoffice-translations-3.6.3.2.tar.xz +49164be68b7eeaf4f8070145194b14a1 libreoffice-binfilter-3.6.4.1.tar.xz +ae3aaab557c5f76ad93f70825ec0c6cb libreoffice-core-3.6.4.1.tar.xz +489bf570cd73180b988588714901efa3 libreoffice-help-3.6.4.1.tar.xz +12126bfed467d06b85e1e24647c5c45b libreoffice-translations-3.6.4.1.tar.xz