Date: Mon, 20 Dec 2004 16:06:06 +0100 From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: Michael Nottebrock <michaelnottebrock@gmx.net> Cc: lofi@freebsd.org Subject: Re: gpgme 1.x and 0.3 conflict Message-ID: <20041220160606.0dc5eba8.sheepkiller@cultdeadsheep.org> In-Reply-To: <200412201541.37542.michaelnottebrock@gmx.net> References: <20041220151133.1fcc95f9.sheepkiller@cultdeadsheep.org> <200412201541.37542.michaelnottebrock@gmx.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Signature=_Mon__20_Dec_2004_16_06_06_+0100_6H2uyqLRcoqx_NRW
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
On Mon, 20 Dec 2004 15:41:33 +0100
Michael Nottebrock <michaelnottebrock@gmx.net> wrote:
> On Monday, 20. December 2004 15:11, Clement Laforet wrote:
>
> > I've made a patch to fix the conflict, but... third apps like
> > sylpheed* need patching. To minimize the amount of patches (just
> > replacing gpgme-config with gpgme03-config), we should move gpgme.h
> > header to${LOCALBASE}/include/gpgpme directory. [lofi's Cc'd for
> > review]
>
> Not entirely sure what you're proposing, but I'll gladly review any
> patches.
I fixed all file-based conflicts. But there's one more, at compilation
time. Since gpgme is in ${LOCALBASE}/include, gpgme03-config --cflags
output is useless. Instead of changing all gpgme.h includes to
gpgme03/gpgme.h, it's easier to move gpgme.h from {PREFIX}/include to
${PREFIX}/include/gpgme in security/gpgme. So, if all ports rely on
gpgme-config, we just have to patch configure scripts to use
gpgme03-config instead of gpgme-config.
You can find patch for gpgme 1.x here:
http://www.cotds.org/~clement/wip/gpgme-1.x.diff
For gpgme 0.3.x:
http://www.cotds.org/~clement/wip/gpgme-0.3.x.diff
clem
--Signature=_Mon__20_Dec_2004_16_06_06_+0100_6H2uyqLRcoqx_NRW
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (FreeBSD)
iD8DBQFBxupesRhfjwcjuh0RAtB2AKCHWEFLGHPzX639LVxJKd8MzQcHNgCgw83n
D6lXhv4qqrJVCStAQNu1lH0=
=Zh+Q
-----END PGP SIGNATURE-----
--Signature=_Mon__20_Dec_2004_16_06_06_+0100_6H2uyqLRcoqx_NRW--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041220160606.0dc5eba8.sheepkiller>