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:
Pere Pujal i Carabantes 2020-12-30 19:57:26 +01:00
commit 2a159dd049
19 changed files with 110 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -4,12 +4,12 @@
# Various contributors (see AUTHORS.txt) # Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - October 15, 2020 # June 14, 2002 - December 27, 2020
# The version number, for release: # The version number, for release:
VER_VERSION:=0.9.25 VER_VERSION:=0.9.26
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d") VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
else else
@ -83,6 +83,9 @@ RSRC_CMD:=$($(OS)_RSRC_CMD)
beos_MIMESET_CMD:=mimeset -f tuxpaint beos_MIMESET_CMD:=mimeset -f tuxpaint
MIMESET_CMD:=$($(OS)_MIMESET_CMD) MIMESET_CMD:=$($(OS)_MIMESET_CMD)
macos_RAD_CMD:=[[ ! -d Resources/share ]] && mkdir -p Resources/share && ln -s ../../data Resources/share/tuxpaint || :
RAD_CMD:=$($(OS)_RAD_CMD)
windows_SO_TYPE:=dll windows_SO_TYPE:=dll
macos_SO_TYPE:=dylib macos_SO_TYPE:=dylib
beos_SO_TYPE:=so beos_SO_TYPE:=so
@ -607,7 +610,7 @@ clean:
@-rm -f templates/.thumbs/*.png @-rm -f templates/.thumbs/*.png
@if [ -d templates/.thumbs ]; then rmdir templates/.thumbs; fi @if [ -d templates/.thumbs ]; then rmdir templates/.thumbs; fi
@-if [ "x$(BUNDLE)" != "x" ]; then rm -rf $(BUNDLE); fi @-if [ "x$(BUNDLE)" != "x" ]; then rm -rf $(BUNDLE); fi
@-rm -f TuxPaint.dmg temp.dmg; rm -rf magic/*.dSYM @-rm -f TuxPaint.dmg temp.dmg; rm -rf magic/*.dSYM Resources
@echo @echo
# "make uninstall" should remove the various parts from their # "make uninstall" should remove the various parts from their
@ -1052,6 +1055,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \
$(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-o tuxpaint $^ \ -o tuxpaint $^ \
$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
@$(RAD_CMD)
@$(RSRC_CMD) @$(RSRC_CMD)
@$(MIMESET_CMD) @$(MIMESET_CMD)

24
Resources/README.txt
View file

@ -1,24 +0,0 @@
This folder exists to ease testing under macOS. Please ignore but do not
delete. More details are below.
macOS requires all files in an application have a specific folder structure.
We create this structure under the folder "TuxPaint.app" when `make install` is
run. But `make install` takes a long time to run under macOS due to the large
number of files that need to be copied, as well as all the processing we do to
those files (see custom/macos.sh for what we need to do.) This makes testing
even a small code change time consuming.
That's the problem this folder solves: Instead of creating the folder
structure under TuxPaint.app every time to test a code change to be able to run
the application, we pre-build the folder structure around the tuxpaint binary
so the binary can be executed directly without re-creating the folder structure
every time. Luckily for us, this only require that we only have a single
folder "Resources" in the root folder of the tuxpaint source code (with some
subfolders and symlinks underneath the Resources folder.)
I hope my fellow Tux Paint contributors will forgive me for taking up yet
another whole folder for use by a single platform, let alone almost empty, in
the root folder of the source code distribution meant for multiple platforms.
Mark Kim
2018.06.27

1
Resources/share/tuxpaint
View file

@ -1 +0,0 @@
../../data

8
docs/CHANGES.txt
View file

@ -8,6 +8,14 @@ http://www.tuxpaint.org/
$Id$ $Id$
2020.December.27 (0.9.26)
* Documentation updates
---------------------
* Expanded the steps for making and posting releases.
* Mended some broken relative links in README.html that
pointed to other parts of the docs.
2020.December.27 (0.9.25) 2020.December.27 (0.9.25)
* New Features * New Features
------------ ------------

66
docs/RELEASE.txt
View file

@ -1,5 +1,8 @@
Release checklist for Tux Paint Release checklist for Tux Paint
Last updated 2020-07-27 -bjk Last updated 2020-12-27 -bjk
Preparing
---------
Do these things _prior_ to cutting a release -- that is, prior to Do these things _prior_ to cutting a release -- that is, prior to
tagging in the source code repository, running "make release" to roll tagging in the source code repository, running "make release" to roll
@ -10,29 +13,28 @@ a .tar.gz source tarball, and making the tarball available for download.
Places to make sure version # and release date gets updated, Places to make sure version # and release date gets updated,
* Makefile * Makefile
* Build description files: * Build description files:
* tuxpaint.spec (Linux RPM package) * tuxpaint.spec (Linux RPM package)
* macos/Info.plist (macOS build) * macos/Info.plist (macOS build)
* win32/resources.rc (Windows mingw/msys build) * win32/resources.rc (Windows mingw/msys build)
* Documentation * Documentation
(For HTML variants, be sure to run "make" in "docs/", to (For HTML variants, be sure to run "make" in "docs/", to
produce plaintext alternatives!) produce plaintext alternatives!)
* docs/CHANGES.txt * docs/CHANGES.txt
* docs/en/html/README.html * docs/en/html/README.html
* docs/en/html/FAQ.html * docs/en/html/FAQ.html
* docs/en/html/OPTIONS.html * docs/en/html/OPTIONS.html
* docs/en/html/EXTENDING.html * docs/en/html/EXTENDING.html
* docs/en/html/ADVANCED-STAMPS-HOWTO.html * docs/en/html/ADVANCED-STAMPS-HOWTO.html
* Manual page (manpage) * Manual page (manpage)
* src/manpage/tuxpaint.1 * src/manpage/tuxpaint.1
* Tidy the HTML documentation * Tidy the HTML documentation
Using
(Be sure to run "make" in "docs/", to produce plaintext alternatives!) (Be sure to run "make" in "docs/", to produce plaintext alternatives!)
tidy -i --markup yes --vertical-space yes --indent yes --indent-attributes yes INFILE.html > OUTFILE.html tidy -i --markup yes --vertical-space yes --indent yes --indent-attributes yes INFILE.html > OUTFILE.html
@ -43,3 +45,55 @@ a .tar.gz source tarball, and making the tarball available for download.
* Don't forget to commit the changes! (git add ... / git commit / git push) * Don't forget to commit the changes! (git add ... / git commit / git push)
Time to release:
----------------
* Tag & roll a release tarball (example here was from 0.9.25):
$ git pull
$ make clean
$ git tag tuxpaint-0_9_25-2020-12-27
$ git push origin tuxpaint-0_9_25-2020-12-27 # or --tags
$ make release
* Upload each project's ".tar.gz" file from their "build/" subdirs
to ftp.tuxpaint.org.
* Place them in the appropriate subdirectories (source/, config/,
and stamps/) under "unix/x/tuxpaint/".
* Copy "docs/CHANGES.txt" from each project onto the FTP site
(Tux Paint's goes in the toplevel, the others go in config/ and
stamps/).
* Create a new PAD file (e.g. `pads/tuxpaint-0.9.25.xml`) on the
FTP site.
* Replace the "pads/tuxpaint-LATEST.xml" symlink on the FTP site with
a new one that points to the new PAD file.
* At SourceForge, go to "Files" and use "Add Folder" under each project
to create new release file subdirectories. (e.g., "0.9.25" under
https://sourceforge.net/projects/tuxpaint/files/tuxpaint/)
* Upload the files! Either from local copies, via a web browser,
or by SCP, Rsync, or SFTP (see
https://sourceforge.net/p/forge/documentation/Release%20Files%20for%20Download/#scp)
e.g.:
$ sftp wkendrick@frs.sourceforge.net
sftp> cd /home/frs/project/tuxpaint/
sftp> cd tuxpaint/0.9.25/
sftp> lcd source
sftp> put tuxpaint-0.9.25.tar.gz
sftp> cd ../..
sftp> lcd ..
[repeat for tuxpaint-config and tuxpaint-stamps]
* Copy latest release's documentation to the tuxpaint.org website.

2
docs/en/ADVANCED-STAMPS-HOWTO.txt
View file

@ -1,5 +1,5 @@
Tux Paint Tux Paint
version 0.9.25 version 0.9.26
Advanced Stamps HOWTO Advanced Stamps HOWTO
Copyright 2006-2008 by Albert Cahalan for the Tux Paint project Copyright 2006-2008 by Albert Cahalan for the Tux Paint project

6
docs/en/EXTENDING.txt
View file

@ -1,6 +1,6 @@
Extending Extending
Tux Paint Tux Paint
version 0.9.25 version 0.9.26
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/ http://www.tuxpaint.org/
@ -123,7 +123,7 @@ Where Files Go
C:\Documents and Settings\(username)\Application Data\TuxPaint\ C:\Documents and Settings\(username)\Application Data\TuxPaint\
Mac OS X macOS
Your personal Tux Paint folder is stored in your "Application Your personal Tux Paint folder is stored in your "Application
Support" folder: Support" folder:
@ -652,7 +652,7 @@ Translations
msgstr "Haz clic y arrastra para dibujar ladrillos grandes." msgstr "Haz clic y arrastra para dibujar ladrillos grandes."
A graphical tool, called poEdit (http://www.poedit.net/), is available A graphical tool, called poEdit (http://www.poedit.net/), is available
for Linux, Windows and Mac OS X. for Linux, Windows and macOS.
Note: It is best to always work off of the latest Tux Paint text catalog Note: It is best to always work off of the latest Tux Paint text catalog
template ("tuxpaint.pot"), since new text is added, and old text is template ("tuxpaint.pot"), since new text is added, and old text is

4
docs/en/FAQ.txt
View file

@ -1,5 +1,5 @@
Tux Paint Tux Paint
version 0.9.25 version 0.9.26
Frequently Asked Questions Frequently Asked Questions
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
@ -267,7 +267,7 @@ Saving
e.g., C:\Documents and Settings\Username\Application e.g., C:\Documents and Settings\Username\Application
Data\TuxPaint\saved Data\TuxPaint\saved
Mac OS X macOS
In the user's "Application Support" folder: In the user's "Application Support" folder:
e.g., /Users/Username/Library/Applicaton e.g., /Users/Username/Library/Applicaton
Support/TuxPaint/saved/ Support/TuxPaint/saved/

6
docs/en/OPTIONS.txt
View file

@ -1,5 +1,5 @@
Tux Paint Tux Paint
version 0.9.25 version 0.9.26
Options Documentation Options Documentation
@ -48,7 +48,7 @@ Linux and Unix Users
--nosysconfig --nosysconfig
Mac OS X Users macOS Users
The file you should create is called "tuxpaint.cfg" and it should be The file you should create is called "tuxpaint.cfg" and it should be
placed in your home folder, under the sub-folder: Library/Application placed in your home folder, under the sub-folder: Library/Application
@ -179,7 +179,7 @@ Windows Users
the 'Print' button is clicked while the [Alt] modifier key is the 'Print' button is clicked while the [Alt] modifier key is
being held. (This is typically used for providing a print being held. (This is typically used for providing a print
dialog, similar to when pressing [Alt]+'Print' in Windows and dialog, similar to when pressing [Alt]+'Print' in Windows and
Mac OS X.) macOS.)
If this option is not specifically not set, the default command If this option is not specifically not set, the default command
is KDE's graphical print dialog: is KDE's graphical print dialog:

2
docs/en/README.txt
View file

@ -1,5 +1,5 @@
Tux Paint Tux Paint
version 0.9.25 version 0.9.26
A simple drawing program for children A simple drawing program for children

2
docs/en/html/ADVANCED-STAMPS-HOWTO.html
View file

@ -20,7 +20,7 @@
width="205" width="205"
height="210" height="210"
alt="Tux&nbsp;Paint"><br> alt="Tux&nbsp;Paint"><br>
version 0.9.25<br> version 0.9.26<br>
Advanced Stamps HOWTO Advanced Stamps HOWTO
</h1> </h1>

6
docs/en/html/EXTENDING.html
View file

@ -21,7 +21,7 @@
width="205" width="205"
height="210" height="210"
alt="Tux Paint"><br> alt="Tux Paint"><br>
version 0.9.25 version 0.9.26
</h1> </h1>
<p> <p>
@ -355,7 +355,7 @@
</blockquote> </blockquote>
<h4> <h4>
Mac OS X macOS
</h4> </h4>
<blockquote> <blockquote>
@ -1471,7 +1471,7 @@
<p> <p>
A graphical tool, called <i><b>poEdit</b></i> (<a href= A graphical tool, called <i><b>poEdit</b></i> (<a href=
"http://www.poedit.net/">http://www.poedit.net/</a>), is "http://www.poedit.net/">http://www.poedit.net/</a>), is
available for Linux, Windows and Mac&nbsp;OS&nbsp;X. available for Linux, Windows and macOS.
</p> </p>
<p> <p>

4
docs/en/html/FAQ.html
View file

@ -20,7 +20,7 @@
width="205" width="205"
height="210" height="210"
alt="Tux&nbsp;Paint"><br> alt="Tux&nbsp;Paint"><br>
version 0.9.25<br> version 0.9.26<br>
Frequently Asked Questions Frequently Asked Questions
</h1> </h1>
@ -538,7 +538,7 @@
</dd> </dd>
<dt> <dt>
Mac OS X macOS
</dt> </dt>
<dd> <dd>

6
docs/en/html/OPTIONS.html
View file

@ -17,7 +17,7 @@
<center> <center>
<h1> <h1>
Tux&nbsp;Paint<br> Tux&nbsp;Paint<br>
version 0.9.25 version 0.9.26
</h1> </h1>
<h2> <h2>
@ -115,7 +115,7 @@
</blockquote> </blockquote>
<h2> <h2>
Mac&nbsp;OS&nbsp;X Users macOS Users
</h2> </h2>
<blockquote> <blockquote>
@ -389,7 +389,7 @@
the <b>[Alt]</b> modifier key is being held. (This is the <b>[Alt]</b> modifier key is being held. (This is
typically used for providing a print dialog, similar to typically used for providing a print dialog, similar to
when pressing <b>[Alt]</b>+'Print' in Windows and when pressing <b>[Alt]</b>+'Print' in Windows and
Mac&nbsp;OS&nbsp;X.) macOS.)
</p> </p>
<p> <p>

10
docs/en/html/README.html
View file

@ -20,7 +20,7 @@
width="205" width="205"
height="210" height="210"
alt="Tux&nbsp;Paint"><br> alt="Tux&nbsp;Paint"><br>
version 0.9.25 version 0.9.26
</h1> </h1>
<h3> <h3>
@ -2093,24 +2093,24 @@
"<code>docs</code>" folder/directory) include: "<code>docs</code>" folder/directory) include:
<ul> <ul>
<li> <li>
<a href="../magic-docs/html/">"Magic" Tool Documentation <a href="../magic-docs/html/index.html">"Magic" Tool Documentation
("magic-docs")</a><br> ("magic-docs")</a><br>
Documentation for each of the currently-installed "Magic" Documentation for each of the currently-installed "Magic"
tools. tools.
</li> </li>
<li> <li>
<a href="../AUTHORS.txt">AUTHORS.txt</a><br> <a href="../../AUTHORS.txt">AUTHORS.txt</a><br>
List of authors and contributors. List of authors and contributors.
</li> </li>
<li> <li>
<a href="../CHANGES.txt">CHANGES.txt</a><br> <a href="../../CHANGES.txt">CHANGES.txt</a><br>
Summary of changed between releases. Summary of changed between releases.
</li> </li>
<li> <li>
<a href="../COPYING.txt">COPYING.txt</a><br> <a href="../../COPYING.txt">COPYING.txt</a><br>
Copying license (The GNU General Public License). Copying license (The GNU General Public License).
</li> </li>

4
macos/Info.plist
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>tuxpaint</string> <string>tuxpaint</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>0.9.25, Copyright 2009-2020, Tux Paint Development Team</string> <string>0.9.26, Copyright 2009-2020, Tux Paint Development Team</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>tuxpaint.icns</string> <string>tuxpaint.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.25</string> <string>0.9.26</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>TXPT</string> <string>TXPT</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

2
src/manpage/tuxpaint.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2020.12.27 .\" tuxpaint.1 - 2020.12.27
.TH TUXPAINT 1 "27 December 2020" "0.9.25" "Tux Paint" .TH TUXPAINT 1 "27 December 2020" "0.9.26" "Tux Paint"
.SH NAME .SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children. tuxpaint -- "Tux Paint", a drawing program for young children.

5
tuxpaint.spec
View file

@ -1,6 +1,6 @@
Summary: A drawing program for young children Summary: A drawing program for young children
Name: tuxpaint Name: tuxpaint
Version: 0.9.25 Version: 0.9.26
Release: 1 Release: 1
License: GPL License: GPL
Group: Multimedia/Graphics Group: Multimedia/Graphics
@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/tp-magic-config.* %{_mandir}/man1/tp-magic-config.*
%changelog %changelog
* Sun Dec 27 2020 <nbs@sonic.net> -
- Set version number 0.9.26
* Mon Jun 22 2020 <nbs@sonic.net> - * Mon Jun 22 2020 <nbs@sonic.net> -
- Set version number 0.9.25 - Set version number 0.9.25

8
win32/resources.rc
View file

@ -26,8 +26,8 @@ IDI_ICON1 ICON DISCARDABLE "data/images/icon-win32.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,25,0 FILEVERSION 0,9,26,0
PRODUCTVERSION 0,9,25,0 PRODUCTVERSION 0,9,26,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x21L FILEFLAGS 0x21L
@ -45,14 +45,14 @@ BEGIN
VALUE "Comments", "\0" VALUE "Comments", "\0"
VALUE "CompanyName", "New Breed Software\0" VALUE "CompanyName", "New Breed Software\0"
VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0" VALUE "FileDescription", "Tux Paint - Interactive Paint Program.\0"
VALUE "FileVersion", "0.9.25\0" VALUE "FileVersion", "0.9.26\0"
VALUE "InternalName", "Tux Paint\0" VALUE "InternalName", "Tux Paint\0"
VALUE "LegalCopyright", "Copyright (C) 2008-2020 by Bill Kendrick, et al\0" VALUE "LegalCopyright", "Copyright (C) 2008-2020 by Bill Kendrick, et al\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "TuxPaint.exe\0" VALUE "OriginalFilename", "TuxPaint.exe\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Tux Paint\0" VALUE "ProductName", "Tux Paint\0"
VALUE "ProductVersion", "0.9.25\0" VALUE "ProductVersion", "0.9.26\0"
VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0" VALUE "SpecialBuild", "win32 build by TOYAMA Shin-ichi\0"
END END
END END