[patch] Enable kde4 vclplug in openoffice.org-3-RC

[Stephane E. Potvin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

The attached patch enable building OOo with the kde4 vclplug enabled, providing a much nicer experience with kde4. As there isn't a
different prefix for qt4, kde3 and kde4 support can't be enabled at the same time (I didn't find a way to change the name of the moc
executable that OOo is looking for in the configure step, without patching OOo itself). I don't think that's a major concern as we
don't try to build a package with everything (like Fedora do for example).

I've checked with a tinderbox to make sure that all the dependencies are correctly specified. The IDL dependency is necessary when
installing on a kde only system as it's necessary for mozilla support and is not installed by default in that case.

Regards,

Steph
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktXEHAACgkQmdOXtTCX/nu26ACfa9sycFbYVVqh93s2vuR5fU/e
QLAAnj0gaIQ31BFCzN4GSuqhmUir44Y/
=PIJR
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/editors/openoffice.org-3-RC/Makefile,v
retrieving revision 1.411
diff -u -r1.411 Makefile
--- Makefile	15 Jan 2010 07:22:27 -0000	1.411
+++ Makefile	19 Jan 2010 19:41:52 -0000
@@ -34,6 +34,13 @@
 
 USE_GNOME=	desktopfileutils gtk20
 
+.if defined(WITH_KDE4) && defined(WITH_KDE)
+.error "Cannot define WITH_KDE and WITH_KDE4 at the same time"
+.endif
+.if defined(WITH_KDE4)
+USE_KDE4=	kdelibs
+USE_QT_VER=	4
+.endif
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=	3
 .endif
@@ -188,6 +195,9 @@
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
+.if defined(WITH_KDE4)
+	@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
+.endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
Index: files/Makefile.knobs
===================================================================
RCS file: /home/FreeBSD/ncvs/ports/editors/openoffice.org-3-RC/files/Makefile.knobs,v
retrieving revision 1.58
diff -u -r1.58 Makefile.knobs
--- files/Makefile.knobs	18 Oct 2009 04:28:01 -0000	1.58
+++ files/Makefile.knobs	20 Jan 2010 03:35:35 -0000
@@ -4,6 +4,11 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
+.if defined(WITH_KDE4)
+CONFIGURE_ARGS+=	--enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
+QT_COMPONENTS+=		moc
+.endif
+
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
@@ -19,6 +24,7 @@
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
 CONFIGURE_ARGS+=	--enable-build-mozilla
+USE_GNOME+=		libidl
 .endif
 
 .if defined(WITHOUT_GNOME)
@@ -86,6 +92,11 @@
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
 	@${ECHO} "make -DWITH_KDE"
 .endif
+.if !defined(WITH_KDE4)
+	@${ECHO}
+	@${ECHO} "You can compile OOo to use Qt/KDE4 vclplug with"
+	@${ECHO} "make -DWITH_KDE4"
+.endif
 .if !defined(WITH_EVOLUTION2)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with evolution2 support by"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OOo_kde4_support.diff.sig
Type: application/octet-stream
Size: 72 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-openoffice/attachments/20100120/0f6eeee8/OOo_kde4_support.diff.obj