From 0079cb4311d9adb774f73081ce1df26dcf002054 Mon Sep 17 00:00:00 2001 From: Ava Glass Date: Thu, 2 Jan 2025 13:06:49 +0000 Subject: [PATCH] Chore: Rename old instances of io.github.qtox to com.github.TokTok The flathub repo should probably be updated too see: https://github.com/flathub/io.github.qtox.qTox/issues/34 --- .github/workflows/build-test-deploy.yaml | 6 +++--- MAINTAINING.md | 4 ++-- cmake/Installation.cmake | 4 ++-- ...ub.qtox.qTox.desktop => com.github.TokTok.qTox.desktop | 0 flatpak/build.sh | 4 ++-- ....github.qtox.qTox.json => com.github.TokTok.qTox.json} | 2 +- ...Tox.appdata.xml => com.github.TokTok.qTox.appdata.xml} | 4 ++-- src/appmanager.cpp | 2 +- tools/update-versions.sh | 4 ++-- tools/validate_pr.py | 8 ++++---- 10 files changed, 19 insertions(+), 19 deletions(-) rename io.github.qtox.qTox.desktop => com.github.TokTok.qTox.desktop (100%) rename flatpak/{io.github.qtox.qTox.json => com.github.TokTok.qTox.json} (98%) rename res/{io.github.qtox.qTox.appdata.xml => com.github.TokTok.qTox.appdata.xml} (96%) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 2b62846c05..588b1f74a6 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -439,8 +439,8 @@ jobs: - name: Point flathub descriptor at the release tag if: contains(github.ref, 'refs/tags/v') run: flatpak/localize_flathub_descriptor.py - --flathub-manifest flatpak/io.github.qtox.qTox.json - --output flatpak/io.github.qtox.qTox.json + --flathub-manifest flatpak/com.github.TokTok.qTox.json + --output flatpak/com.github.TokTok.qTox.json --git-tag "${{ steps.get_version.outputs.version_tag }}" - name: Install docker-compose run: sudo apt-get install -y docker-compose @@ -501,7 +501,7 @@ jobs: - name: Install flatpak run: flatpak install --user -y --bundle qtox.flatpak - name: Run flatpak - run: flatpak run io.github.qtox.qTox --help + run: flatpak run com.github.TokTok.qTox --help env: QT_QPA_PLATFORM: offscreen diff --git a/MAINTAINING.md b/MAINTAINING.md index 4eee546884..85e707415d 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -232,7 +232,7 @@ In the PRs in this step, only make pull requests. Do not merge, yet. release. - Make a PR writing a short blog post for https://github.com/qTox/blog/. - Make a PR on our [Flathub repository] copying the local manifest - [`flatpak/io.github.qtox.qTox.json`] into the repository. + [`flatpak/com.github.TokTok.qTox.json`] into the repository. - Ensure the build passed for qTox on all architectures on [the Flathub build bot] @@ -266,6 +266,6 @@ helping for a while, ask to be added to the `TokTok` organization on GitHub. [`tools/format-code.sh`]: /tools/format-code.sh [`tools/validate_pr.py`]: /tools/validate_pr.py [Flathub repository]: https://github.com/flathub/io.github.qtox.qTox -[`flatpak/io.github.qtox.qTox.json`]: /flatpak/io.github.qtox.qTox.json +[`flatpak/com.github.TokTok.qTox.json`]: /flatpak/com.github.TokTok.qTox.json [`flatpak/update_flathub_descriptor_dependencies.py`]: /flatpak/update_flathub_descriptor_dependencies.py [the Flathub build bot]: https://flathub.org/builds/#/ diff --git a/cmake/Installation.cmake b/cmake/Installation.cmake index 22069930d2..e15a88fe0a 100644 --- a/cmake/Installation.cmake +++ b/cmake/Installation.cmake @@ -26,8 +26,8 @@ else() include(GNUInstallDirs) # follow the xdg-desktop specification install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(FILES "res/io.github.qtox.qTox.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") - install(FILES "io.github.qtox.qTox.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") + install(FILES "res/com.github.TokTok.qTox.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") + install(FILES "com.github.TokTok.qTox.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") # Install application icons according to the XDG spec set(ICON_SIZES 14 16 22 24 32 36 48 64 72 96 128 192 256 512) diff --git a/io.github.qtox.qTox.desktop b/com.github.TokTok.qTox.desktop similarity index 100% rename from io.github.qtox.qTox.desktop rename to com.github.TokTok.qTox.desktop diff --git a/flatpak/build.sh b/flatpak/build.sh index a1bd2d943d..dfb323d92a 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -9,7 +9,7 @@ set -exuo pipefail # use multiple cores when building export MAKEFLAGS="-j$(nproc)" -FLATPAK_DESCRIPTOR=$(dirname "$(realpath "$0")")/io.github.qtox.qTox.json +FLATPAK_DESCRIPTOR=$(dirname "$(realpath "$0")")/com.github.TokTok.qTox.json # If $FLATPAK_BUILD is set, use it as the build directory if [ -n "${FLATPAK_BUILD:-}" ]; then @@ -21,7 +21,7 @@ fi flatpak-builder --ccache --disable-rofiles-fuse --install-deps-from=flathub --force-clean --repo=qtox-repo _build-flatpak "$FLATPAK_DESCRIPTOR" # Create a bundle for distribution -flatpak build-bundle qtox-repo qtox.flatpak io.github.qtox.qTox +flatpak build-bundle qtox-repo qtox.flatpak com.github.TokTok.qTox # If $FLATPAK_BUILD is set, copy the bundle to the build directory if [ -n "${FLATPAK_BUILD:-}" ]; then diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/com.github.TokTok.qTox.json similarity index 98% rename from flatpak/io.github.qtox.qTox.json rename to flatpak/com.github.TokTok.qTox.json index bd43cfb6c7..e658b9e7c0 100644 --- a/flatpak/io.github.qtox.qTox.json +++ b/flatpak/com.github.TokTok.qTox.json @@ -1,5 +1,5 @@ { - "app-id": "io.github.qtox.qTox", + "app-id": "com.github.TokTok.qTox", "runtime": "org.kde.Platform", "sdk": "org.kde.Sdk", "runtime-version": "6.7", diff --git a/res/io.github.qtox.qTox.appdata.xml b/res/com.github.TokTok.qTox.appdata.xml similarity index 96% rename from res/io.github.qtox.qTox.appdata.xml rename to res/com.github.TokTok.qTox.appdata.xml index 3e6da8bd6b..bc56bd153e 100644 --- a/res/io.github.qtox.qTox.appdata.xml +++ b/res/com.github.TokTok.qTox.appdata.xml @@ -1,8 +1,8 @@ - io.github.qtox.qTox - io.github.qtox.qTox.desktop + com.github.TokTok.qTox + com.github.TokTok.qTox.desktop CC-BY-SA-3.0 GPL-3.0 qTox diff --git a/src/appmanager.cpp b/src/appmanager.cpp index 93694b7d5b..2460efca90 100644 --- a/src/appmanager.cpp +++ b/src/appmanager.cpp @@ -211,7 +211,7 @@ int AppManager::run() #endif qapp->setApplicationName("qTox"); - qapp->setDesktopFileName("io.github.qtox.qTox"); + qapp->setDesktopFileName("com.github.TokTok.qTox"); qapp->setApplicationVersion("\nGit commit: " + QString(GIT_VERSION)); // Install Unicode 6.1 supporting font diff --git a/tools/update-versions.sh b/tools/update-versions.sh index 3965a79026..a2bd9ec4a2 100755 --- a/tools/update-versions.sh +++ b/tools/update-versions.sh @@ -49,8 +49,8 @@ update_readme() { update_appdata() { cd "$BASE_DIR"/res/ local isodate="$(date --iso-8601)" - sed -ri "s|( None: files = ( "README.md", "macos/Info.plist", - "res/io.github.qtox.qTox.appdata.xml", + "res/com.github.TokTok.qTox.appdata.xml", "windows/qtox.nsi", "windows/qtox64.nsi", ) @@ -196,7 +196,7 @@ def check_package_versions(failures: list[str], config: Config) -> None: def check_no_version_changes(failures: list[str]) -> None: """Check that no version changes are made in a non-release PR. - Diff res/io.github.qtox.qTox.appdata.xml against $GITHUB_BASE_BRANCH and + Diff res/com.github.TokTok.qTox.appdata.xml against $GITHUB_BASE_BRANCH and check if there's a line starting with "+" or "-" that contains a version number. @@ -215,7 +215,7 @@ def check_no_version_changes(failures: list[str]) -> None: "diff", github.base_branch(), "--", - "res/io.github.qtox.qTox.appdata.xml", + "res/com.github.TokTok.qTox.appdata.xml", ], cwd=GIT_BASE_DIR, universal_newlines=True,