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

Collapse All | Expand All

(-)Makefile (-202 / +215 lines)
Lines 2-25 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	4.1.${SVNREVISION}
5
PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
6
PORTREVISION=	3
7
PORTEPOCH=	2
6
PORTEPOCH=	2
8
CATEGORIES=	editors java
7
CATEGORIES=	editors java
9
MASTER_SITES=	${MASTER_SITE_LOCAL}
8
MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-rc3-r${SVNREVISION}/source/ \
10
MASTER_SITE_SUBDIR=	maho/openoffice
9
		${MASTER_SITE_LOCAL:S@%SUBDIR%@truckman/openoffice@}:extsrc
11
DISTFILES+=	${OOOSRC} ${EXTSRC} unowinreg.dll
10
.if defined(LANG_PKGNAME)
12
EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
11
PKGNAMEPREFIX=		${LANG_PKGNAME}-
12
.endif
13
.if defined(LANG_SUFFIX)
14
PKGNAMESUFFIX=		-${LANG_SUFFIX}
15
.endif
16
DISTFILES=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
17
EXTRACT_ONLY=	${OOOSRC}
13
18
19
MAINTAINER=	office@FreeBSD.org
14
#de facto maintainer is maho@FreeBSD.org
20
#de facto maintainer is maho@FreeBSD.org
15
#Frequent Patch submitters should optionally sign Apache iCLA
21
#Frequent Patch submitters should optionally sign Apache iCLA
16
MAINTAINER=	office@FreeBSD.org
22
COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
17
COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
18
23
19
LICENSE=	APACHE20
24
LICENSE=	APACHE20
20
25
21
PKGNAMESUFFIX=	-devel
26
BUILD_DEPENDS=								\
27
		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip	\
28
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	\
29
		zip:${PORTSDIR}/archivers/zip				\
30
		ant:${PORTSDIR}/devel/apache-ant			\
31
		dmake:${PORTSDIR}/devel/dmake				\
32
		epm:${PORTSDIR}/devel/epm				\
33
		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf		\
34
		imake:${PORTSDIR}/devel/imake				\
35
		gpatch:${PORTSDIR}/devel/patch				\
36
		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
37
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
38
		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
39
		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit		\
40
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh		\
41
		bash:${PORTSDIR}/shells/bash				\
42
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
43
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
44
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
45
LIB_DEPENDS=								\
46
		libapr-1.so:${PORTSDIR}/devel/apr1			\
47
		libcurl.so:${PORTSDIR}/ftp/curl				\
48
		libcairo.so:${PORTSDIR}/graphics/cairo			\
49
		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
50
		libpng.so:${PORTSDIR}/graphics/png			\
51
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
52
		libCoinMP.so:${PORTSDIR}/math/coinmp			\
53
		libfreetype.so:${PORTSDIR}/print/freetype2		\
54
		libnss3.so:${PORTSDIR}/security/nss			\
55
		libexpat.so:${PORTSDIR}/textproc/expat2			\
56
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell	\
57
		libhyphen.so:${PORTSDIR}/textproc/hyphen		\
58
		libtextcat.so:${PORTSDIR}/textproc/libtextcat		\
59
		libmythes-1.2.so:${PORTSDIR}/textproc/mythes		\
60
		librdf.so:${PORTSDIR}/textproc/redland			\
61
		libserf-1.so:${PORTSDIR}/www/serf
62
#		libgraphite.so:${PORTSDIR}/graphics/silgraphite
63
RUN_DEPENDS=								\
64
		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
65
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
66
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
67
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
68
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
22
69
70
AOOVERSION1=		4
71
AOOVERSION2=		1
72
AOOVERSION3=		1
73
AOOVERSION=		${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
74
AOOXXX=			${AOOVERSION1}${AOOVERSION2}${AOOVERSION3}
75
SVNREVISION=		1617669
76
OOOSRC=			apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX}
77
EXTSRC=			ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140809.tar.gz
78
79
OOODIR=			openoffice${AOOVERSION1}
80
#AOOSUFFIX=		${PORTVERSION}
81
AOOSUFFIX=		${AOOVERSION}-rc3
82
INSTALLATION_BASEDIR?=	openoffice-${AOOSUFFIX}
83
EXECBASE?=		openoffice-${AOOSUFFIX}
84
DIST_SUBDIR=		openoffice
85
86
NO_LATEST_LINK=	yes
87
88
ONLY_FOR_ARCHS=	i386 amd64
89
23
USE_GNOME=	gtk20 libxslt libidl glib20
90
USE_GNOME=	gtk20 libxslt libidl glib20
24
USE_XORG=	x11 ice xaw xau xext xrender xrandr \
91
USE_XORG=	x11 ice xaw xau xext xrender xrandr \
25
		xi xt xcursor xdamage xcomposite xfixes
92
		xi xt xcursor xdamage xcomposite xfixes
Lines 26-33 Link Here
26
USE_GL=		gl glu
93
USE_GL=		gl glu
27
USE_GSTREAMER=	yes
94
USE_GSTREAMER=	yes
28
USE_GCC=	yes
95
USE_GCC=	yes
29
USE_PYTHON=	yes
96
USES+=		bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2
30
USES+=		bison perl5 gmake pkgconfig tar:bzip2 desktop-file-utils
31
USE_PERL5=	build
97
USE_PERL5=	build
32
WITHOUT_CPU_CFLAGS=	true
98
WITHOUT_CPU_CFLAGS=	true
33
MAKE_JOBS_SAFE=	yes
99
MAKE_JOBS_SAFE=	yes
Lines 37-49 Link Here
37
GNOMEVFS_DESC=	Enable GNOME Virtual File System
103
GNOMEVFS_DESC=	Enable GNOME Virtual File System
38
CCACHE_DESC=	Mimimize compile time of C/C++ programs
104
CCACHE_DESC=	Mimimize compile time of C/C++ programs
39
105
40
.include "${.CURDIR}/files/Makefile.localized"
41
42
USE_JAVA=	yes
43
JAVA_BUILD=	jdk
44
JAVA_VENDOR=	openjdk
45
JAVA_VERSION=	1.6+
46
47
GCONF_USE=	GNOME=gconf2
106
GCONF_USE=	GNOME=gconf2
48
GCONF_CONFIGURE_OFF=--disable-gconf
107
GCONF_CONFIGURE_OFF=--disable-gconf
49
108
Lines 50-59 Link Here
50
GNOMEVFS_USE=	GNOME=gnomevfs2
109
GNOMEVFS_USE=	GNOME=gnomevfs2
51
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
110
GNOMEVFS_CONFIGURE_OFF=--disable-gnome-vfs
52
111
112
.include <bsd.port.options.mk>
113
53
.include <bsd.port.pre.mk>
114
.include <bsd.port.pre.mk>
54
115
55
ONLY_FOR_ARCHS=	i386 amd64
116
.include <${FILESDIR}/Makefile.localized>
56
117
118
USE_JAVA=	yes
119
JAVA_BUILD=	jdk
120
JAVA_VENDOR=	openjdk
121
JAVA_VERSION=	1.6+
122
57
.if ${ARCH} == amd64
123
.if ${ARCH} == amd64
58
FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
124
FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
59
.else
125
.else
Lines 60-75 Link Here
60
FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
126
FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
61
.endif
127
.endif
62
128
63
OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
129
LOCALIZED_LANG?=	en-US
64
EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}_2${EXTRACT_SUFX}
65
OOODIR=			openoffice4
66
SVNREVISION=		1560773
67
INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
68
EXECBASE?=		openoffice-r${SVNREVISION}
69
DIST_SUBDIR=		openoffice
70
SIMPLEOSVER=		${OSREL:C/\.//g}
71
130
72
PACKAGE_PREFIX=		Apache_OpenOffice
131
PACKAGE_PREFIX=		Apache_OpenOffice
132
73
.if ${ARCH} == amd64
133
.if ${ARCH} == amd64
74
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
134
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86-64
75
.else
135
.else
Lines 76-95 Link Here
76
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
136
PACKAGE_MIDDLE=		${PORTVERSION}_${OPSYS}_x86
77
.endif
137
.endif
78
138
79
LOCALIZED_LANG?=	en-US
80
.if defined(LANG_PKGNAME)
81
PKGNAMEPREFIX=		${LANG_PKGNAME}-
82
.endif
83
.if defined(LANG_SUFFIX)
84
PKGNAMESUFFIX=		-${LANG_SUFFIX}
85
.endif
86
87
RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
88
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
89
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
90
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
91
		${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
92
93
.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
139
.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
94
BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
140
BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
95
CCACHE_PREFIX=	ccache
141
CCACHE_PREFIX=	ccache
Lines 100-147 Link Here
100
OOOCXX=		${CXX}
146
OOOCXX=		${CXX}
101
.endif
147
.endif
102
CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
148
CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
103
		PATH=${WRKSRC}/solenv/bin:$$PATH	\
149
		PATH=${WRKSRC}/solenv/bin:$$PATH
104
		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
105
150
106
LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
107
		libexpat.so:${PORTSDIR}/textproc/expat2 \
108
		libjpeg.so:${PORTSDIR}/graphics/jpeg \
109
		libcurl.so:${PORTSDIR}/ftp/curl \
110
		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
111
		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
112
		librdf.so:${PORTSDIR}/textproc/redland \
113
		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
114
		libfreetype.so:${PORTSDIR}/print/freetype2 \
115
		libapr-1.so:${PORTSDIR}/devel/apr1 \
116
		libCoinMP.so:${PORTSDIR}/math/coinmp \
117
		libserf-1.so:${PORTSDIR}/www/serf \
118
		libfreetype.so:${PORTSDIR}/print/freetype2 \
119
		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
120
		libnss3.so:${PORTSDIR}/security/nss
121
122
BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
123
		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
124
		gpatch:${PORTSDIR}/devel/patch \
125
		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
126
		bash:${PORTSDIR}/shells/bash \
127
		imake:${PORTSDIR}/devel/imake \
128
		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
129
		ant:${PORTSDIR}/devel/apache-ant \
130
		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
131
		${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \
132
		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
133
		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
134
		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
135
		${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \
136
		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
137
		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel \
138
		epm:${PORTSDIR}/devel/epm \
139
		dmake:${PORTSDIR}/devel/dmake \
140
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
141
142
USE_AUTOTOOLS=	autoconf
151
USE_AUTOTOOLS=	autoconf
143
GNU_CONFIGURE=	yes
152
GNU_CONFIGURE=	yes
144
WRKSRC?=	${WRKDIR}/aoo/main
153
WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
154
WRKSRC?=	${WRKSUBDIR}/main
145
BASH?=		${PREFIX}/bin/bash
155
BASH?=		${PREFIX}/bin/bash
146
SUB_FILES=	pkg-message
156
SUB_FILES=	pkg-message
147
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
157
SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
Lines 150-211 Link Here
150
MAKE_JOBS_NUMBER=	4
160
MAKE_JOBS_NUMBER=	4
151
.endif
161
.endif
152
162
153
CONFIGURE_ARGS+=	--enable-verbose \
163
CONFIGURE_ARGS+=							\
154
			--enable-symbols=small \
164
			--with-system-apache-commons=yes		\
155
			--enable-crashdump \
156
			--with-vendor="FreeBSD ports system"	\
157
			--with-epm=${LOCALBASE}/bin/epm \
158
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
159
			--with-gperf=${LOCALBASE}/bin/gperf	\
160
			--x-includes=${LOCALBASE}/include	\
161
			--x-libraries=${LOCALBASE}lib	\
162
			--with-system-libxml 		\
163
			--with-system-libxslt 		\
164
			--with-system-cairo --enable-cairo \
165
			--with-system-zlib		\
166
			--with-system-python		\
167
			--with-system-expat		\
168
			--with-system-openssl		\
169
			--with-system-curl		\
170
			--with-system-poppler \
171
			--with-system-redland \
172
			--with-system-libtextcat \
173
			--with-system-vigra \
174
			--with-system-stdlibs \
175
			--with-system-apr \
176
			--with-system-apr-util \
177
			--with-system-coinmp \
178
			--with-system-apache-commons=yes \
179
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
165
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
180
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
166
			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
181
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
167
			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
182
			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar	\
168
			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
183
			--with-system-lucene \
169
			--with-system-apr				\
184
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar	\
170
			--with-system-apr-util				\
185
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar	\
171
			--with-system-beanshell				\
172
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar	\
173
			--enable-category-b				\
174
			--with-system-cairo --enable-cairo		\
175
			--with-system-coinmp				\
176
			--with-system-curl				\
177
			--enable-crashdump				\
178
			--enable-dbus					\
179
			--with-epm=${LOCALBASE}/bin/epm			\
180
			--with-system-expat				\
181
			--disable-fetch-external			\
182
			--without-fonts					\
183
			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
184
			--with-gperf=${LOCALBASE}/bin/gperf		\
185
			--enable-gstreamer				\
186
			--with-system-hunspell				\
187
			--with-system-hyphen				\
188
			--with-system-jpeg				\
186
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
189
			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
187
			--with-package-format="archive" \
190
			--with-system-libtextcat			\
188
			--enable-gstreamer \
191
			--with-system-libxml				\
189
			--enable-wiki-publisher \
192
			--with-system-libxslt				\
190
			--enable-dbus \
193
			--enable-lockdown				\
191
			--enable-opengl \
194
			--with-system-lucene				\
192
			--enable-category-b \
195
			--with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \
193
			--enable-lockdown \
196
			--with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \
194
			--with-system-hunspell \
197
			--with-system-mythes				\
195
			--with-system-saxon     \
198
			--with-system-nss				\
196
			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
199
			--enable-opengl					\
197
			--with-system-beanshell	\
200
			--with-system-openssl				\
198
			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
201
			--with-package-format="archive"			\
199
			--without-fonts \
202
			--with-system-poppler				\
200
			--with-system-serf \
203
			--with-system-python				\
201
			--with-system-nss \
204
			--with-system-redland				\
202
			--without-stlport
205
			--with-system-saxon				\
206
			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar	\
207
			--with-system-serf				\
208
			--with-system-stdlibs				\
209
			--enable-symbols=small				\
210
			--without-stlport				\
211
			--with-vendor="FreeBSD ports system"		\
212
			--enable-verbose				\
213
			--with-system-vigra				\
214
			--enable-wiki-publisher				\
215
			--x-includes={LOCALBASE}/include		\
216
			--x-libraries=${LOCALBASE}lib			\
217
			--with-system-zlib
218
# system-graphite causes breakage when compiled with clang and linked
219
# with libc++ because aoo is compiled with gcc and linked with libstdc++.
220
#			--with-system-graphite
203
221
204
#			--with-system-jpeg
205
#			--enable-pdfimport
206
#			--without-stlport --disable-mozilla \
207
#			--with-system-graphite \
208
209
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
222
#OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
210
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
223
#OOOEXTENSIONS+=		presenter/presenter-screen.oxt
211
#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
224
#OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
Lines 219-326 Link Here
219
# really tweak, extremely useful when you build all localized language versions
232
# really tweak, extremely useful when you build all localized language versions
220
# needed after when you build with ALL_LOCALIZED_LANGS.
233
# needed after when you build with ALL_LOCALIZED_LANGS.
221
.if defined(TWEAK_L10N)
234
.if defined(TWEAK_L10N)
222
	@${RM} -f ${WRKDIR}/.PLIST*
235
	${RM} -f ${WRKDIR}/.PLIST*
223
	@${RM} -f ${WRKDIR}/.install_done.*
236
	${RM} -f ${WRKDIR}/.install_done.*
224
	@${RM} -f ${WRKDIR}/.package_done.*
237
	${RM} -f ${WRKDIR}/.package_done.*
225
	@${RM} -f ${WRKDIR}/.extract_done.*
238
	${RM} -f ${WRKDIR}/.extract_done.*
226
	@${RM} -f ${WRKDIR}/.patch_done.*
239
	${RM} -f ${WRKDIR}/.patch_done.*
227
	@${RM} -f ${WRKDIR}/.configure_done.*
240
	${RM} -f ${WRKDIR}/.configure_done.*
228
	@${RM} -f ${WRKDIR}/.build_done.*
241
	${RM} -f ${WRKDIR}/.build_done.*
229
	@${MKDIR} ${WRKDIR}
242
	${MKDIR} ${WRKDIR}
230
	@${TOUCH} ${EXTRACT_COOKIE}
243
	${TOUCH} ${EXTRACT_COOKIE}
231
	@${TOUCH} ${PATCH_COOKIE}
244
	${TOUCH} ${PATCH_COOKIE}
232
	@${TOUCH} ${CONFIGURE_COOKIE}
245
	${TOUCH} ${CONFIGURE_COOKIE}
233
	@${TOUCH} ${BUILD_COOKIE}
246
	${TOUCH} ${BUILD_COOKIE}
234
.endif
247
.endif
235
248
236
post-extract:
249
post-extract:
237
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
250
	${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC}
238
#	@${MKDIR} ${WRKSRC}/../ext_sources
251
	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
239
#	@${MV} ${WRKDIR}/aoo/ext_sources/* ${WRKSRC}/../ext_sources/
252
	${RM} -rf ${WRKSRC}/l10n
240
#	@${RM} -rf ${WRKSRC}/l10n
241
	@${MKDIR} ${WRKSRC}/../ext_sources
242
	@${RM} -rf ${WRKSRC}/l10n
243
253
244
post-patch:
254
post-patch:
245
.if defined (USE_GCC)
255
.if defined (USE_GCC)
246
	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
256
	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
247
	@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
257
	${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
248
.else
258
.else
249
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
259
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
250
	@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
260
	${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
251
.endif
261
.endif
252
262
253
pre-configure:
263
pre-configure:
254
	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
264
	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
255
265
256
do-build:
266
do-build:
257
	@cd ${WRKDIR}/aoo ; ${PRINTF} "[repositories]\n" > source_config
267
	cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config
258
	@cd ${WRKDIR}/aoo ; ${PRINTF} "main=active\n" >> source_config
268
	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
259
	@cd ${WRKDIR}/aoo ; ${PRINTF} "extras=active\n" >> source_config
269
	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
260
	@cd ${WRKSRC} ; ./bootstrap
270
	cd ${WRKSRC} ; ./bootstrap
261
	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
271
	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
262
272
263
do-install:
273
do-install:
264
	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
274
	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
265
	@${RM} -Rf ${WRKDIR}/tmp
275
	${RM} -Rf ${WRKDIR}/tmp
266
	@${MKDIR} ${WRKDIR}/tmp
276
	${MKDIR} ${WRKDIR}/tmp
267
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
277
	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
268
		${ECHO_CMD} "extracting $$i" ; \
278
		${ECHO_CMD} "extracting $$i" ; \
269
		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
279
		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
270
	done
280
	done
271
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
281
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
272
	@cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
282
	cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}
273
	@${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
283
	${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
274
	@${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/4/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/openoffice4/program/bootstraprc
284
	${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc
275
	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
285
	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
276
	@cd ${WRKSRC}/solver/4?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
286
	cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
277
287
278
post-install:
288
post-install:
279
	@${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
289
	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD}
290
	for prog in crashrep pagein uri-encode javaldx regmerge regview; do \
291
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \
292
	done
293
	${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
280
	@${ECHO_MSG} "===>  Add wrapper scripts";
294
	@${ECHO_MSG} "===>  Add wrapper scripts";
281
	@${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
295
	${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/
282
	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
296
	${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
283
			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
297
			-e 's#%%SVNREVISION%%#${SVNREVISION}#g' \
284
			-e 's#%%OOODIR%%#${OOODIR}#g' \
298
			-e 's#%%OOODIR%%#${OOODIR}#g' \
285
			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
299
			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
286
			${WRKDIR}/openoffice-wrapper
300
			${WRKDIR}/openoffice-wrapper
287
	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
301
	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
288
		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
302
		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
289
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
303
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase
290
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
304
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc
291
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
305
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw
292
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
306
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang
293
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
307
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress
294
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
308
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath
295
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
309
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin
296
	@${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
310
	${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter
297
	@${ECHO_CMD} "" > ${TMPPLIST}
311
	${ECHO_CMD} "" > ${TMPPLIST}
298
	@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
312
	${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
299
	@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
313
	${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE"    >> ${TMPPLIST}
300
	@${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20"   >> ${TMPPLIST}
314
	${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20"   >> ${TMPPLIST}
301
	@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}"     >> ${TMPPLIST}
315
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
302
	@${ECHO_CMD} "@dirrm share/licenses"                >> ${TMPPLIST}
316
	cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
303
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
317
	cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
304
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
305
	@cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
306
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
318
		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
307
	@for app in base calc draw impress math writer; do \
319
	for app in base calc draw impress math writer; do \
308
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
320
		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
309
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
321
			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
310
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
322
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
311
	done
323
	done
312
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
324
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
313
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
325
		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
314
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
326
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
315
	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
327
	${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
316
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
328
		${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop
317
	@${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
329
	${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
318
	@${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
330
	${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
319
	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
331
	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
320
	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
332
	${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
321
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
333
			${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
322
	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
334
	${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
323
	@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
335
	for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \
324
		for app in base calc draw impress math printeradmin writer; do \
336
		for app in base calc draw impress math printeradmin writer; do \
325
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
337
			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
326
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
338
				${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \
Lines 336-344 Link Here
336
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
348
			${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \
337
		done ; \
349
		done ; \
338
	done
350
	done
339
	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
351
	${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
340
	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
352
	${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
341
	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
353
	${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
342
354
343
.include <${FILESDIR}/Makefile.others>
355
.include <${FILESDIR}/Makefile.others>
356
344
.include <bsd.port.post.mk>
357
.include <bsd.port.post.mk>
(-)distinfo (-4 / +4 lines)
Lines 1-6 Link Here
1
SHA256 (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 5a6247121703b10c44161594c23f439d5488bf011750ed7e0632b3f033e67aea
1
SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f
2
SIZE (openoffice/ApacheOpenOffice.r1560773.tar.bz2) = 245790501
2
SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = ae9ab2fc1eeead0700ce95b8af01fab4f4b45f3f008d43b214f7ddec7f8c8e41
3
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = d0b4925cbf8a32b9dfbf8ca708a485e150c85fe131cc60cff9eb8f0d0b5a710d
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1560773_2.tar.bz2) = 147382699
4
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20140809.tar.gz) = 94099621
5
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
5
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
6
SIZE (openoffice/unowinreg.dll) = 6144
6
SIZE (openoffice/unowinreg.dll) = 6144
(-)files/patch-sal (-40 lines)
Lines 11-53 Link Here
11
     /** Returns a reference to a character of this string. */
11
     /** Returns a reference to a character of this string. */
12
     sal_Char& operator[]( int n ) { return pData->buffer[n]; }
12
     sal_Char& operator[]( int n ) { return pData->buffer[n]; }
13
     /** Returns a const reference to a character of this string. */
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-sal-inline (-16 lines)
Lines 1-16 Link Here
1
Index: sal/util/makefile.mk
2
===================================================================
3
--- sal/util/makefile.mk	(revision 1509387)
4
+++ sal/util/makefile.mk	(working copy)
5
@@ -45,6 +45,11 @@
6
 CFLAGS+= $(LFS_CFLAGS)
7
 CXXFLAGS+= $(LFS_CFLAGS)
8
 
9
+# gcc can have some broken inlining optimizations
10
+.IF "$(OS)"=="FREEBSD" && "$(COM)" == "GCC"
11
+CFLAGS += -fkeep-inline-functions
12
+.ENDIF
13
+
14
 .IF "$(depend)" == ""
15
 
16
 # --- Files --------------------------------------------------------
(-)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 (+99 lines)
Lines 32-34 Link Here
32
 
32
 
33
 typedef serf_connection_t SerfConnection;
33
 typedef serf_connection_t SerfConnection;
34
 
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"
(-)pkg-plist (-1 lines)
Line 1 Link Here
1
# Dummy file, do not delete. Package list is generated automatically.

Return to bug 192557