Hi,
Attached is a patch for the changes I made to the libreoffice Makefile
for you to consider. Changes are
libreoffice,-main
cppunit - in LIB_DEPENDS-main but was not in WANTLIB-main, added.
devel/gperf moved from LIB_DEPENDS-main to
BUILD_DEPENDS/RUN_DEPENDS-main, gperf contains no libraries.
libreoffice,-java
db_java added to WANTLIB-java
devel/apache-ant moved from LIB_DEPENDS-java to
BUILD_DEPENDS/RUN_DEPENDS-java, contains no libraries.
Any of the above which are only used for building, they should be in
BUILD_DEPENDS only. Not easy to find any details if these are needed at
runtime, rather than break something they are included at runtime in the
patch.
The reason for the patch is to avoid rebuild issues using dpb, due to
the make print-package-signature not matching the resulting pkg_info -S
for the package, the port having more dependencies than the resulting
built package.
If dpb -R editors/libreoffice is used, then the existing built packages
are removed each time as signatures will never match, then
editors/libreoffice, editors/libreoffice,-main,
editors/libreoffice,-java, editors/libreoffice,-kde are built.
editors/libreoffice builds the packages, but as signature don't match
editors/libreoffice,-main and editors/libreoffice,-java dpb remove the
packages and starts rebuilding again, resulting in rebuilding an extra 3
times.
Other issues with libreoffice running on current amd64.
1. The button macro on the security dialog, doesn't display the macro
security dialog. Was the same in the previous version.
I had to place marcos I wanted under..
~/.libreoffice/3/user/basic/Standard
2. I get the following when running libreoffice. Only a warning may be
nothing.
/usr/local/lib/libreoffice/program/soffice.bin:/usr/local/lib/libreoffice/program/../basis-link/program/libsvxcoreob.so:
/usr/local/lib/libreoffice/program/../basis-link/program/libfwkob.so :
WARNING: symbol(nCreateSlots) size mismatch, relink your program
/usr/local/lib/libreoffice/program/soffice.bin:/usr/local/lib/libreoffice/program/../basis-link/program/libsvxcoreob.so:
/usr/local/lib/libreoffice/program/../basis-link/program/libfwkob.so :
WARNING: symbol(nConvertSlots) size mismatch, relink your program
3. When libreoffice is run under KWin/kde opening previous files
libreoffice crashes or exits. Possibly some limit needs adjustment.
Under gnome the same file can be opened. This didn't happen with
previous version.
4. I found a reference that for 64bit jre 1.6 is recommended, we are
using 1.5. Could just be some OS's their 64bit jre 1.5 has bugs.
Regards
Nigel Taylor
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/editors/libreoffice/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile 23 Jun 2011 16:38:51 -0000 1.36
+++ Makefile 25 Jun 2011 15:50:14 -0000
@@ -17,7 +17,7 @@ PKGNAME-java= libreoffice-java-${VERSION
CATEGORIES= editors productivity
EPOCH= 0
-REVISION= 2
+REVISION= 3
MAINTAINER= Robert Nagy <[email protected]>
@@ -129,7 +129,9 @@ LIB_DEPENDS-i18n-$l=
BUILD_DEPENDS+= archivers/zip \
archivers/unzip \
archivers/gtar \
+ devel/apache-ant>=1.8.2 \
devel/bison \
+ devel/gperf \
shells/bash \
archivers/p5-Archive-Zip \
print/cups \
@@ -148,7 +150,6 @@ LIB_DEPENDS-main=x11/gtk+2 \
net/curl \
net/neon \
textproc/icu4c \
- devel/gperf \
textproc/raptor \
textproc/redland \
textproc/hunspell \
@@ -167,10 +168,11 @@ WANTLIB-main+= ICE ORBit-2 SM X11 Xau Xc
png pthread pthread-stubs ssl xcb xml2 z gdk_pixbuf-2.0 \
util ${MODGCONF2_WANTLIB}
WANTLIB-main+= GL GLU Xxf86vm drm stdc++ xcb-render xcb-shm
-WANTLIB-main+= hunspell-1.2 gdk_pixbuf_xlib-2.0
+WANTLIB-main+= cppunit hunspell-1.2 gdk_pixbuf_xlib-2.0
WANTLIB-main+= ${MODPY_WANTLIB}
RUN_DEPENDS-main= devel/desktop-file-utils \
+ devel/gperf \
misc/shared-mime-info
MODULES+= x11/qt3
@@ -187,12 +189,12 @@ MODULES+= java
MODJAVA_VER= 1.4+
MODJAVA_JRERUN= Yes
.endif
-LIB_DEPENDS-java= db-java->=4,<5:databases/db/v4,-java,java \
- devel/apache-ant>=1.8.2
+LIB_DEPENDS-java= db-java->=4,<5:databases/db/v4,-java,java
RUN_DEPENDS-java= ${MODJAVA_RUN_DEPENDS} \
editors/libreoffice \
- java/javaPathHelper
-WANTLIB-java= c stdc++ m pthread
+ java/javaPathHelper \
+ devel/apache-ant>=1.8.2
+WANTLIB-java= c stdc++ m pthread db_java
USE_GMAKE= Yes
NO_REGRESS= Yes
