From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH 1/1] gnu: fontconfig: Fix build failure caused by symbol conflict with glibc@2.25. Date: Sun, 26 Feb 2017 16:16:07 +0100 Message-ID: <87k28df0eg.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <4f15aad88b751277b10e5357fcd321167aa4e7eb.1488040009.git.leo@famulari.name> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ci0Ya-0005NM-0y for guix-devel@gnu.org; Sun, 26 Feb 2017 10:16:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ci0YV-0007Pn-GN for guix-devel@gnu.org; Sun, 26 Feb 2017 10:16:16 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:54458) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ci0YV-0007PQ-6y for guix-devel@gnu.org; Sun, 26 Feb 2017 10:16:11 -0500 In-Reply-To: <4f15aad88b751277b10e5357fcd321167aa4e7eb.1488040009.git.leo@famulari.name> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari , guix-devel@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > * gnu/packages/patches/fontconfig-charwidth-symbol-conflict.patch: New fi= le. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/fontutils.scm (fontconfig)[source]: Use it. LGTM, thanks! > --- > gnu/local.mk | 1 + > gnu/packages/fontutils.scm | 1 + > .../fontconfig-charwidth-symbol-conflict.patch | 82 ++++++++++++++++= ++++++ > 3 files changed, 84 insertions(+) > create mode 100644 gnu/packages/patches/fontconfig-charwidth-symbol-conf= lict.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index ec9332271..3623bbb49 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -557,6 +557,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/flint-ldconfig.patch \ > %D%/packages/patches/fltk-shared-lib-defines.patch \ > %D%/packages/patches/fltk-xfont-on-demand.patch \ > + %D%/packages/patches/fontconfig-charwidth-symbol-conflict.patch \ > %D%/packages/patches/fontforge-svg-modtime.patch \ > %D%/packages/patches/freeimage-CVE-2015-0852.patch \ > %D%/packages/patches/freeimage-CVE-2016-5684.patch \ > diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm > index fad0cb11a..ad15659f6 100644 > --- a/gnu/packages/fontutils.scm > +++ b/gnu/packages/fontutils.scm > @@ -229,6 +229,7 @@ fonts to/from the WOFF2 format.") > (uri (string-append > "https://www.freedesktop.org/software/fontconfig/rele= ase/fontconfig-" > version ".tar.bz2")) > + (patches (search-patches "fontconfig-charwidth-symbol-confli= ct.patch")) > (sha256 (base32 > "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6j= dl")))) > (build-system gnu-build-system) > diff --git a/gnu/packages/patches/fontconfig-charwidth-symbol-conflict.pa= tch b/gnu/packages/patches/fontconfig-charwidth-symbol-conflict.patch > new file mode 100644 > index 000000000..8ebe33bc6 > --- /dev/null > +++ b/gnu/packages/patches/fontconfig-charwidth-symbol-conflict.patch > @@ -0,0 +1,82 @@ > +The first patch is copied from the upstream source repository: > + > +https://cgit.freedesktop.org/fontconfig/commit/?id=3D1ab5258f7c2abfafcd6= 3a760ca08bf93591912da > + > +The second patch is adapted from a message to from the OpenEmbedded mail= ing list: > + > +http://lists.openembedded.org/pipermail/openembedded-core/2016-December/= 130213.html > + > +From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Wed, 14 Dec 2016 16:11:05 -0800 > +Subject: Avoid conflicts with integer width macros from TS 18661-1:2014 > + > +glibc 2.25+ has now defined these macros in > +https://sourceware.org/git/?p=3Dglibc.git;a=3Dcommit;h=3D5b17fd0da62bf92= 3cb61d1bb7b08cf2e1f1f9c1a > + > +Create an alias for FC_CHAR_WIDTH for ABI compatibility > + > +Signed-off-by: Khem Raj > + > +diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h > +index 5c72b22..070a557 100644 > +--- a/fontconfig/fontconfig.h > ++++ b/fontconfig/fontconfig.h > +@@ -128,7 +128,8 @@ typedef int FcBool; > + #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION > +=20 > + /* Adjust outline rasterizer */ > +-#define FC_CHAR_WIDTH "charwidth" /* Int */ > ++#define FC_CHARWIDTH "charwidth" /* Int */ > ++#define FC_CHAR_WIDTH FC_CHARWIDTH > + #define FC_CHAR_HEIGHT "charheight"/* Int */ > + #define FC_MATRIX "matrix" /* FcMatrix */ > +=20 > +diff --git a/src/fcobjs.h b/src/fcobjs.h > +index 1fc4f65..d27864b 100644 > +--- a/src/fcobjs.h > ++++ b/src/fcobjs.h > +@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) > + FC_OBJECT (RGBA, FcTypeInteger, NULL) > + FC_OBJECT (SCALE, FcTypeDouble, NULL) > + FC_OBJECT (MINSPACE, FcTypeBool, NULL) > +-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) > ++FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) > + FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) > + FC_OBJECT (MATRIX, FcTypeMatrix, NULL) > + FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) > +--=20 > +cgit v0.10.2 > + > +From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Sun, 11 Dec 2016 14:32:00 -0800 > +Subject: [PATCH] Avoid conflicts with integer width macros from TS > + 18661-1:2014 > + > +glibc 2.25+ has now defined these macros in > +https://sourceware.org/git/?p=3Dglibc.git;a=3Dcommit;h=3D5b17fd0da62bf92= 3cb61d1bb7b08cf2e1f1f9c1a > + > +Signed-off-by: Khem Raj > +--- > +Upstream-Status: Submitted > + > + fontconfig/fontconfig.h | 2 +- > + src/fcobjs.h | 2 +- > + src/fcobjshash.gperf | 2 +- > + src/fcobjshash.h | 2 +- > + 4 files changed, 4 insertions(+), 4 deletions(-) > + > +Index: fontconfig-2.12.1/src/fcobjshash.h > +=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 > +--- fontconfig-2.12.1.orig/src/fcobjshash.h > ++++ fontconfig-2.12.1/src/fcobjshash.h > +@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char > + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNa= mePool_str43,FC_CHARSET_OBJECT}, > + {-1}, > + #line 47 "fcobjshash.gperf" > +- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNa= mePool_str45,FC_CHAR_WIDTH_OBJECT}, > ++ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNa= mePool_str45,FC_CHARWIDTH_OBJECT}, > + #line 48 "fcobjshash.gperf" > + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNa= mePool_str46,FC_CHAR_HEIGHT_OBJECT}, > + #line 55 "fcobjshash.gperf" > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliy8TcACgkQoqBt8qM6 VPpq3Af+NSCZ0H90rcaBLfOUwcg52JEU6uOLsLPgEC2LqojO56l7+JtsYyp/2dyk gZ9mRjU1vmz3E53zl1C7R6VDtk3KAx6gba/nIGA+6wkA/Ug63BiFdjG3y7+y5l2e UN9/SlBDtdeohkcuj6I7sdKtNsJgO1SUIbyRzpcpyncDk20alv+EVfk7OUnd1GkL /l9vXJ2LLs1xTcwWon5e6yhjHSgNHtXR+svVVBTTw3V6lTopr0AJLz6NxJ7Rwt2w AH9Fa2PxXopXF8jr6Zo4nnSHa10zbxX+Eon5SerCRb4UWSEO2qHDfGP6LspXzTOP sflPSjG9u5kqQZzMn04GizFwXQNQGQ== =uv9j -----END PGP SIGNATURE----- --=-=-=--