Try to fix flatpak build and change appid

2 years ago · 93a9fca475
parent b1c2b384c6
commit 93a9fca475
6 changed files with 48 additions and 47 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -213,9 +213,9 @@ build-flatpak:
    - mkdir -p build-flatpak
    - cd build-flatpak
    - echo -e "\e[0Ksection_start:`date +%s`:build_flatpak[collapsed=true]\r\e[0K\e[1m\e[95mBuilding flatpak"
-    - flatpak-builder --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for ${ARCH}" app ../io.github.NhekoReborn.Nheko.yaml
+    - flatpak-builder --install-deps-from=flathub --user --disable-rofiles-fuse --ccache --repo=repo --default-branch=${CI_COMMIT_REF_NAME//\//_} --subject="Build of Nheko ${VERSION} `date` for ${ARCH}" app ../im.nheko.Nheko.yaml
    - echo -e "\e[0Ksection_end:`date +%s`:build_flatpak\r\e[0K"
-    - flatpak build-bundle repo nheko-${ARCH}.flatpak io.github.NhekoReborn.Nheko ${CI_COMMIT_REF_NAME//\//_}
+    - flatpak build-bundle repo nheko-${ARCH}.flatpak im.nheko.Nheko ${CI_COMMIT_REF_NAME//\//_}
  after_script:
    - echo -e "\e[0Ksection_start:`date +%s`:upload_flatpak[collapsed=true]\r\e[0K\e[1m\e[95mUploading flatpak"
    - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-${ARCH}.flatpak
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -799,7 +799,7 @@ endif()

 if(UNIX AND NOT APPLE)
 	if(FLATPAK)
-		set(APPID "io.github.NhekoReborn.Nheko")
+		set(APPID "im.nheko.Nheko")
 		set_target_properties(nheko PROPERTIES OUTPUT_NAME "${APPID}")
 	else()
 		set(APPID "nheko")
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@ nheko
 [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master)
 [![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/latest)
 [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://matrix-static.neko.dev/room/!TshDrgpBNBDmfDeEGN:neko.dev/)
-<a href='https://flatpak.neko.dev/repo/nightly/appstream/io.github.NhekoReborn.Nheko.flatpakref' download='nheko-nightly.flatpakref'><img alt='Download Nightly Flatpak' src='https://img.shields.io/badge/download-flatpak--nightly-green'/></a>
+<a href='https://flatpak.neko.dev/repo/nightly/appstream/im.nheko.Nheko.flatpakref' download='nheko-nightly.flatpakref'><img alt='Download Nightly Flatpak' src='https://img.shields.io/badge/download-flatpak--nightly-green'/></a>
 [![#nheko-reborn:matrix.org](https://img.shields.io/matrix/nheko-reborn:matrix.org.svg?label=%23nheko-reborn:matrix.org)](https://matrix.to/#/#nheko-reborn:matrix.org)
 [![Arch package](https://repology.org/badge/version-for-repo/arch/nheko.svg)](https://archlinux.org/packages/community/x86_64/nheko/)
 <a href='https://flathub.org/apps/details/io.github.NhekoReborn.Nheko'><img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@ -1,7 +1,7 @@
-id: io.github.NhekoReborn.Nheko
-command: io.github.NhekoReborn.Nheko
+id: im.nheko.Nheko
+command: im.nheko.Nheko
 runtime: org.kde.Platform
-runtime-version: '5.15-22.08'
+runtime-version: '6.5'
 sdk: org.kde.Sdk
 finish-args:
  - --device=dri
@ -44,9 +44,9 @@ cleanup:
 modules:
  - name: lmdb
    sources:
-      - sha256: f3927859882eb608868c8c31586bb7eb84562a40a6bf5cc3e13b6b564641ea28
+      - sha256: 8c5a93ac3cc97427c54571ad5a6140b7469389d01e6d2f43df39f96d3a4ccef7
        type: archive
-        url: https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
+        url: https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.30/openldap-LMDB_0.9.30.tar.gz
    make-install-args:
      - prefix=/app
    no-autogen: true
@ -109,45 +109,46 @@ modules:
        tag: 0.20.4
        type: git
        url: https://gitlab.gnome.org/GNOME/libsecret.git
-  - config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DAVIF_CODEC_AOM=ON
-      #- -DBUILD_SHARED_LIBS=OFF
-    buildsystem: cmake-ninja
-    name: libavif
-    sources:
-      - sha256: 66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e
-        type: archive
-        url: https://github.com/AOMediaCodec/libavif/archive/refs/tags/v0.10.1.tar.gz
-  - config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DWITH_EXAMPLES=OFF
-      #- -DBUILD_SHARED_LIBS=OFF
-    buildsystem: cmake-ninja
-    name: libheif
-    sources:
-      - sha256: e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718
-        type: archive
-        url: https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
-  - config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DKIMAGEFORMATS_HEIF=ON
-    buildsystem: cmake-ninja
-    name: KImageFormats
-    sources:
-      - commit: ae6b724824fc2fdf71d50dc7ae0052ad1551b25a
-        tag: v5.93.0
-        type: git
-        url: https://invent.kde.org/frameworks/kimageformats.git
+  #- config-opts:
+  #    - -DCMAKE_BUILD_TYPE=Release
+  #    - -DAVIF_CODEC_AOM=ON
+  #    #- -DBUILD_SHARED_LIBS=OFF
+  #  buildsystem: cmake-ninja
+  #  name: libavif
+  #  sources:
+  #    - sha256: 66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e
+  #      type: archive
+  #      url: https://github.com/AOMediaCodec/libavif/archive/refs/tags/v0.10.1.tar.gz
+  #- config-opts:
+  #    - -DCMAKE_BUILD_TYPE=Release
+  #    - -DWITH_EXAMPLES=OFF
+  #    #- -DBUILD_SHARED_LIBS=OFF
+  #  buildsystem: cmake-ninja
+  #  name: libheif
+  #  sources:
+  #    - sha256: e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718
+  #      type: archive
+  #      url: https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
+  #- config-opts:
+  #    - -DCMAKE_BUILD_TYPE=Release
+  #    - -DKIMAGEFORMATS_HEIF=ON
+  #  buildsystem: cmake-ninja
+  #  name: KImageFormats
+  #  sources:
+  #    - commit: ae6b724824fc2fdf71d50dc7ae0052ad1551b25a
+  #      tag: v5.93.0
+  #      type: git
+  #      url: https://invent.kde.org/frameworks/kimageformats.git
  - config-opts:
      - -DCMAKE_BUILD_TYPE=Release
      - -DBUILD_TEST_APPLICATION=OFF
      - -DQTKEYCHAIN_STATIC=ON
+      - -DBUILD_WITH_QT6=ON
    buildsystem: cmake-ninja
    name: QtKeychain
    sources:
-      - commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c
-        tag: v0.13.1
+      - commit: 69f993c47efed7e557d79a30a367014d9a27d809
+        tag: v0.14.1
        type: git
        url: https://github.com/frankosterfeld/qtkeychain.git
  - config-opts:
@ -170,15 +171,15 @@ modules:
  - buildsystem: meson
    name: gstreamer
    sources:
-      - commit: f7806a854aad960eae3288db4a67a574f92428fe
-        tag: 1.20.5
+      - commit: ecd471f5ea4645102b206a43d863f0f0fe7d04ec
+        tag: 1.22.3
        type: git
        url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
    config-opts:
      - --auto-features=disabled
      -  -Dgood=enabled
-      -  -Dgst-plugins-good:qt5=enabled
-      -  -Dqt5=enabled
+      -  -Dgst-plugins-good:qt6=enabled
+      -  -Dqt6=enabled
      -  -Dbase=enabled
      -  -Dgst-plugins-base:gl=enabled
      -  -Dgst-plugins-base:gl_platform=glx,egl
--- a/nheko-nightly.flatpakref
+++ b/nheko-nightly.flatpakref
@ -1,6 +1,6 @@
 [Flatpak Ref]
 Title=Nheko Nightly
-Name=io.github.NhekoReborn.Nheko
+Name=im.nheko.Nheko
 Branch=master
 Url=https://flatpak.neko.dev/repo/nightly
 SuggestRemoteName=nheko-nightlies
--- a/src/main.cpp
+++ b/src/main.cpp
@ -254,7 +254,7 @@ main(int argc, char *argv[])
    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("nheko"), QIcon{":/logos/nheko.png"}));
 #endif
 #ifdef NHEKO_FLATPAK
-    app.setDesktopFileName(QStringLiteral("io.github.NhekoReborn.Nheko"));
+    app.setDesktopFileName(QStringLiteral("im.nheko.Nheko"));
 #else
    app.setDesktopFileName(QStringLiteral("nheko"));
 #endif