From 319516126b2ae565fad2725cd078b6dfcc83ce4a Mon Sep 17 00:00:00 2001 From: Dexter Reed Date: Sat, 21 Sep 2024 00:01:21 +0100 Subject: [PATCH] Move misc/linux/flatpak to misc/flatpak Otherwise GNOME Builder doesn't detect the Flatpak manifests --- .gitignore | 2 +- misc/{linux => }/flatpak/ClassiCubeLauncher | 0 .../flatpak/net.classicube.flatpak.client.SDL3.json | 8 ++++---- .../flatpak/net.classicube.flatpak.client.X11.json | 8 ++++---- .../flatpak/net.classicube.flatpak.client.desktop | 0 .../flatpak/net.classicube.flatpak.client.metainfo.xml | 0 .../{linux => }/flatpak/net.classicube.flatpak.client.svg | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename misc/{linux => }/flatpak/ClassiCubeLauncher (100%) rename misc/{linux => }/flatpak/net.classicube.flatpak.client.SDL3.json (79%) rename misc/{linux => }/flatpak/net.classicube.flatpak.client.X11.json (60%) rename misc/{linux => }/flatpak/net.classicube.flatpak.client.desktop (100%) rename misc/{linux => }/flatpak/net.classicube.flatpak.client.metainfo.xml (100%) rename misc/{linux => }/flatpak/net.classicube.flatpak.client.svg (100%) diff --git a/.gitignore b/.gitignore index 38e5c5979..e2a2df9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -97,7 +97,7 @@ fontscache.txt !android/app/src/main/java/com/classicube # Flatpak wrapper which needs to be included -!misc/linux/flatpak/ClassiCubeLauncher +!misc/flatpak/ClassiCubeLauncher # CMake files CMakeFiles/ diff --git a/misc/linux/flatpak/ClassiCubeLauncher b/misc/flatpak/ClassiCubeLauncher similarity index 100% rename from misc/linux/flatpak/ClassiCubeLauncher rename to misc/flatpak/ClassiCubeLauncher diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.SDL3.json b/misc/flatpak/net.classicube.flatpak.client.SDL3.json similarity index 79% rename from misc/linux/flatpak/net.classicube.flatpak.client.SDL3.json rename to misc/flatpak/net.classicube.flatpak.client.SDL3.json index 5c75fad61..7aa78cac3 100644 --- a/misc/linux/flatpak/net.classicube.flatpak.client.SDL3.json +++ b/misc/flatpak/net.classicube.flatpak.client.SDL3.json @@ -62,10 +62,10 @@ "build-commands": [ "gcc -fno-math-errno src/*.c -o src/ClassiCube -rdynamic -lpthread -lGL -DCC_WIN_BACKEND=CC_WIN_BACKEND_SDL3 -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -DCC_BUILD_FLATPAK -L /app/lib -lSDL3", "install -Dm755 src/ClassiCube -t ${FLATPAK_DEST}/bin", - "install -Dm755 misc/linux/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" + "install -Dm755 misc/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" ], "sources": [ { diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.X11.json b/misc/flatpak/net.classicube.flatpak.client.X11.json similarity index 60% rename from misc/linux/flatpak/net.classicube.flatpak.client.X11.json rename to misc/flatpak/net.classicube.flatpak.client.X11.json index e064afac8..a06de9634 100644 --- a/misc/linux/flatpak/net.classicube.flatpak.client.X11.json +++ b/misc/flatpak/net.classicube.flatpak.client.X11.json @@ -18,10 +18,10 @@ "build-commands": [ "gcc -fno-math-errno src/*.c -o src/ClassiCube -O1 -DCC_BUILD_FLATPAK -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -rdynamic -lm -lpthread -lX11 -lXi -lGL -ldl", "install -Dm755 src/ClassiCube -t ${FLATPAK_DEST}/bin", - "install -Dm755 misc/linux/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" + "install -Dm755 misc/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", + "install -Dm644 misc/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" ], "sources": [ { diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.desktop b/misc/flatpak/net.classicube.flatpak.client.desktop similarity index 100% rename from misc/linux/flatpak/net.classicube.flatpak.client.desktop rename to misc/flatpak/net.classicube.flatpak.client.desktop diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml b/misc/flatpak/net.classicube.flatpak.client.metainfo.xml similarity index 100% rename from misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml rename to misc/flatpak/net.classicube.flatpak.client.metainfo.xml diff --git a/misc/linux/flatpak/net.classicube.flatpak.client.svg b/misc/flatpak/net.classicube.flatpak.client.svg similarity index 100% rename from misc/linux/flatpak/net.classicube.flatpak.client.svg rename to misc/flatpak/net.classicube.flatpak.client.svg