Date: Sat, 24 Sep 2011 13:47:27 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: "Mikhail T." <mi+thun@aldan.algebra.com> Cc: office@FreeBSD.org Subject: Re: libreoffice and KDE3 Message-ID: <20110924114727.GC79140@azathoth.lan> In-Reply-To: <4E7D6EB6.6000506@aldan.algebra.com> References: <4E7D6EB6.6000506@aldan.algebra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--/Uq4LBwYP4y1W6pO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sat, Sep 24, 2011 at 01:46:30AM -0400, Mikhail T. wrote:
> Hello!
>=20
> The attached patch adds KDE3 as a config-option (and picks two minor=20
> nits). Please, commit or allow me to. Thank you! Yours,
>=20
> -mi
>=20
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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
> =20
> -
> # dmake can't be used from ports
> =20
> @@ -129,10 +128,11 @@
> =20
> OPTIONS=3D 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
> =20
> +.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=3D3
> +CONFIGURE_ARGS+=3D --enable-kde
> +.else
> +CONFIGURE_ARGS+=3D --disable-kde
> +.endif
> .if defined(WITH_KDE4)
> USE_KDE4=3D kdelibs
Thanks let me first run it in my tinderbox :)
regards,
Bapt
--/Uq4LBwYP4y1W6pO
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
iEYEARECAAYFAk59w08ACgkQ8kTtMUmk6Eyt5gCfTLZbclT6GmFo/CM0QwQ9siNi
9tIAoIBMgcYmvXQHoc2mFmSdLdbySkWt
=yuOG
-----END PGP SIGNATURE-----
--/Uq4LBwYP4y1W6pO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110924114727.GC79140>