From unknown Sun Jun 22 11:34:22 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#29677 <29677@debbugs.gnu.org> To: bug#29677 <29677@debbugs.gnu.org> Subject: Status: [PATCH core-updates] gnu: fontconfig: Update to 2.12.6. Reply-To: bug#29677 <29677@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:34:22 +0000 retitle 29677 [PATCH core-updates] gnu: fontconfig: Update to 2.12.6. reassign 29677 guix-patches submitter 29677 Marius Bakke severity 29677 normal tag 29677 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 12 12:07:31 2017 Received: (at submit) by debbugs.gnu.org; 12 Dec 2017 17:07:31 +0000 Received: from localhost ([127.0.0.1]:58794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOo1i-0004ui-RQ for submit@debbugs.gnu.org; Tue, 12 Dec 2017 12:07:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOo1e-0004uS-8k for submit@debbugs.gnu.org; Tue, 12 Dec 2017 12:07:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOo1S-0005q8-SB for submit@debbugs.gnu.org; Tue, 12 Dec 2017 12:07:21 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52724) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOo1S-0005ps-OO for submit@debbugs.gnu.org; Tue, 12 Dec 2017 12:07:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOo1R-0006qx-3T for guix-patches@gnu.org; Tue, 12 Dec 2017 12:07:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOo1N-0005hK-II for guix-patches@gnu.org; Tue, 12 Dec 2017 12:07:13 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:34443) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOo1N-0005eL-B8 for guix-patches@gnu.org; Tue, 12 Dec 2017 12:07:09 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8FE84201FF; Tue, 12 Dec 2017 12:07:07 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 12 Dec 2017 12:07:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=CLVdIjaqu/ld0Noqk0hWjbZgkvpEHuKAo7aULLa+W Mc=; b=ovHz4sIlfRcGBFPFMOAdoVtd9CtArPrHsrJEAeUm3X+w6cIqGNHIFBNiU YOi5FOa89C7+ZwEpFSycWN3RrbaOCIG5zIm8e3mV1lZWj1ERqGFP8P+Jk/X7lQrg pPWC2Ej8uwvJoGdPKcHG4RtakGNqTUmOZ+4958GLOeuhqUtBDbDi0OWezmcX83sv 3Wb8wRHWiUb9I0vQw+OtsruvsP8H878FyjHhVAPhwHhf6CceGATCZjJZSTdO7qqL YuJsXkMQj3Bk0YrkUCqKeIesZz20ioMzRuICCoLeB13qosO485RRGG1Ue2VK3aXU uM9whNxxozKjO6Zpw+pIOIR3HXh1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=CLVdIjaqu/ld0Noqk 0hWjbZgkvpEHuKAo7aULLa+WMc=; b=DlndNRyxmR80QV6M2ig1cDfsgQbMngOu7 t5wDHsIuVLbu96Ybtkw+7V/vZy5iZy6tlZwZv1o+YKFfiqRnMtbwXq61VRLV2+Us uIHFyf7dF34mK6t/ungqbpDJ+o107oFeq3WJk2pzMc2uP9gxz3CdVzP27s40u0hO 4HUM5VG3XXhx77HtoIYF94ZTfQmmwLM++7jtYKN0itAU2xoBOrxyDyWlr5EPtOXH FqnBSEgN60ESUYxIiKiumhfeLOMK1ojk+L17P+xF5BLHCFgOImLdz/jfjzM0SNnr lofp3FpMVtjefPufzW59xiN0c2DyTrv6q9i1yvpcG0MNxa4GKTG1w== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 188E07E0E6; Tue, 12 Dec 2017 12:07:06 -0500 (EST) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: fontconfig: Update to 2.12.6. Date: Tue, 12 Dec 2017 18:07:02 +0100 Message-Id: <20171212170703.19215-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.15.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) Gperf is now a hard dependency. * gnu/packages/patches/fontconfig-remove-debug-printf.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/fontutils.scm (fontconfig): Update to 2.12.6. [source]: Add 'fontconfig-remove-debug-printf.patch'. [arguments]: Remove 'regenerate-fcobjshash' phase. --- gnu/local.mk | 1 + gnu/packages/fontutils.scm | 14 ++++---------- .../patches/fontconfig-remove-debug-printf.patch | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/fontconfig-remove-debug-printf.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b38ce83d..5418d1418 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -636,6 +636,7 @@ dist_patch_DATA = \ %D%/packages/patches/fltk-xfont-on-demand.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ + %D%/packages/patches/fontconfig-remove-debug-printf.patch \ %D%/packages/patches/freeimage-CVE-2015-0852.patch \ %D%/packages/patches/freeimage-CVE-2016-5684.patch \ %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 42efe9130..f6addc31c 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -230,20 +230,21 @@ fonts to/from the WOFF2 format.") (define-public fontconfig (package (name "fontconfig") - (version "2.12.3") + (version "2.12.6") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/fontconfig/release/fontconfig-" version ".tar.bz2")) + (patches (search-patches "fontconfig-remove-debug-printf.patch")) (sha256 (base32 - "1ggq6jmz3mlzk4xjs615aqw9h3hq33chjn82bhli26kk09kby95x")))) + "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g")))) (build-system gnu-build-system) (propagated-inputs `(("expat" ,expat) ("freetype" ,freetype))) (inputs `(("gs-fonts" ,gs-fonts))) (native-inputs - `(("gperf" ,gperf) ; Try dropping this for > 2.12.3. + `(("gperf" ,gperf) ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags @@ -262,13 +263,6 @@ fonts to/from the WOFF2 format.") "PYTHON=false") #:phases (modify-phases %standard-phases - (add-before 'configure 'regenerate-fcobjshash - ;; XXX The pre-generated gperf files are broken. - ;; See . - (lambda _ - (delete-file "src/fcobjshash.h") - (delete-file "src/fcobjshash.gperf") - #t)) (replace 'install (lambda _ ;; Don't try to create /var/cache/fontconfig. diff --git a/gnu/packages/patches/fontconfig-remove-debug-printf.patch b/gnu/packages/patches/fontconfig-remove-debug-printf.patch new file mode 100644 index 000000000..04924a45a --- /dev/null +++ b/gnu/packages/patches/fontconfig-remove-debug-printf.patch @@ -0,0 +1,18 @@ +Fontconfig 2.12.5 and 2.12.6 was released with a stray debugging statement. +See . + +Patch copied from upstream source repository: +https://cgit.freedesktop.org/fontconfig/commit/?id=b56207a069be2574df455ede0a6ab61f44d5ca2b + +diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c +index 842a8b6..6cd5abd 100644 +--- a/fc-query/fc-query.c ++++ b/fc-query/fc-query.c +@@ -170,7 +170,6 @@ main (int argc, char **argv) + FcPattern *pat; + + id = ((instance_num << 16) + face_num); +- printf("id %d\n", id); + if (FT_New_Face (ftLibrary, argv[i], id, &face)) + break; + num_faces = face->num_faces; -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 13:33:03 2017 Received: (at 29677-done) by debbugs.gnu.org; 13 Dec 2017 18:33:04 +0000 Received: from localhost ([127.0.0.1]:60766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ePBq1-0000RQ-SL for submit@debbugs.gnu.org; Wed, 13 Dec 2017 13:33:02 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:55007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ePBpy-0000R3-Gv for 29677-done@debbugs.gnu.org; Wed, 13 Dec 2017 13:33:00 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 57585207FE for <29677-done@debbugs.gnu.org>; Wed, 13 Dec 2017 13:32:58 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 13 Dec 2017 13:32:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=4sk6YhTTBTG/Lopb+aC8ihgFh1VY5UbyYaMMsNYZRLo=; b=AtsbDCgp OpfYycQtIzmRq9+8aMzZoNzuqhu/sMRU8TPWadEM1a8Hf0nc8lw4ivjchvb/feUv 8+IDKDwOoyn+EeCR2Ecb2mK1YTFRX6Kfr7NIR2++IoOjjkI6NqjF5L0bS/pp43RY JANVyyafnbN8IA03FzCQ3OZaKp6+4s9Xpn8gTHGQEXwzHzgYcgSmWziGsfgiH3S+ +/6xg35s/WJYB9OBk0UbeO1o8HEq6bi98gGVYPZYbvGke3mabTd1V6qC01PYfKWM 25P80W6i0C6Pbnxbq3HEFCeiISkxhYNM11B29f/SfN9lEzUvWy7In5VnUev60nLf EW4n7gjknLdnuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4sk6YhTTBTG/Lopb+aC8ihgFh1VY5 UbyYaMMsNYZRLo=; b=pc20K52neg/qVl/pQhKQ9tHCz4R118KTK2bHvChYT0bQR GEnwmzZTBWZICSC1Ka2QBAZgSV9SpD8IHvej3crBUgcYeh9iXPPZdh0lD9cbLL5J KgW4QFnAP64Z8nOoWFwRH2L5WiVzus4Rro/tGulR+8u2Lb3rg4ZaSBWsKY4001Pf XmwetAJWd0peCQG2cldfMsNqrJHrS16D5GAa3BRYETtKPV5U1ni4qmJfGRnbeKsz xNTh1Cx7XG8BfSkMenB/VR8k9vZwHYfMIMYFsIEIcLV3JTCTWkD1brccXHqO8zzi AQu/j97foN4eggZzc36wzubkWgaWu8m0f1LPkos0Q== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id DA35D244AB for <29677-done@debbugs.gnu.org>; Wed, 13 Dec 2017 13:32:57 -0500 (EST) From: Marius Bakke To: 29677-done@debbugs.gnu.org Subject: Re: [PATCH core-updates] gnu: fontconfig: Update to 2.12.6. In-Reply-To: <20171212170703.19215-1-mbakke@fastmail.com> References: <20171212170703.19215-1-mbakke@fastmail.com> User-Agent: Notmuch/0.25.3 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Wed, 13 Dec 2017 19:32:56 +0100 Message-ID: <87efnywk9z.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 29677-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Gperf is now a hard dependency. > > * gnu/packages/patches/fontconfig-remove-debug-printf.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/fontutils.scm (fontconfig): Update to 2.12.6. > [source]: Add 'fontconfig-remove-debug-printf.patch'. > [arguments]: Remove 'regenerate-fcobjshash' phase. As discussed on IRC, I went ahead and pushed this and some other late heavy-impact patches since Hydra haven't gotten started yet. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAloxclgACgkQoqBt8qM6 VPrS1Af/Zw8T6pxGH9wMkeqSn+fQ7RpQl0AI6ETJajSQaUBEbzFfmoTPeulm0U3B 91k/aShvtByoBDxBQc3hY7lbRYqdJRU4lujkhnYx2lFR5K8JYoybzoioxg7/idZG EyqZZYapngOwt6qnqoHHi1XvtdvMXLb4zw0MeBSfaxvsnTUgKmWTVxMJqjg2GqPZ po4BK0X817IHVZ217OkN66oFP+i5gsX+oALzrorEJCef5v55rG9DmYpmk9hY2/1i PJ4Fs2lHv8LAoqxwpy2Jz521m7cJ5Rzlk7/YlQuNbMDmogye6U1dZP/LW2jGZxmF 4aAA/78vwxuPldLh9Y2qAO2Ymhl9qw== =WlPu -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 11:34:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 11 Jan 2018 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator