From 131f87ac1dc5aca8deca71cd01f62421818f2f7b Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 11 Jan 2020 09:22:07 -0800 Subject: [PATCH 1/3] Fix cmake icon. --- CMakeLists.txt | 6 +++--- ...ctral.png => 128-apps-org.eu.encom.spectral.png} | Bin ...ctral.png => 256-apps-org.eu.encom.spectral.png} | Bin ...ectral.png => 32-apps-org.eu.encom.spectral.png} | Bin ...ctral.png => 512-apps-org.eu.encom.spectral.png} | Bin 5 files changed, 3 insertions(+), 3 deletions(-) rename icons/hicolor/{128-apps-spectral.png => 128-apps-org.eu.encom.spectral.png} (100%) rename icons/hicolor/{256-apps-spectral.png => 256-apps-org.eu.encom.spectral.png} (100%) rename icons/hicolor/{32-apps-spectral.png => 32-apps-org.eu.encom.spectral.png} (100%) rename icons/hicolor/{512-apps-spectral.png => 512-apps-org.eu.encom.spectral.png} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index df4dc0e84..06bf3a90c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,8 +242,8 @@ if(LINUX) install(FILES linux/${IDENTIFIER}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo ) - file(GLOB spectral_icons icons/hicolor/*-apps-spectral.png) + file(GLOB spectral_icons icons/hicolor/*-apps-org.eu.encom.spectral.png) ecm_install_icons(ICONS ${spectral_icons} - DESTINATION ${CMAKE_INSTALL_DATADIR}/icons - ) + DESTINATION ${CMAKE_INSTALL_DATADIR}/icons + ) endif(LINUX) diff --git a/icons/hicolor/128-apps-spectral.png b/icons/hicolor/128-apps-org.eu.encom.spectral.png similarity index 100% rename from icons/hicolor/128-apps-spectral.png rename to icons/hicolor/128-apps-org.eu.encom.spectral.png diff --git a/icons/hicolor/256-apps-spectral.png b/icons/hicolor/256-apps-org.eu.encom.spectral.png similarity index 100% rename from icons/hicolor/256-apps-spectral.png rename to icons/hicolor/256-apps-org.eu.encom.spectral.png diff --git a/icons/hicolor/32-apps-spectral.png b/icons/hicolor/32-apps-org.eu.encom.spectral.png similarity index 100% rename from icons/hicolor/32-apps-spectral.png rename to icons/hicolor/32-apps-org.eu.encom.spectral.png diff --git a/icons/hicolor/512-apps-spectral.png b/icons/hicolor/512-apps-org.eu.encom.spectral.png similarity index 100% rename from icons/hicolor/512-apps-spectral.png rename to icons/hicolor/512-apps-org.eu.encom.spectral.png From 27a607d3bbad33397647e6174816c085b9a636d2 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 11 Jan 2020 17:52:51 +0000 Subject: [PATCH 2/3] Fix AppImage build. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22f4dc2e9..e5cb60609 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ build-appimage: - cd .. - cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install/usr -DOlm_DIR="olm/install/lib/cmake/Olm" -DQt5Keychain_DIR="qtkeychain/install/lib/x86_64-linux-gnu/cmake/Qt5Keychain" -DCMARK_LIBRARY="$PWD/cmark/install/lib/libcmark_static.a" -DCMARK_INCLUDE_DIR="$PWD/cmark/install/include" - cmake --build build --target install --parallel $(nproc) - - cp install/usr/share/icons/hicolor/256x256/apps/spectral.png install/org.eu.encom.spectral.png + - cp install/usr/share/icons/hicolor/256x256/apps/org.eu.encom.spectral.png install/org.eu.encom.spectral.png - linuxdeployqt install/usr/share/applications/org.eu.encom.spectral.desktop -appimage -qmldir=qml -qmldir=imports - mv *.AppImage spectral.AppImage artifacts: From 5c19179350aea42ed94688341453e141196468ec Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 11 Jan 2020 18:11:21 +0000 Subject: [PATCH 3/3] Fix flatpak build. --- flatpak/org.eu.encom.spectral.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index 781ce4e8e..84e1db772 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -1,5 +1,4 @@ id: org.eu.encom.spectral -rename-icon: spectral runtime: org.kde.Platform runtime-version: "5.12" sdk: org.kde.Sdk