Oops

overlayeddev · Jul 22, 2024 · 4f148b4 · 4f148b4
1 parent 8c2d2f3
commit 4f148b4
Showing 1 changed file with 56 additions and 59 deletions.
diff --git a/distribution/dev.overlayed.Overlayed.yaml b/distribution/dev.overlayed.Overlayed.yaml
@@ -15,7 +15,7 @@ finish-args:
   - --talk-name=org.freedesktop.Notifications
 
 modules:
-  - shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+  # - shared-modules/libappindicator/libappindicator-gtk3-12.10.json
 
   - name: webkit2gtk-4.0
     sources:
@@ -39,67 +39,64 @@ modules:
       - -DUSE_GTK4=OFF
       - -DUSE_SOUP2=ON
       - -DENABLE_BUBBLEWRAP_SANDBOX=OFF
-    modules:
-      # TODO: get this working
-      # - shared-modules/libsoup/libsoup-2.4.json
 
-      - name: unifdef
-        no-autogen: true
-        make-install-args:
-          - prefix=${FLATPAK_DEST}
-        sources:
-          - type: archive
-            url: https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz
-            sha256: 43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400
-        cleanup:
-          - "*"
+  - name: unifdef
+    no-autogen: true
+    make-install-args:
+      - prefix=${FLATPAK_DEST}
+    sources:
+      - type: archive
+        url: https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz
+        sha256: 43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400
+    cleanup:
+      - "*"
 
-      - name: libjxl
-        buildsystem: cmake
-        config-opts:
-          - -DCMAKE_BUILD_TYPE=Release
-          - -DBUILD_TESTING=OFF
-        sources:
-          - type: git
-            url: https://github.com/libjxl/libjxl.git
-            tag: v0.10.2
-            commit: e1489592a770b989303b0edc5cc1dc447bbe0515
-            disable-shallow-clone: true
-            x-checker-data:
-              type: git
-              tag-pattern: ^v([\d.]+)$
-      - name: overlayed
-        buildsystem: simple
-        build-commands:
-          - chmod +x Overlayed.AppImage
-          - ./Overlayed.AppImage --appimage-extract
+  - name: libjxl
+    buildsystem: cmake
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+    sources:
+      - type: git
+        url: https://github.com/libjxl/libjxl.git
+        tag: v0.10.2
+        commit: e1489592a770b989303b0edc5cc1dc447bbe0515
+        disable-shallow-clone: true
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+  - name: overlayed
+    buildsystem: simple
+    build-commands:
+      - chmod +x Overlayed.AppImage
+      - ./Overlayed.AppImage --appimage-extract
 
-          - |
-            desktop-file-edit \
-              --set-name="Overlayed App" \
-              --set-comment="Overlayed's game launcher" \
-              --set-icon="$FLATPAK_ID" \
-              --set-key="StartupNotify" --set-value="true" \
-              --set-key="Categories" --set-value="Game;ActionGame;AdventureGame;Simulation;" \
-              --set-key="Keywords" --set-value="game;minecraft;mc;" \
-              --set-key="StartupWMClass" --set-value="Overlayed" \
-              squashfs-root/usr/share/applications/overlayed.desktop
+      - |
+        desktop-file-edit \
+          --set-name="Overlayed App" \
+          --set-comment="Overlayed's game launcher" \
+          --set-icon="$FLATPAK_ID" \
+          --set-key="StartupNotify" --set-value="true" \
+          --set-key="Categories" --set-value="Game;ActionGame;AdventureGame;Simulation;" \
+          --set-key="Keywords" --set-value="game;minecraft;mc;" \
+          --set-key="StartupWMClass" --set-value="Overlayed" \
+          squashfs-root/usr/share/applications/overlayed.desktop
 
-          - mkdir -p /app/{bin,share}
-          - cp -r squashfs-root/usr/share/icons /app/share/icons
-          - install -Dm755 squashfs-root/usr/bin/overlayed /app/bin/overlayed
-          - install -Dm644 squashfs-root/usr/share/applications/overlayed.desktop /app/share/applications/dev.overlayed.Overlayed.desktop
-          - install -Dm644 dev.overlayed.Overlayed.metainfo.xml /app/share/metainfo/dev.overlayed.OverlayedApp.metainfo.xml
+      - mkdir -p /app/{bin,share}
+      - cp -r squashfs-root/usr/share/icons /app/share/icons
+      - install -Dm755 squashfs-root/usr/bin/overlayed /app/bin/overlayed
+      - install -Dm644 squashfs-root/usr/share/applications/overlayed.desktop /app/share/applications/dev.overlayed.Overlayed.desktop
+      - install -Dm644 dev.overlayed.Overlayed.metainfo.xml /app/share/metainfo/dev.overlayed.OverlayedApp.metainfo.xml
 
-        sources:
-          - type: file
-            url: https://raw.githubusercontent.com/overlayeddev/overlayed/14a6d2c8b022f7d44de4a57350e8f30ff35ef7dc/distribution/dev.overlayed.Overlayed.metainfo.xml
-            sha256: 35773ae27a47753852aac2ace795675cef222d5d9681e5cdd93d92b6d16831c5
+    sources:
+      - type: file
+        url: https://raw.githubusercontent.com/overlayeddev/overlayed/14a6d2c8b022f7d44de4a57350e8f30ff35ef7dc/distribution/dev.overlayed.Overlayed.metainfo.xml
+        sha256: 35773ae27a47753852aac2ace795675cef222d5d9681e5cdd93d92b6d16831c5
 
-          # NOTE: we are skipping building from source as there is no direct pnpm support as of yet
-          # i saw this PR has some work to begin efforts on that https://github.com/flathub/flathub/pull/3876
-          - type: file
-            url: https://github.com/overlayeddev/overlayed/releases/download/v0.5.0/overlayed_0.5.0_amd64.AppImage
-            dest-filename: Overlayed.AppImage
-            sha256: bbcc773e89ba6cdbf4b3e91156b2702b2a82a91b5df7a8bbd2e274d5104a9725
-            only-arches: [x86_64]
+      # NOTE: we are skipping building from source as there is no direct pnpm support as of yet
+      # i saw this PR has some work to begin efforts on that https://github.com/flathub/flathub/pull/3876
+      - type: file
+        url: https://github.com/overlayeddev/overlayed/releases/download/v0.5.0/overlayed_0.5.0_amd64.AppImage
+        dest-filename: Overlayed.AppImage
+        sha256: bbcc773e89ba6cdbf4b3e91156b2702b2a82a91b5df7a8bbd2e274d5104a9725
+        only-arches: [x86_64]