kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Forgot libreoffice itself in previous commit

Browse source
This commit is contained in:
Baptiste Daroussin 2014-06-11 14:45:18 +00:00
parent 6366b4495a
commit 0533abe3e7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=357485
32 changed files with 3297 additions and 994 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
editors/libreoffice/Makefile
View file

@ -2,7 +2,7 @@
.include "${.CURDIR}/Makefile.common"
PORTREVISION= 1
PORTREVISION= 0
COMMENT= Full integrated office productivity suite
@ -39,7 +39,7 @@ LIB_DEPENDS= libicutu.so:${PORTSDIR}/devel/icu \
libnss3.so:${PORTSDIR}/security/nss \
libclucene-core.so:${PORTSDIR}/textproc/clucene \
libexpat.so:${PORTSDIR}/textproc/expat2 \
libmwaw-0.1.so:${PORTSDIR}/textproc/libmwaw \
libmwaw-0.2.so:${PORTSDIR}/textproc/libmwaw \
libodfgen-0.0.so:${PORTSDIR}/textproc/libodfgen \
libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
libhyphen.so:${PORTSDIR}/textproc/hyphen \
@ -50,7 +50,10 @@ LIB_DEPENDS= libicutu.so:${PORTSDIR}/devel/icu \
libwpd-0.9.so:${PORTSDIR}/textproc/libwpd \
libwps-0.2.so:${PORTSDIR}/textproc/libwps \
libmythes-1.2.so:${PORTSDIR}/textproc/mythes \
librdf.so:${PORTSDIR}/textproc/redland
librdf.so:${PORTSDIR}/textproc/redland \
libabw-0.0.so:${PORTSDIR}/textproc/libabw00 \
libfreehand-0.0.so:${PORTSDIR}/graphics/libfreehand00 \
libe-book-0.0.so:${PORTSDIR}/textproc/libe-book00
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
${LOCALBASE}/lib/X11/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
@ -59,30 +62,30 @@ RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11
${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
CONFLICTS_INSTALL= libreoffice-legacy-[0-9]*
_MAKE_JOBS= #
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf aclocal
USE_GL= gl glu
USE_OPENLDAP= yes
USE_PERL5= build
USE_PYTHON= yes
USE_QT4= # empty but required
USE_XORG= xaw xrandr
USES= bison compiler:c++11-lang gmake perl5 pkgconfig tar:xz
USES= bison compiler:c++11-lang gmake perl5 pkgconfig shared-mime-info tar:xz
WANT_GNOME= yes
DISTFILES+= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX}
DISTFILES+= ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
EXTRA_PATCHES+= ${FILESDIR}/extra-icu53.diff:-p1 \
${FILESDIR}/extra-icu53-crash.diff:-p1 \
${FILESDIR}/extra-fix-ldl:-p1
EXTRACT_ONLY:= ${DISTFILES}
DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src
DIST_SUBDIR= libreoffice
LODESTDIR= ${WRKDIR}/loinstall
WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
@ -90,7 +93,9 @@ CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
GPERF=${LOCALBASE}/bin/gperf \
PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \
TMPDIR=${WRKDIR}
TMPDIR=${WRKDIR} \
OPENSSL_CFLAGS="-I/usr/include" \
OPENSSL_LIBS="-lcrypto -lssl"
CONFIGURE_ARGS+= --disable-dependency-tracking \
--disable-fetch-external \
@ -109,8 +114,8 @@ CONFIGURE_ARGS+= --disable-epm \
--disable-gstreamer \
--disable-kde \
--disable-kdeab \
--disable-linkoo \
--disable-mergelibs \
--disable-firebird-sdbc \
--enable-cairo-canvas \
--enable-graphite \
--enable-python=system \
@ -132,9 +137,13 @@ CONFIGURE_ARGS+= --disable-epm \
--with-system-icu \
--with-system-jpeg \
--with-system-lcms2 \
--with-system-libabw \
--with-system-libcdr \
--with-system-libcmis \
--with-system-libebook \
--with-system-libetonyek \
--with-system-libexttextcat \
--with-system-libfreehand \
--with-system-liblangtag \
--with-system-libmspub \
--with-system-libmwaw \
@ -163,6 +172,8 @@ CONFIGURE_ARGS+= --disable-epm \
--without-myspell-dicts \
--without-system-npapi-headers
#XXX add: --with-system-libeot or --with-system-libatomic_ops
OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \
SYSTRAY TEST VERBOSE WEBDAV
OPTIONS_DEFAULT=CUPS GTK2
@ -176,14 +187,10 @@ TEST_DESC= Run all regression tests
VERBOSE_DESC= Increase build verbosity
WEBDAV_DESC= Enable webdav protocol
.include <bsd.port.options.mk>
CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
CUPS_CONFIGURE_ENABLE= cups
.if ${PORT_OPTIONS:MCUPS}
LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+= --enable-cups
.else
CONFIGURE_ARGS+= --disable-cups
.endif
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEBUG}
IGNORE= known as broken
@ -232,11 +239,9 @@ INSTALLS_ICONS= yes
CONFLICTS_BUILD= classpath-[0-9]*
#additionnal distfiles needed for java
DISTFILES+= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz:src \
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz:src \
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz:src \
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz:src \
@ -335,7 +340,7 @@ LDFLAGS= -B${LOCALBASE}/bin
.endif
.if ${COMPILER_FEATURES:Mlibc++}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++
EXTRA_PATCHES+= ${FILESDIR}/extra-libc++:-p1
.endif
.if ${OSVERSION} < 900506
@ -351,49 +356,45 @@ MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}"
MAKE_ENV+= LANG=C LC_ALL=C
MAKE_ENV+= SED="${LOCALBASE}/bin/gsed" USE_GMAKE=1
INSTALL_TARGET= distro-pack-install
pre-configure:
@${TOUCH} ${WRKSRC}/autogen.lastrun
post-configure:
@${TOUCH} ${WRKSRC}/src.downloaded
do-build:
@cd ${WRKSRC} && ${SETENV} DESTDIR="" ${MAKE_ENV} ${GMAKE}
do-install:
@cd ${WRKSRC} && ${SETENV} DESTDIR="${LODESTDIR}" \
${GMAKE} distro-pack-install
post-install:
@${RM} -f ${PLISTF} ${PLISTD}
# It seems that the empty directories are necessary for libreoffice keep them for now
@cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
-empty -exec ${ECHO_CMD} "@exec ${MKDIR} %D/{}" \; >> ${PLISTD}
@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s bin lib man \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s bin lib man \
\( -type f -o -type l \) -print >> ${PLISTF}
@cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
-exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
@${ECHO_CMD} etc/bash_completion.d/libreoffice.sh >> ${PLISTF}
@${ECHO_CMD} "@dirrmtry etc/bash_completion.d" >> ${PLISTD}
.for subdir in applications icons mime mimelnk
@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
\( -type f -o -type l \) -print >> ${PLISTF}
@cd ${LODESTDIR}${PREFIX} && ${FIND} -d share/${subdir} -type d \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -d share/${subdir} -type d \
-exec ${ECHO_CMD} "@dirrmtry {}" \; >> ${PLISTD}
.endfor
# do not add the subdir itself as dirrmtry
.for subdir in application-registry mime-info
@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s share/${subdir} \
\( -type f -o -type l \) -print >> ${PLISTF}
.endfor
.if ${PORT_OPTIONS:MSDK}
.for subdir in include share share/doc share/idl
@cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s ${subdir}/libreoffice \
\( -type f -o -type l \) -print >> ${PLISTF}
@cd ${LODESTDIR}${PREFIX} && ${FIND} -d ${subdir}/libreoffice \
@cd ${STAGEDIR}${PREFIX} && ${FIND} -d ${subdir}/libreoffice \
-type d -exec echo "@dirrm {}" \; >> ${PLISTD}
.endfor
@${ECHO_CMD} "@dirrmtry share/idl" >> ${PLISTD}
@ -405,9 +406,8 @@ do-install:
@${GREP} '^@dirrmtry ' ${PLISTD} | ${SORT} -ru | \
${SED} -e '${PLIST_REINPLACE_DIRRMTRY}' >> ${TMPPLIST}
@cd ${LODESTDIR}${PREFIX} ; ${PAX} -rw . ${STAGEDIR}${PREFIX}
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
@${INSTALL_SCRIPT} ${LODESTDIR}/etc/bash_completion.d/libreoffice.sh \
@${INSTALL_SCRIPT} ${STAGEDIR}/etc/bash_completion.d/libreoffice.sh \
${STAGEDIR}${PREFIX}/etc/bash_completion.d
.include <bsd.port.post.mk>

23
editors/libreoffice/Makefile.common
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libreoffice
PORTVERSION= 4.1.6
PORTVERSION= 4.2.4
RCVER= 2
#PRERELEASE= yes
LOVERSION= ${PORTVERSION}.${RCVER}
@ -14,26 +14,7 @@ LICENSE_COMB= dual
.if defined(PRERELEASE)
MASTER_SITES?= http://dev-builds.libreoffice.org/pre-releases/${MASTER_SITE_SUBDIR}
.else
MASTER_SITES?= http://ftp.rediris.es/mirror/TDF/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirrors.supportex.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirror.netcologne.de/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/${MASTER_SITE_SUBDIR} \
http://artfiles.org/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirror.galpon.org/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://tdf.panu.it/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.klid.dk/ftp/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://gd.tuwien.ac.at/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://archive.sunet.se/pub/Office/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.astral.ro/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.roedu.net/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.unicamp.br/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirror.yongbok.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \
http://ftp.osuosl.org/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR}
MASTER_SITES?= http://download.documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR}/
.endif
ONLY_FOR_ARCH= i386 amd64

12
editors/libreoffice/distinfo
View file

@ -1,21 +1,17 @@
SHA256 (libreoffice/libreoffice-4.1.6.2.tar.xz) = 68dde9756732ddb5f7ce8a42100799ada65a538f32f420c400a28ce100f411f4
SIZE (libreoffice/libreoffice-4.1.6.2.tar.xz) = 122048924
SHA256 (libreoffice/libreoffice-help-4.1.6.2.tar.xz) = f2da2b9aedfc34626123b294ac24cfe550e2f5589df0c11fc1c93f8e29cc342f
SIZE (libreoffice/libreoffice-help-4.1.6.2.tar.xz) = 1849372
SHA256 (libreoffice/libreoffice-4.2.4.2.tar.xz) = d166ffa1f2cd336a2f668ea3a912aaf98873757c67e1bcde1ac6f57c6cc605a0
SIZE (libreoffice/libreoffice-4.2.4.2.tar.xz) = 123378868
SHA256 (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = a372efb0f82eeed56b7232d15a2d80a522174c3127986f6210239bbbfc342a3d
SIZE (libreoffice/libreoffice-help-4.2.4.2.tar.xz) = 1855080
SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470
SHA256 (libreoffice/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz) = 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
SIZE (libreoffice/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz) = 3568559
SHA256 (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2
SIZE (libreoffice/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz) = 1882664
SHA256 (libreoffice/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz) = ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b
SIZE (libreoffice/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz) = 262206
SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582
SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796
SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157
SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743

57
editors/libreoffice/files/extra-fix-ldl Normal file
View file

@ -0,0 +1,57 @@
From a5a17ccdbc870b475e6a2dc076a780b55e16ccab Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Jun 2014 16:32:51 +0000
Subject: Filter out OS not needing -ldl
Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d
Reviewed-on: https://gerrit.libreoffice.org/9715
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index f56a1d3..c6ab9a0 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -199,7 +199,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
))
-ifeq ($(filter ANDROID WNT,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4f385d9..9178a9d 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -23,9 +23,11 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
ifneq ($(OS),WNT)
+ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
))
+endif
$(eval $(call gb_Library_use_external,npsoplugin,gtk))
diff --git a/vcl/Executable_xid_fullscreen_on_all_monitors.mk b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
index 5f9c127..ee17162 100644
--- a/vcl/Executable_xid_fullscreen_on_all_monitors.mk
+++ b/vcl/Executable_xid_fullscreen_on_all_monitors.mk
@@ -9,9 +9,11 @@
$(eval $(call gb_Executable_Executable,xid-fullscreen-on-all-monitors))
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Executable_add_libs,xid-fullscreen-on-all-monitors,\
-ldl \
))
+endif
$(eval $(call gb_Executable_add_cobjects,xid-fullscreen-on-all-monitors,\
vcl/unx/gtk/window/xid_fullscreen_on_all_monitors \
--
cgit v0.9.0.2-2-gbebe

271
editors/libreoffice/files/extra-icu53-crash.diff Normal file
View file

@ -0,0 +1,271 @@
From 1ce42d1001139a9168e9451dbd48a6daef95c691 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 30 Apr 2014 16:51:05 +0000
Subject: resolve crashes with ICU 53.1 in locales with collator data, fdo#77071
ICU 53.1 changed API behavior:
https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RuleBasedCollator.html#a2f4c7eeaf020ad68e3bd9722dd272357
isn't correct anymore:
length: size of the image. If negative, the API will try to figure out the
length of the image
NO, IT WILL NOT! It bails out with an error instead.
Introduced a function to obtain the length for each collator data.
base: collator, usually root. The base is required to be present through the
lifetime of the collator. Currently it cannot be NULL.
NOT "usually root"! There's a check now that bails out if
if(base->tailoring != CollationRoot::getRoot(errorCode))
So using an instance created with icu::Locale::getRoot()
(cherry picked from commit a3c627fe38236e82bc6008075d862b3cbfbd9ce3)
Conflicts:
i18npool/source/collator/collator_unicode.cxx
Backported.
make DISABLE_DYNLOADING on Android happy, fdo#77071 related
(cherry picked from commit dc7ba1af236ec28d399eff833d56608fde9fb70d)
Change-Id: Ia9c4e27d5ef4f8083bbe57e4e2f4b3ff63bb42ed
Reviewed-on: https://gerrit.libreoffice.org/9215
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 90dd2f3b..42dfef3 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -84,6 +84,27 @@ const sal_uInt8* get_collator_data_zh_radical();
const sal_uInt8* get_collator_data_zh_stroke();
const sal_uInt8* get_collator_data_zh_zhuyin();
+size_t get_collator_data_ca_charset_length();
+size_t get_collator_data_dz_charset_length();
+size_t get_collator_data_hu_charset_length();
+size_t get_collator_data_ja_charset_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_first_length();
+size_t get_collator_data_ja_phonetic_alphanumeric_last_length();
+size_t get_collator_data_ko_charset_length();
+size_t get_collator_data_ku_alphanumeric_length();
+size_t get_collator_data_ln_charset_length();
+size_t get_collator_data_my_dictionary_length();
+size_t get_collator_data_ne_charset_length();
+size_t get_collator_data_sid_charset_length();
+size_t get_collator_data_zh_TW_charset_length();
+size_t get_collator_data_zh_TW_radical_length();
+size_t get_collator_data_zh_TW_stroke_length();
+size_t get_collator_data_zh_charset_length();
+size_t get_collator_data_zh_pinyin_length();
+size_t get_collator_data_zh_radical_length();
+size_t get_collator_data_zh_stroke_length();
+size_t get_collator_data_zh_zhuyin_length();
+
}
#endif
@@ -120,6 +141,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
}
if (!collator && OUString::createFromAscii(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
const sal_uInt8* (*func)() = NULL;
+ size_t (*funclen)() = NULL;
#ifndef DISABLE_DYNLOADING
OUStringBuffer aBuf;
@@ -132,11 +154,21 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
if ( rLocale.Language == "zh" ) {
OUString func_base = aBuf.makeStringAndClear();
+ OUString funclen_base = func_base + "_length";
if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
+ {
+ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
OUString(func_base + "TW_" + rAlgorithm).pData);
+ funclen = (size_t (*)()) osl_getFunctionSymbol(hModule,
+ OUString(funclen_base + "TW_" + rAlgorithm).pData);
+ }
if (!func)
- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData);
+ {
+ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(
+ hModule, OUString(func_base + rAlgorithm).pData);
+ funclen = (size_t (*)()) osl_getFunctionSymbol(
+ hModule, OUString(funclen_base + rAlgorithm).pData);
+ }
} else {
if ( rLocale.Language == "ja" ) {
// replace algorithm name to implementation name.
@@ -149,72 +181,147 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
} else {
aBuf.append(rAlgorithm);
}
- func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, aBuf.makeStringAndClear().pData);
+ OUString func_base = aBuf.makeStringAndClear();
+ OUString funclen_base = func_base + "_length";
+ func = (const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, func_base.pData);
+ funclen = (size_t (*)()) osl_getFunctionSymbol(hModule, funclen_base.pData);
}
}
#else
if ( rLocale.Language == "ca" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_ca_charset;
+ funclen = get_collator_data_ca_charset_length;
+ }
} else if ( rLocale.Language == "dz" || rLocale.Language == "bo" ) {
// 'bo' Tibetan uses the same collation rules as 'dz' Dzongkha
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_dz_charset;
+ funclen = get_collator_data_dz_charset_length;
+ }
} else if ( rLocale.Language == "hu" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_hu_charset;
+ funclen = get_collator_data_hu_charset_length;
+ }
} else if ( rLocale.Language == "ja" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_ja_charset;
+ funclen = get_collator_data_ja_charset_length;
+ }
else if ( rAlgorithm == "phonetic (alphanumeric first)" )
+ {
func = get_collator_data_ja_phonetic_alphanumeric_first;
+ funclen = get_collator_data_ja_phonetic_alphanumeric_first_length;
+ }
else if ( rAlgorithm == "phonetic (alphanumeric last)" )
+ {
func = get_collator_data_ja_phonetic_alphanumeric_last;
+ funclen = get_collator_data_ja_phonetic_alphanumeric_last_length;
+ }
#if (U_ICU_VERSION_MAJOR_NUM < 53)
} else if ( rLocale.Language == "ko" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_ko_charset;
+ funclen = get_collator_data_ko_charset_length;
+ }
#endif
} else if ( rLocale.Language == "ku" ) {
if ( rAlgorithm == "alphanumeric" )
+ {
func = get_collator_data_ku_alphanumeric;
+ funclen = get_collator_data_ku_alphanumeric_length;
+ }
} else if ( rLocale.Language == "ln" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_ln_charset;
+ funclen = get_collator_data_ln_charset_length;
+ }
} else if ( rLocale.Language == "my" ) {
if ( rAlgorithm == "dictionary" )
+ {
func = get_collator_data_my_dictionary;
+ funclen = get_collator_data_my_dictionary_length;
+ }
} else if ( rLocale.Language == "ne" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_ne_charset;
+ funclen = get_collator_data_ne_charset_length;
+ }
} else if ( rLocale.Language == "sid" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_sid_charset;
+ funclen = get_collator_data_sid_charset_length;
+ }
} else if ( rLocale.Language == "zh" && (rLocale.Country == "TW" || rLocale.Country == "HK" || rLocale.Country == "MO") ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_zh_TW_charset;
+ funclen = get_collator_data_zh_TW_charset_length;
+ }
else if ( rAlgorithm == "radical" )
+ {
func = get_collator_data_zh_TW_radical;
+ funclen = get_collator_data_zh_TW_radical_length;
+ }
else if ( rAlgorithm == "stroke" )
+ {
func = get_collator_data_zh_TW_stroke;
+ funclen = get_collator_data_zh_TW_stroke_length;
+ }
} else if ( rLocale.Language == "zh" ) {
if ( rAlgorithm == "charset" )
+ {
func = get_collator_data_zh_charset;
+ funclen = get_collator_data_zh_charset_length;
+ }
else if ( rAlgorithm == "pinyin" )
+ {
func = get_collator_data_zh_pinyin;
+ funclen = get_collator_data_zh_pinyin_length;
+ }
else if ( rAlgorithm == "radical" )
+ {
func = get_collator_data_zh_radical;
+ funclen = get_collator_data_zh_radical_length;
+ }
else if ( rAlgorithm == "stroke" )
+ {
func = get_collator_data_zh_stroke;
+ funclen = get_collator_data_zh_stroke_length;
+ }
else if ( rAlgorithm == "zhuyin" )
+ {
func = get_collator_data_zh_zhuyin;
+ funclen = get_collator_data_zh_zhuyin_length;
+ }
}
#endif
- if (func) {
+ if (func && funclen) {
const sal_uInt8* ruleImage=func();
- uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL), status);
+ size_t ruleImageSize = funclen();
+ // Not only changed ICU 53.1 the API behavior that a negative
+ // length (ruleImageSize) now leads to failure, but also that
+ // the base RuleBasedCollator passed as uca_base here needs to
+ // have a base->tailoring == CollationRoot::getRoot() otherwise
+ // the init bails out as well, as it does for the previously
+ // used "empty" RuleBasedCollator.
+ // The default collator of the en-US locale would also fulfill
+ // the requirement. The collator of the actual locale or the
+ // NULL (default) locale does not.
+ uca_base = static_cast<RuleBasedCollator*>(icu::Collator::createInstance(
+ icu::Locale::getRoot(), status));
if (! U_SUCCESS(status)) throw RuntimeException();
- collator = new RuleBasedCollator(reinterpret_cast<const uint8_t*>(ruleImage), -1, uca_base, status);
+ collator = new RuleBasedCollator(
+ reinterpret_cast<const uint8_t*>(ruleImage), ruleImageSize, uca_base, status);
if (! U_SUCCESS(status)) throw RuntimeException();
}
}
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index a801545..5ba9f5d 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -65,8 +65,10 @@ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
fprintf(fp, "#ifndef DISABLE_DYNLOADING\n");
fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_%s() { return %s; }\n", name, name);
+ fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_%s_length() { return sizeof(%s); }\n", name, name);
fprintf(fp, "#else\n");
fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_collator_data_%s() { return %s; }\n", name, name);
+ fprintf(fp, "SAL_DLLPUBLIC_EXPORT size_t get_collator_data_%s_length() { return sizeof(%s); }\n", name, name);
fprintf(fp, "#endif\n");
fprintf(fp, "\n");
fprintf (fp, "}\n");
--
cgit v0.9.0.2-2-gbebe

2771
editors/libreoffice/files/extra-icu53.diff Normal file
View file

File diff suppressed because it is too large Load diff

94
editors/libreoffice/files/extra-libc++ Normal file
View file

@ -0,0 +1,94 @@
From 7511a8eeca171575e878528a1fa434197f1c1f22 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Jun 2014 18:35:36 +0200
Subject: [PATCH] Fix build on FreeBSD with libc++
Change-Id: Ib51b05eb3f7c5d1288bee0f9f738ab1f37251c3e
---
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 32 ++++++++++++++++++++
.../source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 7 +++++
2 files changed, 39 insertions(+)
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index e476119..624d543 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -31,6 +31,32 @@
#include "config_gcc.h"
#include "uno/mapping.h"
+#ifdef _LIBCPP_VERSION
+
+namespace __cxxabiv1
+{
+ struct __class_type_info : public std::type_info
+ {
+ explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+ virtual ~__class_type_info();
+ };
+
+ struct __si_class_type_info : public __class_type_info
+ {
+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
+ __class_type_info( __n ), __base_type( __b ) { }
+ virtual ~__si_class_type_info();
+ const __class_type_info *__base_type;
+ };
+
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
+}
+
+#else
+
namespace CPPU_CURRENT_NAMESPACE
{
@@ -101,6 +127,8 @@ extern "C" void __cxa_throw(
__attribute__((noreturn));
}
#endif
+}
+#endif
namespace CPPU_CURRENT_NAMESPACE
{
@@ -109,7 +137,11 @@ void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
void fillUnoException(
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index b520054..f4c70a1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -285,10 +285,17 @@ static void cpp_call(
catch (...)
{
// fill uno exception
+#ifdef _LIBCPP_VERSION
+ CPPU_CURRENT_NAMESPACE::fillUnoException(
+ reinterpret_cast< __cxxabiv1::__cxa_eh_globals * >(
+ __cxxabiv1::__cxa_get_globals())->caughtExceptions,
+ *ppUnoExc, pThis->getBridge()->getCpp2Uno());
+#else
fillUnoException(
reinterpret_cast< CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * >(
__cxxabiv1::__cxa_get_globals())->caughtExceptions,
*ppUnoExc, pThis->getBridge()->getCpp2Uno());
+#endif
// temporary params
for ( ; nTempIndices--; )
--
1.7.9.5

490
editors/libreoffice/files/extra-patch-libc++
View file

@ -1,490 +0,0 @@
--- configure.ac.orig 2013-08-13 16:11:48.000000000 -0400
+++ configure.ac 2013-09-13 17:50:41.000000000 -0400
@@ -5518,7 +5518,7 @@
CPPFLAGS="-isysroot $MACOSX_SDK_PATH $CPPFLAGS"
fi
- if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+ if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE" -a "$COM_GCC_IS_CLANG" != "TRUE"; then
dnl gcc#19664, gcc#22482, rhbz#162935
AC_MSG_CHECKING([if STL headers are visibility safe (GCC bug 22482)])
AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
--- binaryurp/source/cache.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ binaryurp/source/cache.hxx 2013-09-13 18:14:53.000000000 -0400
@@ -25,6 +25,7 @@
#include <cassert>
#include <cstddef>
#include <map>
+#include <list>
#include "boost/noncopyable.hpp"
#include "sal/types.h"
@@ -37,88 +38,57 @@
}
-template< typename T > class Cache: private boost::noncopyable {
+template< typename T > class Cache : private boost::noncopyable {
public:
+ typedef sal_uInt16 IdxType;
+
explicit Cache(std::size_t size):
- size_(size), first_(map_.end()), last_(map_.end())
+ size_(size)
{
assert(size < cache::ignore);
}
- sal_uInt16 add(T const & content, bool * found) {
- assert(found != 0);
- typename Map::iterator i(map_.find(content));
- *found = i != map_.end();
- if (i == map_.end()) {
- typename Map::size_type n = map_.size();
- if (n < size_) {
- i =
- (map_.insert(
- typename Map::value_type(
- content,
- Entry(
- static_cast< sal_uInt16 >(n), map_.end(),
- first_)))).
- first;
- if (first_ == map_.end()) {
- last_ = i;
- } else {
- first_->second.prev = i;
- }
- first_ = i;
- } else if (last_ != map_.end()) {
- i =
- (map_.insert(
- typename Map::value_type(
- content,
- Entry(last_->second.index, map_.end(), first_)))).
- first;
- first_->second.prev = i;
- first_ = i;
- typename Map::iterator j(last_);
- last_ = last_->second.prev;
- last_->second.next = map_.end();
- map_.erase(j);
- } else {
- // Reached iff size_ == 0:
- return cache::ignore;
- }
- } else if (i != first_) {
- // Move to front (reached only if size_ > 1):
- i->second.prev->second.next = i->second.next;
- if (i->second.next == map_.end()) {
- last_ = i->second.prev;
- } else {
- i->second.next->second.prev = i->second.prev;
- }
- i->second.prev = map_.end();
- i->second.next = first_;
- first_->second.prev = i;
- first_ = i;
- }
- return i->second.index;
+ IdxType add( const T& rContent, bool* pbFound) {
+ assert( pbFound != NULL);
+ if( !size_) {
+ *pbFound = false;
+ return cache::ignore;
+ }
+ // try to insert into the map
+ list_.push_front( rContent); // create a temp entry
+ typedef std::pair<typename LruList::iterator, IdxType> MappedType;
+ typedef std::pair<typename LruItMap::iterator,bool> MapPair;
+ MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
+ *pbFound = !aMP.second;
+
+ if( !aMP.second) { // insertion not needed => found the entry
+ list_.pop_front(); // remove the temp entry
+ list_.splice( list_.begin(), list_, aMP.first->first); // the found entry is moved to front
+ return aMP.first->second;
+ }
+
+ // test insertion successful => it was new so we keep it
+ IdxType n = static_cast<IdxType>( map_.size() - 1);
+ if( n >= size_) { // cache full => replace the LRU entry
+ // find the least recently used element in the map
+ typename LruItMap::iterator it = map_.find( --list_.end());
+ n = it->second;
+ map_.erase( it); // remove it from the map
+ list_.pop_back(); // remove from the list
+ }
+ aMP.first->second = n;
+ return n;
}
private:
- struct Entry;
-
- typedef std::map< T, Entry > Map;
-
- struct Entry {
- sal_uInt16 index;
- typename Map::iterator prev;
- typename Map::iterator next;
-
- Entry(
- sal_uInt16 theIndex, typename Map::iterator thePrev,
- typename Map::iterator theNext):
- index(theIndex), prev(thePrev), next(theNext) {}
- };
+ typedef std::list<T> LruList; // last recently used list
+ typedef typename LruList::iterator LruListIt;
+ struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}};
+ typedef ::std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList
std::size_t size_;
- Map map_;
- typename Map::iterator first_;
- typename Map::iterator last_;
+ LruItMap map_;
+ LruList list_;
};
}
--- binaryurp/source/lessoperators.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ binaryurp/source/lessoperators.cxx 2013-09-13 18:15:58.000000000 -0400
@@ -38,8 +38,30 @@
typelib_TypeClass tc2 = right.get()->eTypeClass;
return tc1 < tc2 ||
(tc1 == tc2 &&
- (OUString(left.get()->pTypeName) <
- OUString(right.get()->pTypeName)));
+ (OUString::unacquired(&left.get()->pTypeName) <
+ OUString::unacquired(&right.get()->pTypeName)));
+}
+
+bool TypeDescEqual::operator()( const TypeDescription& rLeft, const TypeDescription& rRight) const
+{
+ assert( rLeft.is() && rRight.is());
+ const typelib_TypeDescription& rA = *rLeft.get();
+ const typelib_TypeDescription& rB = *rRight.get();
+ if( rA.eTypeClass != rB.eTypeClass)
+ return false;
+ const sal_Int32 nCmp = rtl_ustr_compare_WithLength(
+ rA.pTypeName->buffer, rA.pTypeName->length,
+ rB.pTypeName->buffer, rB.pTypeName->length);
+ return (nCmp == 0);
+}
+
+sal_Int32 TypeDescHash::operator()( const TypeDescription& rTD) const
+{
+ assert( rTD.is());
+ const typelib_TypeDescription& rA = *rTD.get();
+ sal_Int32 h = rtl_ustr_hashCode_WithLength( rA.pTypeName->buffer, rA.pTypeName->length);
+ h ^= static_cast<sal_Int32>(rA.eTypeClass);
+ return h;
}
} } } }
@@ -47,8 +69,8 @@
namespace rtl {
bool operator <(ByteSequence const & left, ByteSequence const & right) {
- for (sal_Int32 i = 0; i != std::min(left.getLength(), right.getLength());
- ++i)
+ const sal_Int32 nLen = std::min( left.getLength(), right.getLength());
+ for( sal_Int32 i = 0; i < nLen; ++i )
{
if (left[i] < right[i]) {
return true;
--- binaryurp/source/lessoperators.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ binaryurp/source/lessoperators.hxx 2013-09-13 18:14:53.000000000 -0400
@@ -31,6 +31,10 @@
bool operator <(TypeDescription const & left, TypeDescription const & right);
+struct TypeDescHash { sal_Int32 operator()( const TypeDescription&) const; };
+
+struct TypeDescEqual { bool operator()( const TypeDescription&, const TypeDescription&) const; };
+
} } } }
namespace rtl {
--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 2013-09-18 13:06:42.000000000 -0400
@@ -22,11 +22,6 @@
#include <dlfcn.h>
#include <boost/unordered_map.hpp>
-#include <cxxabi.h>
-#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
-#define _GLIBCXX_CDTOR_CALLABI
-#endif
-
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
@@ -248,7 +243,11 @@
Reference< XInterface >() );
}
+#ifdef _LIBCPP_VERSION
+ pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
+#else
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+#endif
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
// destruct uno exception
@@ -280,7 +279,11 @@
}
}
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
+#else
__cxa_throw( pCppExc, rtti, deleteException );
+#endif
}
//==================================================================================================
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx 2013-09-18 13:06:17.000000000 -0400
@@ -25,10 +25,39 @@
#include <uno/any2.h>
+#include <cxxabi.h>
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+
+#ifdef _LIBCPP_VERSION
+
+namespace __cxxabiv1
+{
+ struct __class_type_info : public std::type_info
+ {
+ explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+ virtual ~__class_type_info();
+ };
+
+ struct __si_class_type_info : public __class_type_info
+ {
+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
+ __class_type_info( __n ), __base_type( __b ) { }
+ virtual ~__si_class_type_info();
+ const __class_type_info *__base_type;
+ };
+
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
+}
+
+#else
+
namespace CPPU_CURRENT_NAMESPACE
{
-
-void dummy_can_throw_anything( char const * );
// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
@@ -86,6 +115,15 @@
void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
#endif
+}
+
+#endif
+
+namespace CPPU_CURRENT_NAMESPACE
+{
+
+void dummy_can_throw_anything( char const * );
+
// -----
//==================================================================================================
@@ -93,8 +132,11 @@
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException(
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
-
+#endif
}
namespace x86
--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 2013-09-18 13:05:25.000000000 -0400
@@ -203,7 +203,11 @@
catch (...)
{
// fill uno exception
+#ifdef _LIBCPP_VERSION
+ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxxabiv1::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+#else
fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+#endif
// temporary params
for ( ; nTempIndizes--; )
--- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-09-18 12:55:37.000000000 -0400
@@ -22,11 +22,6 @@
#include <string.h>
#include <dlfcn.h>
-#include <cxxabi.h>
-#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
-#define _GLIBCXX_CDTOR_CALLABI
-#endif
-
#include <boost/unordered_map.hpp>
#include <rtl/strbuf.hxx>
@@ -255,7 +250,11 @@
Reference< XInterface >() );
}
+#ifdef _LIBCPP_VERSION
+ pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
+#else
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+#endif
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
// destruct uno exception
@@ -274,7 +273,11 @@
}
}
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
+#else
__cxa_throw( pCppExc, rtti, deleteException );
+#endif
}
//==================================================================================================
--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx 2013-09-18 12:53:27.000000000 -0400
@@ -23,6 +23,37 @@
#include <exception>
#include <cstddef>
+#include <cxxabi.h>
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+
+#ifdef _LIBCPP_VERSION
+
+namespace __cxxabiv1
+{
+ struct __class_type_info : public std::type_info
+ {
+ explicit __class_type_info( const char *__n ) : type_info( __n ) { }
+ virtual ~__class_type_info();
+ };
+
+ struct __si_class_type_info : public __class_type_info
+ {
+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) :
+ __class_type_info( __n ), __base_type( __b ) { }
+ virtual ~__si_class_type_info();
+ const __class_type_info *__base_type;
+ };
+
+extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT;
+
+extern "C" _LIBCPP_NORETURN void __cxa_throw(
+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) );
+}
+
+#else
+
namespace CPPU_CURRENT_NAMESPACE
{
@@ -82,6 +113,13 @@
void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
#endif
+}
+
+#endif
+
+namespace CPPU_CURRENT_NAMESPACE
+{
+
// -----
//==================================================================================================
@@ -89,7 +128,11 @@
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
//==================================================================================================
void fillUnoException(
+#ifdef _LIBCPP_VERSION
+ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 2013-09-18 12:58:22.000000000 -0400
@@ -291,7 +291,11 @@
catch (...)
{
// fill uno exception
+#ifdef _LIBCPP_VERSION
+ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxxabiv1::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+#else
fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
+#endif
// temporary params
for ( ; nTempIndizes--; )
--- include/sal/log.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ include/sal/log.hxx 2013-09-13 05:27:31.000000000 -0400
@@ -177,9 +177,13 @@
@since LibreOffice 3.5
*/
+#ifdef _LIBCPP_VERSION
#define SAL_STREAM(stream) \
- (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream). \
- str())
+ (::std::ostringstream() << stream).str()
+#else
+#define SAL_STREAM(stream) \
+ (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str())
+#endif
/**
@page sal_log Basic logging functionality.
--- slideshow/source/engine/activities/activitiesfactory.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ slideshow/source/engine/activities/activitiesfactory.cxx 2013-09-13 05:47:27.000000000 -0400
@@ -557,7 +557,7 @@
// interpolate between nIndex and nIndex+1 values
(*mpAnim)(
getPresentationValue(
- accumulate( maValues.back(),
+ accumulate<ValueType>( maValues.back(),
mbCumulative ? nRepeatCount : 0,
maInterpolator( maValues[ nIndex ],
maValues[ nIndex+1 ],
@@ -577,7 +577,7 @@
// this is discrete, thus no lerp here.
(*mpAnim)(
getPresentationValue(
- accumulate( maValues.back(),
+ accumulate<ValueType>( maValues.back(),
mbCumulative ? nRepeatCount : 0,
maValues[ nFrame ] ) ) );
}

11
editors/libreoffice/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- Makefile.in.orig 2014-04-23 00:25:28.000000000 +0200
+++ Makefile.in 2014-06-10 12:41:59.927303302 +0200
@@ -361,7 +361,7 @@
endif
@rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
-distro-pack-install: install
+distro-pack-install: install-strip
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
$(SRCDIR)/bin/distro-install-sdk

15
editors/libreoffice/files/patch-bin__distro-install-desktop-integration
View file

@ -1,13 +1,12 @@
--- bin/distro-install-desktop-integration.orig 2013-12-11 01:11:21.000000000 +0900
+++ bin/distro-install-desktop-integration 2014-01-29 16:00:32.000000000 +0900
--- bin/distro-install-desktop-integration.orig 2014-04-30 21:49:45.000000000 +0200
+++ bin/distro-install-desktop-integration 2014-06-11 00:30:50.431187842 +0200
@@ -94,13 +94,13 @@
}
# install desktop integration from plain packages
-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX`
+sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX`
-cp -a workdir/unxlng*/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
+cp -a ../workdir/unx*/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
builddir=`pwd`
cd $sysui_temp
@ -17,7 +16,11 @@
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
@@ -114,8 +114,9 @@
@@ -111,11 +111,13 @@
export PREFIX=$INSTALLDIRNAME
export ICON_PREFIX=$INSTALLDIRNAME
export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
+ export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
export GNOMEDIR=$PREFIXDIR
@ -28,7 +31,7 @@
)
cd -
rm -rf $sysui_temp
@@ -131,7 +132,7 @@
@@ -131,7 +133,7 @@
# we want non-versioned desktop files
cd $DESTDIR/$INSTALLDIR/share/xdg
# we want non-versioned stuff in the distro packages

11
editors/libreoffice/files/patch-bridges__Library_cpp_uno.mk
View file

@ -1,11 +0,0 @@
--- bridges/Library_cpp_uno.mk.orig 2013-12-11 01:11:21.000000000 +0900
+++ bridges/Library_cpp_uno.mk 2014-01-29 16:13:21.000000000 +0900
@@ -188,7 +188,7 @@
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
))
-ifeq ($(filter ANDROID WNT,$(OS)),)
+ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
))

11
editors/libreoffice/files/patch-bridges__Module_bridges.mk Normal file
View file

@ -0,0 +1,11 @@
--- bridges/Module_bridges.mk.orig 2014-06-10 16:26:56.078373584 +0200
+++ bridges/Module_bridges.mk 2014-06-10 16:26:26.759413474 +0200
@@ -19,7 +19,7 @@
$(if $(filter ARM,$(CPUNAME)),\
$(if $(filter IOS,$(OS)),\
CustomTarget_gcc3_ios_arm) \
- $(if $(filter ANDROID LINUX,$(OS)),\
+ $(if $(filter ANDROID FREEBSD LINUX,$(OS)),\
CustomTarget_gcc3_linux_arm) \
) \
))

26
editors/libreoffice/files/patch-bridges__source__cpp_uno__gcc3_linux_x86-64__callvirtualmethod.cxx
View file

@ -1,26 +0,0 @@
--- bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx 2013-09-17 14:52:46.000000000 -0400
@@ -63,11 +63,12 @@
pMethod = *((sal_uInt64 *)pMethod);
// Load parameters to stack, if necessary
+ sal_uInt64* pCallStack = NULL;
if ( nStack )
{
// 16-bytes aligned
sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 16;
- sal_uInt64 *pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
+ pCallStack = (sal_uInt64 *) __builtin_alloca( nStackBytes );
std::memcpy( pCallStack, pStack, nStackBytes );
}
@@ -112,7 +113,8 @@
"movsd %%xmm0, %2\n\t"
"movsd %%xmm1, %3\n\t"
: "=m" ( rax ), "=m" ( rdx ), "=m" ( xmm0 ), "=m" ( xmm1 )
- : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR )
+ : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
+ "m" ( pCallStack ) // dummy input to prevent the compiler from optimizing the alloca out
: "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r10", "r11",
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
"xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15"

20
editors/libreoffice/files/patch-configure Normal file
View file

@ -0,0 +1,20 @@
--- configure.orig 2014-04-30 22:16:17.000000000 +0200
+++ configure 2014-06-10 15:40:17.936566195 +0200
@@ -10511,7 +10511,7 @@
PLATFORMID=freebsd_x86
OUTPATH=unxfbsdi
;;
- x86_64)
+ amd64)
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=freebsd_x86_64
@@ -17482,7 +17482,7 @@
JAVA_ARCH="i386"
JAVA_TOOLKIT="client"
;;
- x86_64)
+ amd64)
if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
JAVA_ARCH="i386"
JAVA_TOOLKIT="client"

76
editors/libreoffice/files/patch-configure.ac
View file

@ -1,76 +0,0 @@
--- configure.ac.orig 2014-02-21 20:38:43.000000000 -0500
+++ configure.ac 2014-02-24 12:51:26.000000000 -0500
@@ -3586,7 +3586,7 @@
PLATFORMID=freebsd_x86
OUTPATH=unxfbsdi
;;
- x86_64)
+ amd64|x86_64)
CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
@@ -6541,21 +6541,13 @@
JAVA_ARCH="i386"
JAVA_TOOLKIT="client"
;;
- x86_64)
- if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
- JAVA_ARCH="i386"
- JAVA_TOOLKIT="client"
- else
- JAVA_ARCH="amd64"
- JAVA_TOOLKIT="server"
- fi
+ amd64|x86_64)
+ JAVA_ARCH="amd64"
+ JAVA_TOOLKIT="server"
;;
esac
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/freebsd"
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd"
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
;;
k*bsd*-gnu*)
@@ -7222,7 +7214,7 @@
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.1])
dnl ===================================================================
dnl Check for system libwpd
@@ -8416,7 +8408,7 @@
dnl ===================================================================
AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
+if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_GRAPHITE="TRUE"
AC_DEFINE(ENABLE_GRAPHITE)
@@ -8641,7 +8633,7 @@
with_system_openssl=no
libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
- elif test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
+ elif test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
"$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
@@ -10472,10 +10464,10 @@
dnl Check for Meta Object Compiler
- AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+ AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] )
MOC4="$MOCQT4"
if test "$MOC4" = "no"; then
- AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+ AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH] )
if test "$MOC4" = "no"; then
AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QT4DIR before running "configure".])

14
editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk
View file

@ -1,14 +0,0 @@
--- ./extensions/Library_npsoplugin.mk.orig 2013-01-31 05:54:53.000000000 -0500
+++ ./extensions/Library_npsoplugin.mk 2013-02-19 17:00:56.000000000 -0500
@@ -44,9 +44,11 @@
ifeq ($(GUI),UNX)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
$(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
))
+endif
$(eval $(call gb_Library_use_external,npsoplugin,gtk))

29
editors/libreoffice/files/patch-filter__source__graphicfilter__ipbm__ipbm.cxx
View file

@ -1,29 +0,0 @@
--- filter/source/graphicfilter/ipbm/ipbm.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ filter/source/graphicfilter/ipbm/ipbm.cxx 2014-02-24 15:38:35.000000000 -0500
@@ -102,7 +102,7 @@
{
case 0 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
mpAcc->SetPaletteEntryCount( 2 );
mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
@@ -117,7 +117,7 @@
else
maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
mnCol = (sal_uInt16)mnMaxVal + 1;
if ( mnCol > 256 )
@@ -132,7 +132,7 @@
break;
case 2 :
maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
break;
}

11
editors/libreoffice/files/patch-filter__source__graphicfilter__ipcd__ipcd.cxx
View file

@ -1,11 +0,0 @@
--- filter/source/graphicfilter/ipcd/ipcd.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ filter/source/graphicfilter/ipcd/ipcd.cxx 2014-02-24 15:38:35.000000000 -0500
@@ -151,7 +151,7 @@
nBMPHeight = nWidth;
}
aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
- if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
ReadImage( 5 ,65 );

11
editors/libreoffice/files/patch-filter__source__graphicfilter__ipcx__ipcx.cxx
View file

@ -1,11 +0,0 @@
--- filter/source/graphicfilter/ipcx/ipcx.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ filter/source/graphicfilter/ipcx/ipcx.cxx 2014-02-24 15:38:35.000000000 -0500
@@ -100,7 +100,7 @@
if ( nStatus )
{
aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
- if ( ( pAcc = aBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( pAcc = aBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
if ( nDestBitsPerPixel <= 8 )

11
editors/libreoffice/files/patch-filter__source__graphicfilter__iras__iras.cxx
View file

@ -1,11 +0,0 @@
--- filter/source/graphicfilter/iras/iras.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ filter/source/graphicfilter/iras/iras.cxx 2014-02-24 15:38:35.000000000 -0500
@@ -98,7 +98,7 @@
return sal_False;
maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
- if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == sal_False )
+ if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == 0 )
return sal_False;
if ( mnDstBitsPerPix <= 8 ) // paletten bildchen

11
editors/libreoffice/files/patch-filter__source__graphicfilter__itga__itga.cxx
View file

@ -1,11 +0,0 @@
--- filter/source/graphicfilter/itga/itga.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ filter/source/graphicfilter/itga/itga.cxx 2014-02-24 15:38:35.000000000 -0500
@@ -732,8 +732,6 @@
mpFileHeader->nColorMapEntrySize = 0x3f; // patch for the following switch routine
}
mpColorMap = new sal_uInt32[ nColors ]; // we will always index dwords
- if ( mpColorMap == sal_False )
- return sal_False; // out of memory %&!$&/!"<22>$
switch( mpFileHeader->nColorMapEntrySize )
{

115
editors/libreoffice/files/patch-libcmis-0.4.x
View file

@ -1,115 +0,0 @@
--- ucb/source/ucp/cmis/auth_provider.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/auth_provider.hxx 2013-08-16 18:32:50.000000000 -0400
@@ -28,7 +28,7 @@
#ifndef AUTH_PROVIDER_HXX
#define AUTH_PROVIDER_HXX
-#include <libcmis/session.hxx>
+#include <libcmis/libcmis.hxx>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
--- ucb/source/ucp/cmis/cmis_content.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_content.cxx 2013-08-16 18:32:50.000000000 -0400
@@ -51,8 +51,6 @@
#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <libcmis/document.hxx>
-
#include <comphelper/processfactory.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
#include <ucbhelper/content.hxx>
--- ucb/source/ucp/cmis/cmis_content.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_content.hxx 2013-08-16 18:32:50.000000000 -0400
@@ -40,7 +40,7 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <libcmis/session-factory.hxx>
+#include <libcmis/libcmis.hxx>
#include <list>
--- ucb/source/ucp/cmis/cmis_provider.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_provider.hxx 2013-08-16 18:32:50.000000000 -0400
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/Property.hpp>
#include <ucbhelper/providerhelper.hxx>
-#include <libcmis/session.hxx>
+#include <libcmis/libcmis.hxx>
namespace cmis
{
--- ucb/source/ucp/cmis/cmis_repo_content.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_repo_content.cxx 2013-08-16 18:32:50.000000000 -0400
@@ -59,7 +59,7 @@
{
RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier,
- list< libcmis::RepositoryPtr > aRepos )
+ vector< libcmis::RepositoryPtr > aRepos )
throw ( ucb::ContentCreationException )
: ContentImplHelper( rxContext, pProvider, Identifier ),
m_pProvider( pProvider ),
@@ -188,7 +188,7 @@
if ( !m_sRepositoryId.isEmpty() )
{
- for ( list< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
+ for ( vector< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
it != m_aRepositories.end( ) && NULL == repo.get( ); ++it )
{
if ( STD_TO_OUSTR( ( *it )->getId( ) ) == m_sRepositoryId )
@@ -368,7 +368,7 @@
if ( m_sRepositoryId.isEmpty( ) )
{
- for ( list< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
+ for ( vector< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
it != m_aRepositories.end(); ++it )
{
URL aUrl( m_aURL );
--- ucb/source/ucp/cmis/cmis_repo_content.hxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_repo_content.hxx 2013-08-16 18:32:50.000000000 -0400
@@ -39,8 +39,9 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <libcmis/repository.hxx>
+#include <libcmis/libcmis.hxx>
+#include <vector>
#include <list>
namespace com { namespace sun { namespace star {
@@ -71,7 +72,7 @@
URL m_aURL;
rtl::OUString m_sRepositoryId;
- std::list< libcmis::RepositoryPtr > m_aRepositories;
+ std::vector< libcmis::RepositoryPtr > m_aRepositories;
private:
@@ -95,7 +96,7 @@
RepoContent( const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
- std::list< libcmis::RepositoryPtr > aRepos = std::list< libcmis::RepositoryPtr > ( ) )
+ std::vector< libcmis::RepositoryPtr > aRepos = std::vector< libcmis::RepositoryPtr > ( ) )
throw ( com::sun::star::ucb::ContentCreationException );
virtual ~RepoContent();
--- ucb/source/ucp/cmis/cmis_url.cxx.orig 2013-08-13 16:11:48.000000000 -0400
+++ ucb/source/ucp/cmis/cmis_url.cxx 2013-08-16 18:32:50.000000000 -0400
@@ -26,7 +26,7 @@
* instead of those above.
*/
-#include <libcmis/session-factory.hxx>
+#include <libcmis/libcmis.hxx>
#include <rtl/uri.hxx>

27
editors/libreoffice/files/patch-mdds-0.9.x
View file

@ -1,27 +0,0 @@
--- sc/inc/mtvelements.hxx.org 2013-07-25 21:25:20.837766596 +0200
+++ sc/inc/mtvelements.hxx 2013-07-25 21:26:32.853493134 +0200
@@ -63,11 +63,11 @@
namespace sc {
// Broadcaster storage container
-typedef mdds::mtv::custom_block_func1<sc::element_type_broadcaster, sc::custom_broadcaster_block> BCBlkFunc;
+typedef mdds::mtv::custom_block_func1<sc::custom_broadcaster_block> BCBlkFunc;
typedef mdds::multi_type_vector<BCBlkFunc> BroadcasterStoreType;
// Cell text attribute container.
-typedef mdds::mtv::custom_block_func1<sc::element_type_celltextattr, sc::custom_celltextattr_block> CTAttrFunc;
+typedef mdds::mtv::custom_block_func1<sc::custom_celltextattr_block> CTAttrFunc;
typedef mdds::multi_type_vector<CTAttrFunc> CellTextAttrStoreType;
/**
--- sc/source/core/tool/scmatrix.cxx.org 2013-07-25 21:26:36.733621612 +0200
+++ sc/source/core/tool/scmatrix.cxx 2013-07-25 21:27:08.784683394 +0200
@@ -89,7 +89,7 @@
}
}
- static void delete_block(mdds::mtv::base_element_block* p)
+ static void delete_block(const mdds::mtv::base_element_block* p)
{
if (!p)
return;

11
editors/libreoffice/files/patch-sw__inc__unotbl.hxx
View file

@ -1,11 +0,0 @@
--- sw/inc/unotbl.hxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/inc/unotbl.hxx 2014-02-25 12:20:50.000000000 -0500
@@ -71,7 +71,7 @@
public SwClient
{
friend void sw_setString( SwXCell &rCell, const OUString &rTxt,
- sal_Bool bKeepNumberFmt = sal_False );
+ sal_Bool bKeepNumberFmt );
friend double sw_getValue( SwXCell &rCell );
friend void sw_setValue( SwXCell &rCell, double nVal );

11
editors/libreoffice/files/patch-sw__inc__viewsh.hxx
View file

@ -1,11 +0,0 @@
--- sw/inc/viewsh.hxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/inc/viewsh.hxx 2014-02-25 12:20:50.000000000 -0500
@@ -109,7 +109,7 @@
// Set SwVisArea in order to enable clean formatting before printing.
- friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False );
+ friend void SetSwVisArea( ViewShell *pSh, const SwRect & );
static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images
static BitmapEx* mpErrorBmp; ///< error display of missed images

11
editors/libreoffice/files/patch-sw__source__core__inc__frame.hxx
View file

@ -1,11 +0,0 @@
--- sw/source/core/inc/frame.hxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/source/core/inc/frame.hxx 2014-02-25 12:20:50.000000000 -0500
@@ -234,7 +234,7 @@
friend class SwLooping;
// voids lower during creation of a column
- friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
+ friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart );
friend void RestoreCntnt( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow );
#ifdef DBG_UTIL

11
editors/libreoffice/files/patch-sw__source__core__inc__frmtool.hxx
View file

@ -1,11 +0,0 @@
--- sw/source/core/inc/frmtool.hxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/source/core/inc/frmtool.hxx 2014-02-25 12:20:50.000000000 -0500
@@ -70,7 +70,7 @@
sal_uLong SqRt( BigInt nX );
-SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart );
+SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart = NULL );
void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow );
// Get CntntNodes, create CntntFrms, and add them to LayFrm.

11
editors/libreoffice/files/patch-sw__source__core__unocore__unotbl.cxx
View file

@ -1,11 +0,0 @@
--- sw/source/core/unocore/unotbl.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/source/core/unocore/unotbl.cxx 2014-02-25 12:20:50.000000000 -0500
@@ -692,7 +692,7 @@
/* non UNO function call to set string in SwXCell */
void sw_setString( SwXCell &rCell, const OUString &rTxt,
- sal_Bool bKeepNumberFmt )
+ sal_Bool bKeepNumberFmt = sal_False )
{
if(rCell.IsValid())
{

11
editors/libreoffice/files/patch-sw__source__core__view__vprint.cxx
View file

@ -1,11 +0,0 @@
--- sw/source/core/view/vprint.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ sw/source/core/view/vprint.cxx 2014-02-25 12:20:50.000000000 -0500
@@ -172,7 +172,7 @@
}
}
-void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, sal_Bool /*bPDFExport*/ )
+void SetSwVisArea( ViewShell *pSh, const SwRect &rRect )
{
OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" );
pSh->maVisArea = rRect;

10
editors/libreoffice/files/patch-sysui__Module_sysui.mk
View file

@ -1,10 +0,0 @@
--- sysui/Module_sysui.mk.orig 2014-02-05 10:04:15.000000000 -0500
+++ sysui/Module_sysui.mk 2014-02-24 14:02:40.000000000 -0500
@@ -12,7 +12,6 @@
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,sysui,\
CustomTarget_share \
- CustomTarget_slackware \
Package_share \
Package_desktop \
$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \

13
editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
View file

@ -1,6 +1,6 @@
--- sysui/desktop/share/create_tree.sh.orig 2013-12-11 01:11:21.000000000 +0900
+++ sysui/desktop/share/create_tree.sh 2014-01-29 17:16:09.000000000 +0900
@@ -57,32 +57,32 @@
--- sysui/desktop/share/create_tree.sh.orig 2014-04-30 21:49:45.000000000 +0200
+++ sysui/desktop/share/create_tree.sh 2014-06-11 00:20:55.539133736 +0200
@@ -57,37 +57,37 @@
chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".*
fi
@ -44,3 +44,10 @@
+ ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}"
done
-mkdir -p "${DESTDIR}/usr/share/appdata"
+mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata"
for i in base calc draw impress writer; do
- cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml"
+ cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
done

11
editors/libreoffice/files/patch-vcl__headless__svptext.cxx
View file

@ -1,11 +0,0 @@
--- vcl/headless/svptext.cxx.orig 2014-02-05 10:04:15.000000000 -0500
+++ vcl/headless/svptext.cxx 2014-02-24 14:16:24.000000000 -0500
@@ -172,7 +172,7 @@
void SvpGlyphPeer::RemovingGlyph( ServerFont&, GlyphData& rGlyphData, int /*nGlyphIndex*/ )
{
- if( rGlyphData.ExtDataRef().mpData != Format::NONE )
+ if( rGlyphData.ExtDataRef().mpData != 0 )
{
// release the glyph related resources
DBG_ASSERT( (rGlyphData.ExtDataRef().meInfo <= Format::MAX), "SVP::RG() invalid alpha format" );