View | Details | Raw Unified | Return to bug 192258 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-12 / +14 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	4.0.1
5
PORTVERSION=	4.1.0
6
PORTREVISION=	4
7
CATEGORIES=	editors java
6
CATEGORIES=	editors java
8
MASTER_SITES=	http://www.apache.org/dist/openoffice/${PORTVERSION}/source/ \
7
MASTER_SITES=	http://www.apache.org/dist/openoffice/${PORTVERSION}/source/ \
9
		ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
8
		ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
Lines 25-31 Link Here
25
		xi xt xcursor xdamage xcomposite xfixes
24
		xi xt xcursor xdamage xcomposite xfixes
26
USE_GL=		gl glu
25
USE_GL=		gl glu
27
USE_GSTREAMER=	yes
26
USE_GSTREAMER=	yes
28
USE_GCC=	any
27
USE_GCC=	yes
29
USE_PYTHON=	yes
28
USE_PYTHON=	yes
30
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
29
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
31
USE_PERL5=	build
30
USE_PERL5=	build
Lines 37-44 Link Here
37
GNOMEVFS_DESC=	Enable GNOME Virtual File System
36
GNOMEVFS_DESC=	Enable GNOME Virtual File System
38
CCACHE_DESC=	Mimimize compile time of C/C++ programs
37
CCACHE_DESC=	Mimimize compile time of C/C++ programs
39
38
40
.include "${.CURDIR}/files/Makefile.localized"
39
.include <bsd.port.pre.mk>
41
40
41
.include <${FILESDIR}/Makefile.localized>
42
42
USE_JAVA=	yes
43
USE_JAVA=	yes
43
JAVA_BUILD=	jdk
44
JAVA_BUILD=	jdk
44
JAVA_VENDOR=	openjdk
45
JAVA_VENDOR=	openjdk
Lines 50-57 Link Here
50
GNOMEVFS_USE=	GNOME=gnomevfs2
51
GNOMEVFS_USE=	GNOME=gnomevfs2
51
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
52
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
52
53
53
.include <bsd.port.pre.mk>
54
55
ONLY_FOR_ARCHS=	i386 amd64
54
ONLY_FOR_ARCHS=	i386 amd64
56
55
57
.if ${ARCH} == amd64
56
.if ${ARCH} == amd64
Lines 63-69 Link Here
63
OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
62
OOOSRC=			apache-openoffice-${PORTVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
64
EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
63
EXTSRC=			ApacheOpenOffice.ext_sources.${PORTVERSION}.r${SVNREVISION}${EXTRACT_SUFX}
65
OOODIR=			openoffice4
64
OOODIR=			openoffice4
66
SVNREVISION=		1524958
65
SVNREVISION=		1589052
67
INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
66
INSTALLATION_BASEDIR?=	openoffice-${PORTVERSION}
68
EXECBASE?=		openoffice-${PORTVERSION}
67
EXECBASE?=		openoffice-${PORTVERSION}
69
DIST_SUBDIR=		openoffice
68
DIST_SUBDIR=		openoffice
Lines 116-122 Link Here
116
		libCoinMP.so:${PORTSDIR}/math/coinmp \
115
		libCoinMP.so:${PORTSDIR}/math/coinmp \
117
		libserf-1.so:${PORTSDIR}/www/serf \
116
		libserf-1.so:${PORTSDIR}/www/serf \
118
		libfreetype.so:${PORTSDIR}/print/freetype2 \
117
		libfreetype.so:${PORTSDIR}/print/freetype2 \
119
		libtextcat.so:${PORTSDIR}/textproc/libtextcat
118
		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
119
		libnss3.so:${PORTSDIR}/security/nss
120
120
121
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
121
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
122
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
122
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
Lines 161-167 Link Here
161
			--with-system-libxml 		\
161
			--with-system-libxml 		\
162
			--with-system-libxslt 		\
162
			--with-system-libxslt 		\
163
			--with-system-cairo --enable-cairo \
163
			--with-system-cairo --enable-cairo \
164
			--with-system-boost 		\
165
			--with-system-zlib		\
164
			--with-system-zlib		\
166
			--with-system-python		\
165
			--with-system-python		\
167
			--with-system-expat		\
166
			--with-system-expat		\
Lines 197-203 Link Here
197
			--with-system-beanshell	\
196
			--with-system-beanshell	\
198
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
197
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
199
			--without-fonts \
198
			--without-fonts \
200
			--with-system-serf
199
			--with-system-serf \
200
			--with-system-nss \
201
			--without-stlport
202
201
#			--with-system-jpeg
203
#			--with-system-jpeg
202
#			--enable-pdfimport
204
#			--enable-pdfimport
203
#			--without-stlport --disable-mozilla \
205
#			--without-stlport --disable-mozilla \
Lines 235-241 Link Here
235
#	@${MKDIR} ${WRKSRC}/../ext_sources
237
#	@${MKDIR} ${WRKSRC}/../ext_sources
236
#	@${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
238
#	@${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
237
#	@${RM} -rf ${WRKSRC}/l10n
239
#	@${RM} -rf ${WRKSRC}/l10n
238
	@${MKDIR} ${WRKSRC}/../ext_sources
240
#	@${MKDIR} ${WRKSRC}/../ext_sources
239
	@${RM} -rf ${WRKSRC}/l10n
241
	@${RM} -rf ${WRKSRC}/l10n
240
242
241
post-patch:
243
post-patch:
Lines 270-276 Link Here
270
	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
272
	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
271
	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
273
	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
272
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
274
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
273
	@cd ${WRKSRC}/solver/4??/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
275
	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
274
276
275
post-install:
277
post-install:
276
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
278
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
(-)distinfo (-4 / +4 lines)
Lines 1-6 Link Here
1
SHA256 (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 577862db1934754e56475b4c124a303a8825cbaefef5ede570c2aee7c99b0667
1
SHA256 (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
2
SIZE (openoffice/apache-openoffice-4.0.1-r1524958-src.tar.bz2) = 214506399
2
SIZE (openoffice/apache-openoffice-4.1.0-r1589052-src.tar.bz2) = 217686497
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052.tar.bz2) = 7f06487342c2f7c37fcc3e0194b025c336227a907528d0d4619e488c06ded4e1
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.1.0.r1589052.tar.bz2) = 64439131
3
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
5
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
4
SIZE (openoffice/unowinreg.dll) = 6144
6
SIZE (openoffice/unowinreg.dll) = 6144
5
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 0c77c1edd0641336d839f27424f89808c61cf9cfeefba4f5e015c4cf2685a63c
6
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.0.1.r1524958.tar.bz2) = 137466799
(-)files/extra-patch-libexttextcat-lingucomponent (-13 lines)
Lines 1-13 Link Here
1
$FreeBSD$
2
3
--- lingucomponent/source/languageguessing/simpleguesser.cxx.orig	2012-01-10 19:42:30.000000000 +0900
4
+++ lingucomponent/source/languageguessing/simpleguesser.cxx	2012-08-07 11:14:45.000000000 +0900
5
@@ -114,7 +114,7 @@
6
         if(!h){return guesses;}
7
 
8
         //calculate le number of unicode charcters (symbols)
9
-        int len = utfstrlen(text);
10
+        int len = strlen(text);
11
 
12
 	if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;}
13
 
(-)files/patch-configmgr (-19 lines)
Lines 1-19 Link Here
1
--- configmgr/source/partial.hxx
2
+++ configmgr/source/partial.hxx
3
@@ -26,6 +26,7 @@
4
 
5
 #include "sal/config.h"
6
 
7
+#include <boost/functional/hash.hpp>
8
 #include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
9
 #include <set>
10
 
11
@@ -50,7 +51,7 @@ public:
12
 
13
 private:
14
     struct Node {
15
-        typedef boost::unordered_map< rtl::OUString, Node > Children;
16
+        typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
17
 
18
         Node(): startInclude(false) {}
19
         void clear() { startInclude=false; children.clear(); }
(-)files/patch-i123018 (-11 lines)
Lines 1-11 Link Here
1
--- offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl	2013/08/12 08:53:46	1513085
2
+++ offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl	2013/08/12 09:41:11	1513086
3
@@ -122,7 +122,7 @@
4
         <p>The change in the data model will be notified to registered listeners via
5
         <member">XGridDataListener::dataChanged</member>. The <member>GridDataEvent::FirstColumn</member> and
6
         <member>GridDataEvent::LastColumn</member> will denote the smallest respectively largest column
7
-        index from <argColumnIndexes</arg>.</p>
8
+        index from <arg>ColumnIndexes</arg>.</p>
9
 
10
 		@param ColumnIndexes
11
 			contains the column indexes of the cells, which should be updated
(-)files/patch-moz-freetype_header_relocation (-73 lines)
Lines 1-73 Link Here
1
--- moz/makefile.mk.orig	2013-08-13 11:49:32.000000000 +0000
2
+++ moz/makefile.mk	2014-01-01 20:09:17.000000000 +0000
3
@@ -99,7 +99,8 @@
4
     patches/respect_disable_pango.patch \
5
     patches/arm_build_fix.patch \
6
     patches/link_fontconfig.patch \
7
-    patches/brokenmakefile.patch
8
+    patches/brokenmakefile.patch \
9
+    patches/freetype_header_relocation.patch
10
 
11
 .IF "$(OS)"=="LINUX"
12
 PATCH_FILES+=patches/nss_linux.patch
13
--- moz/patches/freetype_header_relocation.patch.orig	1970-01-01 00:00:00.000000000 +0000
14
+++ moz/patches/freetype_header_relocation.patch	2014-01-01 20:50:11.000000000 +0000
15
@@ -0,0 +1,58 @@
16
+--- misc/build/mozilla/config/system-headers.orig	2007-11-19 21:36:18.000000000 +0100
17
++++ misc/build/mozilla/config/system-headers	2014-01-01 20:47:56.000000000 +0100
18
+@@ -193,12 +193,12 @@
19
+ fpieee.h
20
+ frame/log.h
21
+ frame/req.h
22
+-freetype/freetype.h
23
+-freetype/ftcache.h
24
+-freetype/ftglyph.h
25
+-freetype/ftoutln.h
26
+-freetype/ttnameid.h
27
+-freetype/tttables.h
28
++freetype.h
29
++ftcache.h
30
++ftglyph.h
31
++ftoutln.h
32
++ttnameid.h
33
++tttables.h
34
+ fribidi/fribidi.h
35
+ FSp_fopen.h
36
+ fstream.h
37
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
38
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2014-01-01 20:43:42.000000000 +0000
39
+@@ -67,8 +67,8 @@
40
+ #include "nsFontConfigUtils.h"
41
+ 
42
+ #include <gdk/gdkx.h>
43
+-#include <freetype/tttables.h>
44
+-#include <freetype/freetype.h>
45
++#include <tttables.h>
46
++#include <freetype.h>
47
+ 
48
+ #define FORCE_PR_LOG
49
+ #include "prlog.h"
50
+--- misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2008-01-29 19:31:08.000000000 +0000
51
++++ misc/build/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2014-01-01 20:44:06.000000000 +0000
52
+@@ -58,7 +58,7 @@
53
+ #include <fontconfig/fontconfig.h>
54
+ #include <gdk/gdk.h>
55
+ #include <gdk/gdkx.h>
56
+-#include <freetype/tttables.h>
57
++#include <tttables.h>
58
+ 
59
+ #include "mozilla-decoder.h"
60
+ 
61
+--- misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp.orig	2008-01-29 19:31:08.000000000 +0000
62
++++ misc/build/mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2014-01-01 20:44:34.000000000 +0000
63
+@@ -67,8 +67,8 @@
64
+ #include "nsFontConfigUtils.h"
65
+ 
66
+ #include <gdk/gdkx.h>
67
+-#include <freetype/tttables.h>
68
+-#include <freetype/freetype.h>
69
++#include <tttables.h>
70
++#include <freetype.h>
71
+ 
72
+ #define FORCE_PR_LOG
73
+ #include "prlog.h"
(-)files/patch-nss (+43 lines)
Line 0 Link Here
1
--- set_soenv.in~	2014-01-22 15:21:04.000000000 +0900
2
+++ set_soenv.in	2014-02-03 12:12:03.000000000 +0900
3
@@ -1864,6 +1864,8 @@
4
 ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
5
 ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
6
 ToFile( "SYSTEM_NSS",        "@SYSTEM_NSS@",       "e" );
7
+ToFile( "NSS_CFLAGS",        "@NSS_CFLAGS@",       "e" );
8
+ToFile( "NSS_LIBS",          "@NSS_LIBS@",         "e" );
9
 ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
10
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
11
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
12
13
--- xmlsecurity/util/makefile.mk	2014-02-03 15:50:50.000000000 +0900
14
+++ xmlsecurity/util/makefile.mk	2014-02-03 16:03:11.000000000 +0900
15
@@ -98,12 +98,12 @@
16
 SHL2STDLIBS +=-ldl
17
 .ENDIF
18
 
19
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
20
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
21
 .IF "$(NSPR_LIB)" != ""
22
 SHL2STDLIBS += $(NSPR_LIB)
23
 .ENDIF
24
-.IF "$(NSS_LIB)" != ""
25
-SHL2STDLIBS += $(NSS_LIB)
26
+.IF "$(NSS_LIBS)" != ""
27
+SHL2STDLIBS += $(NSS_LIBS)
28
 .ENDIF
29
 .ENDIF
30
 
31
--- xmlsecurity/source/xmlsec/nss/makefile.mk	2014-01-22 15:07:16.000000000 +0900
32
+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2014-02-03 16:13:30.000000000 +0900
33
@@ -48,8 +48,8 @@
34
 NSPR_INC = $(MOZ_INC)$/nspr
35
 .ELSE
36
 # TODO: better use pkgconfig to find the proper system include path
37
-NSS_INC = /usr/include/nss3
38
-NSPR_INC = /usr/include/nspr4
39
+NSS_INC = $(NSS_CFLAGS)
40
+NSPR_INC = $(NSS_CFLAGS)
41
 .ENDIF
42
 
43
 .IF "$(GUI)" == "WNT"
(-)files/patch-nss-gcc46 (-27 lines)
Lines 1-27 Link Here
1
--- nss/makefile.mk.orig	2013-08-13 11:46:06.000000000 +0000
2
+++ nss/makefile.mk	2014-01-01 18:13:26.000000000 +0000
3
@@ -44,6 +44,10 @@
4
 TARFILE_ROOTDIR=nss-3.12.6
5
 PATCH_FILES=nss.patch
6
 
7
+.IF "$(OS)"=="FREEBSD"
8
+PATCH_FILES+=nss_freebsd.patch
9
+.ENDIF # "$(OS)"=="FREEBSD"
10
+
11
 .IF "$(OS)"=="MACOSX"
12
 MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
13
 .EXPORT : MACOS_SDK_DIR
14
--- nss/nss_freebsd.patch.orig	1970-01-01 00:00:00.000000000 +0000
15
+++ nss/nss_freebsd.patch	2014-01-01 18:08:20.000000000 +0000
16
@@ -0,0 +1,11 @@
17
+--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig	2009-08-22 05:33:09.000000000 +0000
18
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk	2014-01-01 13:47:48.000000000 +0000
19
+@@ -38,7 +38,7 @@
20
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
21
+ 
22
+ DEFAULT_COMPILER	= gcc
23
+-CC			= gcc
24
++#CC			= gcc
25
+ CCC			= g++
26
+ RANLIB			= ranlib
27
+ 
(-)files/patch-sal (+53 lines)
Line 0 Link Here
1
--- sal/inc/rtl/string.hxx	2014-01-24 03:32:49.000000000 +0900
2
+++ sal/inc/rtl/string.hxx	2014-02-04 14:57:30.000000000 +0900
3
@@ -234,8 +234,9 @@
4
       @return a pointer to a (not necessarily null-terminated) byte string
5
       representing the characters of this string object.
6
     */
7
-    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
8
+
9
 public:
10
+    operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
11
     /** Returns a reference to a character of this string. */
12
     sal_Char& operator[]( int n ) { return pData->buffer[n]; }
13
     /** Returns a const reference to a character of this string. */
14
build -- version: 275224
15
16
17
=============
18
Building module canvas
19
=============
20
21
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/inc
22
23
24
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/factory
25
26
27
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/tools
28
29
30
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/null
31
32
33
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/vcl
34
35
36
Entering /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
37
38
Compiling: canvas/source/cairo/cairo_textlayout.cxx
39
g++46  -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0   -I/usr/local/include/cairo -I/usr/local/include/glib-2.0 -I/usr/local/include/pixman-1  -I/usr/local/include/freetype2 -I/usr/local/include/libpng15 -D_THREAD_SAFE -I/usr/local/include   -I/usr/local/include/freetype2   -I. -I../../unxfbsdx.pro/inc/cairocanvas -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc -I. -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/stl -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/external -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/unxfbsdx/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/res -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solenv/inc/Xp31 -I/usr/local/openjdk6/include -I/usr/local/openjdk6/include/freebsd -I/usr/local/openjdk6/include/bsd -I/usr/local/openjdk6/include/linux -I/usr/local/openjdk6/include/native_threads/include -I/usr/local/include  -I/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/offuh -I. -I../../res -I. -pipe  -Wl,-rpath=/usr/local/lib/gcc46 -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc46/include/c++ -DSUPD=410 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGUI -DSOLAR_JAVA   -DVERBOSE -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../unxfbsdx.pro/slo/cairo_textlayout.o /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx 
40
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'void cairocanvas::TextLayout::useFont(cairo::Cairo*)':
41
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
42
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:315:157: error: within this context
43
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::Cairo*)':
44
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/solver/410/unxfbsdx.pro/inc/rtl/string.hxx:237:5: error: 'rtl::OString::operator const sal_Char*() const' is private
45
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:336:40: error: within this context
46
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx: In member function 'bool cairocanvas::TextLayout::draw(cairo::SurfaceSharedPtr&, OutputDevice&, const Point&, const com::sun::star::rendering::ViewState&, const com::sun::star::rendering::RenderState&) const':
47
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:475:51: warning: declaration of 'aIter' shadows a previous local [-Wshadow]
48
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:415:47: warning: shadowed declaration is here [-Wshadow]
49
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:476:57: warning: declaration of 'aEnd' shadows a previous local [-Wshadow]
50
/work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo/cairo_textlayout.cxx:416:53: warning: shadowed declaration is here [-Wshadow]
51
dmake:  Error code 1, while making '../../unxfbsdx.pro/slo/cairo_textlayout.obj'
52
ERROR: error 65280 occurred while making /work/tinderbox-ligeti8amd64/portstrees/FreeBSD/ports/editors/openoffice-devel/work/aoo/main/canvas/source/cairo
53
(-)files/patch-vcl_source_glyphs_graphite_adaptors.cxx (-11 lines)
Lines 1-11 Link Here
1
--- vcl/source/glyphs/graphite_adaptors.cxx.orig	2013-08-13 11:45:43.000000000 +0000
2
+++ vcl/source/glyphs/graphite_adaptors.cxx	2013-12-31 16:39:41.000000000 +0000
3
@@ -45,7 +45,7 @@
4
 
5
 #include <salgdi.hxx>
6
 
7
-#include <freetype/ftsynth.h>
8
+#include <ftsynth.h>
9
 
10
 // Module
11
 #include "gcach_ftyp.hxx"
(-)files/patch-webdav (+133 lines)
Line 0 Link Here
1
--- ucb/source/ucp/webdav/SerfUri.hxx_	2014-02-04 14:39:02.000000000 +0900
2
+++ ucb/source/ucp/webdav/SerfUri.hxx	2014-02-04 14:39:18.000000000 +0900
3
@@ -23,7 +23,7 @@
4
 #ifndef INCLUDED_SERFURI_HXX
5
 #define INCLUDED_SERFURI_HXX
6
 
7
-#include <apr-util/apr_uri.h>
8
+#include <apr_uri.h>
9
 #include <rtl/ustring.hxx>
10
 #include "DAVException.hxx"
11
 
12
--- ucb/source/ucp/webdav/SerfSession.cxx_	2014-02-04 14:40:19.000000000 +0900
13
+++ ucb/source/ucp/webdav/SerfSession.cxx	2014-02-04 14:40:26.000000000 +0900
14
@@ -30,7 +30,7 @@
15
 #include "ucbhelper/simplecertificatevalidationrequest.hxx"
16
 
17
 #include "AprEnv.hxx"
18
-#include <apr/apr_strings.h>
19
+#include <apr_strings.h>
20
 
21
 #include "DAVAuthListener.hxx"
22
 #include "SerfTypes.hxx"
23
24
--- ucb/source/ucp/webdav/SerfTypes.hxx	2014-01-24 03:33:21.000000000 +0900
25
+++ ucb/source/ucp/webdav/SerfTypes.hxx	2014-02-04 14:38:44.000000000 +0900
26
@@ -24,7 +24,7 @@
27
 #ifndef INCLUDED_SERFTYPES_HXX
28
 #define INCLUDED_SERFTYPES_HXX
29
 
30
-#include <serf/serf.h>
31
+#include <serf.h>
32
 
33
 typedef serf_connection_t SerfConnection;
34
 
35
--- ucb/source/ucp/webdav/SerfCallbacks.hxx.orig	2014-02-25 00:24:42.000000000 -0800
36
+++ ucb/source/ucp/webdav/SerfCallbacks.hxx	2014-07-28 01:11:38.000000000 -0700
37
@@ -23,7 +23,7 @@
38
 #ifndef INCLUDED_CALLBACKS_HXX
39
 #define INCLUDED_CALLBACKS_HXX
40
 
41
-#include <serf/serf.h>
42
+#include <serf.h>
43
 
44
 extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
45
                                            serf_bucket_t **read_bkt,
46
--- ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
47
+++ ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx	2014-07-28 01:11:43.000000000 -0700
48
@@ -24,7 +24,7 @@
49
 
50
 #include "SerfCopyReqProcImpl.hxx"
51
 
52
-#include <serf/serf.h>
53
+#include <serf.h>
54
 
55
 namespace http_dav_ucp
56
 {
57
--- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx.orig	2014-02-25 00:24:42.000000000 -0800
58
+++ ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx	2014-07-28 01:11:47.000000000 -0700
59
@@ -24,7 +24,7 @@
60
 
61
 #include "SerfDeleteReqProcImpl.hxx"
62
 
63
-#include <serf/serf.h>
64
+#include <serf.h>
65
 
66
 namespace http_dav_ucp
67
 {
68
--- ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
69
+++ ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx	2014-07-28 01:11:51.000000000 -0700
70
@@ -24,7 +24,7 @@
71
 
72
 #include "SerfMkColReqProcImpl.hxx"
73
 
74
-#include <serf/serf.h>
75
+#include <serf.h>
76
 
77
 namespace http_dav_ucp
78
 {
79
--- ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
80
+++ ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx	2014-07-28 01:11:57.000000000 -0700
81
@@ -24,7 +24,7 @@
82
 
83
 #include "SerfMoveReqProcImpl.hxx"
84
 
85
-#include <serf/serf.h>
86
+#include <serf.h>
87
 
88
 namespace http_dav_ucp
89
 {
90
--- ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
91
+++ ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx	2014-07-28 01:12:00.000000000 -0700
92
@@ -24,7 +24,7 @@
93
 
94
 #include "SerfPostReqProcImpl.hxx"
95
 
96
-#include <serf/serf.h>
97
+#include <serf.h>
98
 
99
 using namespace com::sun::star;
100
 
101
--- ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx.orig	2014-02-25 00:24:43.000000000 -0800
102
+++ ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx	2014-07-28 01:12:05.000000000 -0700
103
@@ -26,7 +26,7 @@
104
 
105
 #include "SerfPutReqProcImpl.hxx"
106
 
107
-#include <serf/serf.h>
108
+#include <serf.h>
109
 
110
 namespace http_dav_ucp
111
 {
112
--- ucb/source/ucp/webdav/SerfRequestProcessor.hxx.orig	2014-02-25 00:24:43.000000000 -0800
113
+++ ucb/source/ucp/webdav/SerfRequestProcessor.hxx	2014-07-28 01:12:10.000000000 -0700
114
@@ -26,7 +26,7 @@
115
 #include <apr_errno.h>
116
 #include <apr_pools.h>
117
 
118
-#include <serf/serf.h>
119
+#include <serf.h>
120
 
121
 #include "DAVTypes.hxx"
122
 #include "DAVResource.hxx"
123
--- ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx.orig	2014-02-25 00:24:42.000000000 -0800
124
+++ ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx	2014-07-28 01:12:14.000000000 -0700
125
@@ -22,7 +22,7 @@
126
 #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
127
 #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
128
 
129
-#include <serf/serf.h>
130
+#include <serf.h>
131
 
132
 #include <sal/types.h>
133
 #include "DAVRequestEnvironment.hxx"

Return to bug 192258