How do you "-cp" folders in a manifest file?

gardenspider · July 21, 2023, 3:19pm

Maybe I’m asking the wrong question here, but the ares (emulator) flatpak: GitHub - flathub/dev.ares.ares currently does not copy over two folders from ares, a “Shaders” and a “Database” folder.

These are fairly important folders so I was trying to look into how to fix it but I wasn’t able to come up with anything conclusive.

The aur package for ares is able to solve this issue by using both a patch file and using two “-cp” lines:

Is something like what the aur package does possible for the manifest or any ideas on how to properly copy the “Shaders” and “Database” folders with the Flatpak?

cxrvh · July 21, 2023, 5:38pm

Because it’s buildsystem: simple you can just add additional commands to build-commands of the module.

But the folders should already get copied by the build:

On Linux, running make install after compilation will copy these directories and binary into suitable locations (see desktop-ui/GNUmakefile for details). Alternatively, these directories can be copied from ares/Shaders/* and mia/Database/*.

github.com

ares-emulator/ares/blob/8e62cd8162f477ddee1cea3da74f17ef299d750f/desktop-ui/GNUmakefile#L130


      
          else ifeq ($(platform),macos)
          	mkdir -p ~/Library/Application\ Support/$(name)/
          	cp -R $(output.path)/$(name).app /Applications/$(name).app
          else ifneq ($(filter $(platform),linux bsd),)
          	mkdir -p $(prefix)/bin/
          	mkdir -p $(prefix)/share/applications/
          	mkdir -p $(prefix)/share/icons/hicolor/256x256/apps/
          	mkdir -p $(prefix)/share/$(name)/Shaders/
          	mkdir -p $(prefix)/share/$(name)/Database/
          	cp $(output.path)/$(name) $(prefix)/bin/$(name)
          	cp -R $(ares.path)/Shaders/* $(prefix)/share/$(name)/Shaders/
          	cp -R $(mia.path)/Database/* $(prefix)/share/$(name)/Database/
          	cp resource/$(name).desktop $(prefix)/share/applications/$(name).desktop
          	cp resource/$(name).png $(prefix)/share/icons/hicolor/256x256/apps/$(name).png
          endif
          
          
uninstall:
          ifeq ($(platform),windows)
          else ifeq ($(shell id -un),root)
          	$(error "make uninstall should not be run as root")
          else ifeq ($(platform),macos)

gardenspider · July 21, 2023, 6:05pm

Thank you for the reply.

Yes, it’s odd, it does seem to copy the Shaders folder after install but it doesn’t seem to copy it to the correct place.

The below is from flatpak-builder.

mkdir -p /app/bin/
mkdir -p /app/share/applications/
mkdir -p /app/share/icons/hicolor/256x256/apps/
mkdir -p /app/share/ares/Shaders/
cp out/ares /app/bin/ares
cp -R …/ares/Shaders/* /app/share/ares/Shaders/
cp resource/ares.desktop /app/share/applications/ares.desktop
cp resource/ares.png /app/share/icons/hicolor/256x256/apps/ares.png

You can see a bit more info here on this GitHub issue: Ares missing shaders · Issue #18 · flathub/dev.ares.ares · GitHub

I’ll poke around with the build-commands though.

cxrvh · July 21, 2023, 6:49pm

The folder is actually in the correct place, any files of a Flatpak application must be inside the /app-prefix.

You’ll have to use the ares-paths.patch from AUR to search in the data folder & update the application to look into /app/share/ instead /usr/share:

github.com

ares-emulator/ares/blob/8e62cd8162f477ddee1cea3da74f17ef299d750f/nall/path.cpp#L122


      
          
          
NALL_HEADER_INLINE auto sharedData() -> string {
            #if defined(PLATFORM_WINDOWS)
            wchar_t path[PATH_MAX] = L"";
            SHGetFolderPathW(nullptr, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE, nullptr, 0, path);
            string result = (const char*)utf8_t(path);
            result.transform("\\", "/");
            #elif defined(PLATFORM_MACOS)
            string result = "/Library/Application Support/";
            #else
            string result = "/usr/share/";
            #endif
            if(!result) result = ".";
            if(!result.endsWith("/")) result.append("/");
            return result;
          }
          
          
NALL_HEADER_INLINE auto temporary() -> string {
            #if defined(PLATFORM_WINDOWS)
            wchar_t path[PATH_MAX] = L"";
            GetTempPathW(PATH_MAX, path);

gardenspider · July 21, 2023, 11:42pm

Ah thank you, that makes sense!

I’ll have to see if I can figure out how to port over the ares-paths.patch file and see if I can make it work with the Flatpak, might be a bit above my skill level with this one .

razzeee · July 22, 2023, 11:42am

Try changing /usr/ in line 122 to /app/ and rebuild the flatpak

You’ll also need to register the patch in your yaml/json

  - type: patch
    path: name-of-patch.patch

gardenspider · July 22, 2023, 11:32pm

Is there any documentation or general step by step on how to create these patch files?

I’ve tried searching, but the flatpak builder documentation only mentions the purpose of patches and doesn’t go into much detail.

razzeee · July 23, 2023, 7:27am

Patches can either be created with “diff” or “git diff”, if you don’t want to do that by hand.

So I would suggest to read the man page on that.

gardenspider · July 25, 2023, 12:01am

Thank you everyone for being so helpful! I think I got it working now.