[Frugalware-git] frugalware-current: libreoffice-3.4.4.2-1-i686
Miklos Vajna
vmiklos at frugalware.org
Wed Nov 9 15:12:55 CET 2011
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=783415e25aa701075abdcccd9bfeb52c647374bb
commit 783415e25aa701075abdcccd9bfeb52c647374bb
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Wed Nov 9 15:24:07 2011 +0100
libreoffice-3.4.4.2-1-i686
- up to 3.4.4
- new Scottish Gaelic langpack
- drop backported patches
diff --git a/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch b/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch
deleted file mode 100644
index 96541fb..0000000
--- a/source/xapps/libreoffice/0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 911227ffc1a0f4a84afabe28f3cc5b54ab475f83 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Fri, 2 Sep 2011 13:15:49 +0100
-Subject: [PATCH] Resolves: rhbz#735182 libreoffice doesn't build with
- poppler-0.17.3
-
----
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index cf28922..3f1261c 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
- void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
- {
- // dump JPEG file as-is
-+#if POPPLER_CHECK_VERSION(0, 17, 3)
-+ str = str->getBaseStream();
-+#else
- str = ((DCTStream *)str)->getRawStream();
-+#endif
- str->reset();
-
- int c;
-@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
- }
-
- #if POPPLER_CHECK_VERSION(0, 17, 0)
--void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
-+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
- #else
- void PDFOutDev::processLink(Link* link, Catalog*)
- #endif
---
-1.7.6
-
diff --git a/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch b/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch
deleted file mode 100644
index 20cfa15..0000000
--- a/source/xapps/libreoffice/0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
-From: =?latin2?q?Caol=E1n=20McNamara?= <caolanm at redhat.com>
-Date: Tue, 19 Jul 2011 08:54:07 +0100
-Subject: [PATCH] poppler 0.17.0 changed its api for no some reason or other
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index f7741b4..df15a94 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
- printf("endPage\n");
- }
-
-+#if POPPLER_CHECK_VERSION(0, 17, 0)
-+void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
-+#else
- void PDFOutDev::processLink(Link* link, Catalog*)
-+#endif
- {
- assert(link);
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 3ac0f49..0fd43c5 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -65,7 +65,10 @@ class GfxPath;
- class GfxFont;
- class PDFDoc;
- #ifndef SYSTEM_POPPLER
-+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
- typedef GString GooString;
-+#else
-+#include <glib/poppler-features.h>
- #endif
-
- namespace pdfi
-@@ -193,9 +196,13 @@ namespace pdfi
- // Convert between device and user coordinates.
- // 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
- virtual void processLink(Link *link, Catalog *catalog);
-+ #endif
-
- //----- save/restore graphics state
- virtual void saveState(GfxState *state);
diff --git a/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch b/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch
deleted file mode 100644
index d546819..0000000
--- a/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 148e0ccb50ce419e18e452eb7ccfe03cb4881634 Mon Sep 17 00:00:00 2001
-From: =?latin2?q?Caol=E1n=20McNamara?= <caolanm at redhat.com>
-Date: Tue, 5 Jul 2011 10:22:23 +0100
-Subject: [PATCH] workaround for x86 gcc 4.6.1 link failure
-
----
- sc/Library_vbaobj.mk | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
-index 51d0ed5..58dc936 100644
---- a/sc/Library_vbaobj.mk
-+++ b/sc/Library_vbaobj.mk
-@@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbaquerytable \
- sc/source/ui/vba/vbarange \
- sc/source/ui/vba/vbasheetobject \
-- sc/source/ui/vba/vbasheetobjects \
- sc/source/ui/vba/vbastyle \
- sc/source/ui/vba/vbastyles \
- sc/source/ui/vba/vbatextboxshape \
-@@ -138,6 +137,20 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbawsfunction \
- ))
-
-+#32bit Fedora gcc 4.6.1 fails to link sc without this
-+#TO-DO: make standalone reproducer for this and file
-+#gcc bug
-+ifeq ($(strip $(COM)),GCC)
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+ sc/source/ui/vba/vbasheetobjects \
-+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+else
-+$(eval $(call gb_Library_add_exception_objects,vbaobj,\
-+ sc/source/ui/vba/vbasheetobjects \
-+))
-+endif
-+
- ifeq ($(OS),WNT)
- $(eval $(call gb_Library_add_linked_libs,vbaobj,\
- advapi32 \
---
-1.7.6
-
diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild
index deffaeb..95f0ca6 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -3,10 +3,10 @@
# Contributor: Laszlo Dvornik <dvornik at gnome.hu>
pkgname=libreoffice
-pkgver=3.4.3.2
+pkgver=3.4.4.2
minor=${pkgver%%.?} # x.y.z
major=${pkgver%%.?.?} # x.y
-pkgrel=3
+pkgrel=1
pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org."
url="http://www.documentfoundation.org/download/"
_F_gnome_desktop="y"
@@ -35,10 +35,7 @@ modules=('artwork' 'base' 'bootstrap' 'calc'
'impress' 'translations' 'libs-core' 'libs-extern-sys'
'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
'ure' 'writer')
-source=(0001-workaround-for-x86-gcc-4.6.1-link-failure.patch \
- 0001-poppler-0.17.0-changed-its-api-for-no-some-reason-or.patch \
- 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch)
-signatures=('' '' '')
+source=()
ext=bz2
for i in ${modules[@]}
do
@@ -79,20 +76,20 @@ subgroups=('kde' 'gnome-extra' 'devel-extra' 'xapps')
subinstall=("" "$_F_gnome_scriptlet" "" "")
# sed ':a;N;$!ba;s/\\\n//g' solenv/inc/langlist.mk|grep ^completelangiso=|sed 's/completelangiso=//;s/en-US //'
-completelangiso=(af ar as ast be bo bg br brx bn bs ca ca-XV cs cy da de
- dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it
- ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ml mr my ne nb nl nn
- nr nso om oc or pa-IN pl pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh
- sr ss st sv sw-TZ te ta th tn tr ts tg ug uk uz ve vi xh zh-CN zh-TW zu)
+completelangiso=(af ar as ast be bo bg br brx bn bs ca ca-XV cs cy da de dgo dz
+ el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk
+ km kn ko kok ks ku lo lt lv mai mk mn mni ml mr my ne nb nl nn nr nso om oc or
+ pa-IN pl pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh sr ss st sv sw-TZ te ta
+ th tn tr ts tg ug uk uz ve vi xh zh-CN zh-TW zu)
# for i in ${completelangiso[@]}; do echo -n "'$(grep -1 STR_NAME_MODULE_LANGPACK_$(echo $i|tr '[a-z]' '[A-Z]'|tr '-' '_') scp2/source/ooo/module_langpack.ulf|sed -n 's/.*"\(.*\)"/\1/;$ p')' "; done
completelangdescs=('Afrikaans' 'Arabic' 'Assamese' 'Asturian' 'Belarusian'
'Tibetan' 'Bulgarian' 'Bodo' 'Bodo' 'Bengali (India)' 'Bosnian' 'Catalan
(Valencian)' 'Catalan (Valencian)' 'Czech' 'Welsh' 'Danish' 'German' 'Dogri'
'Dzongkha' 'Greek' 'English (United Kingdom)' 'English (South Africa)'
'Esperanto' 'Spanish' 'Estonian' 'Basque' 'Farsi' 'Finnish' 'French' 'Irish'
- 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Hungarian' 'Indonesian'
- 'Icelandic' 'Italian' 'Japanese' 'Georgian' 'Kazakh' 'Khmer' 'Kannada'
- 'Konkani' 'Konkani' 'Kashmiri' 'Kurdish' 'Lao' 'Lithuanian' 'Latvian'
+ 'Scottish Gaelic' 'Galician' 'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Hungarian'
+ 'Indonesian' 'Icelandic' 'Italian' 'Japanese' 'Georgian' 'Kazakh' 'Khmer'
+ 'Kannada' 'Konkani' 'Konkani' 'Kashmiri' 'Kurdish' 'Lao' 'Lithuanian' 'Latvian'
'Maithili' 'Macedonian' 'Manipuri' 'Manipuri' 'Malayalam' 'Marathi' 'Burmese'
'Nepali' 'Norwegian (Bokmål)' 'Dutch' 'Norwegian (Nynorsk)' 'Ndebele South'
'Northern Sotho' 'Oromo' 'Occitan' 'Oriya' 'Punjabi' 'Polish' 'Portuguese
More information about the Frugalware-git
mailing list