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

2
.gitignore vendored
View file

@ -16,4 +16,4 @@ TuxPaint.dmg
*.thumbs *.thumbs
src/po/POTFILES.in src/po/POTFILES.in
src/tuxpaint.desktop src/tuxpaint.desktop
src/org.tuxpaint.Tuxpaint.metainfo.xml src/org.tuxpaint.Tuxpaint.appdata.xml

13
Makefile
View file

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

8
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2022.June.26 (0.9.29) 2022.June.29 (0.9.29)
* Bug Fixes: * Bug Fixes:
---------- ----------
* Opening and immediately dismissing Color Mixer could cause * Opening and immediately dismissing Color Mixer could cause
@ -38,6 +38,12 @@ http://www.tuxpaint.org/
(See https://sourceforge.net/u/wjjjjt/tuxpaint/ci/b4aa697474e1cc60b6faac80297cc66a602f54fd/) (See https://sourceforge.net/u/wjjjjt/tuxpaint/ci/b4aa697474e1cc60b6faac80297cc66a602f54fd/)
Will Thompson <https://sourceforge.net/u/wjjjjt/profile/> Will Thompson <https://sourceforge.net/u/wjjjjt/profile/>
* Use RHEL 7-compatible appdata filename
+ Rename metainfo file to appdata
+ Fix detection of xdg-icon-resource
(See https://sourceforge.net/u/wjjjjt/tuxpaint/ci/4120af3b5f78ad69819b35ec821974081194c475/)
Will Thompson <https://sourceforge.net/u/wjjjjt/profile/>
* Adding "2DGraphics" (and hence "Graphics") and "KidsGame" (and hence * Adding "2DGraphics" (and hence "Graphics") and "KidsGame" (and hence
"Game") to the categories listed in "tuxpaint.desktop" launcher for "Game") to the categories listed in "tuxpaint.desktop" launcher for
FreeDesktop systems (e.g., Linux) FreeDesktop systems (e.g., Linux)

0
src/org.tuxpaint.Tuxpaint.metainfo.xml.in → src/org.tuxpaint.Tuxpaint.appdata.xml.in
View file

2
src/po/POTFILES.in.in
View file

@ -6,7 +6,7 @@ great.h
im.c im.c
macos.h macos.h
macos.m macos.m
org.tuxpaint.Tuxpaint.metainfo.xml.in org.tuxpaint.Tuxpaint.appdata.xml.in
shapes.h shapes.h
titles.h titles.h
tools.h tools.h