From patchwork Thu Sep 18 08:37:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 70470 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 B61F7CAC59F for ; Thu, 18 Sep 2025 08:37:20 +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.9106.1758184638175841071 for ; Thu, 18 Sep 2025 01:37:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@windriver.com header.s=PPS06212021 header.b=PVuBNPS/; 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=1356ab658e=peng.zhang1.cn@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 58I4ehGm2372847 for ; Thu, 18 Sep 2025 01:37:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=PPS06212021; bh=9zS2w6cVUwgQhWdOz7MA 2XoJ5tkfGpcQJsvMtIrZ8Nw=; b=PVuBNPS/JXQl1wD/IxkOQ1VZ/R8RqT4cX0Xn Tdoqk+1Z3w4rM+rJ8aosb0Zt251BdLM8/k948oDZ8nXEHQkBFeJdkCAAH933yXpz UFPptxMsyUoyMC32zNoxEIlkIG2cZuSYZIdof4HHhA2H7uwz/8PeDa3d24Ej2crn lDzBV4bWfCzt6OGXwfJSukxENlmmI50L9UCIIQDjieDquLlVqse2JRD8Xq0PrQnY /e6TSg+T+GDZkVXIjoBQFnnU0F28tWhh9dZx7HYKOYgB/hdZBHFzCRYYcWoK8lIi iz5bU3SiQFn5nVlBke4Zb99msBl+JZVJKe8+LIpPaPV2TPQadA== Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazon11013011.outbound.protection.outlook.com [40.93.201.11]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 497fwr1svj-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Thu, 18 Sep 2025 01:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PTSjw2NXAV2lOnKorgCu7WINCh/ZErEvqlu+scBwi/qg+Yf3gMwN1E1Orm/hzzEvt9vAoqQe59helvm+E4Pm1N1bDzfIwlKQ6Uwny+SDVh4FJD4JV37D54v6N4PvJkCGJw9A5zwYE6xS6Z2K5hrybTWyXOySTzYJHMjjG8BFsodWiWTazgyzI/0Y5BqoUHlYzJy5fYXdgvMWy74fGDzmvBy6scE8/LUaHuP8dkSS9aj+gthJ2Sp/0F3XwGtjXBTABIibYcNxW/BdO8krSmJc+SUJt2I5ccTQ8QLDQ/+eFJ0Z/qFW9op19x1LGIpcLCGXNjLH2Qk4eA8RUbkfYL8qPg== 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=9zS2w6cVUwgQhWdOz7MA2XoJ5tkfGpcQJsvMtIrZ8Nw=; b=mwCMVAWdaeTDijkpnJoE+MpSluG8TStDnXwmzCi2RhhBymz3kEaX5hHc42aKaYDpxmZEN+M/HgO9hL9PTBAwUEC+tMSBN9qVAzgEFM1WBV0I3mWoOBS4t28p0C2skJNyQZGHTxAR0MG0XkGa5fcNcXZBpVwqdOUwj4khZ/0+f7yGLv5LbVyGmZj9UQi29XCw6LhNh5HbfaClnr7+d03hjVFx/gIH25MSk0Jq7zpsxd+0hqgyTPw/wzJ8tGh5c19pQ2TpOkWsaVZ2bM7ieNAXTlsbhpZf1xDiuRUYfUfi50aOzEb37pVi/3P6+/w0UmDuVYXBg80JGzEPSE5lssX1Jg== 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 CH3PR11MB8562.namprd11.prod.outlook.com (2603:10b6:610:1b8::13) by PH8PR11MB8062.namprd11.prod.outlook.com (2603:10b6:510:251::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Thu, 18 Sep 2025 08:37:15 +0000 Received: from CH3PR11MB8562.namprd11.prod.outlook.com ([fe80::24c6:f8fc:1afe:179f]) by CH3PR11MB8562.namprd11.prod.outlook.com ([fe80::24c6:f8fc:1afe:179f%4]) with mapi id 15.20.9137.012; Thu, 18 Sep 2025 08:37:15 +0000 From: peng.zhang1.cn@windriver.com To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][scarthgap][PATCH 1/2] wxwidgets: upgrade 3.2.1 -> 3.2.6 Date: Thu, 18 Sep 2025 16:37:02 +0800 Message-ID: <20250918083704.181400-1-peng.zhang1.cn@windriver.com> X-Mailer: git-send-email 2.50.0 X-ClientProxiedBy: TYWP286CA0004.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:178::6) To CH3PR11MB8562.namprd11.prod.outlook.com (2603:10b6:610:1b8::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR11MB8562:EE_|PH8PR11MB8062:EE_ X-MS-Office365-Filtering-Correlation-Id: b415d9cc-9b2b-4117-0518-08ddf68e91ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?i1DrO8qwOLuBy6w9DGB41KVSsvvGgZr?= =?utf-8?q?DCtTmdYPZRyPNrGfh+VR5q2fnWimhsHKgpFC90r03nN6OaoZY3q5Q+U5xTak3Ebmi?= =?utf-8?q?JXDcv0QefTgE4irp9zn1lBNXXVvoDECZkoXpU98SB4HNoi4GfvKwFHVFF5Y2laDGt?= =?utf-8?q?Au813I4rtA3lIQQNPfKUJpA2mS0LUoxNqcMMGzFS9eMyB7/RaXw3pjNla2XBWdb03?= =?utf-8?q?hZGHMbMy8Y/Slg1PFCdA4/zh3F0FvHlLYV1yh32myhV4Bwh3GkLZBj6WZuPIi0eyz?= =?utf-8?q?VsvyimFB89muGdH+eTh1BjdNDVgnRGcXyALiRoRjV//Lx/IM+K4UAne8wp0vF/xBl?= =?utf-8?q?HA0zSOYNGetpKrvzf2i75aWj0ZRGvYQAMsojtrIfm/ydKXb3GLcueuJuOxGOXZByo?= =?utf-8?q?0RabC+1MvAKetGnBfQ9zNc3H1JRo4yJcxwN5V7LayDcW1dqnasrZJHuvsBtmCvCA9?= =?utf-8?q?xkso7YV4+7hDo+KE5itRsZLnw4IebQzqOS/FSCZ/kZeWiDE+TQeyOd71slI9G7l64?= =?utf-8?q?AfJS7C8BheY2At9hE8PFSnxvIfiteLe+h/bquelbVKBYkfgLi52cnRU+qVwhOhKfJ?= =?utf-8?q?/IfvL9owW3Qpb36NsU3NUz6KqV+Uw5+fRKwe4a/W3317xivtI7vx8jZvpJ5ioWPiP?= =?utf-8?q?FZb/kUWXt2BlKBhYWVgWhZOhF0Y4Sr3aloGUfW4qzsWsFjmd7OL977EyuzB29z7lu?= =?utf-8?q?9bVhKuM5qguzfZFc4Q5BMa80wdpHR8Ok+2AvaC1bPNJLr+Bi5wfrb3dVdH05kGS7B?= =?utf-8?q?fYEFgf6pzniaXUl9Ifj0GKumfI20JXDD32SUfgm2VlzvQH+cERL/ku1Yyh+vbAILL?= =?utf-8?q?J+ob/ioPiUCcpeXEsHD9FtKjIitXWoz+9T+FbC1mlsHZUL+t0Pexs7afGP9rr7OhT?= =?utf-8?q?YkiUroO9b0zJ5U75qDRGbbNSN09HdzSmtHiO7S4A24gB/mfytPf5qAG5AWwJQUCYg?= =?utf-8?q?SLx7Hj6nE23T8bG4sf2Qyh96dqj7yKD22WBxgYqTJ/qXtPrPLtV6eVlKSaEh5HO4s?= =?utf-8?q?w/wOxlHEOohkY2v3d3CA92qkHkZ1Lvw75BEL6BuKSazZ3RBpJ+plngoENPZLb0ao+?= =?utf-8?q?cQpmx+du98qYWB0NuoMkzJ3fsjPZOuCZBQxv+/Gkdk7yEKVSJFoKpI5NwoRhe5y2x?= =?utf-8?q?5yLbltpYYQW2yq3ONgo/Oyn8moyb4inFVLrI2uMJLBRTA0B8HsQ/QKG4uEkS0UaXR?= =?utf-8?q?qta2C5QnVNywcLP8MaTslgY6aiz6Wbvgm8MP+gYwRrohNV1UoOBBb8kPHtOjVW2wH?= =?utf-8?q?ZCtzUCNQbww5i6/m/suUgc1s1h/EYf8rtkxFk2aN18kZBh/VUK/2IGRSH4TC9zwWI?= =?utf-8?q?vqeP/b0UatBf7NZYLYO3yHictAcW2A0qmgJvLveBTBh00taSZSLpNTo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR11MB8562.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?gN1OoDsqTHn7ysI0liNVuJ1daIIN?= =?utf-8?q?wGVYXvTxCw0vtlRjlNfbT2CHDYY49/CssuNlXsN/8YHCdpRaipIWwsJdow75/9o4a?= =?utf-8?q?snU+clRJVe64cVdA3/dV1/It1tSucSSJQ95DdjAvmj2jdLbbYkvHwO6NAmNEh3gKN?= =?utf-8?q?7nHtrJKYaOjQ5U0lkSd7p3MLAztHxlJuZ8yfbtKT3gMox817oIU2lfZCbc9ZwTlLl?= =?utf-8?q?4+D0CVS4U3BnSUe27iFVi9FvrG26d550LKDJXHZXTNWf1Sb/Ff1Z/IbMM4mVl32fv?= =?utf-8?q?+lz/1Z6/op2KFvkHmJX7A94afOeabdvmRBq1HdwfjKsxM7+Ku6NQ6Vo611fVvy62B?= =?utf-8?q?S+EPNpHENaD3hdf23/nwZzHQMAG3sZUe21x8W2BNFbcwqxkx/BTA6a4Ij5jjqr5la?= =?utf-8?q?ejDoCmLAgRDnKrJGga7kplNG/s2e8gAOE4Z/+WCC22ipXthHP66+b9O6P2dx3py1P?= =?utf-8?q?XRJnQE/LeTvR/b/A+V3Dcb6yRdZM+e1WF7vHmg9gdIaG0WHuL3GvSQufDXu2QGgo1?= =?utf-8?q?kJZkiWBkcVZujiL5bNGZ2zUej0uShq+8XT53kkU9Lko8rjRMPuAYABU+ATXO6nFCb?= =?utf-8?q?Z+g+hZIj9IVOysCtqaMzubJAZmWQyX6Dx+WneBmX4ei7gYZftDCaww6rgfLfI1uo5?= =?utf-8?q?LjupCn3G7+xkbHEcR43hBT1s7bvYcruPypEInmlKgPEdLqU/Pu5WIoeKGxlTVjai0?= =?utf-8?q?VUUcs5Rt2YOAULgOBoA7VHu3WOiv/nDdXt5CFA/MaREpKyUDbxRttoTS91kx8seRi?= =?utf-8?q?Eg40b0eFs63syRt5BKlP+JoavxAHEOpnpsAHU7TX3TW2soR142bjnuFsTJdbgqL+t?= =?utf-8?q?pqi803ujxgQl2mPT8gvnWClNLrTULcTCxhW6wK7aGqJcPExl6lBZ8izvDDISywsV+?= =?utf-8?q?VJ5ILPoqw7PZr2GTa/e0/IRaz9O4ldmxvyUKBEdEIxcgBNO1tv2oIDWb42O2MYlp/?= =?utf-8?q?S3kRXB0Tl80+a/4igeOclkKzo8KbLx+3PbmEV1yUcYM5jzHW5U/pC0+Ln83pLTO41?= =?utf-8?q?Pz5L2J/kv4rW258mG6vaFRUj769JPRpqU1zYau3vBewtw/McvigWpTD6J/P+hsyaW?= =?utf-8?q?iqMmtNi8+C9yMVlVxk52fvcP7KnfIPJSQZE9loMurmg/K9BUODljX04DNxIV741p9?= =?utf-8?q?PyA96uZK65tz2goyIMCEyoejVXi8Y4+uT3bGAxEIHxnGc9gxJlWHZIRTydGGW7XLj?= =?utf-8?q?MRCKJ6pf2bp/Obr2Pxc9iqneNJNPjFMYj9j8fXNt+DvVg+ACNji87RxWq9hPvGYcs?= =?utf-8?q?hcjbLqKT8Awel3ZGu9SjIqhndacg11vzGgkCuLiwMNquKTAczivRaxvMbYk6RUpp0?= =?utf-8?q?EVVYlCi62Ot3nBIDm7xVRIuyGgNhgvPNHugv6l8kBlxC6kkL0vPQQeElhMLjzPnan?= =?utf-8?q?M6MwDgpJ5wqRlcUeqgHhtCDDx/zawA/TWrTBSxjh6QD/V9qRZ1GIXSLUeQllYxGw1?= =?utf-8?q?5ewUyiDw/qAxWjIFkNaRF4EXvVAdB816d0j/3Bcf67CsjSCYfkQdOfYvFwmkFUN8L?= =?utf-8?q?d435BP7plJ1485ZedvZir8HXDpDsU+36og=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b415d9cc-9b2b-4117-0518-08ddf68e91ee X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8562.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2025 08:37:15.3700 (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: HClh0okve3bPkZmGTWdkuhoyJpjhU3NpSnxjy2DxGwNXwLqUfH0kHAfai5hVDKBSkdB+yvqmxP2r0F0o4rksqHLaXegrUEpJKwRifYyOeH0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8062 X-Authority-Analysis: v=2.4 cv=Jay8rVKV c=1 sm=1 tr=0 ts=68cbc4bd cx=c_pps a=NzAOMTrFL2nmaFUJOsdohw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=IToquFxsAAAA:20 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=kJubvfstYM-9OTd9FwYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=FdTzh2GWekK77mhwV6Dw:22 a=bA3UWDv6hWIuX7UZL3qL:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTE4MDA3OCBTYWx0ZWRfX2h55NRpZH7AG //2W3Hj+8szDwwKJ8hUIHXe8MolNAbN8TjzTEn92Y87Xape9nlirGzYeBcO741hf8WyXwS2ASEY dxDUyvGMRe/81fruhISmYjoChcQFyCsnD2zEFHLDBCxn3JNJRiX+ufQWL+9IMqs7EUXTfZl+jUZ 84XaqKmiYiLldGlNWnJpLk9NmUWe4Iavneve7EpNObB5J1GQiDmiUoSZr1bNNlsnlhEwILIdHtf RrIOOph2NmcQL+3uQVNoTJJEvfvivF9gwcFdUWQpFx3/P2bl15woz62vynfNERhRxDA/VQbZw1J viZYV/4bEa5vTHOpiEvt20focBDwdJsdLHQ+T8uRWz6EsRAc/wXPGfJlQtpScI= X-Proofpoint-GUID: 5AyzmYl4rGEdP5YGugaydxye4u960yAN X-Proofpoint-ORIG-GUID: 5AyzmYl4rGEdP5YGugaydxye4u960yAN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-17_01,2025-09-18_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 malwarescore=0 suspectscore=0 adultscore=0 bulkscore=0 phishscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2507300000 definitions=firstrun X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 58I4ehGm2372847 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 ; Thu, 18 Sep 2025 08:37:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/119539 From: Yi Zhao 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 Signed-off-by: Khem Raj (master rev: 903ed68669550ccae20bcd0c18c26d0c336da810) Signed-off-by: Zhang Peng --- ...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 52f4449339..0000000000 --- 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 b3b9e79c53..a3b8d0c0ee 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 ea204ed3b1..b599f38871 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 6eef0b6790..dbede0304f 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 6329256b0c..e3463ba170 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 628f8dee56..b650c50386 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 e4ca6579f8..37d61dcb3f 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 5160f2e1fe..ef94e3551b 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 91653e2852..71e2a60e0c 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)