From voyageur@gentoo.org Wed Sep 28 22:43:15 2016 Received: (at submit) by bugs.x2go.org; 28 Sep 2016 20:43:18 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=3.0 tests=BAYES_50,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from localhost (localhost [127.0.0.1]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 50C755DA96 for ; Wed, 28 Sep 2016 22:43:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ymir.das-netzwerkteam.de Received: from ymir.das-netzwerkteam.de ([127.0.0.1]) by localhost (ymir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6yPLyAvIaWze for ; Wed, 28 Sep 2016 22:43:08 +0200 (CEST) X-Greylist: delayed 483 seconds by postgrey-1.34 at ymir.das-netzwerkteam.de; Wed, 28 Sep 2016 22:43:08 CEST Received: from intrepid.cafarelli.fr (intrepid.cafarelli.fr [195.154.119.210]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 860A75DA95 for ; Wed, 28 Sep 2016 22:43:07 +0200 (CEST) Received: from enterprise.cafarelli.fr (unknown [IPv6:2001:bc8:33c5:8::1000]) by intrepid.cafarelli.fr (Postfix) with ESMTPSA id 5DDC08007D for ; Wed, 28 Sep 2016 22:35:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 intrepid.cafarelli.fr 5DDC08007D Date: Wed, 28 Sep 2016 22:35:00 +0200 From: Bernard Cafarelli To: submit@bugs.x2go.org Subject: Qt5 build: qmake does not bundle resources correctly Message-ID: <20160928223500.2d8a55a6@enterprise.cafarelli.fr> Organization: Gentoo Foundation, Inc. X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) X-Face: 7~4(Qk<`!us|JEfF`9/56!o9Lag,791'IUvmH;`8s>5orOs['3K9z-]Z+q\P>g' MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/OAdaAOdvYdODieN1bseKbaY" X-Virus-Scanned: clamav-milter 0.99 at intrepid X-Virus-Status: Clean --MP_/OAdaAOdvYdODieN1bseKbaY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2goclient Version: 4.0.5.2 While updating the x2goclient Gentoo package to support a Qt5 build, I found out that the binary did not have bundled resources (images and translations), even if the same build with Qt4 worked fine. Sample errors: x2go-WARNING-1> "Non-fatal: can't load translator: :/i18n/x2goclient_fr_fr" [...] Cannot open file ':/img/svg/x2gologo.svg', because: No such file or directory [...] Huge thanks to Michael Palimaka who found out the root cause: rcc is the compiled version of qrc, so it looks like for some reason qmake5 assumes the rcc files are already compiled, and bundles them as-is instead of processing them The fix is to rename the resources files from .rcc to .qrc (and update the project file accordingly). Patch attached, tested and working fine on Gentoo with Qt 4.8.7 and 5.6.1 -- Bernard Cafarelli (Voyageur) Gentoo developer --MP_/OAdaAOdvYdODieN1bseKbaY Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=x2goclient-4.0.5.2-rcc_to_qrc.patch diff -Naur x2goclient-4.0.5.2.orig/res/changelog.qrc x2goclient-4.0.5.2/res/changelog.qrc --- x2goclient-4.0.5.2.orig/res/changelog.qrc 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-4.0.5.2/res/changelog.qrc 2016-09-19 06:17:43.000000000 +0200 @@ -0,0 +1,5 @@ + + + txt/changelog + + diff -Naur x2goclient-4.0.5.2.orig/res/changelog.rcc x2goclient-4.0.5.2/res/changelog.rcc --- x2goclient-4.0.5.2.orig/res/changelog.rcc 2016-09-19 06:17:43.000000000 +0200 +++ x2goclient-4.0.5.2/res/changelog.rcc 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ - - - txt/changelog - - diff -Naur x2goclient-4.0.5.2.orig/res/git.qrc x2goclient-4.0.5.2/res/git.qrc --- x2goclient-4.0.5.2.orig/res/git.qrc 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-4.0.5.2/res/git.qrc 2016-09-19 06:17:43.000000000 +0200 @@ -0,0 +1,5 @@ + + + txt/git-info + + diff -Naur x2goclient-4.0.5.2.orig/res/git.rcc x2goclient-4.0.5.2/res/git.rcc --- x2goclient-4.0.5.2.orig/res/git.rcc 2016-09-19 06:17:43.000000000 +0200 +++ x2goclient-4.0.5.2/res/git.rcc 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ - - - txt/git-info - - diff -Naur x2goclient-4.0.5.2.orig/res/resources.qrc x2goclient-4.0.5.2/res/resources.qrc --- x2goclient-4.0.5.2.orig/res/resources.qrc 1970-01-01 01:00:00.000000000 +0100 +++ x2goclient-4.0.5.2/res/resources.qrc 2016-09-19 06:17:44.000000000 +0200 @@ -0,0 +1,113 @@ + + + img/svg/bg.svg + img/svg/bg_hildon.svg + img/svg/line.svg + img/svg/onlogo.svg + img/svg/x2gologo.svg + img/svg/passform.svg + img/svg/sessionbut.svg + img/svg/folder.svg + img/svg/folder_grey.svg + img/svg/sessionbut_grey.svg + img/png/ico.png + img/png/ico_mini.png + img/png/sess_ico.png + img/png/ico_440x180.png + img/png/power-button.png + img/icons/128x128/x2go.png + img/icons/128x128/folder.png + img/icons/128x128/x2gosession.png + img/icons/128x128/create_file.png + img/icons/128x128/lxde.png + img/icons/128x128/preferences.png + img/icons/128x128/rdp.png + img/icons/64x64/audio.png + img/icons/64x64/personal.png + img/icons/64x64/create_file.png + img/icons/64x64/lxde.png + img/icons/64x64/preferences.png + img/icons/64x64/rdp.png + img/icons/32x32/edit.png + img/icons/32x32/edit_settings.png + img/icons/32x32/exit.png + img/icons/32x32/file-open.png + img/icons/32x32/new_file.png + img/icons/32x32/create_file.png + img/icons/32x32/lxde.png + img/icons/32x32/preferences.png + img/icons/32x32/rdp.png + img/icons/32x32/reconnect.png + img/icons/32x32/tbhide.png + img/icons/32x32/tbshow.png + img/icons/32x32/attach.png + img/icons/32x32/detach.png + img/icons/32x32/suspend.png + img/icons/32x32/stop.png + img/icons/32x32/auth.png + img/icons/32x32/x2goclient.png + img/icons/32x32/resolution.png + img/icons/32x32/contest.png + img/icons/32x32/apps.png + img/icons/32x32/open_dir.png + img/icons/32x32/suspend_session.png + img/icons/32x32/stop_session.png + img/icons/16x16/audio.png + img/icons/16x16/file-open.png + img/icons/16x16/delete.png + img/icons/16x16/edit.png + img/icons/16x16/gnome.png + img/icons/16x16/unity.png + img/icons/16x16/xfce.png + img/icons/16x16/mate.png + img/icons/16x16/kde.png + img/icons/16x16/cinnamon.png + img/icons/16x16/trinity.png + img/icons/16x16/openbox.png + img/icons/16x16/icewm.png + img/icons/16x16/new_file.png + img/icons/16x16/resolution.png + img/icons/16x16/session.png + img/icons/16x16/x2go.png + img/icons/16x16/tbshow.png + img/icons/16x16/X.png + img/icons/16x16/create_file.png + img/icons/16x16/lxde.png + img/icons/16x16/preferences.png + img/icons/16x16/rdp.png + img/icons/22x22/applications-development.png + img/icons/22x22/applications-education.png + img/icons/22x22/applications-games.png + img/icons/22x22/applications-graphics.png + img/icons/22x22/applications-internet.png + img/icons/22x22/applications-multimedia.png + img/icons/22x22/applications-office.png + img/icons/22x22/applications-other.png + img/icons/22x22/applications-system.png + img/icons/22x22/applications-utilities.png + img/icons/22x22/preferences-system.png + txt/packs + txt/encodings + i18n/x2goclient_da.qm + i18n/x2goclient_de.qm + i18n/x2goclient_es.qm + i18n/x2goclient_et.qm + i18n/x2goclient_fi.qm + i18n/x2goclient_fr.qm + i18n/x2goclient_nb_no.qm + i18n/x2goclient_nl.qm + i18n/x2goclient_pt.qm + i18n/x2goclient_ru.qm + i18n/x2goclient_sv.qm + i18n/x2goclient_tr.qm + i18n/x2goclient_zh_tw.qm + i18n/qt_da.qm + i18n/qt_de.qm + i18n/qt_es.qm + i18n/qt_fr.qm + i18n/qt_pt.qm + i18n/qt_ru.qm + i18n/qt_sv.qm + i18n/qt_zh_tw.qm + + diff -Naur x2goclient-4.0.5.2.orig/res/resources.rcc x2goclient-4.0.5.2/res/resources.rcc --- x2goclient-4.0.5.2.orig/res/resources.rcc 2016-09-19 06:17:44.000000000 +0200 +++ x2goclient-4.0.5.2/res/resources.rcc 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ - - - img/svg/bg.svg - img/svg/bg_hildon.svg - img/svg/line.svg - img/svg/onlogo.svg - img/svg/x2gologo.svg - img/svg/passform.svg - img/svg/sessionbut.svg - img/svg/folder.svg - img/svg/folder_grey.svg - img/svg/sessionbut_grey.svg - img/png/ico.png - img/png/ico_mini.png - img/png/sess_ico.png - img/png/ico_440x180.png - img/png/power-button.png - img/icons/128x128/x2go.png - img/icons/128x128/folder.png - img/icons/128x128/x2gosession.png - img/icons/128x128/create_file.png - img/icons/128x128/lxde.png - img/icons/128x128/preferences.png - img/icons/128x128/rdp.png - img/icons/64x64/audio.png - img/icons/64x64/personal.png - img/icons/64x64/create_file.png - img/icons/64x64/lxde.png - img/icons/64x64/preferences.png - img/icons/64x64/rdp.png - img/icons/32x32/edit.png - img/icons/32x32/edit_settings.png - img/icons/32x32/exit.png - img/icons/32x32/file-open.png - img/icons/32x32/new_file.png - img/icons/32x32/create_file.png - img/icons/32x32/lxde.png - img/icons/32x32/preferences.png - img/icons/32x32/rdp.png - img/icons/32x32/reconnect.png - img/icons/32x32/tbhide.png - img/icons/32x32/tbshow.png - img/icons/32x32/attach.png - img/icons/32x32/detach.png - img/icons/32x32/suspend.png - img/icons/32x32/stop.png - img/icons/32x32/auth.png - img/icons/32x32/x2goclient.png - img/icons/32x32/resolution.png - img/icons/32x32/contest.png - img/icons/32x32/apps.png - img/icons/32x32/open_dir.png - img/icons/32x32/suspend_session.png - img/icons/32x32/stop_session.png - img/icons/16x16/audio.png - img/icons/16x16/file-open.png - img/icons/16x16/delete.png - img/icons/16x16/edit.png - img/icons/16x16/gnome.png - img/icons/16x16/unity.png - img/icons/16x16/xfce.png - img/icons/16x16/mate.png - img/icons/16x16/kde.png - img/icons/16x16/cinnamon.png - img/icons/16x16/trinity.png - img/icons/16x16/openbox.png - img/icons/16x16/icewm.png - img/icons/16x16/new_file.png - img/icons/16x16/resolution.png - img/icons/16x16/session.png - img/icons/16x16/x2go.png - img/icons/16x16/tbshow.png - img/icons/16x16/X.png - img/icons/16x16/create_file.png - img/icons/16x16/lxde.png - img/icons/16x16/preferences.png - img/icons/16x16/rdp.png - img/icons/22x22/applications-development.png - img/icons/22x22/applications-education.png - img/icons/22x22/applications-games.png - img/icons/22x22/applications-graphics.png - img/icons/22x22/applications-internet.png - img/icons/22x22/applications-multimedia.png - img/icons/22x22/applications-office.png - img/icons/22x22/applications-other.png - img/icons/22x22/applications-system.png - img/icons/22x22/applications-utilities.png - img/icons/22x22/preferences-system.png - txt/packs - txt/encodings - i18n/x2goclient_da.qm - i18n/x2goclient_de.qm - i18n/x2goclient_es.qm - i18n/x2goclient_et.qm - i18n/x2goclient_fi.qm - i18n/x2goclient_fr.qm - i18n/x2goclient_nb_no.qm - i18n/x2goclient_nl.qm - i18n/x2goclient_pt.qm - i18n/x2goclient_ru.qm - i18n/x2goclient_sv.qm - i18n/x2goclient_tr.qm - i18n/x2goclient_zh_tw.qm - i18n/qt_da.qm - i18n/qt_de.qm - i18n/qt_es.qm - i18n/qt_fr.qm - i18n/qt_pt.qm - i18n/qt_ru.qm - i18n/qt_sv.qm - i18n/qt_zh_tw.qm - - diff -Naur x2goclient-4.0.5.2.orig/x2goclient.pro x2goclient-4.0.5.2/x2goclient.pro --- x2goclient-4.0.5.2.orig/x2goclient.pro 2016-09-19 06:17:44.000000000 +0200 +++ x2goclient-4.0.5.2/x2goclient.pro 2016-09-28 22:03:41.830790244 +0200 @@ -167,16 +167,16 @@ TEMPLATE = app DEPENDPATH += . INCLUDEPATH += src -RESOURCES += res/resources.rcc +RESOURCES += res/resources.qrc exists(res/txt/git-info) { message("Configuring with --git-info") - RESOURCES += res/git.rcc + RESOURCES += res/git.qrc } exists(res/txt/changelog) { message("Configuring with --changelog") - RESOURCES += res/changelog.rcc + RESOURCES += res/changelog.qrc } linux-g++ { --MP_/OAdaAOdvYdODieN1bseKbaY--