Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Importing distro files from Flatpak and Arch Linux #130

Merged
merged 24 commits into from
Jan 20, 2025
Merged

Conversation

cengique
Copy link
Member

@cengique cengique commented Jun 2, 2024

Imported packaging files and new screenshots @AsciiWolf

misc/io.github.Tremulous.appdata.xml Outdated Show resolved Hide resolved
misc/io.github.Tremulous.appdata.xml Outdated Show resolved Hide resolved
misc/grangerhub-logo.png Outdated Show resolved Hide resolved
@AsciiWolf
Copy link

Looks much better now, thanks! :-)

misc/grangerhub-logo.png Outdated Show resolved Hide resolved
@cengique
Copy link
Member Author

cengique commented Jun 3, 2024

@AsciiWolf just pushed some more commits, please review. Thanks! :)

<screenshot><image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/tremulous/d.png</image></screenshot>
<screenshot><image>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/tremulous/e.png</image></screenshot>
<screenshot type="default">
<image type="source" width="1280" height="960">https://github.com/GrangerHub/tremulous/blob/master/misc/grangerhub-trem1.3-7d1b.jpg?raw=true</image>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note: I may be wrong, but I think that the correct URL should be https://raw.githubusercontent.com/GrangerHub/tremulous/master/misc/grangerhub-trem1.3-7d1b.jpg.

Same with the other screenshots/videos.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this sounds right. I used to be able to get those URLs but somehow I can't seem to get to them. But just using your example works (for existing files). I will re-confirm once I merge this PR to master.

@AsciiWolf
Copy link

Nice, I think it looks good now (except for the screenshots URL)! The only remaining thing are the Makefile rules. :-)

@AsciiWolf
Copy link

AsciiWolf commented Jun 3, 2024

Although, we should probably sort through the screenshots, select the best ones and remove others. Currently, there are too many of them and some are very similar.

For example, misc/screenshots/c-fedora.png and misc/screenshots/d-fedora.png look almost the same.

@cengique
Copy link
Member Author

cengique commented Jun 4, 2024

Nice, I think it looks good now (except for the screenshots URL)! The only remaining thing are the Makefile rules. :-)

Great! I will sort through the screenshots, but I will need some help with the Makefile.

@wtfbbqhax @jkent can you help crafting an install section in the Makefile that can place binaries, icon, and desktop files in the proper places? As far as I see, we only have one target in the Makefile that just produces a zip or other file based on target distro. So we never worried about an install section. What's the situation with the CMake build? Was that ever working? Thanks!

@cengique
Copy link
Member Author

cengique commented Jun 4, 2024

Looks like libcurl is also outdated and causing Linux build errors due to USE_RESTCLIENT=1.

@cengique
Copy link
Member Author

@AsciiWolf @jkent I added an install: target in the Makefile. I'd appreciate if you can review. Note that the game client is not perfectly working in this branch, so I'll rebase to a release branch to complete testing. I'm looking for general feedback about the changes in the Makefile. Thanks!

@AsciiWolf I removed screenshot d-fedora.png, but kept the newer ones as not all are referenced in the flatpak.

Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@AsciiWolf
Copy link

It looks good except the things that I pointed out. Thanks!

@AsciiWolf
Copy link

By the way, we have a CI build failure on Linux:

error: 'CURLMOPT_MAX_TOTAL_CONNECTIONS' conflicts with a previous declaration

Is it the same thing as already mentioned here?

Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@cengique
Copy link
Member Author

By the way, we have a CI build failure on Linux:

error: 'CURLMOPT_MAX_TOTAL_CONNECTIONS' conflicts with a previous declaration

Is it the same thing as already mentioned here?

That's right, we will work on that separately, but for now you can build with:

USE_INTERNAL_LUA=1 make -j

by removing the building of the REST client.

@cengique
Copy link
Member Author

@AsciiWolf I think I addressed all the issues. Please check! Thanks :)

@cengique
Copy link
Member Author

cengique commented Oct 7, 2024

@AsciiWolf just got around to fixing these issues. If you can check the conversations and resolve, we may be close to being done! If this is all good, I'll rebase this branch to a working release and do more testing.

Makefile Outdated Show resolved Hide resolved
@AsciiWolf
Copy link

AsciiWolf commented Oct 9, 2024

Looks very good now (except the few things mentioned before), thanks! :-)

@AsciiWolf
Copy link

Any progress here?

cengique and others added 2 commits January 19, 2025 15:49
Included more screenshots showing alien race units.
@cengique
Copy link
Member Author

Any progress here?

Thanks for the reminder @AsciiWolf ! I needed it. :)

I added a number of alien screenshots, in addition to fixing the other issues. Thanks as usual for checking and providing feedback.

Once we're done here, I think I need to update so that we can build the flatpak for 0.15. Any other next steps?

@cengique
Copy link
Member Author

@AsciiWolf removed URL from appdata as requested. I posted a comment above regarding screenshots.

I also corrected the Github Actions for the Linux build, which may help with fixing the issues while building the Flatpak.

@AsciiWolf
Copy link

AsciiWolf commented Jan 20, 2025

Thanks! Everything looks good to me now. :-)

cengique and others added 2 commits January 20, 2025 16:59
Trying 13. macos-11 no longer supported
Co-authored-by: AsciiWolf <[email protected]>
@cengique cengique merged commit 30eb593 into master Jan 20, 2025
3 checks passed
@cengique cengique deleted the flatpak-patches branch January 20, 2025 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants