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.

Sign up for GitHub

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

Importing distro files from Flatpak and Arch Linux #130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f6e2c1b
old screenshots from fedora-appstream
cengique May 31, 2024
ae96336
2 old screenshots from grangerhub
cengique May 31, 2024
c367954
grangerhub logo and screenshots downloaded from forum
cengique Jun 1, 2024
d812950
appstream and desktop files from flathub and arch linux package, resp…
cengique Jun 2, 2024
0882a03
replaced with correct files from asciiwolf PR to flathub
cengique Jun 2, 2024
6ee082b
Added screenshots in appdata, added 2 videos, imported AsciiWolf's dr…
cengique Jun 3, 2024
a1e36fe
added Linux install target for superuser; removed some .PHONY targets
cengique Jun 11, 2024
cd6c2d4
removed redundant old screenshot
cengique Jun 11, 2024
6946d98
path corrections
cengique Jun 14, 2024
7899d86
adjusting Makefile, install files, and directories. Removing lowres s…
cengique Jun 16, 2024
769d1f8
Remove paragraph from misc/io.github.grangerhub.Tremulous.appdata.xml
cengique Aug 26, 2024
92d393c
changing name back to Tremulous and updating other names for consistency
cengique Aug 26, 2024
ce074a6
Fixes for clarity and consistency requested by AsciiWolf
cengique Oct 7, 2024
3943f6f
Update misc/io.github.grangerhub.Tremulous.desktop
cengique Jan 19, 2025
61934eb
Minor fixes suggested by AsciiWolf
cengique Jan 19, 2025
ea31b0b
Remove URL from appdata
cengique Jan 20, 2025
20b3543
testing quick fix to curl build error
cengique Jan 20, 2025
6ca89f6
USE_LOCAL_HEADERS in Github Actions linux build
cengique Jan 20, 2025
f345855
USE_CURL_DLOPEN=0 in Github Actions linux build
cengique Jan 20, 2025
2357340
more specific include of local curl headers
cengique Jan 20, 2025
28ab20a
Upgrade to MacOS 13
cengique Jan 20, 2025
a6361eb
Correct typo
cengique Jan 20, 2025
c407cb0
Updated copyright notice
cengique Jan 20, 2025
b1b1693
Update .github/workflows/build-macos.yml
cengique Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2947,27 +2947,24 @@ $(B)/$(SERVERBINSH):
@echo 'cd $(COPYBINDIR)' >> $@
@echo './$(SERVERBIN) "$$@"' >> $@

# Install the .desktop, icon files, license, etc.
install: release
ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
$(echo_cmd) "Installing for Linux platform in $(COPYBINDIR) and $(PREFIX)"
@$(MKDIR) -p $(COPYBINDIR)
@$(INSTALL) -d $(PREFIX)/bin "$(PREFIX)/share/metainfo/" \
Copy link

Choose a reason for hiding this comment

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

Just a very small nitpick here. I noticed that some paths have "/" at their end and some don't. It does not matter, but it would still be nice to make it consistent.

"$(PREFIX)/share/licenses/$(PACKAGE)/" "$(PREFIX)/share/applications/" \
"$(PREFIX)/share/icons/hicolor/128x128/apps" "$(COPYBINDIR)"
@cd $(BR) && for file in $(NAKED_TARGETS); do \
$(INSTALL) -D $$file $(COPYBINDIR)/$$file; \
done
# @(cd $(BR) && $(INSTALL) $() $(COPYBINDIR) )
# TODO: create these .sh files:
@$(INSTALL) -d $(PREFIX)/bin
@$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(BR)/$(SERVERBINSH) $(PREFIX)/bin
# Install the .desktop, icon files, license, etc.
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.png" "$(PREFIX)/share/pixmaps/tremulous.png"
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.desktop" \
"$(PREFIX)/share/applications/tremulous.desktop"
@$(INSTALL) -d "$(PREFIX)/share/metainfo/" "$(PREFIX)/share/licenses/$(PACKAGE)/"
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(PREFIX)/bin/tremulous-grangerhub
cengique marked this conversation as resolved.
Show resolved Hide resolved
cengique marked this conversation as resolved.
Show resolved Hide resolved
$(INSTALL) -D -m755 $(BR)/$(SERVERBINSH) $(PREFIX)/bin/tremded-grangerhub
$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.png" "$(PREFIX)/share/icons/hicolor/128x128/apps/"
$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.desktop" \
cengique marked this conversation as resolved.
Show resolved Hide resolved
"$(PREFIX)/share/applications/"
$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
"$(PREFIX)/share/metainfo/"
@$(INSTALL) -D -m644 "COPYING" "$(PREFIX)/share/licenses/$(PACKAGE)/"
@$(INSTALL) -D -m644 "GPL" "$(PREFIX)/share/licenses/$(PACKAGE)/"
@$(INSTALL) -D -m644 "CC" "$(PREFIX)/share/licenses/$(PACKAGE)/"
$(INSTALL) -D -m644 "COPYING" "GPL" "CC" "$(PREFIX)/share/licenses/$(PACKAGE)/"
endif


Expand Down
0 misc/io.github.grangerhub.Tremulous-alt.png → misc/Tremulous-Grangerhub-alt.png
View file
Open in desktop
File renamed without changes
0 misc/io.github.grangerhub.Tremulous.desktop → misc/Tremulous-Grangerhub.desktop
View file
Open in desktop
File renamed without changes.
0 misc/io.github.grangerhub.Tremulous.png → misc/Tremulous-Grangerhub.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions misc/io.github.grangerhub.Tremulous.appdata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<provides>
<id>tremulous.desktop</id>
</provides>
<launchable type="desktop-id">io.github.grangerhub.Tremulous.desktop</launchable>
<name>Tremulous</name>
<launchable type="desktop-id">Tremulous-Grangerhub.desktop</launchable>
cengique marked this conversation as resolved.
Show resolved Hide resolved
<name>Tremulous-Grangerhub</name>
Copy link

Choose a reason for hiding this comment

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

Why? This will only make it confusing for our users. You can instead mention in the description that this is a "Grangerhub version of Tremulous". And it will add me much work to do to adjust the Flatpak to this unnecessary change. :-/

<developer_name>Dark Legion Development and GrangerHub</developer_name>
<summary>Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy</summary>
<description>
Expand Down
Binary file removed misc/screenshots/a-fedora.png
View file
Open in desktop
cengique marked this conversation as resolved.
Outdated Show resolved Hide resolved
cengique marked this conversation as resolved.
Outdated Show resolved Hide resolved
Binary file not shown.
Binary file removed misc/screenshots/b-fedora.png
View file
Open in desktop
Binary file not shown.
Binary file removed misc/screenshots/c-fedora.png
View file
Open in desktop
Binary file not shown.
Binary file removed misc/screenshots/e-fedora.png
View file
Open in desktop
Binary file not shown.
Loading