From 551ab9e1372755256d91b23f1af2b5fabdb551f7 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Thu, 14 Sep 2023 15:02:27 +0200
Subject: [PATCH] Change flatpak exec/command name to cbconvert

---
 .../flatpak/io.github.gen2brain.cbconvert.desktop    |  2 +-
 .../io.github.gen2brain.cbconvert.metainfo.xml       |  8 ++++++++
 .../linux/flatpak/io.github.gen2brain.cbconvert.yml  | 12 ++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop
index 75f9c4e..1153d5f 100644
--- a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop
@@ -2,7 +2,7 @@
 Name=CBconvert
 GenericName=A Comic Book converter
 Comment=A comic converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories
-Exec=cbconvert-gui
+Exec=cbconvert
 Icon=io.github.gen2brain.cbconvert
 Terminal=false
 Type=Application
diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml
index 3a288d4..649671b 100644
--- a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml
@@ -30,6 +30,14 @@
   <url type="bugtracker">https://github.com/gen2brain/cbconvert/issues</url>
 
   <releases>
+    <release version="1.0.2" date="2023-09-14" type="stable">
+      <description>
+        <ul>
+            <li>Change flatpak exec/command name to cbconvert</li>
+        </ul>
+      </description>
+      <url type="details">https://github.com/gen2brain/cbconvert/releases/tag/v1.0.2</url>
+    </release>
     <release version="1.0.1" date="2023-09-14" type="stable">
       <description>
         <ul>
diff --git a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.yml b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.yml
index 3533a44..df93279 100644
--- a/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.yml
+++ b/cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.yml
@@ -5,7 +5,7 @@ sdk: org.freedesktop.Sdk
 sdk-extensions:
     - org.freedesktop.Sdk.Extension.golang
 
-command: cbconvert-gui
+command: cbconvert
 
 finish-args:
   - --share=ipc
@@ -47,7 +47,7 @@ modules:
         sha256: 7a4c6077f45180926583e2087571371bdd9cb21b6e6fada85a6fbd544f26a0e2
 
   - name: highway
-    buildsystem: cmake
+    buildsystem: cmake-ninja
     config-opts:
       - -DBUILD_SHARED_LIBS=ON
       - -DHWY_ENABLE_TESTS=OFF
@@ -59,7 +59,7 @@ modules:
         sha256: 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5
 
   - name: libjxl
-    buildsystem: cmake
+    buildsystem: cmake-ninja
     config-opts:
       - -DBUILD_SHARED_LIBS=ON
       - -DJPEGXL_ENABLE_BENCHMARK=OFF
@@ -154,14 +154,14 @@ modules:
     buildsystem: simple
     build-commands:
       - cp cmd/cbconvert-gui/dist/linux/flatpak/modules.txt cmd/cbconvert-gui/vendor/
-      - cd cmd/cbconvert-gui && $GOROOT/bin/go build -mod=vendor -trimpath -tags "extlib portal" -ldflags "-s -w -X main.appVersion=1.0.1"
-      - install -Dm00755 cmd/cbconvert-gui/cbconvert-gui $FLATPAK_DEST/bin/cbconvert-gui
+      - cd cmd/cbconvert-gui && $GOROOT/bin/go build -mod=vendor -trimpath -tags "extlib portal" -ldflags "-s -w -X main.appVersion=1.0.2"
+      - install -Dm00755 cmd/cbconvert-gui/cbconvert-gui $FLATPAK_DEST/bin/cbconvert
       - install -Dm00644 cmd/cbconvert-gui/dist/linux/cbconvert.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/$FLATPAK_ID.png
       - install -Dm00644 cmd/cbconvert-gui/dist/linux/flatpak/$FLATPAK_ID.desktop $FLATPAK_DEST/share/applications/$FLATPAK_ID.desktop
       - install -Dm00644 cmd/cbconvert-gui/dist/linux/flatpak/$FLATPAK_ID.metainfo.xml $FLATPAK_DEST/share/metainfo/$FLATPAK_ID.metainfo.xml
     sources:
       - type: archive
-        url: https://github.com/gen2brain/cbconvert/archive/refs/tags/v1.0.1.tar.gz
+        url: https://github.com/gen2brain/cbconvert/archive/refs/tags/v1.0.2.tar.gz
         sha256: 34964e24fb8a81e6a2b7e556de8aa28d5b5fbd5698157f67fb5e7e9ee02330cc
 
       - type: archive