From patchwork Mon Mar 23 11:41:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhang Peng X-Patchwork-Id: 84121 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 44B73EC01CF for ; Mon, 23 Mar 2026 11:42:13 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.15352.1774266131979964553 for ; Mon, 23 Mar 2026 04:42:11 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@windriver.com header.s=PPS06212021 header.b=Z0p6Zssq; 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=7542b98c32=peng.zhang1.cn@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62N5kqHJ3731459 for ; Mon, 23 Mar 2026 04:42:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=kcGiMvQzdui1JDhY/7eIvMJu2fIBry1MNwhsbJnxgZk=; b=Z0p6Zssq4/J9 FRSjO0sYUCSS7i6NnBEtYfAnf+1mKeTwzDvCxMKBVLaFbJhe+y/yjx8+RH/tytrg CoMNcd9eUy8OluCdv9xekS+ePBLytIzL6O3o+ZglumpsLtPhMaHP9zObIF0oRrbF Fo0sBbtaGi85PBWg/VdI0+LzB148VDRcx6Dg93I4h4bBeXVMj9BkCVRtOucPCR1q H/x1UevoheibByiO3MY1eCGZtH0fAW5WyLB7xkYc7UIzkPJORsP8wiB8AWAlzkWw JhRV4yMQgjD9mxpGrkF5r0UmKbJtI7jN13+B6VtjSk5szKVTR1OzrlVyBWwf2N2K STNJLvLLZA== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11012003.outbound.protection.outlook.com [52.101.43.3]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4d1pky9k2h-6 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 23 Mar 2026 04:42:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EjWstSUIaZ7iP6RS+kPJv0O4w1Dc3s40nb2PtcjIdf1LxyslSzl/DWYAr2t2jeyZY98+09rhxkiDWzLmE2uo4BUXpYKaYlQisk5X4pP1ikF2PQ/nqozan67HfKj8cTyj8eZl7/tI+bJBNhiJjdLird+yPEdDSbN6pzwvNFYxuI6u/qg6vPR52eKcveVrufU599st1VvADxF81/HtF+/wmkCuchPfg7dmhgQzkBeuyl44hEdUTLX3kXknp10EK6kO5IPxctKUJ1gLw7d5+b6blxnUI0tsEI+2CesF78XU245MMwTLMdIL372M7gGYk+O5UvXNpRhc6YXdoHdfF3IARA== 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=kcGiMvQzdui1JDhY/7eIvMJu2fIBry1MNwhsbJnxgZk=; b=W4qSTgjBXkbdgWCiOHtVrz/wlyGobFjtOgWg/y61I8ZBEtNyPRaltkdABPK2ERHZgt7KFnb6a9j0Ye8Tk9Wc+a46KPpvpzSeyD+EB3W2C2sQ9Op6Wzuhmr0BkrDaDOWwJs4BIZQDMr4FVkPM5cm7uvZCQLnfNVvNVvIVoIE6jywKTNn8jRdsYX/c1R9/mu7QTRi3OWMLdAVZ2JKK5KRjPFkwBknkp6etdHnp3LlQRsajMMbDRyBkiyTK4YqNA0NcvrFFV0/mGPSjJ0hqXIF9qGPpJazwVHnOwcDja2ktlVUaAyP5/H70RJUxQiGuPfcNUdQ+dbdZm5DAjTkPMxi8UA== 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 CH3PR11MB7763.namprd11.prod.outlook.com (2603:10b6:610:145::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.10; Mon, 23 Mar 2026 11:42:10 +0000 Received: from CH3PR11MB8562.namprd11.prod.outlook.com ([fe80::ea76:e083:b8bf:7484]) by CH3PR11MB8562.namprd11.prod.outlook.com ([fe80::ea76:e083:b8bf:7484%5]) with mapi id 15.20.9745.007; Mon, 23 Mar 2026 11:42:09 +0000 From: peng.zhang1.cn@windriver.com To: openembedded-devel@lists.openembedded.org Subject: [meta-xfce][PATCH 05/15] xfce4-session: upgrade 4.20.3 -> 4.21.1 Date: Mon, 23 Mar 2026 19:41:42 +0800 Message-Id: <20260323114152.4178269-6-peng.zhang1.cn@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260323114152.4178269-1-peng.zhang1.cn@windriver.com> References: <20260323114152.4178269-1-peng.zhang1.cn@windriver.com> X-ClientProxiedBy: TYCP286CA0108.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::14) To CH3PR11MB8562.namprd11.prod.outlook.com (2603:10b6:610:1b8::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR11MB8562:EE_|CH3PR11MB7763:EE_ X-MS-Office365-Filtering-Correlation-Id: ede3447c-4456-424e-a905-08de88d13791 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|1800799024|376014|38350700014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: epe2V4ENWhApLWBs+/VAlpcsXy+JDG8Ahwzxp/6c8IgDBTQvqLlwiqHGdMQe6PwdzxH2Yyx8wVcZFVHoXtAo6lpBJrsCG5Fp3g/uYu+SBy8uIh1ZU5cp2acFzl7WWG/81zasE8NM1OuNPDZbZegDbpFJgU/vet9CW4KKtT9SikxvQyPUxAYrmD/6e7X3sViPjAntrod66oyUpawMFP2xPySfF0mlLhHMRC8AgVkNE8Q3dNSNYbRo+VPZfceunmC5S7pYB+uifaOatuJVqokgV/QdOBZE0mojyyvncgLuB56qtePKss6CZkubKsZZxvuYgypthGEXE7F08NezCSjNA2iGeAztQLc1SQKJEhy+aU1AzZMqd3NVJlNJJMqfYvHZgjmdLBcMngez61ITLN582lGIRmzNBVFlmW1vm/FSEdZ4/3W2xEYIvLPv/pkvtqH2QeFvHM12jOB6IeHYXy7h+RAeYnhTWQRGq1P2fIA31mI4gjNCSwBkBqgQyJDv5cgPChxBt/shSoKouEMByFqt8LMbI7oh7e/kCMdfCvclhNHr9Fabm/mewS0GL/dRkcxx/k1ntD/MkEg1jl7qUD+up4LbQ+WbbgEThIWXmj94j9CaX7nn7fb7vlenkFWUEdlD/5TiI2cusHjlxEF70hLoLKkFqPrau4R/1TGPDUfxf6rA+ThOamsPsM/CJJiHvRiDp+LRWprvSiddRA9Hmw2crYFibGfw0w4plMwIfcJzZjLovD8LZxONf4dvuDBfUUBxSI2B9pH8Ok4dQlHAIO85q0zCbWaU6BwF/7oIxDsX6lw= 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)(52116014)(1800799024)(376014)(38350700014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bVhhxeqqLb4Dofq0ypvJb2peqWkN?= =?utf-8?q?26sn/AiikeLN+m2OWBaLzFwm0HETDZBAzMyCJFwzei3+w68yYOuiaj4KAjJcBExbY?= =?utf-8?q?zJcDZTMwGcahbjXIVbMIiF8/xc/Q1lcnfmyPseu4tb/Q8K4dxrK4sFzZfrlF+xQPE?= =?utf-8?q?eOhj6aalDoaV+t9HMuRFsr9bkDczcAKph3TFjEEDG3ZoyEf0hNd/0AuxValkDrJJs?= =?utf-8?q?NpxQBz163uDCSvA3I+RxCwh+7QMPZxIPo35QRswD55pWX4wzTvQvACzZQ93LUmAfR?= =?utf-8?q?xqohSei46JfGZRS1W3KtQeLv6ypQ09+Qz8aqMPBbIuwxJyLdwytGNp44EtLXHLKHU?= =?utf-8?q?kHa2a4Jyc4fToxFfoalGiVeAs7keCJVSF7LBMUekb4EfgKyBJIT4lYU62yltgt63+?= =?utf-8?q?c/cAFgFwsfCVfS2fZHZQw4bADAikbk11OG+HeuibfnFbGQa29f5RWAy4kS2FvPGEP?= =?utf-8?q?QCdV3ZVZOttQZIFRIroHFL9OGqlxuh2NglJ43dFwp3GferVEGybSHyEjOAxx8A95j?= =?utf-8?q?k++BFkGuMpHVoa2yNK9YiJ2BWxi0sBJ7+kaOp31rCbLp/bCIeuNKNzFI4Uvuj46v/?= =?utf-8?q?RFc7mNQQrkkSl05fP+d97vVpCqh/JaILWH6wHysRll01hTo+Xn+wwJmbT5bTCoT6z?= =?utf-8?q?Ew3XAX5GE1UELO+me5TZ1SMxtfEQ4PeZB2ARBY7e+u49yQ7bs/UzyToORYVmDuVeX?= =?utf-8?q?NBRz0xB78KafOrxgUnsRc8uSSKMPpovPog3dhiNSZxx1fknPSCQOkLsFNF1gc6/dn?= =?utf-8?q?8IL9YsVPVDVL0ZTT74OU4pfZneTBtdILlPVo9eJ8kRPJauiavCCEmp1eeiqxeYVmc?= =?utf-8?q?5tiPAntLgWyUpjKkvoo4kTjoHfUxLYGVgC5v8Fqq/yn8T/sdLV+Vq4ZZ6FiDAZyg9?= =?utf-8?q?zkskcTPBakNGoxOK4+5jeQIkVSOJ19CiD71hYydHXsQkYVy4fsx+5irXlDalrHE8Y?= =?utf-8?q?0tBv3t2rUUU5PwS3ybeP1cJsnS1QEQFhPobkwQRSOsODMx/O2NUVDJWwXTfe1HQAK?= =?utf-8?q?T9fs/cmEx71T7RD7/N1Z9WkJkw74DyKMwaGXneOS//os96PxqfeGGzl9o+T1Ifqmp?= =?utf-8?q?ug8pwIgspiRke9Waigl15ItlreMwblqOSjcfkNs9ew/WsJgoP9dG1BN84baDI2rU5?= =?utf-8?q?81Do2sgyw2XCOAW2Yd6yMGiXimoj6OCuqlb9DWmdoLzub55G49d4fG45I8p38lH++?= =?utf-8?q?Tkf7PYQEIp8OWIzirE/w3BGq06RCtlCkDioWJDeuns14UC2Vvf41Np81EogPIMu53?= =?utf-8?q?YUmwQlL95T7TgOnsLn5YkqPM41ySgOaaqPi6NV0lGqcUdIjzBkxWKXl7hmz332Fmo?= =?utf-8?q?/l/ECqKwvEnbZWVJceNVjGNZVhPKPQBGQd4iH6zmiD5rt1EISM9/kIzZ2BHmevYIY?= =?utf-8?q?bc5NV9c6cBQoQzvGYLO76o02lO4uy5Z2/XF3kNQd53qcyCi0AEBTpLm3lDhdnBhbX?= =?utf-8?q?utnLRnu0uAklf3rPTFWTtr5KJ2h0KrgSHsvRutGQ9INGHFiPQQw/ftVmO3PnMnzqW?= =?utf-8?q?A+DsknOJmuMF8FElyxS8hpmqFEMfkANy89Y7k4Fxm1unbZBzAxQat2jjfo03C8VXp?= =?utf-8?q?aUgeHBF5BObjUz8D8Wwme6xY+N6ZKSLfth6o/UY4WZTj5N8i6RVZrMRPCmeClnwEw?= =?utf-8?q?3qd0JEevOnw87tjNpTM6KR7g537ThCAn2IMLBZHDTye3mq8FHnoaw=3D?= X-Exchange-RoutingPolicyChecked: aRiHWv/9vcXOghdi50eniXME1tPxOr037A39p2RlIzpiQV3UH3qsCnb4ENdvRb+sHH0amDFAjsL1znMqrXI2yYNjjmBhleyQ8V3iZN5HAlBjjAGgXcn9SzMBEBdgKhOcJ4qwu47N8A4NaDc0uMNfbmVJvGIadVvLBYANmjOz/mKNQ6sxxumicq5saXh9CQOBrjm5Lwtc6IVYDrGoFskr1Fh6Fsc8x4G6Mty8qk/Dog5dP+JDVN+TWNUyK0KIecfZ40mJiiJ7IyL451t3INPe1L8Kul4zAXjW3ze2H8nyz4fYDqnGv9IZGkG/3J2VPPl/kJcIhQLjUbmIISGadFlChA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ede3447c-4456-424e-a905-08de88d13791 X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8562.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2026 11:42:09.9263 (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: x7JJCMHcdpi7e6CuTt6nsJpl3GfYcfxbEV19xX06cox3FgvMHDmidR57k45MawNoxoid469zDKxtJScqOnbSkV5E2ovnnTfTVR9FczhnqHA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7763 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzIzMDA5MSBTYWx0ZWRfX9yVU1JWiKKkx 3e9Zq01y7E6TzC8usrMga4U4vnIB0tKWg1KRKM9EgkFcTN3A19PJF0RFMJ7cTT+Xb2bysv8gUzP t83JCVcaLuDFJ4OXL2v2+MCi6U06SnAwGLByLIUwyQJW3Gk24EsrA1j6CDNHM8MFZ+JUWLwwOdb iAfpU071DEcHe176YqNFFmewlS/COJTWWs8/CoPZSfXQ5x93ULfqwad/bySEmAVAATAGAN2TtVF YGokYbgdB+DCEXgJHyHUFY3nLfQY0ijTM59namxiKrL8bvetGujtZGKs9hFh1g3H55zk0M6zvIj MTxhRxYXgGfdHJivIN10fFkDCShNxrLyLa8i0NodQch1yWdcLBAaxIE5OdJwWgTFyvwSzA0BzvI UTs3fQYYtu32tSwiXrO4mZ2ostDsZLZe6Y+afJ+DLCDpZUI35D3CiSzFeWexCF9cXjBySce6rHY JrRC8wqNUOJmTfD6j5A== X-Proofpoint-ORIG-GUID: qk1SbUm3SwL6JDTRNJjCWQ6R86zDZKoq X-Authority-Analysis: v=2.4 cv=Scr6t/Ru c=1 sm=1 tr=0 ts=69c12713 cx=c_pps a=ayBBURk7jZ4GzqZFlR2IhQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=O24Aq5uEAAAA:8 a=t7CeM3EgAAAA:8 a=mK_AVkanAAAA:8 a=f8LJXPsAXp_22yhX5GYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=SYBONWESK5muIIdMMRMZ:22 a=FdTzh2GWekK77mhwV6Dw:22 a=3gWm3jAn84ENXaBijsEo:22 X-Proofpoint-GUID: qk1SbUm3SwL6JDTRNJjCWQ6R86zDZKoq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-23_03,2026-03-20_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 phishscore=0 adultscore=0 suspectscore=0 impostorscore=0 bulkscore=0 spamscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603230091 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 62N5kqHJ3731459 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 23 Mar 2026 11:42:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/125508 From: Zhang Peng Changelog: https://gitlab.xfce.org/xfce/xfce4-session/-/tags/xfce4-session-4.21.1 https://gitlab.xfce.org/xfce/xfce4-session/-/tags/xfce4-session-4.21.0 https://gitlab.xfce.org/xfce/xfce4-session/-/tags/xfce4-session-4.20.4 Refresh patch to algined with meson build. Signed-off-by: Zhang Peng --- ...nfigure.in-hard-code-path-to-iceauth.patch | 43 ---------------- ...eson.build-hard-code-path-to-iceauth.patch | 49 +++++++++++++++++++ ...sion_4.20.3.bb => xfce4-session_4.21.1.bb} | 12 ++--- 3 files changed, 55 insertions(+), 49 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.20.3.bb => xfce4-session_4.21.1.bb} (75%) diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch deleted file mode 100644 index 0e20143f10..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 31 Dec 2012 16:35:29 +0100 -Subject: [PATCH] configure.ac: hard code path to iceauth -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -workaround AC_PATH_PROG which was meant to find programs required at build-time -not at run-time. - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Andreas Müller - -Rebase for xfce4-session 4.20.0. - -Signed-off-by: Kai Kang ---- - configure.ac | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 81b362f..ccde685 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -136,13 +136,7 @@ if test x"$ENABLE_X11" = x"yes"; then - AC_CHECK_FUNCS([_IceTransNoListen]) - LIBS="$ac_LIBS" - -- dnl Check for iceauth -- AC_PATH_PROG([ICEAUTH], [iceauth]) -- if test x"$ICEAUTH" != x""; then -- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) -- else -- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) -- fi -+ AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) - - dnl Find a location for the session desktop file - AC_MSG_CHECKING([what xsession-prefix to use]) --- -1.7.4.4 diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch new file mode 100644 index 0000000000..0a34f8f039 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-meson.build-hard-code-path-to-iceauth.patch @@ -0,0 +1,49 @@ +From d3561f125e6e6d6bfea0b41ba1ea02d14eb07244 Mon Sep 17 00:00:00 2001 +From: Zhang Peng +Date: Tue, 17 Mar 2026 17:14:33 +0800 +Subject: [PATCH] meson.build: hard code path to iceauth + +Workaround find_program() which finds the native iceauth during +cross-compilation instead of the target path. + +This is the meson equivalent of the autotools patch that modified +configure.ac to hard code the iceauth path. + +This patch is replace the patch 0001-configure.in-hard-code-path-to-iceauth.patch + +Upstream-Status: Inappropriate [cross-compile specific] + +Signed-off-by: Zhang Peng +--- + meson.build | 2 +- + xfce4-session/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 7ab81ae5..c54ebafd 100644 +--- a/meson.build ++++ b/meson.build +@@ -75,7 +75,7 @@ if enable_x11 + feature_cflags += '-DHAVE__ICETRANSNOLISTEN=1' + endif + +- iceauth = find_program('iceauth', required: true) ++ # iceauth path is hard-coded below for cross-compilation + + xsession_prefix = get_option('xsession-prefix') + if xsession_prefix == '' +diff --git a/xfce4-session/meson.build b/xfce4-session/meson.build +index 56a297f9..e36885e4 100644 +--- a/xfce4-session/meson.build ++++ b/xfce4-session/meson.build +@@ -42,7 +42,7 @@ c_args = [ + + if enable_x11 + c_args += [ +- '-DICEAUTH_CMD="@0@"'.format(iceauth.full_path()), ++ '-DICEAUTH_CMD="' + get_option('prefix') / get_option('bindir') / 'iceauth' + '"', + ] + + session_sources += [ +-- +2.50.0 diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb similarity index 75% rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb rename to meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb index af7ab98ae5..61a059f051 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.20.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.21.1.bb @@ -6,18 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libwnck3 libsm libxfce4ui libxfce4windowing virtual/libx11" +XFCE_COMPRESS_TYPE = "xz" +XFCEBASEBUILDCLASS = "meson" + inherit xfce update-alternatives features_check -SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "dbf00672c5316a30b7001fe852e6a5ba9f889afeab8a247545a160d4302f1fa2" +SRC_URI += "file://0001-meson.build-hard-code-path-to-iceauth.patch" +SRC_URI[sha256sum] = "a8fe873fdb20366a44f1345400bfb29c2ff0cfe89dfefd852e2575464b80567c" REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" -PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" - -EXTRA_OECONF = "GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \ - GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources" +PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" ALTERNATIVE:${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session"