From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 09 Apr 2023 10:05: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 1plQ37-00FAn6-Nl for lore@lore.pengutronix.de; Sun, 09 Apr 2023 10:05: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 1plQ37-000231-Un; Sun, 09 Apr 2023 10:05:21 +0200 Received: from mail-am7eur03on2062.outbound.protection.outlook.com ([40.107.105.62] helo=EUR03-AM7-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 1plQ2z-00022B-48 for ptxdist@pengutronix.de; Sun, 09 Apr 2023 10:05:14 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ABiyfw+NWTgKdsbcdrEpAi5MlExRkW3ZsFHY4SEqzirhkXjlnRUOE4Nt0gwPW1japlqhRbj8W0JL2v/rwvefW1qK3Eoi9v7GsMPdSQskQzd4fXWiMQaaztk8S1FGMjLrcOmW7PfS7ydVryZEcyNDfIzBhlIGs3GaJK4LYmzOEHJV+chkdw4kyiHB+lfCS8kaGiR9UmxEgxiQKlc++jAobFn3SCiYQtkFax4I+Nw0h5AUfmo4R7orGqAkqiAT+2PU4utrxbyyc7y2rP8eA53zFSr6A0o/icAf37qXmlqzJsHBcQ8w3moMxWxAK36YkIh9v8XlhT576wpg5utiE3E4OQ== 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=OfAegBLPhOCshQnjQnNmxRxZlb3zBkY6q4D1UO/fubA=; b=fqK2DDs3HlqdKiqmoVViPKqDtzDJrDO6W0Gs8qC97MumRwfb7Oara29LKyYoWuwrIWi0uxeTqSl6CGhKf3RtNYno+WeGud1drNrb394xll7oiwyiaiU+IPIthSbl3uFjdAWDSEjufiDgz9RtZtAYtMWb+bqklqUAH0Sw4pFzmiZnySE66cEVOnE6dKVgcF4IjVUxchGF2mhdOUsgHCaEqycgmNjSaOvJYcGduw0iK/Gb7Krly/K7APO4a37oASHi6kQJ0M17L0OQxnkQlJ/ZKWxAH8+mh0vlaLwfh3bz4LQxbCkAGMFYQFQn7gwgk8JaVqU34yIm4/2ZbeNNUJPA3w== 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=OfAegBLPhOCshQnjQnNmxRxZlb3zBkY6q4D1UO/fubA=; b=cZr7BCdw4YdZAuFXpEoZ3tZ2gBd4EzaGqfulAjwJBiDf3nPmXBrN+S6zcpowyH+rMSMsK6VyVHSc0AqI/movenB32Gjs++wwM/3AalLjbz35GSIvdXc812B41ipy+QS8/fwFwUYnwb4Ho4TRv0TZnMUY5TX9lLlu/pirnZ42rkA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DB9P251MB0665.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:325::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.33; Sun, 9 Apr 2023 08:05:10 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::34c0:dc94:1803:278a]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::34c0:dc94:1803:278a%7]) with mapi id 15.20.6254.035; Sun, 9 Apr 2023 08:05:10 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Sun, 9 Apr 2023 10:05:03 +0200 Message-Id: <20230409080503.561247-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GVYP280CA0015.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:fa::13) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|DB9P251MB0665:EE_ X-MS-Office365-Filtering-Correlation-Id: 2800501d-9618-4b7a-2fe8-08db38d1240a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FiRf5Im2XK2A8oDtbL2jGALPcjn4Qf6/XWVpuh7vIwP6eMvb5BAWXF0EGHoYh23QYxAQcWAFHtYTPDbfcdDyVQzAsfDYT2B/Y+s8nbQf1ZtlcFWvA/701EU+c/T7fCtw2ZbNQEl/oTDULItkoy3Yr/WSkrkC3OxmTyGCMbTfzHf31HA+Z0cWeLh0KAwbI1TNB6L652ftGS8GRRO0d9kSQGelracV9yRUBLXHd3DHb6E8F1AVgtxnZqPDRfwtt4oCLSyPm29LY1fS8uJ+rRBgHdgE2FIGEjuNHTZUtfiVvnpWhEkY9l/Duc4jmADbOdaQR+pdU46RoPunpuTpHbd2igREdw2Z/C07/1MiixqRroip3TKagdv0us4bbBRYcV+YfXTo0RaCZ3mPExGwjINK9TGmpqiDY23zeaHFzm+upZe7Y2AFFBZFWwPv/vL///7ZQQm9c7Vxup7/Cplwtk92pVGmbfWMxpwdYeKbg88XIOoRsT3Pq4uHfklDc79xKPtEeYpuFeAn5fUurvVvU1ivCfvjHwWXgfIMU7EV/4FVmcz449Q/GKBBJndSFL1Dh0iJ2G+/Ei0Dk8PncpPPVg22qncc7y2wToXfCfKLLIXQDGKIvPgEGhox3fbzzTECFPvr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(396003)(39830400003)(136003)(366004)(346002)(376002)(451199021)(8676002)(6666004)(38100700002)(41300700001)(36756003)(38350700002)(5660300002)(44832011)(2906002)(316002)(86362001)(8936002)(66556008)(66946007)(66476007)(6916009)(2616005)(83380400001)(26005)(1076003)(6506007)(478600001)(6512007)(6486002)(52116002)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fsCT7B2REAY1nsYn9xXHDRYFbOd8hzgYDzM49Uh8VskT465UK48TE3LyEpdP?= =?us-ascii?Q?mnQfbcH9RDQrGf5Rx7+8ji2Gwg8brfwf5LfJkrrGsoYamKWJOsQMnQ12fWkn?= =?us-ascii?Q?KLaKZfBavs1QQS/NmKXomS27IU3TCmlzCmkfGz1ZzqPWaJmCI+1rOSLqdj+3?= =?us-ascii?Q?BAeR6hdFcix1ctUW37wf1u0fuOoalJju4YsLh/T4HR3BvMAvE9UxPFBhygO4?= =?us-ascii?Q?o1b4k5L+9zHm648VLj7udhtz67EGIwRaanul+bWzy9AUPeqrj9/5qZ+xM0SB?= =?us-ascii?Q?vRi89tdP803DKcjdM88iRY5p02bPwRiLfJ0BVhyvMAi9RsU9/mvQ5Pfn3uxK?= =?us-ascii?Q?pgeH4+iNWY2H6SXKaR0xlCorB0juFGfjYZ1brG4FxvwnWVYbtVik0eP1z58p?= =?us-ascii?Q?/4HrQ+ncxvuwsb+e8lPE6oFKAcI96nK7U4CHE8Xfy3zTJ2JvtEjWaiNEo4aA?= =?us-ascii?Q?xioetzcfsQ2clizDrvUfe8hBHsQaDeAR10cnXf0DhuWwYrpjZ90pRyHGjhWG?= =?us-ascii?Q?n1vEa8nq385t2QyFn0CGcVj4Ih5C8R6M+PZGWLlk5U8cJXJUlYEYvmXxNYNe?= =?us-ascii?Q?QrVbZXl7eO4sauBrIYDqcSn6ZcoJA9sLURb8PtoELgk7O6jc8KuKIWUmbd+3?= =?us-ascii?Q?Q7EuC2QsyERQwwBD4F07Vz8oZsi9yNiKS4ZRoA/d9ka4Opgp6r79v6WhpNRE?= =?us-ascii?Q?LZpNXWuGgOYgKKSmdfyBrHzwPF7nJfuNvy7iAxpaZ96E0WAXOuGYF5SHQ+Ih?= =?us-ascii?Q?4sHordABQncEmA5Llgc7rt2GeznZxD4634+qm08HP3rT7gzQlJWrVU8VdJYJ?= =?us-ascii?Q?yGrpvXONXnNHeQiSgOamjhLzqXN5UhR7yYSbQ4CYKbX14VnOhfR5c6huPOCn?= =?us-ascii?Q?jKQt/W92ayIxu8gAiarwJoY+oXvTmt8gqaq7fCGw2qgx0bEzzUCTGD1crh8S?= =?us-ascii?Q?2s1L9aT9+CGl6Yi0qGvREPu/VMtFf68sotZghOc1oIKeyRPAP4KIbOHjkY1U?= =?us-ascii?Q?MiIdoogux+34U4ktB1YXvgCIL4s4T1POFy43XDHXgNrBS0D/amUwyH4iDf/3?= =?us-ascii?Q?re+s+6WMSmgcR5ucB9sFcEEsv2rlmH6X7o2q66OofVQIuwN+6xbpEIsG86hh?= =?us-ascii?Q?X0hWjFySmQZ6/WJmxSsIkqJDXFbRc5RDO1tpdFXbZw4FyLl9ihySI5WO/pv0?= =?us-ascii?Q?U6sjrrwskWiEFmKMCDErzkw5tBh+zXRd6DUUbvvgZmWTOaI6YoUzQ0kPmSZl?= =?us-ascii?Q?szDxNrSdZIpIblRRDgo2B/UiAXSex0yKzZItuHNL6aCbqxTuEBLRNcwT0Zku?= =?us-ascii?Q?cYeo8QWf2zR6bArTcZMbTeWTMQGtsA9e4OCHAuFrtUOV2XQbZYVXvNtfSod5?= =?us-ascii?Q?7D0NjbTccJ39+xciMc+y9hFwaSm0yTNF3k7dmPodkEySNMRbnUu4BuZoiM8F?= =?us-ascii?Q?WELAtY9/Dkj7q2IFzcgqacaY90WIRVONXuazn7NOcEn/b4rjDC9BO6ep3UdC?= =?us-ascii?Q?FiM+J3PZKhUFtlZUohTu9MBzk7pSSEeWDJ8ymgwGdq8t+7uaDii3W2qe+YRe?= =?us-ascii?Q?cJ0nyKJIYLgkLy4CmuCiwCM+CDZ/V5GDtSYGjPxSyLP1QrHSExY2Ie2GpGhW?= =?us-ascii?Q?Jw=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2800501d-9618-4b7a-2fe8-08db38d1240a X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 08:05:10.8116 (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: IDlD+a7kUp+ve6nLuwN4QMAOXNmc5uJZFSNt41g6lWjZZSMRCVqNzI1qgc1n5Ug0lTLbaszk8sW+A/tINtAAXJ9mjBZoMeF0HzXtFLEXv2E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P251MB0665 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] cairo: Remove doc installation. 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 Even though docs are build disabled, cairo proceeds to install them. This results in an ugly install error (which ptxdist ignores?). Just remove it. Signed-off-by: Christian Melki --- ...ic-Makefile.in-Remove-install-target.patch | 65 +++++++++++++++++++ patches/cairo-1.16.0/series | 3 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch diff --git a/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch b/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch new file mode 100644 index 000000000..69bc2c677 --- /dev/null +++ b/patches/cairo-1.16.0/0009-doc-public-Makefile.in-Remove-install-target.patch @@ -0,0 +1,65 @@ +From: Christian Melki +Date: Sat, 8 Apr 2023 14:28:37 +0200 +Subject: [PATCH] doc/public/Makefile.in: Remove install target. + +Even though all doc targets were removed from the build, +Cairo pursues to install documentation which breaks. +Just remove it. + +Signed-off-by: Christian Melki +--- + build/Makefile.am.gtk-doc | 15 --------------- + doc/public/Makefile.in | 14 -------------- + 2 files changed, 29 deletions(-) + +diff --git a/build/Makefile.am.gtk-doc b/build/Makefile.am.gtk-doc +index 56aa4957d32e..13a60c1326e4 100644 +--- a/build/Makefile.am.gtk-doc ++++ b/build/Makefile.am.gtk-doc +@@ -130,21 +130,6 @@ maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- -installfiles=`echo $(srcdir)/html/*`; \ +- if test "$$installfiles" = '$(srcdir)/html/*'; \ +- then echo '-- Nothing to install' ; \ +- else \ +- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ +- for i in $$installfiles; do \ +- echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ +- done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- which gtkdoc-rebase >/dev/null && \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ +- fi +- + + uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* +diff --git a/doc/public/Makefile.in b/doc/public/Makefile.in +index cb7d90a6e054..dbfa211b0a51 100644 +--- a/doc/public/Makefile.in ++++ b/doc/public/Makefile.in +@@ -1871,20 +1871,6 @@ maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: +- -installfiles=`echo $(srcdir)/html/*`; \ +- if test "$$installfiles" = '$(srcdir)/html/*'; \ +- then echo '-- Nothing to install' ; \ +- else \ +- $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ +- for i in $$installfiles; do \ +- echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ +- done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- which gtkdoc-rebase >/dev/null && \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ +- fi + + uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series index 0904871d9..938366ebb 100644 --- a/patches/cairo-1.16.0/series +++ b/patches/cairo-1.16.0/series @@ -8,4 +8,5 @@ 0006-There-is-a-potential-infinite-loop-in-function-_arc_.patch 0007-There-is-an-assertion-in-function-_cairo_arc_in_dire.patch 0008-Fix-stack-buffer-overflow.patch -# 1e1d9f93062b124d13fb5d535d4df3e1 - git-ptx-patches magic +0009-doc-public-Makefile.in-Remove-install-target.patch +# 7dd9e257a31197339f99d5ae03e77c9b - git-ptx-patches magic -- 2.34.1