From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 13 May 2022 16:42:52 +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 1npWVI-00C25M-RX for lore@lore.pengutronix.de; Fri, 13 May 2022 16:42:52 +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 1npWVI-0000Ey-1N; Fri, 13 May 2022 16:42:52 +0200 Received: from mail-eopbgr80040.outbound.protection.outlook.com ([40.107.8.40] helo=EUR04-VI1-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 1npWV2-0000Ac-Pc for ptxdist@pengutronix.de; Fri, 13 May 2022 16:42:39 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uz+iETLYjjdFgSq/fgX0fvmKgAV5FCAaOYs1OcdpLk+2FXWbvMjZ7gcGcA2aiN057BR4s3vBYzSJL2vxHSGqZVqk2tWl8NlWdPDQ/KV22K4Yg06godXRK2mA+S0+9zxu3Ad/MjqrEV4gEG46G6RxD2I4jLu59MyyUBD9TWCGZ/aLgES+FiAw5VkMM1Y0evpQtL/eh6viMENuACBNbIIm9oDA2SpMl+Evy5YesSW6lJNiss3THDZ4GT1K4Brcvmhf7VtoIiMOMLNIRZPXFDdtFYDDGAiUMGLW5PEGfl7jpWavkcAMUQzcxJtRhNVenrlMc+cSJCtEwr5uW7sGdyFk8g== 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=K1LdSo3NqORzZiiNqc2Pbu86tKLKrTyAc2Jv5N1NiEw=; b=Cf6oVBj8Mw5ntmZnFE/JGWaBmpbKnu2cJduekbINL7TjNlk5qOM/08lNs/oqNrsrPjt56cIrVX6GIPZ78RIWZZzGJ4rGOBME3F/HH/ol9Y8lM5DT6FcYFZHXXYNHF3cZdFy+Rw0Nq1PTas8k7b0SgMIxu8yogCHFit56MLKY4T273h2ZBic8HbVhCE3ySN8vfjsMMqxQPyvDuZwAi5KUHOmyAsOowQA5K8ya2loU8S4k5e5PcBO/UsTW/ZawjNDsct/BvgI8TFYFvIoMqOep2uLbboOVJiecKtkPPPb5FUDlb5hft3NuMa7XEN9cg+318enJTEQ57LzcT5k7rJvt8w== 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=K1LdSo3NqORzZiiNqc2Pbu86tKLKrTyAc2Jv5N1NiEw=; b=EYeXY5sF5inCncX7HLLCuT0a4EpQs8HOnEtdtDNI/JMngvLJARR/hA0PrtW20ti46Wcek7RTnj0TpbUXoxcpvDb73FglN9Jux9qMYBeilp6U7X05jsmXkglFJQUKkinju4qo5/JxeOljTbM49oLr/yQvTanqHgEJalb22ycMGGE= 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 AM9P251MB0110.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:415::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.15; Fri, 13 May 2022 14:42:34 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1d7f:19a9:18f9:57af%8]) with mapi id 15.20.5250.014; Fri, 13 May 2022 14:42:34 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Fri, 13 May 2022 16:42:28 +0200 Message-Id: <20220513144228.2334805-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0021.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::22) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bff827d-3ada-4dfe-76d4-08da34eed167 X-MS-TrafficTypeDiagnostic: AM9P251MB0110: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: z1BaBJfAxr0CYdr95MTrxnxRwtK66Gz28zat6SoxSn8LMh9qW3y93mUxk2XKCzIeGo86YddSO+Q6fB/FcCY8r3JaqNI6t9j8UDbNk1mZsUh5MnQ8+FilDgkLIVIQnYTILp1TrCIHt7iBvZDjsiKpI/Ni6S0MQuqw3Iz3wLNFNRVAzKS+IWp0BB0Nfv2+imjAvDsq6KufVUE3/vwkFq60SwOpDBfOCUmAVl2DNJEOWfqPZUZSdARg5Vtma4G4wCEs7Mq54gn+lEn0D0pzB4mRxWFsd8sb9ypU07PTE5Mlhso10fpkXAVtsbDTeuZcvTBMzAaQ4ZQaNCquJLFltseDd79fl+pVEG+gvZJsRwcSITcx502vnkUqUKOYJoy/mJFPd7OKDgqhFunHHobU1uv/JJsTxpFsthyeAaNOoiuoCqYmc7cv+pJwc9tRKR3cOL1QiXR+GvpteelSe+yrnLWbeILcjMfL74Ac+WcreMng3lLT9DFu7UIkSQj42V21FADpVYQAjcXDGGErJqJ6gUkqUvB4myL0vd+Rois5rdDQZc3MOXcQF/aVtOUR5chlF/QjfHxoMmz4Xwm6SJlXO4roCXXxjhE2fiuP31Jc77I8SicrubQK/gYmxYZJIjlyiDUduaPsTbFmcwYKMTWanjbx53yCW/pin87PggGwM219eaFITYT6i6YqhPtkSW+93DcfkH0RqbZc+Fkjzf50qb6K5Yl7HPm2sA4J7LAbOtK2/9o= 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:(13230001)(39830400003)(346002)(376002)(136003)(396003)(366004)(6486002)(36756003)(2906002)(52116002)(5660300002)(38100700002)(86362001)(6512007)(316002)(6916009)(83380400001)(26005)(8676002)(6506007)(38350700002)(66476007)(508600001)(44832011)(66556008)(8936002)(186003)(2616005)(66946007)(6666004)(1076003)(26583001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7Az7Ua0yzjvIoiZ4XoO9kto8XUSB/bXY+dUfKFa+AKCS2r7melRx1yEeVDcO?= =?us-ascii?Q?MNNrEqTJtd7LCEWweI2Q/mhHDGKCLHcLhq6GQbhowT3C8NTSH/j6Pn1dbVXV?= =?us-ascii?Q?qz0+BQQ5JxDGAw0pEWMkXN6IosbRyRJWQlbzbRYo4IvvThi6dgPbwqOBov1d?= =?us-ascii?Q?Zkn3NtR8zrokdEsy4CMjwERY9+wzAGwFkHhUruUxuNJIn1REOxNQu6MbaJyN?= =?us-ascii?Q?wwI7Lr4jOHGAnVdYClLpivbqPW7pA3z5xE7/INLVPPS1wNswEccYyPS2fIph?= =?us-ascii?Q?fDUZGXocy0cokcwHeXq4II7f0qxAmmMDLIDdIJYluXXnTUnZCLdQ+CM+13ag?= =?us-ascii?Q?/9NBN4WYcAMpR4O3FTIgj1iaTC7Oy1OYyKQk2Ya5IMw97Wxt/46VpPPy1uol?= =?us-ascii?Q?h3w6mGuHyDuU2e9Bhl5S+tAwEUGM0nkhl/DOa53YiS7zS+SWsk9CXbFnxSv1?= =?us-ascii?Q?fInGRVgoj8k6nOnMSQCncwdx5EitiA0l9Dt4QY5IwRz4LCgWpHmm7xG0OhSH?= =?us-ascii?Q?L204VkvoEABI724z7kY63eFC8TuwvG3VngQhBfCqEU4eIsy8PIA4C81+ZHrE?= =?us-ascii?Q?cZJt2tjyJbARbmi++8DfENerNBTvkbUSMw1MuECwzjVlYOg6cEZwBq/HWXzr?= =?us-ascii?Q?aB/3XgP5aHBT9Bvb7MMFKohfKrSkRGEBTsIzJwkIB3XmTojIqfnJtThkzW/S?= =?us-ascii?Q?CN8Al3Euwqf98JkQAbB6UlSHQKIn+wiMbd/3RPRHOcdJkt4skvfwsWOQ5laY?= =?us-ascii?Q?Am/khR0xI+Juwnq28rcAhJtjhyvuQny3qrNv8rSjs9T507MzxY55h2r5gGGG?= =?us-ascii?Q?957OSRvBv25xYzaCCbM7wGoaYDuX+M2HxBTxgV1N6IftKtHxyAJGlIvik8vT?= =?us-ascii?Q?eKf9HSxM1UbjEuXXqysbmYiB8J4ICzkokRVctR7ITztMKBgHPGQE6kSAI+A6?= =?us-ascii?Q?ndeOXLFf9/ViBFwp9OclG+5MlaGUshXgVpbVsGpfOncHHIgwsCzq2vbfy//S?= =?us-ascii?Q?YxZbUgl0ysIF2fp0GC7lgnIwrTWMsxJfY1S1yETWD8VKqi6932wQ2IUNjcD0?= =?us-ascii?Q?6D8/HcF5Ar5wwpIzL89ukbtT8lrPXSO4kNK9pdPD6Z0K8Z6tx+9Z8bl5ck9m?= =?us-ascii?Q?cj1cW5uLK5Vfb1G3UghBwSPbsp8qFO3mTWa7KV/c14MjJQxnwkt0WurI4NUx?= =?us-ascii?Q?Z4lLfcPzJyTY+bSDx6ygSxN5BGIw0E7zsI05z9hrBU7eohvY7RA2nSWKy2/w?= =?us-ascii?Q?slaVguOHlYLntuHYhapFt/4ASYXd7vwxheVBGQoQQCAQfbtEHO33zzu1D3Tp?= =?us-ascii?Q?m/yHm7UEiEYfSDukGKqOwfW8P1ltYeRAJCifuSOTCkZLchAnuFAS2Pxq8tvv?= =?us-ascii?Q?irdW2+qtsgFNAkKCwms5L3Ob+2FKwTzRsy25iMLx0zJFz3rv2Vfs/QFC0tbY?= =?us-ascii?Q?BamXc4fli/DK7nYZR7JgMB5aJb/Z7afn5zoGzE/8d32WcrCio2Xqv/RvVrmu?= =?us-ascii?Q?pFAr9m2pcDePDRw8ztmDjZosFGLDIr2MbnbMLZ7AuN0f54O6QA5jjx1yG7vk?= =?us-ascii?Q?v1jU5eE/16i0aOfHLZ3VtCvrQNXzwnoagV33VT3R/d0AmX+rOXfiBlSYOAw2?= =?us-ascii?Q?ZCnXSPpc5u0gWv3qNFOGMCoMuPF8HKaMosiycGHVDdLnuOndy+TEzgKtrHu5?= =?us-ascii?Q?rIyRan+2Ql6hyPQdrIDowT6yKMxHjz6wUwi1YDGmpNDYqfUQQEtsTryugmn6?= =?us-ascii?Q?kYYsDyQg7LbCHyY623NYCy1IKCUgCCWPDIx3RycQKPfIYG0nBKPi?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bff827d-3ada-4dfe-76d4-08da34eed167 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 14:42:34.7362 (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: PBTsyz53S0w9Qb5BeoOH+EeqysQNC20A2xHSshbVGXcXg0LPvB6K8UbjzEGACGOUDMw1dASPwbBu9aRM3rwEwKSt6x15Qdn2zLIu45Z7QaU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P251MB0110 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.1 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] cairo: Try to get rid of gtkdoc dependencies. 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 Since the autoconf update, gtk-doc dependencies seems to have become hard when running autoreconf. Several other build environments default to building gtk-doc. I'd prefer not to so this is an effort to disable doc building entirely. * Add patch to remove doc building. * Remove gtk-doc options from rulefile. Signed-off-by: Christian Melki --- ...to-get-rid-of-gtkdocize-dependencies.patch | 89 +++++++++++++++++++ patches/cairo-1.16.0/series | 3 +- rules/cairo.make | 3 - 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch diff --git a/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch new file mode 100644 index 000000000..d37eaf278 --- /dev/null +++ b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch @@ -0,0 +1,89 @@ +From: Christian Melki +Date: Thu, 12 May 2022 19:40:34 +0200 +Subject: [PATCH] Try to get rid of gtkdocize dependencies. + +gtk-doc (gtkdocize) looks like a bugged hard dependency +under autoconf > 2.69. +Cut docs out. + +Signed-off-by: Christian Melki +--- + Makefile.am | 8 +++----- + autogen.sh | 7 ------- + configure.ac | 5 ----- + 3 files changed, 3 insertions(+), 17 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 03fa3523649f..1c5a8e8f5b47 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,8 +16,8 @@ EXTRA_DIST += \ + + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} + +-DIST_SUBDIRS = src doc util boilerplate test perf +-SUBDIRS = src doc util ++DIST_SUBDIRS = src util boilerplate test perf ++SUBDIRS = src util + # libpng is required for our test programs + if CAIRO_HAS_PNG_FUNCTIONS + SUBDIRS += boilerplate test perf +@@ -25,8 +25,6 @@ endif + + configure: cairo-version.h + +-doc: +- cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ + test retest recheck: all + cd test && $(MAKE) $(AM_MAKEFLAGS) $@ + perf: all +@@ -34,7 +32,7 @@ perf: all + check-valgrind: all + cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind + cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind +-.PHONY: doc test retest recheck perf check-valgrind ++.PHONY: test retest recheck perf check-valgrind + + + EXTRA_DIST += \ +diff --git a/autogen.sh b/autogen.sh +index 4b10251db941..c80d2b9e5688 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -13,13 +13,6 @@ if test -z $AUTORECONF; then + exit 1 + fi + +-GTKDOCIZE=`which gtkdocize` +-if test -z $GTKDOCIZE; then +- echo "*** No GTK-Doc found, documentation won't be generated ***" +-else +- gtkdocize || exit $? +-fi +- + # create dummy */Makefile.am.features and ChangeLog to make automake happy + > boilerplate/Makefile.am.features + > src/Makefile.am.features +diff --git a/configure.ac b/configure.ac +index 5e33c96ea8b3..8d4cf0fe1ab1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,9 +22,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Workaround for Automake 1.12 + LT_PREREQ([2.2]) + LT_INIT([win32-dll]) + +-# Api documentation +-GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) +- + AC_SYS_LARGEFILE + + dnl =========================================================================== +@@ -890,8 +887,6 @@ util/cairo-script/examples/Makefile + util/cairo-sphinx/Makefile + util/cairo-trace/Makefile + util/cairo-trace/cairo-trace +-doc/Makefile +-doc/public/Makefile + ]) + AC_CONFIG_COMMANDS([cairo-trace], + [chmod a+x util/cairo-trace/cairo-trace]) diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series index dc125547f..b08004c0d 100644 --- a/patches/cairo-1.16.0/series +++ b/patches/cairo-1.16.0/series @@ -3,4 +3,5 @@ 0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch 0002-Makefile.sources-move-font-variations.c-a-test-code-.patch 0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch -# dfb78163a7d65338b42965982e516176 - git-ptx-patches magic +0004-Try-to-get-rid-of-gtkdocize-dependencies.patch +# bc9e55960c5fbeb015e3a298371e311f - git-ptx-patches magic diff --git a/rules/cairo.make b/rules/cairo.make index e9e395b26..594f31ad8 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -39,9 +39,6 @@ CAIRO_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --enable-shared \ --disable-static \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-atomic \ --disable-gcov \ -- 2.34.1