Flathub wishlist

[9thIvy]

I think it should satisfy the first two requirements I put out here for packaging for flatpak. The desktop files don't need to be in /res , I just dunno where to put them.

[ouwou]

res/desktop is probably fine
hows this for the c++fs ? (untested) see https://en.cppreference.com/w/cpp/filesystem.html#Notes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d667a..4ead59a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,12 +62,14 @@ if (NOT (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
     target_precompile_headers(abaddon PRIVATE <gtkmm.h> src/abaddon.hpp src/util.hpp)
 endif ()
 
-if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
-((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_CXX_COMPILER_VERSION LESS 9))))
+if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1"))
     target_link_libraries(abaddon stdc++fs)
 endif ()
 
+if ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0"))
+    target_link_libraries(abaddon c++fs)
+endif ()
+
 if (NOT WIN32)
     target_sources(abaddon PRIVATE src/notifications/notifier_gio.cpp)
 else ()

[ouwou]

i updated the dbus id. i assume it needs a release for flathub. if i dont do it in the next couple days spam me to remind me i keep slacking :3

[9thIvy]

Just tested this as a patch against the latest commit and it works \o/

[9thIvy]

@ouwou Reminder >_>
Also, I don't think it needs a release, as I'm building abaddon from source for flathub.

[ouwou]

i swear ill do it tonight if i dont then i got hit by a bus. i remember reading they only build off stable and not just off master branch/nightly. maybe im wrong

[9thIvy]

i swear ill do it tonight if i dont then i got hit by a bus. i remember reading they only build off stable and not just off master branch/nightly. maybe im wrong

If you...don't get hit by a bus? O.o

Yeah, it's built off of stable, but in this case, specific commits instead of whatever is on master branch. AFAIK I would just need to update the commit listed in the manifest during maintenance to bring updates to flathub.

[ouwou]

i made a release but just realized i probably should have merged this first lol (running workflows rn). let me know if a new release would help

[9thIvy]

Sorry for the late response! Another release wouldn't help, since I have to build off of a specific commit rather than distributing the binary. I can just watch for merges to the master branch to see when I need to update things in the manifest!

[9thIvy]

@ouwou Sorry to bother you, but any chance you can merge these so I can proceed with putting this on flathub?

[9thIvy]

@ouwou poke

[ouwou]

yolo