aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/libreoffice/Makefile3
-rw-r--r--editors/libreoffice/distinfo80
-rw-r--r--editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx20
-rw-r--r--editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx22
4 files changed, 41 insertions, 84 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 317377eacf74..0831c8d444a9 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libreoffice
-PORTVERSION= 3.4.3
-PORTREVISION= 2
+PORTVERSION= 3.4.4
CATEGORIES= editors
MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/${PORTVERSION}/ \
http://ftp.rediris.es/mirror/TDF/libreoffice/src/${PORTVERSION}/ \
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index 298b0b9da473..8db4649ad9f0 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,43 +1,43 @@
-SHA256 (libreoffice/libreoffice-bootstrap-3.4.3.2.tar.bz2) = 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
-SIZE (libreoffice/libreoffice-bootstrap-3.4.3.2.tar.bz2) = 2711992
-SHA256 (libreoffice/libreoffice-artwork-3.4.3.2.tar.bz2) = 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743
-SIZE (libreoffice/libreoffice-artwork-3.4.3.2.tar.bz2) = 13537796
-SHA256 (libreoffice/libreoffice-base-3.4.3.2.tar.bz2) = 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa
-SIZE (libreoffice/libreoffice-base-3.4.3.2.tar.bz2) = 2068714
-SHA256 (libreoffice/libreoffice-calc-3.4.3.2.tar.bz2) = 05f543b5a47511f789cd30fc74ba31cdd0074a4fe7a9bc91e9dd5ab969583335
-SIZE (libreoffice/libreoffice-calc-3.4.3.2.tar.bz2) = 9521313
-SHA256 (libreoffice/libreoffice-components-3.4.3.2.tar.bz2) = 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
-SIZE (libreoffice/libreoffice-components-3.4.3.2.tar.bz2) = 5094591
-SHA256 (libreoffice/libreoffice-extensions-3.4.3.2.tar.bz2) = 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d
-SIZE (libreoffice/libreoffice-extensions-3.4.3.2.tar.bz2) = 4216448
-SHA256 (libreoffice/libreoffice-extras-3.4.3.2.tar.bz2) = 3f4fe22ddf23e9e368e9145fd00cf9bc6de6e19539dfc1f818fde93426fda159
-SIZE (libreoffice/libreoffice-extras-3.4.3.2.tar.bz2) = 38643532
-SHA256 (libreoffice/libreoffice-filters-3.4.3.2.tar.bz2) = 2a12e9afa38f8d82419418c4c7443e47cc3cc39f78d5c2dc22bc61123b35dbe1
-SIZE (libreoffice/libreoffice-filters-3.4.3.2.tar.bz2) = 11779881
-SHA256 (libreoffice/libreoffice-help-3.4.3.2.tar.bz2) = 013a21f3a22e39782af784213efda43ebe4f38882932267b009ec745f32cff23
-SIZE (libreoffice/libreoffice-help-3.4.3.2.tar.bz2) = 1846706
-SHA256 (libreoffice/libreoffice-impress-3.4.3.2.tar.bz2) = 09114924804a876d41f971cfd6a2bf440df8ff79c97ebfe6698e74e7d39d87c0
-SIZE (libreoffice/libreoffice-impress-3.4.3.2.tar.bz2) = 2651830
-SHA256 (libreoffice/libreoffice-libs-core-3.4.3.2.tar.bz2) = 714001111ffacd69485676bec34d35a42e7440fe0b166cb5268e74d5ee32c858
-SIZE (libreoffice/libreoffice-libs-core-3.4.3.2.tar.bz2) = 15592792
-SHA256 (libreoffice/libreoffice-libs-extern-3.4.3.2.tar.bz2) = 681316cafbff67093ac93fa3803117219e80e3d3191c312f53129cf1a0e159c8
-SIZE (libreoffice/libreoffice-libs-extern-3.4.3.2.tar.bz2) = 637830
-SHA256 (libreoffice/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2) = d6086fac838167c733e135ecde70807ade4bed21687d6740d2d7a66ca7ee84ee
-SIZE (libreoffice/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2) = 40030519
-SHA256 (libreoffice/libreoffice-libs-gui-3.4.3.2.tar.bz2) = 9ae7e7092f4055bab2f3285cbfc388730caa91ab38af4307482906bd6c983ab6
-SIZE (libreoffice/libreoffice-libs-gui-3.4.3.2.tar.bz2) = 10866411
-SHA256 (libreoffice/libreoffice-postprocess-3.4.3.2.tar.bz2) = 5066d9c3dc631e182f150c372a806b30f5428d39c7d7358a4beeec3f8065e6c2
-SIZE (libreoffice/libreoffice-postprocess-3.4.3.2.tar.bz2) = 50913
-SHA256 (libreoffice/libreoffice-sdk-3.4.3.2.tar.bz2) = fa540938fd9526bd242c2e46db813f679a0261914e4feed214763618f82ab34a
-SIZE (libreoffice/libreoffice-sdk-3.4.3.2.tar.bz2) = 1721285
-SHA256 (libreoffice/libreoffice-testing-3.4.3.2.tar.bz2) = 89c25311bed6d9d8646bd0f8e7f37a9c227b125309cf7b49f2ab083a8b73d6c0
-SIZE (libreoffice/libreoffice-testing-3.4.3.2.tar.bz2) = 50848140
-SHA256 (libreoffice/libreoffice-ure-3.4.3.2.tar.bz2) = 9150a51fe93b803be51af02be585c8e9b2e2fce7c6a4061ed9b8c5d60183ca20
-SIZE (libreoffice/libreoffice-ure-3.4.3.2.tar.bz2) = 6214027
-SHA256 (libreoffice/libreoffice-writer-3.4.3.2.tar.bz2) = 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a
-SIZE (libreoffice/libreoffice-writer-3.4.3.2.tar.bz2) = 7295462
-SHA256 (libreoffice/libreoffice-translations-3.4.3.2.tar.bz2) = 331596511967d7cc31b3a517d5887025f3bd131325830df5984c14b121acaae2
-SIZE (libreoffice/libreoffice-translations-3.4.3.2.tar.bz2) = 137012907
+SHA256 (libreoffice/libreoffice-bootstrap-3.4.4.2.tar.bz2) = 7e4477795b535656b1f8853a439e74d91a035ff8958d307cbb42c38f209fb548
+SIZE (libreoffice/libreoffice-bootstrap-3.4.4.2.tar.bz2) = 2715038
+SHA256 (libreoffice/libreoffice-artwork-3.4.4.2.tar.bz2) = b30265ed7b30fa87eee4677521b414984d41c2a9766364a624c623fffba4aae9
+SIZE (libreoffice/libreoffice-artwork-3.4.4.2.tar.bz2) = 13539032
+SHA256 (libreoffice/libreoffice-base-3.4.4.2.tar.bz2) = 92dab1cb9efe2c023a3f9648e0a5eb52c00bb75376a5341c10fc52a4184cdc2c
+SIZE (libreoffice/libreoffice-base-3.4.4.2.tar.bz2) = 2069793
+SHA256 (libreoffice/libreoffice-calc-3.4.4.2.tar.bz2) = d65562e02bacaef368bef4e4e107933b4fa743e9ada17c9147a22255853d7a0b
+SIZE (libreoffice/libreoffice-calc-3.4.4.2.tar.bz2) = 9513923
+SHA256 (libreoffice/libreoffice-components-3.4.4.2.tar.bz2) = d06141b0e078b609406b82db64599618bb7b93efa7841034f4a6cf441a0b442b
+SIZE (libreoffice/libreoffice-components-3.4.4.2.tar.bz2) = 5095697
+SHA256 (libreoffice/libreoffice-extensions-3.4.4.2.tar.bz2) = ff07833ecb59a15cd3aa1e0c74e59fb985e5aae9d7285679e25ed96bbc3fefed
+SIZE (libreoffice/libreoffice-extensions-3.4.4.2.tar.bz2) = 4219139
+SHA256 (libreoffice/libreoffice-extras-3.4.4.2.tar.bz2) = cf279f63aaf9fed525a1fc73923800cb6b202f4484d91d97f8b4fb5a7aebc5c8
+SIZE (libreoffice/libreoffice-extras-3.4.4.2.tar.bz2) = 38643643
+SHA256 (libreoffice/libreoffice-filters-3.4.4.2.tar.bz2) = d004f87f8b7b14f8552b2aeb9fba2442e506e8e9c760f2b2683f349cd926e29d
+SIZE (libreoffice/libreoffice-filters-3.4.4.2.tar.bz2) = 11777005
+SHA256 (libreoffice/libreoffice-help-3.4.4.2.tar.bz2) = f9f65d8bd5733dc039f76548502aa995a95dddab7ef27b3b5e1e2291d0d65c4c
+SIZE (libreoffice/libreoffice-help-3.4.4.2.tar.bz2) = 1845778
+SHA256 (libreoffice/libreoffice-impress-3.4.4.2.tar.bz2) = 9bcfdd5eb75f050c8c04c6fd4bdb52de8bbaca7225733f4195bae08178ce148d
+SIZE (libreoffice/libreoffice-impress-3.4.4.2.tar.bz2) = 2652247
+SHA256 (libreoffice/libreoffice-libs-core-3.4.4.2.tar.bz2) = 0b2f353ba01336870acf49e9f21fca129fc3daf5a97e0c91d05f8eaa7bcee032
+SIZE (libreoffice/libreoffice-libs-core-3.4.4.2.tar.bz2) = 15594335
+SHA256 (libreoffice/libreoffice-libs-extern-3.4.4.2.tar.bz2) = ae14e78269ae37651f1e4284d56330d72114c22d37eb4d38e47dbb631fdfeb67
+SIZE (libreoffice/libreoffice-libs-extern-3.4.4.2.tar.bz2) = 638337
+SHA256 (libreoffice/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2) = 0724e4317abd9ab77b56940a51da575e7c79cd28807a36f4d3c4ee749a36c2d0
+SIZE (libreoffice/libreoffice-libs-extern-sys-3.4.4.2.tar.bz2) = 40034592
+SHA256 (libreoffice/libreoffice-libs-gui-3.4.4.2.tar.bz2) = 6073ee58680a30c3625003914fc8e4ab9bb62b34a67757916f788f17b199134b
+SIZE (libreoffice/libreoffice-libs-gui-3.4.4.2.tar.bz2) = 10865441
+SHA256 (libreoffice/libreoffice-postprocess-3.4.4.2.tar.bz2) = ca7b3e50408065e2cdcf0892be566b0ccd59b5ff5ae1059e47069a8156402764
+SIZE (libreoffice/libreoffice-postprocess-3.4.4.2.tar.bz2) = 50884
+SHA256 (libreoffice/libreoffice-sdk-3.4.4.2.tar.bz2) = 3ea5d0dda904da30a53d3b68065e4ccb5f233c6b4c60fbae024dd85f5ea382bb
+SIZE (libreoffice/libreoffice-sdk-3.4.4.2.tar.bz2) = 1721685
+SHA256 (libreoffice/libreoffice-testing-3.4.4.2.tar.bz2) = c68f1b879bf1f63f00cef19ebac0c93a101f2f5f1e3f63104123c5fba6360f27
+SIZE (libreoffice/libreoffice-testing-3.4.4.2.tar.bz2) = 50846747
+SHA256 (libreoffice/libreoffice-ure-3.4.4.2.tar.bz2) = 4f7df352778a88bf693cd317beb749755dfdcbafba035123b9057cc79714b733
+SIZE (libreoffice/libreoffice-ure-3.4.4.2.tar.bz2) = 6213533
+SHA256 (libreoffice/libreoffice-writer-3.4.4.2.tar.bz2) = f6e60ec963032cb1d3d11175c7b783072af84fb5b9db0cdc622eaecb237484cd
+SIZE (libreoffice/libreoffice-writer-3.4.4.2.tar.bz2) = 7296517
+SHA256 (libreoffice/libreoffice-translations-3.4.4.2.tar.bz2) = b96a7e8ce0ff4ffa46d7bbf3355e3201aad9cdde708db8340b4f611e89d61c66
+SIZE (libreoffice/libreoffice-translations-3.4.4.2.tar.bz2) = 137622943
SHA256 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
SIZE (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217
SHA256 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
deleted file mode 100644
index 55e570ad8f50..000000000000
--- a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2011-10-26 13:23:40.000000000 +0000
-+++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-10-26 13:23:57.000000000 +0000
-@@ -150,7 +150,7 @@
- void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
- {
- // dump JPEG file as-is
-- str = ((DCTStream *)str)->getRawStream();
-+ str = str->getBaseStream();
- str->reset();
-
- int c;
-@@ -489,7 +489,7 @@ void PDFOutDev::endPage()
- printf("endPage\n");
- }
-
--void PDFOutDev::processLink(Link* link, Catalog*)
-+void PDFOutDev::processLink(AnnotLink* link, Catalog*)
- {
- assert(link);
-
diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
deleted file mode 100644
index b891f3d08615..000000000000
--- a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2011-05-19 09:14:21.000000000 +0000
-+++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-10-29 20:19:33.000000000 +0000
-@@ -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
-@@ -195,7 +198,7 @@ namespace pdfi
- // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-
- //----- link borders
-- virtual void processLink(Link *link, Catalog *catalog);
-+ virtual void processLink(AnnotLink *link, Catalog *catalog);
-
- //----- save/restore graphics state
- virtual void saveState(GfxState *state);