From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 13 May 2022 09:55:22 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1npQ8v-00BkYO-L0 for lore@lore.pengutronix.de; Fri, 13 May 2022 09:55:22 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1npQ8t-0000wd-P1; Fri, 13 May 2022 09:55:19 +0200 Received: from mail-eopbgr140077.outbound.protection.outlook.com ([40.107.14.77] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1npQ8W-0000wJ-R2 for ptxdist@pengutronix.de; Fri, 13 May 2022 09:55:00 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NC0InO2cFRp8U2q+IJepFLyvq37pWg+pgfb5rCO+vu2Nt1kKMedf9ARUvcFmIvXtglBimFVglIq+HdbJUGhXVOd52D1rjD2PhyYiZ5X+kuPR3CmXeiosEDslsNSFvdciAdG1LS2ThWGOIKhw0wLbSZ4g+oqr29DT59xqgfiMECyf0SR937f/9l5GscVfW6MzTi7uZKA3sQntAwRR2V7Bp3mWsBHHaAuavOtmIPIaUTgdycjpO8Z3FXd9PAnupkyJ3TtQPSr62RogvQHKLYcingKXyS/FuIti+24PO67rQ/hXWYkwwND1vs0hs2PedAzL3vhs4E4j/rfympxuO2WJzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g6XzsL43VNwRjTQ0eRR3r47sNyurWsmpmzD4JkDDznI=; b=hdFN2/gIpJqc8p3617LmeakalBCVwH0nQWr+dKfyjAAksaKHfR3NI0QpV71TopjO5Lhv+EaAA/VTdhYP/N6YX4ObILvuRldwMrl/MqV24pFMXhQDwcxIpIUfXcT5vwd1BZ/YVwwPcKF6P7vO8yXAHT9FiPy7/Y4SStltjMhl5dHvcUAG/prGA6EcTPhwE1sdjDbYKjiddDWNfCf51/0d2X3Q+7Go2GY4LlR+dJZYWQVPdWg+0l7OhZMa/we2LPE8mc2Prv5XitTG2FQ7qjoHZ1nHf4gi4BUGGqX0okb28t9+Wfj4Q6RwJU8rk44ysQven+7rkVcKLx5K5XM9dJn2qQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g6XzsL43VNwRjTQ0eRR3r47sNyurWsmpmzD4JkDDznI=; b=Urow0igOPxW7TuxLuRlZRpix2gyFBfbOvMuBlnJhTAuengBSKL6iizxZ7u6l7hv11sMiKoCTF+SsvFr9+6ejzIq0fzHBfMBCNvJRQcEyYzk9O+5sg9Ix8nLO5cWULfhh/yIu7ZwUl7HahVbMpk1rBz/OHdb3ubh0BwP3P7MYMe8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from AM9P251MB0330.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:41c::6) by AM9P251MB0350.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:416::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Fri, 13 May 2022 07:54:54 +0000 Received: from AM9P251MB0330.EURP251.PROD.OUTLOOK.COM ([fe80::882d:20a7:2f35:6fa6]) by AM9P251MB0330.EURP251.PROD.OUTLOOK.COM ([fe80::882d:20a7:2f35:6fa6%5]) with mapi id 15.20.5250.014; Fri, 13 May 2022 07:54:54 +0000 From: Linnea Gunnarsson To: ptxdist@pengutronix.de Date: Fri, 13 May 2022 09:54:42 +0200 Message-Id: <20220513075442.48049-1-linnea.gunnarsson@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0035.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:9::9) To AM9P251MB0330.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:41c::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2c57f33-ed18-42b7-6304-08da34b5dddb X-MS-TrafficTypeDiagnostic: AM9P251MB0350:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PZ5PPwIw44YECbva8EQjNIRdm/C8Z0K4vrJKnjPiUf0NmfmKtWLMp923huDIjvnybSAygRlD2L3GWzTU99r7vr+i02RJjajBQdtIj/dy8xkBkNt4ecjl1gzzfuLjGz3hhB1d0Vl4/Cn8vxTnB4d4XcNkYnt3NDXmhDNHfIan6KptifYgngj5Vc+Jmfr+Lr6w1vSFRb+IdERJ5SPU5PkJQABGRC7FRhsdb3LI8Tu6tVQIcxNd7kqsNOQTI6ZQgwv6eaJFQVFCpYWp6xMZK/pmWYjnJh659eEAmRjZVf5SqFzbYDcq4zlfF8WvjSQgGoNz8iIUMEch+p2FpdsfxbiKQtnvZiTHo7aE3edhtbUYeQfMqnZt4TCPmwvwQ6+ytkPzxCQLc2XvMPp/3Oa2lcwY8bL3u4R/Uqg51eoQoJjRAnpbKkFbx69mjrwpM8Py71qidQcrtQG8U1J6dO7+2e+ZGTIpipQSt0KmBQWnf6r+jHf5VJrSSQTvYvhcvLm+uPMPPMUAaAosbcsV0eD1jmVy/uWWGv9irUKb7NtveiSOMtn/UcA4+us3lb1pJxVEkXBeCoZg3tUiAYmVx7DHqd17O4DS5aAFovMqBiYFdfcZX0pmODMWotLrHrL1VNQdySLif6a6lsoGlTJB6WDX1PxCn4DOiZSk7NVtEWtPXth0wm+P0mieVp+Ix7JX7rvBzd5C8cEDmRfUMx6kmbSRh20AoyWFgI6KtWDa0C1JStq/CvMCz5LkaAZwOarwGKhpDFbDs7/beG7g/sSelO9Lrt21bvLetlQhs2AbT20ZNP+rOkNcJINbw2fYcBBF5iqecR/m X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9P251MB0330.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(39830400003)(136003)(376002)(396003)(366004)(346002)(6512007)(36756003)(316002)(38100700002)(38350700002)(83380400001)(26005)(6916009)(8936002)(186003)(6506007)(86362001)(8676002)(66476007)(66556008)(66946007)(6666004)(44832011)(5660300002)(966005)(1076003)(2616005)(2906002)(6486002)(508600001)(52116002)(134885004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WZjahoaYSpEzExf7UaKkfhF8fOCLp7760j2Tlief1rmYkN134n5YXOI09pae?= =?us-ascii?Q?XsH/4tz8h0mrdpqk/q6rnDJJDef0GTU0nOcIrpqCIqPMN5Nx5lS054mpFaeD?= =?us-ascii?Q?BriERoXxZ9yWfWhBEyZMQEnwPj3S2haW63VghquoQo1Ygfv0fYt7iVRC0UmY?= =?us-ascii?Q?qoPNBT7SJzCnPWT7Q4P8upjkCYOJadBsUlGdlb+6n2wjd9O0fWPHyJwzALis?= =?us-ascii?Q?T9DbfoEyITUyVzPk/WxGNQbnzAF0oB41mWzKZMitRBGd+MRqQZ8b/T9FUB+U?= =?us-ascii?Q?+WYx/3cU4y8SatQZMhaLFomO7FfPrwUW0MiNBAsfYZ92Kbp526Hd7ySRVSyi?= =?us-ascii?Q?sp9n6ddennIOj5fnwvsmlhwK4n7z5AnVIG0x/L41AfQiqQpxz9bmMie5L4KY?= =?us-ascii?Q?YjjDvK6wbMGLeZ2f+JA1w1i9latf5eQEFp3Wr7uEawlkAAqQcG1X0PMjVelu?= =?us-ascii?Q?EgMO5mTkSjr1IvEK9717IbXFdxOfmhHT5oWkIsqYAFNKy8gl/gg6GXNzbdD7?= =?us-ascii?Q?9CLi/t+SBaW/t5zJ0A7phIdvbafSDVeDUMToOJza5qJZcjrVADY8G0Pn70oq?= =?us-ascii?Q?C3ttbVSk3/paU4lwwHmizBwyz9QcVB3gv+trMo0D9IGTH7PnppAb7Fhp83xW?= =?us-ascii?Q?Y8+qX/U3yXGMTp2EYUR8cGu0X7vbvQtr/Wv1VpTukGgWF+7sKv90R43Ay9/6?= =?us-ascii?Q?PvAIKdYLjgcrf5hi3FXncDB/XzJbDc6XqQDKsfkcktaltYkBG+4HC1BBgJFK?= =?us-ascii?Q?gzqdGJLvEUS3/XsQObY0hiO1X5Pw7IutPbRT6BxplbzyrEblmst87J+SRjIW?= =?us-ascii?Q?IdIs4Q5C/eM/OI0mLFr6+3WRGpcl3lSoOtGmtCVpItkR0KavEn8bt8MP3SgV?= =?us-ascii?Q?jR2RI0QKwGnITuy+8UNZidjWOyEciWLumTt3CVv7R/U3ZfH3RIoS+daTUEJB?= =?us-ascii?Q?0zcsfQgCYbhLBIvqXQJKF/Mh5Ssm302AuwlprxPIoAk8bVgimspwWI3vIaTi?= =?us-ascii?Q?wgWHQgfUzrk4KruAMSJ+9LZoH2rlNklQlSn4BoihFQSR2TP5T9v6b+8D14dg?= =?us-ascii?Q?n5VSFzolcRRyTt5RzR7Jbji/FamWWraFaU+QkLMyYJ7VUH+sSu2FlTzRJLwK?= =?us-ascii?Q?abMU6fsapztTWEkqQr8Iymw1YMJMJTQwXK2TiADKtJzhqrcjBwWTuUl3z6sB?= =?us-ascii?Q?OQljfkCsqCld3s7X3RTyPBrJaVK8S+QL38ymbBAGCL+tryIGCoUTOnVpuqZ1?= =?us-ascii?Q?C/lQKSRdqyMQyv/Xn6NUii1V+drHtrKEQbnmbD4DquJ4LV33QHeMWYytzDLK?= =?us-ascii?Q?nxSyLI6ckGVUueEXZu/fpnPRoZ8qyULZugy/NgpBGBQwgF4uiOAaGMYPEzxs?= =?us-ascii?Q?Vkcf5LxDZx0Jp6zJEefS+a12CtGCKnGPCajBRrajgnGjAIahXYlMEnhB4bfX?= =?us-ascii?Q?/oVJWdnOBpoWMiM8flF8RGjwuijaVgu0ND5hwsyzmqJJWROLmFeURpn/9a1u?= =?us-ascii?Q?4UZZ9Sgpr5yoc96cFh6qyMibZuNwJSvE46pgrUohVhVdVb7L7ISGcU4pDs/t?= =?us-ascii?Q?JGwu1T+ozRE6RspEJYyMBLy/8Xv7q05CMFDmeMVYJbpJKyX8f2MKFiy/VfFL?= =?us-ascii?Q?/xUDNpWZ1VXmsUbNwLZVWq4S3FTkBGrnVjRdJYSWHpsVE5pg9chuHgtD3t2N?= =?us-ascii?Q?/dslN3uqsB0dIj6kbVm0bna35AIa/FjQii0qQkxwQ9g2KZBRHbcB3ZaEhEzn?= =?us-ascii?Q?tFSByRCqQc2ClspMDZSupvpVy23bi5zSIHpoiAEYtFGMiqKyGNff?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2c57f33-ed18-42b7-6304-08da34b5dddb X-MS-Exchange-CrossTenant-AuthSource: AM9P251MB0330.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 07:54:54.3619 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kAjtKpj5wjNTvRaYi++ev9eH+Yda+FT73LS2G9O3Mat/Vgw66Ucaa4CH3QWfXh3wd2vWBBvhFwaWkSShUXb3fStv5n/l24Xj0fjuN/RIyTc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P251MB0350 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] Freetype: version bump 2.11.1 -> 2.12.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false - It now handles OT-SVG fonts, can be controlled with the FT_CONFIG_OPTION_SVG macro. - Some improvements on font handling and other things. - Some bug fixes. - The internal zlib is in sync with zlib v. 1.2.12. - In version 2.12.1 there are some fixes for bugs introduced in version 2.12.0. - New config option for demo. - New md5sum for license, its a new url and some text changes, nothing important. Signed-off-by: Linnea Gunnarsson --- patches/freetype-2.11.1/series | 4 - .../autogen.sh | 0 ...e-config-and-freetype2.pc-correctly.patch} | 98 ++++++++----------- patches/freetype-2.12.1/series | 1 + rules/freetype.make | 6 +- 5 files changed, 46 insertions(+), 63 deletions(-) delete mode 100644 patches/freetype-2.11.1/series rename patches/{freetype-2.11.1 => freetype-2.12.1}/autogen.sh (100%) rename patches/{freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch => freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch} (54%) create mode 100644 patches/freetype-2.12.1/series diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.11.1/series deleted file mode 100644 index ab166a354..000000000 --- a/patches/freetype-2.11.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-generate-freetype-config-and-freetype2.pc-correctly.patch -# c59ef464a7fe3a60ef114485523f346e - git-ptx-patches magic diff --git a/patches/freetype-2.11.1/autogen.sh b/patches/freetype-2.12.1/autogen.sh similarity index 100% rename from patches/freetype-2.11.1/autogen.sh rename to patches/freetype-2.12.1/autogen.sh diff --git a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch similarity index 54% rename from patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch rename to patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch index 9f6d6b5fc..1dc42fafe 100644 --- a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch +++ b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch @@ -1,35 +1,48 @@ -From: Michael Olbrich -Date: Wed, 20 Nov 2013 14:06:25 +0100 -Subject: [PATCH] generate freetype-config and freetype2.pc correctly - -Signed-off-by: Michael Olbrich ---- - builds/unix/configure.ac | 4 +++- - builds/unix/freetype-config.in | 19 ++++++------------- - builds/unix/freetype2.in | 14 +++++++------- - builds/unix/unix-def.in | 3 --- - 4 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac -index d1b7f1a78c59..11490364fd51 100644 ---- a/builds/unix/configure.ac -+++ b/builds/unix/configure.ac -@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) +diff -ruN a/builds/unix/configure.ac b/builds/unix/configure.ac +--- a/builds/unix/configure.ac 2022-05-11 13:51:49.525055650 +0200 ++++ b/builds/unix/configure.ac 2022-05-11 13:52:30.389952135 +0200 +@@ -1147,7 +1147,9 @@ # and `builds/unix/unix-cc.mk' that will be used by the build system # AC_CONFIG_FILES([unix-cc.mk:unix-cc.in - unix-def.mk:unix-def.in]) + unix-def.mk:unix-def.in -+ freetype-config:freetype-config.in -+ freetype2.pc:freetype2.in]) ++ freetype-config:freetype-config.in ++ freetype2.pc:freetype2.in]) AC_OUTPUT -diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index 4edb092d09c4..f0864cbec48b 100644 ---- a/builds/unix/freetype-config.in -+++ b/builds/unix/freetype-config.in -@@ -16,13 +16,6 @@ export LC_ALL +diff -ruN a/builds/unix/freetype2.in b/builds/unix/freetype2.in +--- a/builds/unix/freetype2.in 2022-05-11 13:52:10.165508453 +0200 ++++ b/builds/unix/freetype2.in 2022-05-11 13:52:41.518196259 +0200 +@@ -1,14 +1,14 @@ +-prefix=%prefix% +-exec_prefix=%exec_prefix% +-libdir=%libdir% +-includedir=%includedir% ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: FreeType 2 + URL: https://freetype.org + Description: A free, high-quality, and portable font engine. +-Version: %ft_version% +-Requires: %PKGCONFIG_REQUIRES% +-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE% +-Libs: %PKGCONFIG_LIBS% +-Libs.private: %PKGCONFIG_LIBS_PRIVATE% ++Version: @ft_version@ ++Requires: @PKGCONFIG_REQUIRES@ ++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@ ++Libs: @PKGCONFIG_LIBS@ ++Libs.private: @PKGCONFIG_LIBS_PRIVATE@ + Cflags: -I${includedir}/freetype2 +diff -ruN a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in +--- a/builds/unix/freetype-config.in 2022-05-11 13:51:59.341270992 +0200 ++++ b/builds/unix/freetype-config.in 2022-05-11 13:52:36.646089382 +0200 +@@ -16,13 +16,6 @@ # if `pkg-config' is available, use values from `freetype2.pc' %PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1 if test $? -eq 0 ; then @@ -43,7 +56,7 @@ index 4edb092d09c4..f0864cbec48b 100644 prefix=`%PKG_CONFIG% --variable prefix freetype2` exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2` -@@ -35,17 +28,17 @@ if test $? -eq 0 ; then +@@ -35,17 +28,17 @@ dynamic_libs=`%PKG_CONFIG% --libs freetype2` static_libs=`%PKG_CONFIG% --static --libs freetype2` else @@ -67,37 +80,10 @@ index 4edb092d09c4..f0864cbec48b 100644 if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64" ; then libs_L="-L${SYSROOT}$libdir" -diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in -index 2d759ecf8bfd..f44f14cabf9a 100644 ---- a/builds/unix/freetype2.in -+++ b/builds/unix/freetype2.in -@@ -1,14 +1,14 @@ --prefix=%prefix% --exec_prefix=%exec_prefix% --libdir=%libdir% --includedir=%includedir% -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: FreeType 2 - URL: https://freetype.org - Description: A free, high-quality, and portable font engine. --Version: %ft_version% -+Version: @ft_version@ - Requires: --Requires.private: %REQUIRES_PRIVATE% -+Requires.private: @REQUIRES_PRIVATE@ - Libs: -L${libdir} -lfreetype --Libs.private: %LIBS_PRIVATE% -+Libs.private: @LIBS_PRIVATE@ - Cflags: -I${includedir}/freetype2 -diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index d0c758d03fb2..dbfc40bf303e 100644 ---- a/builds/unix/unix-def.in -+++ b/builds/unix/unix-def.in -@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in +diff -ruN a/builds/unix/unix-def.in b/builds/unix/unix-def.in +--- a/builds/unix/unix-def.in 2022-05-11 13:52:17.861677285 +0200 ++++ b/builds/unix/unix-def.in 2022-05-11 13:52:49.614373872 +0200 +@@ -157,7 +157,4 @@ # defines whether we should install `freetype-config' or not INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@ diff --git a/patches/freetype-2.12.1/series b/patches/freetype-2.12.1/series new file mode 100644 index 000000000..e1eb8923e --- /dev/null +++ b/patches/freetype-2.12.1/series @@ -0,0 +1 @@ +generate-freetype-config-and-freetype2.pc-correctly.patch diff --git a/rules/freetype.make b/rules/freetype.make index c65a2dbcf..7008ebb78 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.11.1 -FREETYPE_MD5 := 24e79233d607ded439ef36ff1f3ab68f +FREETYPE_VERSION := 2.12.1 +FREETYPE_MD5 := 7f7cd7c706d8e402354305c1c59e3ff2 FREETYPE := freetype-$(FREETYPE_VERSION) FREETYPE_SUFFIX := tar.xz FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) @@ -26,7 +26,7 @@ FREETYPE_LICENSE_FILES := \ file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ - file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \ + file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \ file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 FREETYPE_URL := \ -- 2.34.1