Date: Sat, 24 Sep 2011 01:46:30 -0400 From: "Mikhail T." <mi+thun@aldan.algebra.com> To: office@FreeBSD.org Subject: libreoffice and KDE3 Message-ID: <4E7D6EB6.6000506@aldan.algebra.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------050008010808040908030005
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hello!
The attached patch adds KDE3 as a config-option (and picks two minor
nits). Please, commit or allow me to. Thank you! Yours,
-mi
--------------050008010808040908030005
Content-Type: text/plain;
name="libre-kde3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="libre-kde3.patch"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/libreoffice/Makefile,v
retrieving revision 1.31
diff -U 2 -r1.31 Makefile
--- Makefile 23 Sep 2011 22:22:20 -0000 1.31
+++ Makefile 24 Sep 2011 05:44:44 -0000
@@ -101,5 +101,4 @@
cups.2:${PORTSDIR}/print/cups-client
-
# dmake can't be used from ports
@@ -129,10 +128,11 @@
OPTIONS= WEBDAV "Support webdav protocol" off \
- KDE4 "With Qt4/KDE4 vclplug support" off \
+ KDE3 "With KDE3 support (conflicts with KDE4)" off \
+ KDE4 "With Qt4/KDE4 vclplug support (not KDE3)" off \
GTK "With GTK vclplug support" on \
GNOME "Better integration in gnome environnement" off \
JAVA "Add Java support (XML Filters, macros)" off \
PYUNO "Allow to script libreoffice in python" off \
- SYSTRAY "Enable systemtry quickstarter" off \
+ SYSTRAY "Enable systemtray quickstarter" off \
MMEDIA "Enable multimedia backend for impress" off \
SDK "Build with SDK" off \
@@ -183,5 +183,4 @@
--disable-build-mozilla \
--without-system-mozilla \
- --disable-kde \
--without-stlport \
--disable-nss-module \
@@ -258,4 +257,13 @@
.endif
+.if defined(WITH_KDE4) && defined(WITH_KDE3)
+.error Only one of the KDE3 and KDE4 can be turned on
+.endif
+.if defined(WITH_KDE3)
+USE_KDELIBS_VER=3
+CONFIGURE_ARGS+= --enable-kde
+.else
+CONFIGURE_ARGS+= --disable-kde
+.endif
.if defined(WITH_KDE4)
USE_KDE4= kdelibs
--------------050008010808040908030005--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E7D6EB6.6000506>