From d3f132adc6e984b1b8fd98786df291996bb65c60 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sat, 14 Dec 2024 13:28:17 +0100 Subject: [PATCH 1/8] Try to fix icon on Wayland --- ...qelectrotech.desktop => org.qelectrotech.qelectrotech.desktop} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename misc/{qelectrotech.desktop => org.qelectrotech.qelectrotech.desktop} (100%) diff --git a/misc/qelectrotech.desktop b/misc/org.qelectrotech.qelectrotech.desktop similarity index 100% rename from misc/qelectrotech.desktop rename to misc/org.qelectrotech.qelectrotech.desktop From 52d56c18a21db458a8c12d24df0eebcf651a0623 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sat, 14 Dec 2024 13:31:42 +0100 Subject: [PATCH 2/8] Try to fix icon on Wayland --- qelectrotech.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qelectrotech.pro b/qelectrotech.pro index 092f3c6cb..e044ad99a 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -281,7 +281,7 @@ mime_package.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_PACKAGE_PATH}) mime_package.files = misc/qelectrotech.xml desktop.path = $$join(INSTALL_PREFIX,,,$${QET_DESKTOP_PATH}) -desktop.files = misc/qelectrotech.desktop +desktop.files = misc/org.qelectrotech.qelectrotech.desktop appdata.path = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH}) appdata.files = misc/qelectrotech.appdata.xml From 0e646aed0b0acd5fff022f5b5972456662ab7927 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sat, 14 Dec 2024 14:25:35 +0100 Subject: [PATCH 3/8] Update translations_stat.pl --- misc/translations_stat.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/translations_stat.pl b/misc/translations_stat.pl index 212391d20..fd3111935 100755 --- a/misc/translations_stat.pl +++ b/misc/translations_stat.pl @@ -33,7 +33,7 @@ my $no = '[no]'; my $todo = 'TODO'; our $default_language = 'fr'; -our @misc_desktop_files = qw(misc/qelectrotech.desktop); +our @misc_desktop_files = qw(misc/org.qelectrotech.qelectrotech.desktop); our @misc_xml_files = qw(misc/qelectrotech.xml); our @readme_files = qw(CREDIT README INSTALL ELEMENTS.LICENSE build-aux/linux/fedora/README.elements); our @ordered_languages = qw(fr en es pt cs pl ca de it ar sl hr el nl be ru ro da pt_BR hu sr tr nb ja mn uk zh); From e3e48d3966cce6ba657122e5f9134c64257df4d7 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sat, 14 Dec 2024 16:09:07 +0100 Subject: [PATCH 4/8] Fix snapcraft.yaml --- build-aux/snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index a390aefe0..9460b688c 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -93,7 +93,7 @@ parts: craftctl default # patch desktop file with correct icon path SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" - $SED_CMD usr/local/share/applications/qelectrotech.desktop + $SED_CMD usr/local/share/applications/org.qelectrotech.qelectrotech.desktop cleanup: after: [qelectrotech, qet-tb-generator] From 406af16e94514dfa67bec8924fde07de82ff1608 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 15 Dec 2024 09:32:16 +0100 Subject: [PATCH 5/8] Update org.qelectrotech.QElectroTech.json --- build-aux/flatpak/org.qelectrotech.QElectroTech.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json index 96702c37a..84593da1c 100644 --- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -5,7 +5,7 @@ "runtime-version": "5.15-23.08", "sdk": "org.kde.Sdk", "command": "qelectrotech", - "rename-desktop-file": "qelectrotech.desktop", + "rename-desktop-file": "org.qelectrotech.qelectrotech.desktop", "rename-appdata-file": "qelectrotech.appdata.xml", "rename-icon": "qelectrotech", "copy-icon": true, From efc8745bc723e24e54a30bd452903e557ebd521f Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 15 Dec 2024 09:35:26 +0100 Subject: [PATCH 6/8] Update packaging_script_AppImage.sh --- packaging_script_AppImage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging_script_AppImage.sh b/packaging_script_AppImage.sh index 622d593ba..77e9957ca 100644 --- a/packaging_script_AppImage.sh +++ b/packaging_script_AppImage.sh @@ -39,9 +39,9 @@ rm -Rf qelectrotech/usr/share/{elements,examples,titleblocks,lang,man,doc} cp ../build/qelectrotech qelectrotech/usr/bin/ cp -r ../{elements,examples,titleblocks,lang,man} qelectrotech/usr/share/ -./linuxdeployqt-continuous-x86_64.AppImage qelectrotech/usr/share/qelectrotech.desktop -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines +./linuxdeployqt-continuous-x86_64.AppImage qelectrotech/usr/share/org.qelectrotech.qelectrotech.desktop -appimage -bundle-non-qt-libs -verbose=1 -extra-plugins=iconengines rm qelectrotech/AppRun -sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' qelectrotech/qelectrotech.desktop +sed -i 's/'"QElectroTech_*.*/QElectroTech_$tagName-r$HEAD"'/' qelectrotech/org.qelectrotech.qelectrotech.desktop cp AppRun qelectrotech/ rm QElectroTech_*.AppImage From 48942845207cce87025503b404f5948329fc8415 Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 15 Dec 2024 14:41:34 +0100 Subject: [PATCH 7/8] Fix segfault due to calling method of uninitialized object, thanks ladmanj https://github.com/qelectrotech/qelectrotech-source-mirror/issues/311 --- sources/qetdiagrameditor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index a21c62aaf..73158e26b 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -1558,7 +1558,9 @@ void QETDiagramEditor::slot_updateActions() m_csv_export -> setEnabled(editable_project); m_project_export_conductor_num-> setEnabled(opened_project); m_terminal_strip_dialog -> setEnabled(editable_project); +#ifdef QET_EXPORT_PROJECT_DB m_export_project_db -> setEnabled(editable_project); +#endif m_project_terminalBloc -> setEnabled(editable_project); From a140c5ad39b6d171d6b475a4b803f36b8fdb82ab Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Sun, 15 Dec 2024 15:05:23 +0100 Subject: [PATCH 8/8] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 075286d0a..794ac6eb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,7 @@ install(DIRECTORY elements DESTINATION share/qelectrotech) install(DIRECTORY examples DESTINATION share/qelectrotech) install(DIRECTORY titleblocks DESTINATION share/qelectrotech) install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech) -install(FILES misc/qelectrotech.desktop DESTINATION share/applications) +install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications) install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages) install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH}) install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})