notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2.0

Browse source
This commit is contained in:
Bill Kendrick 2022-06-29 21:04:32 -07:00
commit d289d407ad
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -535,7 +535,7 @@ $(MOFILES): trans/%.mo: src/po/%.po
%.desktop: %.desktop.in $(POTFILES)
msgfmt --desktop -d src/po --template $< -o $@
%.metainfo.xml: %.metainfo.xml.in $(POTFILES)
%.appdata.xml: %.appdata.xml.in $(POTFILES)
msgfmt --xml -d src/po --template $< -o $@
.PHONY: translations
@ -547,7 +547,7 @@ translations: trans
@echo "Install gettext to run Tux Paint in non-U.S. English modes."
@echo "--------------------------------------------------------------"
else
translations: trans $(MOFILES) src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
translations: trans $(MOFILES) src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
endif
trans:
@ -722,7 +722,7 @@ clean:
# are the same as they were when you installed, of course!!!
.PHONY: uninstall
uninstall: uninstall-i18n
-rm $(METAINFO_PREFIX)/org.tuxpaint.Tuxpaint.metainfo.xml
-rm $(METAINFO_PREFIX)/org.tuxpaint.Tuxpaint.appdata.xml
-rm /usr/share/applications/tuxpaint.desktop
-rm /usr/share/pixmaps/tuxpaint.png
-rm $(ICON_PREFIX)/tuxpaint.png
@ -939,10 +939,10 @@ install-nokia770:
# FIXME: No way to install SVG icons using `xdg-icon-resource`
# (see https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/790449)
.PHONY: install-xdg
install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
@echo
@echo "...Installing launcher icon into desktop environment..."
@if [ "x$(shell which xdg-icon-resource install)" != "x" ]; then \
@if [ "x$(shell which xdg-icon-resource)" != "x" ]; then \
xdg-icon-resource install --size 192 data/images/icon192x192.png tux4kids-tuxpaint ; \
xdg-icon-resource install --size 128 data/images/icon128x128.png tux4kids-tuxpaint ; \
xdg-icon-resource install --size 96 data/images/icon96x96.png tux4kids-tuxpaint ; \
@ -960,8 +960,7 @@ install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
@if [ "x$(shell which update-desktop-database)" != "x" ]; then \
update-desktop-database ; \
fi
@mkdir -p $(METAINFO_PREFIX)
install --mode=0644 -t $(METAINFO_PREFIX) src/org.tuxpaint.Tuxpaint.metainfo.xml
install --mode=0644 -Dt $(METAINFO_PREFIX) src/org.tuxpaint.Tuxpaint.appdata.xml
# Install the PNG icon (for KDE desktop, etc.)
# and the 24-color 32x32 XPM (for other Window managers):