From patchwork Sun Oct 13 04:09:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 50505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CC37CF2592 for ; Sun, 13 Oct 2024 04:09:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.25531.1728792585295313146 for ; Sat, 12 Oct 2024 21:09:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=00166a7a54=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49D451di003116 for ; Sat, 12 Oct 2024 21:09:44 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2176.outbound.protection.outlook.com [104.47.55.176]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 427md4gkrm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 12 Oct 2024 21:09:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mxzdbdq7CfaP1s5q/0plhqVEOAWDWFZby3WEeHo/5w4dTQZ79jyDoSjnz9Rs7Llk+2pTw5SqtCUHSYaz971K+x6MquK0FthKPycUF/ALbDt/EwKBTYC19MPYQ4/vtvP7+ybtAH8eJLb2MHDyZ+eb97dyACYUCIDeaRpjKxBnIbypeiYFvj5a+IxdOGk6Xjlb2UwOEgdO6bMlIjF/Mb5QxrWKiF5IyebEAQscr2mLADzXHZ5hkeD0WACp6wUSCobFpFEQcLV6dw5R85+IHRR4zThgU8jlyP1QfgB23eM0BuW1RypsLSJc3JHVIP0HTd4VBBxzx4RYX0gldg/wskF1eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=V2GREI4/5Ep/wpdp91oHEVfTC6R8wd/t/6Fuvt75Tsg=; b=kd3pgjlRN9ryCNSNvImCHPKLFeGIazRLOoMrrbFDvIP4bAH5g5Ul3CXR/14uIR8l2Rk+bT3DrDKlKVyAPK8JcJl3hh+cArz/S9H1hy9pVUNIdXeFPdE/Nsx3B5bCy1nCzDdWT74OEV5jqWmSlasPzoVmcwbJbq40trxMZ6JetsV4zzGUwbIOpKqF9DhSUznBhYz03WxQKbfefycE0VwvivKi2RYTajJPFI7hsBAc6TVJ8U6U8xAk3abeaK5Rir3v9ay3JUnbJD8mfu8cRTFrCGjGbQOzIdLW1x3MKGa1g5TXb+q1mKD3DKsdMygakuzIlmcGHex+ClJtygvT5qC+WA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SJ0PR11MB6768.namprd11.prod.outlook.com (2603:10b6:a03:47f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Sun, 13 Oct 2024 04:09:41 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%5]) with mapi id 15.20.8048.020; Sun, 13 Oct 2024 04:09:41 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH] wxwidgets: upgrade 3.2.1 -> 3.2.6 Date: Sun, 13 Oct 2024 12:09:24 +0800 Message-Id: <20241013040924.3100620-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: TYCP286CA0280.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::8) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SJ0PR11MB6768:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fbf857e-34e8-451e-85f9-08dceb3cdc64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?5FpJuCU9zUqNWkul/Gn5p0pApUdiUL4?= =?utf-8?q?e6wIF3qlEl1RbEDqEk7c8WIbtBYAATgVVMursxrSx6247b/NTCIrZ++jGorWIHolM?= =?utf-8?q?otWNbPiMFESibjigICFdX+j9vKiQvfJJ9pchLBnUNdiRPS+RDHyRUImhhpoQ4NNRx?= =?utf-8?q?bJWr+Xg+p/kbbD3zsuaRHarS6YN4vuMI5V/XbVOl8i2QmVP2ordAeHEupnXEXVEqN?= =?utf-8?q?cMtqGfHyGnbGiXQhPnI4dGtXiO3qNmjUsz6lNHkOLfNfd6kJI+FtDvCcDekDH8M4H?= =?utf-8?q?mLNIwuBEJH+4b2vCSOMuy1Ns4ESdY2MBbPZ3V3gUWNrI0CEM+puzhrltMvXM7RS7q?= =?utf-8?q?1mCS1qEphREh6QAR1o+NUPXZ6u514Fjc+go2i5JOG3YX/yWhvmPDnFcjJSDaOOXhJ?= =?utf-8?q?Xt/imzaBVstfP57JmyuXt6THagVUqx6ybfg6FS8UIQKUnTT4TJoj3uhGR+0yLL+Eh?= =?utf-8?q?MHlwARfdx3+I/oXamHoDeEC2DOH0/8YJ3GHDL9LVS2Nxfv7QIgMQRXK3KUJEX+k28?= =?utf-8?q?w0aklmG0sY2xyeW8isfCODsGGE8APv1/mleWfFpjaEdrqsY96NcnJIIoURV7sgt80?= =?utf-8?q?3b1sd2vwF6QUK9KwWiRg8eOk+UYATjFhuC3t0uwBUF4aIkT6hRTvgf4qrjd9lxwCp?= =?utf-8?q?bXNkiGyEaV6vXkibsd3qRhjooPTektQ1drveq0amlf3IdMpVjwDZ97OdrpAITFpbN?= =?utf-8?q?0chR8pL4A9fVkRN1/cZpl3KkC0knwmJxCZZlI7cuaRwGWU2fjbIwoXSShxJCrD8V/?= =?utf-8?q?j/Gacev/7glbguyMnIZKFOenQ4ha11hLc+gG/a9xdrCh5WH/nNmSMl3Q5ckHEJf2B?= =?utf-8?q?KydUkXTRqJawDik0rxBAxnY2hRA3j3hnvVr+NQRFklQJ/QiYZRqtEbr/Af/aO+shx?= =?utf-8?q?prPlewiL8eKTzppagMQae/lR09RXDu3xKNTckbEPK1bNN/1vSufj9i0gioDxb4Pqn?= =?utf-8?q?4/NDtVBxlHFetUH/EWKnaQLPIINY31JA87EcnEz7Wzo83U6g7IOo2atA8CpOHwGwZ?= =?utf-8?q?vjdmSPFsDu1sLMCc++13GuMn8+T/vw5j/ud6DQv0IxzYUY4LWEJHEpucbefWautUE?= =?utf-8?q?3BZZJO9Kc5B6gw7BRB/Njlpq2qs3uNGCjRYEfVDwTuPRTcicymk3OxsJa+lE/o0Jb?= =?utf-8?q?qq5z+tsu2EkGfWfdogxo6+t1ynJ/w1CmU+WLikq68J255eSo3qNA2gO6KvE1ODhrG?= =?utf-8?q?mzZnfXCDRCmheVNgUG4wWqqRuMFuZEnN6YvcUBKuOWhSZDqE19lYt2tM4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(1800799024)(376014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ZEyyzZj7606z7u2PYW7SeBlJ+zuS?= =?utf-8?q?w1y1zWKt0LBuxkC1iBkaVxOV1FsYMcHfRCQm3BuS3MLHmRl83blAcDQqX+KNrSxuQ?= =?utf-8?q?Kfp/yBgyXic9I5t9XVL6AATanKOFul7Xoifgnhdw177VcddhYLGIASVagpNdN2+VZ?= =?utf-8?q?oAkNS1UrpsZ068G1CM8cezdZcYEMK/6V2XErExCu1VdHUJ8MFY7bE8vwmwEthCK0Z?= =?utf-8?q?8PrKiS4dM6VEhCwbtInvwOVgH9lHN6u3FATpJcdQG6kvYu1rTsvRrZ+ZgIy4bgJLk?= =?utf-8?q?wSXOU0vP3fHhUaYvlF7bSEau3ZrYU3Fj4ZcRdM9b8u2kVQu8B8SjGlC9//pvlUdpO?= =?utf-8?q?dbX4u1baPduJ00TKY5AI14MSREE+HB9bBnE8x1bfYfKEHLQEhdO5OpW78XvpAFpUi?= =?utf-8?q?APgBYsk5NZpBXjRWEiALzWXJTzOsXvS0CnwxUczETKatPY+AMjCZH2BCmGmVw88uM?= =?utf-8?q?gVBfu+LWQH84gpTG3jq+ZCurmDWbeoXdneDK5yYu3HNfyGjyoYU8whdUqizg7sTtF?= =?utf-8?q?+urQMH4C3wbxwu1x+eLWjw9Jt6KfxTpf2anQVoOe2Ieuie86krfSlJ4NCae+IZKw0?= =?utf-8?q?SHpnHs56cmOM0NxtCDUaZuScbkyhB9u8HBAEleI183eIV5TlCudoE7Z5EI+WDUEj2?= =?utf-8?q?mIDM8Fjyh9bwde4CJyeQ3p3h1C3x82+ynLYU6PcQGPcVIfZNP5OXzwXIFWCQg/zj9?= =?utf-8?q?BKxAan0anj3Qvgfe9Rkn0Dm74T163ZcTRQJ9CicZGToh2zX/7d1K1r9OT/gdWFxfm?= =?utf-8?q?4ogEaos1zKL/tLKXViciv8FwRdzhxmS2HvLg2nbejKTILlTCef6gH01muRG8lOc3/?= =?utf-8?q?kmYUGyVs7PS/JIcxlWfkikAPgl9ECfQWEilo8jxh5Fr1CWR7cRDdRYR75En9oMOJt?= =?utf-8?q?iENTN+1hDpVUp6VmRlyz/fsWQK0z+BLePFylAtIyVB6kP6gtT5Rv+yU0ZjWKzZVc6?= =?utf-8?q?IgXi03eCg8+uZ+lCuL2aelRYsMVryHAtwKflDVaJ5iWcj9sicPH50Z4SEfvY6ygyb?= =?utf-8?q?IzWp0EdgoTtrxjKD3hqgAJGGKaggK7NHmdsKMD31UJ22sIwTEuI3BP6//Sjo35lWe?= =?utf-8?q?B3FdilStJ+yvpBIL3G3b0cc16GhIOMc5/bmqowjJr7Npelv8G+nFEKdjebjMNVlR5?= =?utf-8?q?9+DksZzL6PwtbS+Ar4WTbiIwwcV7XL/AmGMZX2xaaBC5s6T7WaTeQq0zo4juf4hGY?= =?utf-8?q?z9TbHyyFEJ7etj3kutINN8ydyeeatm/f67YcS9q+imMXcBEmuJE0yBXAeOVB9331x?= =?utf-8?q?mGyoPxp5BykWXV6vbd62Qhrkqy6L7TmSRnQCZ+w2yygIv0s/+Cpj1ECiFyg8mURRY?= =?utf-8?q?8k2Yy4FhSEIO59JaTv77P05rpJkxY1ZTsgIHKCicVzAcKa7PfTWVjrT1ZLgN87Dh7?= =?utf-8?q?x2RNqiCqYUvQ2osMJ3gdI963hwE5trrlUnCXP9zRoNTxd7JaBSTACDsclewkBsbEo?= =?utf-8?q?hCpKeVSfZVMIz7QaDf7zfwPXM1jOn5TfkC2gEW8DuaL6Lzpt9UN+GoriAwjHFG8xQ?= =?utf-8?q?yRaN684J8AGY?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fbf857e-34e8-451e-85f9-08dceb3cdc64 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2024 04:09:41.0824 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Vn9jL4ucvHq2xmMXRLQAyT82I9zeIQNvVQN7zuor68dFMfwjAe3ICLdEFULoJzJSyHuiqmgQD7bkc1Y/oi7I1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB6768 X-Proofpoint-ORIG-GUID: E-Gl4tVgI-Q4IY3h_2QUQ7AftkwQfviZ X-Authority-Analysis: v=2.4 cv=d6CnygjE c=1 sm=1 tr=0 ts=670b4808 cx=c_pps a=rPWB9DPlu1VaKM/QD/CSBg==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=DAUX931o1VcA:10 a=bRTqI5nwn0kA:10 a=IToquFxsAAAA:20 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=NEAV23lmAAAA:8 a=kJubvfstYM-9OTd9FwYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=bA3UWDv6hWIuX7UZL3qL:22 X-Proofpoint-GUID: E-Gl4tVgI-Q4IY3h_2QUQ7AftkwQfviZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-13_03,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 clxscore=1015 suspectscore=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2410130027 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 49D451di003116 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 13 Oct 2024 04:09:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112834 ChangeLog: https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.2.6/docs/changes.txt * Drop 0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch as it has been merged upstream * Refresh patches * Add UPSTREAM_CHECK_GITTAGREGEX Signed-off-by: Yi Zhao --- ...using-glibc-specific-defines-on-musl.patch | 26 -------------- ...able-cross-magic-it-does-not-work-fo.patch | 8 ++--- ...tch => 0002-fix-libdir-for-multilib.patch} | 35 ++++++++++++------- ...003-create-links-with-relative-path.patch} | 22 ++++++++---- ...-not-append-system-name-to-lib-name.patch} | 12 +++++-- ...5-wx-config-fix-libdir-for-multilib.patch} | 29 +++++++++------ ...-l.patch => 0006-Fix-locale-on-musl.patch} | 18 ++++++++-- ...E_LARGEFILE_SUPPORT-to-1-explicitly.patch} | 9 ++--- ...{wxwidgets_3.2.1.bb => wxwidgets_3.2.6.bb} | 17 ++++----- 9 files changed, 100 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{fix-libdir-for-multilib.patch => 0002-fix-libdir-for-multilib.patch} (82%) rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{create-links-with-relative-path.patch => 0003-create-links-with-relative-path.patch} (72%) rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{not-append-system-name-to-lib-name.patch => 0004-don-not-append-system-name-to-lib-name.patch} (73%) rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{wx-config-fix-libdir-for-multilib.patch => 0005-wx-config-fix-libdir-for-multilib.patch} (74%) rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{musl-locale-l.patch => 0006-Fix-locale-on-musl.patch} (70%) rename meta-oe/recipes-extended/wxwidgets/wxwidgets/{0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch => 0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch} (83%) rename meta-oe/recipes-extended/wxwidgets/{wxwidgets_3.2.1.bb => wxwidgets_3.2.6.bb} (90%) diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch deleted file mode 100644 index 52f444933..000000000 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 18 Dec 2022 14:51:34 -0800 -Subject: [PATCH] locale: Avoid using glibc specific defines on musl - -musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME - -Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050] -Signed-off-by: Khem Raj ---- - src/unix/uilocale.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp -index 57773e17f5..86816ba896 100644 ---- a/src/unix/uilocale.cpp -+++ b/src/unix/uilocale.cpp -@@ -619,7 +619,7 @@ wxString - wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const - { - wxString str; --#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) -+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__) - switch (name) - { - case wxLOCALE_NAME_LOCALE: diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch index b3b9e79c5..a3b8d0c0e 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch @@ -1,4 +1,4 @@ -From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001 +From 8f582c0ea40ccdb2d439b7614459d752f3606e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 11 Oct 2020 22:16:55 +0200 Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us @@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wx-config.in b/wx-config.in -index d132e3182f..d0d162e8a3 100755 +index 4df8571d28..1173d89685 100755 --- a/wx-config.in +++ b/wx-config.in -@@ -396,7 +396,7 @@ get_mask() +@@ -394,7 +394,7 @@ get_mask() } # Returns true if this script is for a cross compiled config. @@ -31,5 +31,5 @@ index d132e3182f..d0d162e8a3 100755 # Determine the base directories we require. -- -2.26.2 +2.25.1 diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch similarity index 82% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch index ea204ed3b..b599f3887 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch @@ -1,12 +1,18 @@ -wxWidgets hardcodes libdir with 'lib' and does not support multilib which will -change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable. +From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Sat, 12 Oct 2024 18:43:25 +0800 +Subject: [PATCH] fix libdir for multilib + +wxWidgets hardcodes libdir with 'lib' and does not support multilib +which will change it. Respect variable wxPLATFORM_LIB_DIR to support +libdir be configurable. Upstream-Status: Pending Signed-off-by: Kai Kang -Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this -patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. +Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX +in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. Signed-off-by: Kai Kang --- @@ -17,36 +23,36 @@ Signed-off-by: Kai Kang 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a49ecd3883..d469471f38 100644 +index f6ae7f6210..2a13e448db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) # Initialize variables for quick access to wx root dir in sub dirs set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) + set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib) +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX}) # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index b359560bc0..c59ea60923 100644 +index addd8d6b81..9ec677534b 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake -@@ -76,7 +76,7 @@ function(wx_write_config_inplace) +@@ -100,7 +100,7 @@ function(wx_write_config_inplace) execute_process( COMMAND "${CMAKE_COMMAND}" -E ${COPY_CMD} -- "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" -+ "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" - "${CMAKE_CURRENT_BINARY_DIR}/wx-config" +- "${wxBINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" ++ "${wxBINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" + "${wxBINARY_DIR}/wx-config" ) endfunction() diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 7182364e5e..55fbebc7ee 100644 +index 72a34f0b4f..81ede7d8ae 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake -@@ -435,8 +435,8 @@ macro(wx_add_library name) +@@ -462,8 +462,8 @@ macro(wx_add_library name) endif() wx_install(TARGETS ${name} EXPORT wxWidgetsTargets @@ -105,3 +111,6 @@ index 384c6837b8..d3303faabb 100644 ) # uninstall target +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch similarity index 72% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch index 6eef0b679..dbede0304 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch @@ -1,18 +1,23 @@ +From b86806ef34d4c9171165c1533064bf34ad822e20 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Sat, 12 Oct 2024 18:43:25 +0800 +Subject: [PATCH] create links with relative path + It fails to build python3-wxgtk4 which depends on wxwidgets: | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux - /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work - /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config + /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work + /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0 - /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2. + /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2. Please replace this with a relative link. | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native - /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native - /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc - /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2. - Please replace this with a relative link. + /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native + /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc + /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2. + Please replace this with a relative link. Create symlink with relative path to fix the issues. @@ -50,3 +55,6 @@ index dbed8cc9b3..1dbc3261d3 100644 \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ )" ) +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch similarity index 73% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch index 6329256b0..e3463ba17 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch @@ -1,3 +1,8 @@ +From 5e9725c1151e2b029066d61ef5dccf1f3e6cb323 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Sat, 12 Oct 2024 18:43:25 +0800 +Subject: [PATCH] don not append system name to lib name + It appends system name to library names for cross compile. For example, the library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is not appropriate for oe. @@ -14,10 +19,10 @@ Signed-off-by: Kai Kang 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index e374d9a273..c6b1908bd6 100644 +index 81ede7d8ae..23eebeb914 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake -@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name) +@@ -243,9 +243,9 @@ function(wx_set_target_properties target_name) endif() set(cross_target) @@ -30,3 +35,6 @@ index e374d9a273..c6b1908bd6 100644 set(lib_prefix "lib") if(MSVC OR (WIN32 AND wxBUILD_SHARED)) +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch similarity index 74% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch index 628f8dee5..b650c5038 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch @@ -1,8 +1,14 @@ -It sets 'libdir' with path element 'lib' directly which is not suitable for -multilib. Add an option '--baselib' for wx-config to support multilib when -cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}". +From 4230cd84f156f9eb5c9b80ffbc69dd55fa7c7ca7 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Sat, 12 Oct 2024 18:43:25 +0800 +Subject: [PATCH] wx-config: fix libdir for multilib -Upstream-Status: Pending [oe specific] +It sets 'libdir' with path element 'lib' directly which is not suitable +for multilib. Add an option '--baselib' for wx-config to support +multilib when cross compile. And set default value of baselib with +"lib${wxPLATFORM_LIB_DIR}". + +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Kai Kang @@ -15,10 +21,10 @@ Signed-off-by: Kai Kang 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 52ae69d3f6..28aa733eb0 100644 +index 9ec677534b..ee61cf7572 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake -@@ -86,7 +86,7 @@ function(wx_write_config) +@@ -110,7 +110,7 @@ function(wx_write_config) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(includedir "\${prefix}/include") @@ -26,9 +32,9 @@ index 52ae69d3f6..28aa733eb0 100644 + set(libdir "\${exec_prefix}/\${baselib}") set(bindir "\${exec_prefix}/bin") - find_program(EGREP egrep) + if(wxBUILD_MONOLITHIC) diff --git a/wx-config.in b/wx-config.in -index e3f7d115bb..0e78af03c7 100755 +index 1173d89685..8364a33e9d 100755 --- a/wx-config.in +++ b/wx-config.in @@ -42,7 +42,8 @@ usage() @@ -41,7 +47,7 @@ index e3f7d115bb..0e78af03c7 100755 [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT] [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]] [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR] -@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix +@@ -133,7 +134,7 @@ wxconfig_output_options="prefix exec_prefix # Options that permit the user to supply hints that may affect the output. # These options all accept arbitrary values, to interpret as they please. @@ -50,7 +56,7 @@ index e3f7d115bb..0e78af03c7 100755 # Input options that accept only a yes or no argument. # -@@ -404,6 +405,7 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } +@@ -400,6 +401,7 @@ is_cross() { [ "xno" = "xyes" ]; } # Determine the base directories we require. prefix=${input_option_prefix-${this_prefix:-@prefix@}} exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} @@ -58,3 +64,6 @@ index e3f7d115bb..0e78af03c7 100755 wxconfdir="@libdir@/wx/config" installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch similarity index 70% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch index e4ca6579f..37d61dcb3 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch @@ -1,8 +1,19 @@ -Upstream-Status: Pending +From 64d5d7f68cde208c6f8a5e0b71da93f98e4720f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 12 Oct 2024 20:30:16 +0800 +Subject: [PATCH] Fix locale on musl these macro'd away functions don't exist in musl (yet) + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + include/wx/xlocale.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h -index c433d25..3ab9d84 100644 +index c433d25d05..794cf0b66b 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -33,6 +33,26 @@ @@ -32,3 +43,6 @@ index c433d25..3ab9d84 100644 // The platform-specific locale type // If wxXLocale_t is not defined, then only "C" locale support is provided #ifdef wxHAS_XLOCALE_SUPPORT +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch similarity index 83% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch rename to meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch index 5160f2e1f..ef94e3551 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch @@ -1,4 +1,4 @@ -From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001 +From 22f70d5bd039b20bfdad522341412ca001c639db Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 19 Dec 2022 15:07:55 -0800 Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly @@ -6,16 +6,17 @@ Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly nothing sets this to 0, but for some reason it gets undef'd Upstream-Status: Pending + Signed-off-by: Khem Raj --- build/cmake/setup.h.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in -index bce33a73f3..22afb4cfa0 100644 +index fcc282980d..767adbf658 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in -@@ -869,8 +869,7 @@ +@@ -867,8 +867,7 @@ /* * Define if large (64 bit file offsets) files are supported. */ @@ -26,5 +27,5 @@ index bce33a73f3..22afb4cfa0 100644 * Use OpenGL */ -- -2.39.0 +2.25.1 diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb similarity index 90% rename from meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb rename to meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb index 91653e285..2ddda142e 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb @@ -20,17 +20,18 @@ DEPENDS += " \ SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ - file://fix-libdir-for-multilib.patch \ - file://create-links-with-relative-path.patch \ - file://not-append-system-name-to-lib-name.patch \ - file://wx-config-fix-libdir-for-multilib.patch \ - file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \ - file://musl-locale-l.patch \ - file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ + file://0002-fix-libdir-for-multilib.patch \ + file://0003-create-links-with-relative-path.patch \ + file://0004-don-not-append-system-name-to-lib-name.patch \ + file://0005-wx-config-fix-libdir-for-multilib.patch \ + file://0006-Fix-locale-on-musl.patch \ + file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \ " -SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496" +SRCREV= "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + # These can be either 'builtin' or 'sys' and builtin means cloned soures are # build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see # DEPENDS)