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: Ulrich Sibiller <uli42@gmx.de>, 1601@bugs.x2go.org
Resent-From: Ulrich Sibiller <uli42@gmx.de>
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 19:30:02 +0000
Resent-Message-ID: <handler.1601.B1601.168366030117693@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> <86067a1e-44c8-110c-4135-6273e15a749a@nwra.com> <04e068b1-91de-5d88-1e8f-e836cbbd028d@nwra.com>
Received: via spool by 1601-submit@bugs.x2go.org id=B1601.168366030117693
          (code B ref 1601); Tue, 09 May 2023 19:30:02 +0000
Received: (at 1601) by bugs.x2go.org; 9 May 2023 19:25:01 +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.9 required=3.0 tests=BAYES_00,FREEMAIL_FROM,
	HTML_MESSAGE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
	version=3.4.2
Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id D8CB05DAEE;
	Tue,  9 May 2023 21:24:55 +0200 (CEST)
Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-18f4a6d2822so39917970fac.1;
        Tue, 09 May 2023 12:24:55 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1683660294; x=1686252294;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=RpvTmvQb2bTRwmpgRVzmQ+xfTWw7xIL7tkMq/x6Hv0k=;
        b=KOgx9rthWkMaseOYxAomyfSZofnFd+P9ZVLeGRXd2dWIxoklhiqE/p3qfQbHMY2kQ0
         HV2RrlXFdz+Tim9Xvu91dHGfsGVhgubrqM8G+G6DgoZWl1Y15lDgzEIwmX0S8CQuWcE8
         +c0zBhcUojFNmPTMofIZPsPsg/WiBdhOFsn/pWWXJ02UGqOihyGdde2B1hEjhI0m5+Uh
         tJ52S81usxceq80VLoQPTNDyXIx4NFKNWWTw60qdiyuAxbuBz5x4XPpwLfY1dVFZN5VG
         lyNHJSsxfx/c9AgOpnBZz9iiCu2zsl5zHEPq3CYsaY7GrQTBRWNfVvUeXrPr4H68sp67
         JFcA==
X-Gm-Message-State: AC+VfDw7RDqlfKgR1TvkPLmlmkGFtMaIRlegp88zuKkLOA/0bLR5PBYH
	+3MED6hoWY/2cmTeilSD2ycXhj/9/vMUpvyZOc++R5KG
X-Google-Smtp-Source: ACHHUZ6TkNzQRmd1j/1BuReVadKUpmn/3DS7lLmgNr89hGMcv3wWxqYLEWWgVi+CGivR9dey6928mikKQjCYs1TQrD8=
X-Received: by 2002:a05:6870:1f92:b0:192:c930:8f32 with SMTP id
 go18-20020a0568701f9200b00192c9308f32mr9314492oac.5.1683660294293; Tue, 09
 May 2023 12:24:54 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <86067a1e-44c8-110c-4135-6273e15a749a@nwra.com>
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 9 May 2023 21:24:42 +0200
Message-ID: <CANVnVY+qNXfOqqEH5R8h9gFAB6Lmqqe81M6RtkzP79H5KaHcNA@mail.gmail.com>
To: Orion Poplawski <orion@nwra.com>
Cc: 1601@bugs.x2go.org, submit@bugs.x2go.org
Content-Type: multipart/alternative; boundary="000000000000c38bb905fb47b52b"

[Message part 1 (text/plain, inline)]
Ok, that makes sense.

Checkout README .mxe for instructions how to compile for windows using mxe
on Linux

Uli



Orion Poplawski <orion@nwra.com> schrieb am Di., 9. Mai 2023, 20:19:

> 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/
>
>

[Message part 2 (text/html, inline)]

Send a report that this bug log contains spam.

X2Go Developers <owner@bugs.x2go.org>. Last modified: Thu Nov 21 14:59:32 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.