X2Go Bug report logs - #1601
Patch for x2goclient Qt5 build on Windows

version graph

Package: x2goclient; Maintainer for x2goclient is X2Go Developers <x2go-dev@lists.x2go.org>; Source for x2goclient is src:x2goclient.

Reported by: Orion Poplawski <orion@nwra.com>

Date: Tue, 9 May 2023 17:00:01 UTC

Severity: normal

Tags: patch

Found in version 4.1.2.2

Full log

🔗 View this message in rfc822 format

X-Loop: owner@bugs.x2go.org
Subject: Bug#1601: [X2Go-Dev] Bug#1601: Patch for x2goclient Qt5 build on Windows
Reply-To: Orion Poplawski <orion@nwra.com>, 1601@bugs.x2go.org
Resent-From: Orion Poplawski <orion@nwra.com>
Resent-To: x2go-dev@lists.x2go.org
Resent-CC: X2Go Developers <x2go-dev@lists.x2go.org>
X-Loop: owner@bugs.x2go.org
Resent-Date: Tue, 09 May 2023 18:25:01 +0000
Resent-Message-ID: <handler.1601.B1601.168365640610444@bugs.x2go.org>
Resent-Sender: owner@bugs.x2go.org
X-X2Go-PR-Message: followup 1601
X-X2Go-PR-Package: x2goclient
X-X2Go-PR-Keywords: patch
References: <04e068b1-91de-5d88-1e8f-e836cbbd028d@nwra.com> <CANVnVY+=cw9K-fsBT6p72kwW0zABQscQQ1TNwKR+1r0-1NGYvA@mail.gmail.com> <CANVnVY+vsPeNxz9C05vegOnvNoBqx0FKgMAruKMa=BF28sxU-g@mail.gmail.com> <888e8ec8-a449-2514-69b3-b66006460849@nwra.com> <04e068b1-91de-5d88-1e8f-e836cbbd028d@nwra.com>
Received: via spool by 1601-submit@bugs.x2go.org id=B1601.168365640610444
          (code B ref 1601); Tue, 09 May 2023 18:25:01 +0000
Received: (at 1601) by bugs.x2go.org; 9 May 2023 18:20:06 +0000
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-1.4 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,NICE_REPLY_A,SPF_HELO_PASS,
	T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
	version=3.4.2
Received: from GCC02-DM3-obe.outbound.protection.outlook.com (mail-dm3gcc02on2070b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d04::70b])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id DA2CE5DAEE;
	Tue,  9 May 2023 20:19:56 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=UQ/BCorBnNNRrLkHDzrm0ai2B32nZGqpCNI1LNa140Oou7gekHhqT36GgMzjG3ML2vdhLo1fcIQmDuVBWyfe+Yv2gKoMTAvY+uEDVhBpRUY7sMmzgmPeyXUx1ketKDb92lN7IlmZ9R82LZ1qnqXEz4Lh0liFyin35A5aztqtHnN7HzUqgEZx437S71UI7lURpkrqK6oqmQzva1VtixBx8PobAb7tJFGeYmfPCEAAF/bEUpX0iz7evdixohDmJbEzLmD9KnhKncq376CiUdp6hrt8xAs/jW+DJ/afwwRDLekLmF3V9sLZA+Xpy+5ntH5LvcWq/NKRe65dwee8eThseA==
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=OCDzlaUXADaTEOfcDB5rrLRABg0nX2ORBRgXIsyxd1Q=;
 b=KeJ5+q4jkNd8FB4DNo5k5DINMyusidJau6MdXqhXu1gRGPe8B3E53Z6kPl+ONlV9+bsgEt3U6QqvrehGkEwY3NKfYlZ/mo167TBE4Ed/o4JNiPYBhEvxrs70dXlmn73mOlEAzWRdwagc/RvEomqG7gzXbxfUJP+6veuzCIDJVP+nPUTdzAGXgkDIyy12wFQWsjkM75iLlBegGtth/JlUylSaG8/Dz2AuHHBGaZX7HY30sBafvwSNWnktHJHXMU21AKPtCKZRJa6xAXOmA/KSoF4leZ/+5Bava8lSu6JKwrOZnvgO2+ucHK4mGMLLY+QAythF/WM6IvHPUalUVNdjQw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=nwra.com; dmarc=pass action=none header.from=nwra.com;
 dkim=pass header.d=nwra.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nwra.com; s=selector2;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=OCDzlaUXADaTEOfcDB5rrLRABg0nX2ORBRgXIsyxd1Q=;
 b=m2ZHj8Vu7VNx8UeR7k2UkJKWGIdxMebO4YXPV9QNR7h8uwWKNlUS79I6zQQ4KXaCaOWVqUpdUI8IifQSYJrtW4z5ROe6xHgK6KLR3Qk4KGC6w877gmLil4O5NE8OuzXYhG8KlxeyukgKSJXAQzxSlyjUle70II+F0XCHMmmZ94jsRP/8NLXOXpELdTugHo5eQU7i2TbsRh0ZYFsUIDDUO2k0jsB5X+09ec4VNtGUxiZxjG5ntYAQ8ScMTdjWr0iyVt2c1P474I+/fSXfuNt7eUcseEkbQYPrMiftMx15M5ytNW5yu8LU2/6aFN0SGcgqy7XBGtmxOwVr29ki8hSGHg==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=nwra.com;
Received: from SJ0PR09MB6318.namprd09.prod.outlook.com (2603:10b6:a03:26b::14)
 by PH8PR09MB9744.namprd09.prod.outlook.com (2603:10b6:510:18c::13) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Tue, 9 May
 2023 18:19:51 +0000
Received: from SJ0PR09MB6318.namprd09.prod.outlook.com
 ([fe80::21ee:67bb:7cac:af4e]) by SJ0PR09MB6318.namprd09.prod.outlook.com
 ([fe80::21ee:67bb:7cac:af4e%7]) with mapi id 15.20.6363.033; Tue, 9 May 2023
 18:19:51 +0000
Message-ID: <86067a1e-44c8-110c-4135-6273e15a749a@nwra.com>
Date: Tue, 9 May 2023 12:19:48 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.0
Content-Language: en-US
From: Orion Poplawski <orion@nwra.com>
To: uli42@gmx.de, 1601@bugs.x2go.org
Cc: submit@bugs.x2go.org
Organization: NorthWest Research Associates
In-Reply-To: <888e8ec8-a449-2514-69b3-b66006460849@nwra.com>
Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms050402090201080908000403"
X-ClientProxiedBy: CY8PR10CA0041.namprd10.prod.outlook.com
 (2603:10b6:930:4b::12) To SJ0PR09MB6318.namprd09.prod.outlook.com
 (2603:10b6:a03:26b::14)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SJ0PR09MB6318:EE_|PH8PR09MB9744:EE_
X-MS-Office365-Filtering-Correlation-Id: 36bbabf0-a1e3-4166-7f7c-08db50b9fb07
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	vkRHZwtA53IebLGeQRFbY7389UlBLA1IbSHKpOta21BcfXIrSsuEufr2yaHLuUedltllRK2xker27nrO6qJNOqPVouZnVUOr7ij5eVn2GQsE6bc+dfGzBnc96x2Ek6BA3Q+ydngeFv0mFJZWL72ADAHc5MQbVfe/vm3lt4JUK0U8P/oatG38X3eyeViccD8whAlXvq1w/KC8kBqMTLgWe8Z4Nec5szcvjbyuAgm+F7Qn2H9VpR10mE+yGxNfLCoCjaJaSBrJtRgn0OO6Z2caXkyI0H3YT+Eo8gIJZQYxHigKpA8rhRb8gmpWCMN2IWpxAJKVInOblSKBsUUxurUZw4ATCw1bz7vgf9sztL4rD4Bb67EoPX62rN0wJFw2eagRn3IODUI9cvkEyAV+/eFojieZbsOdpMRmT8b6xiLwaSVZ2sH4FLiF1hYqpnMKPuvv3FSaRecSUghQAihHIWWifDw8UVjIILKCbbYtbTGOh7bQXObjP0onA4nUarAxxAkAEckWJzLvX6DLHXmiWd4NUHIMCd+Pdnc1ZopZANstBcr4DX97BxrRCCqwXfYy1h8daAJE5/8xiiyvbLx7c8AUHc19be2+Ic/sYMpJBJm0eVFfRqLd5eaWogYV7DhG+lSEdG9v8pJSgxZLPmm3+S55kA==
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR09MB6318.namprd09.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(39830400003)(136003)(396003)(451199021)(66946007)(4326008)(508600001)(66556008)(66476007)(966005)(8936002)(5660300002)(235185007)(8676002)(26005)(6512007)(31686004)(33964004)(36916002)(41300700001)(6486002)(53546011)(6506007)(6666004)(2906002)(2616005)(186003)(66574015)(41320700001)(86362001)(31696002)(40140700001)(36756003)(38100700002)(43740500002)(45980500001);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	GiP5r20RcI8+6YDQ9eOk/E0GiyxkTNTBKh1N/4OqX9n6Bo5wvB+U8kyHGfdqkuTvjnRFrCv211EJA4j/w55ft8M07XWBJzWEk0LQnkpYhus4r6yFZN4XXg8eAV3HIakF6oPCjlaKmtCcq+EURY8GRQ5n5a/oKWBQu74DLgpveirGe/cb6oG/GXFOUUXigGQ6mRyVa5PvjPYVPkfQ5Ly6XDOaAy1v/Lr0CtNtZDkDXFFrmJseWzafLqh5VTzozeYUOc0fmATLx9/l3pKBWAWab5TEGxSIz1b6sQCGzPQ6nHVmeNvf8kopNhPb2vtuUX1hTUA5YR/a/aj4la94EY+s5e36WKkX6L8UXxyrxQTPiJrgPfP+lUHvOmzfgJhriLqbCubtQAq96iR7aXIU+cCpYbtCsu7z2XpQ2vfjX4SrCIkQi3jSrPHF+QmVkru1d6CgNcmpgCzs081JaXdCD0ckgxNsLYijwwE8LOlfQOw27m0i9swQy01Yo4Ty0bghYkCw+e5xgtno1wTd7b6LLn2d+oENWYivBqo2EujHO1/NzQ8YHp4UyqTyc3ehyrAIgIkJbnwya1aBQ5wJINeaqRMAR+k8wOAzvAx3u+L/c9DmJ/fIAGT9yA1gK2F90HTJizNSu9Xuescve9XABIHyFhySmxqTOZR9dlNZhlGBe+K2hI8tqenpqu+3xV2rx6YpefN1/8bPeOcVHRxL7C7XLIfAgUmpYhHR3U8XISCdzwIXWfPjd7YDCbE+Nx20VWPvCdaz47+NBRKjf2GlWnnd8yikGsPhpC8PxG1Pm57CtppL9WvzXasXatbuhsuuUEG9FGUPFqc7OFKCFb+Xg2nZrDmBZpLurmbJfaDY52BywPHLD3O+/jBVgNEB7R1UWreFeevj7GOOOJxgKlU8kv+QWllVC5ERgozYC/AG8nyiWiszF0407JhCz6a/0U9RjfzFCSDs5qYd8lAKdaEXzl12qftpu8zrfruxWlRlam4eMhXZN8bxk2jlBA2K4Q0QCJ6OLB4nI6eCZiGA4cHZxJ9uAJKdqu20ayPd6YOcrslQ7Wd6WTSD2aCD4X8BVdTJMFr4HQhRIu8WCp9voCeWz4o+13pL31n88/SG5/kY0YVh8aDQnsRtRACWW1DOsg5B7vusPMdVuGst6MqDE+zWhqU/lfCoPI5kKeHrRxFieZbskgGSduHMUBG1d6S8Sx4DclYCuPP2ZpEZCHxKMfUBDP2ObYyqw8fzcqYpVPBsBgEbbW3ly6zC323OxHE8mQnoPZYhLuaELLavXCH3wwcQXy6z3jKiN7OKHgzy6EIEBFbawOmN2FhJPVyDm/fijgvXBi9cRob+7xGwghujXvbyAGS4U7zvblnWA0uiMrApaxI5KZE95xtiiiv5qjOXFATBAZ9qxY/ebmJxqUlUV9RzBLGTtKWlF4AQtruE6V7X4kAyqECDby7xu9U/ah13kZ34gR5zHLMyfJ4SUZwP5DLye3F/eA3RwQ+SFMfAv6ivLtaMeelJI2xCIz0VXjH7wsg8AjI14JE+/l1w9s3sYrcG74NtL871OaASRlZj8XtUkXSuXL+IlH2hqY99NWj6SOov1umSOKF9
X-OriginatorOrg: nwra.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 36bbabf0-a1e3-4166-7f7c-08db50b9fb07
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR09MB6318.namprd09.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2023 18:19:51.6029
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 761303a3-2ec2-424e-8122-be8b689b4996
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR09MB9744

[Message part 1 (text/plain, inline)]
And I think at the moment I still prefer simply removing the 
wapiSetWindowIcon() code since it isn't used and allows the removal of 
the QT winextras dependency.

On 5/9/23 12:16, Orion Poplawski wrote:
> Gah, once again I make the mistake of not trying to build with the 
> latest git
> code.
> 
> So now I'm trying with that and getting:
> 
> i686-w64-mingw32-g++ -c -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 
> -fexceptions --param=ssp-buffer-size=4 -fno-keep-inline-dllexport -O2 
> -Wall -Wextra -mthreads -DUNICODE -DCFGCLIENT -DQT_STATIC 
> -DQT_DESIGNER_STATIC -DDBUS_STATIC_BUILD -DPCRE_STATIC -DPCRE2_STATIC 
> -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_WINEXTRAS_LIB 
> -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NEEDS_QMAIN 
> -I../../x2goclient-1ca43813937df9cd136ae6d282204604ab659fab -I. -I../src 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtSvg 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtWidgets 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtWinExtras 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtGui 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtNetwork 
> -I/usr/i686-w64-mingw32/sys-root/mingw/include/qt5/QtCore -Irelease -I. 
> -I/usr/i686-w64-mingw32/sys-root/mingw/share/qt5/mkspecs/mingw-w64-g++ 
> -o release/wapi.o ../src/wapi.cpp
> ../src/wapi.cpp:25:10: fatal error: AccCtrl.h: No such file or directory
>     25 | #include <AccCtrl.h>
>        |          ^~~~~~~~~~~
> 
> I couldn't find anything that provided that on my system so I simply 
> removed it.  And that seems to compile okay.
> 
> Ah, just realized I'm on a case sensitive system, so changing that to 
> <accctrl.h> works too.  But perhaps it isn't really needed?
> 
> On 5/9/23 11:27, Ulrich Sibiller wrote:
>> Hi again,
>>
>> the current upstream of x2goclient contains these lines. So it looks
>> like your QT_VERSION is not set correctly. (see
>> https://code.x2go.org/gitweb?p=x2goclient.git;a=blob;f=src/wapi.cpp;h=12732c24b7b7cbf2da4cc8b0d0d9f782646960d3;hb=HEAD)
>>
>> Uli
>>
>> On Tue, May 9, 2023 at 7:25 PM Ulrich Sibiller
>> <ulrich.sibiller@gmail.com> wrote:
>>>
>>> Iirc I have made some patches for the windows version. I thought they 
>>> had been merged but I must check that. For now try this:
>>>
>>>
>>> #if QT_VERSION >= 0x050200
>>>    largeIcon=QtWin::toHICON(icon.scaled(iconx,icony, 
>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
>>>    smallIcon=QtWin::toHICON(icon.scaled(smallx,smally, 
>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
>>> #else
>>>    largeIcon=icon.scaled(iconx,icony, 
>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON();
>>>    smallIcon=icon.scaled(smallx,smally, 
>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON();
>>> #endif
>>>
>>>
>>> Uli
>>>
>>> Orion Poplawski <orion@nwra.com> schrieb am Di., 9. Mai 2023, 19:00:
>>>>
>>>> Package: x2goclient
>>>> Version: 4.1.2.2
>>>> Tag: patch
>>>>
>>>>
>>>> When compiling against Qt5 5.15.9 I get:
>>>>
>>>> ../src/wapi.cpp: In function 'void wapiSetWindowIcon(HWND, const 
>>>> QPixmap&)':
>>>> ../src/wapi.cpp:224:88: error: 'class QPixmap' has no member named
>>>> 'toWinHICON'
>>>>    224 |     largeIcon=icon.scaled(iconx,icony,
>>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON ();
>>>>        |                        ^~~~~~~~~~
>>>> ../src/wapi.cpp:225:90: error: 'class QPixmap' has no member named
>>>> 'toWinHICON'
>>>>    225 |     smallIcon=icon.scaled(smallx,smally,
>>>> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON ();
>>>>        |                          ^~~~~~~~~~
>>>>
>>>> Now, the only call to wapiSetWindowIcon() is commented out, so I just
>>>> commented out the wapiSetWindowIcon() code as we...  Looks like the
>>>> current function to use is QImage::toHICON().
>>>>
>>>> I'm also curious that you need to shift to a Windows API call -
>>>> shouldn't we be able to do everything in Qt?
>>>>
>>>>
>>>>
>>>> -- 
>>>> Orion Poplawski
>>>> he/him/his  - surely the least important thing about me
>>>> IT Systems Manager                         720-772-5637
>>>> NWRA, Boulder/CoRA Office             FAX: 303-415-9702
>>>> 3380 Mitchell Lane                       orion@nwra.com
>>>> Boulder, CO 80301                 
>>>> https://www.nwra.com/_______________________________________________
>>>> x2go-dev mailing list
>>>> x2go-dev@lists.x2go.org
>>>> https://lists.x2go.org/listinfo/x2go-dev
> 

-- 
Orion Poplawski
he/him/his  - surely the least important thing about me
IT Systems Manager                         720-772-5637
NWRA, Boulder/CoRA Office             FAX: 303-415-9702
3380 Mitchell Lane                       orion@nwra.com
Boulder, CO 80301                 https://www.nwra.com/


[smime.p7s (application/pkcs7-signature, attachment)]

Send a report that this bug log contains spam.

X2Go Developers <owner@bugs.x2go.org>. Last modified: Thu Nov 21 15:44:37 2024; Machine Name: ymir.das-netzwerkteam.de

X2Go Bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

Copyright © 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson, 2005-2017 Don Armstrong, and many other contributors.