Commit graph

415 commits

Author SHA1 Message Date
Shin-ichi TOYAMA
af2166df14 Added FREETYPE_CFLAGS macro to make it find those headers. 2022-08-18 14:38:21 +09:00
Bill Kendrick
60120b763c Merge branch 'master' into sdl2.0 2022-07-03 19:58:34 -07:00
Bill Kendrick
06fafcb6d6 "test-png" tool to find PNGs that cause warnings
New tool, "test-png", which exercises libpng library on
a set of PNG image files, allowing us to find those which
cause Tux Paint (via SDL_image, in turn via libpng) to
report back warnings to STDERR.

h/t Tim Dickson, per https://sourceforge.net/p/tuxpaint/bugs/252/
2022-07-03 17:18:58 -07:00
Mark Kim
633a3628d6 Compatibility with SDL2_Pango 0.1.3
Include all headers needed by SDL2_Pango when building the fonts file by
querying pkg-config.
2022-07-02 22:29:47 -04:00
Bill Kendrick
d289d407ad Merge branch 'master' into sdl2.0 2022-06-29 21:04:32 -07:00
Will Thompson
38bc3b27d8 Fix detection of xdg-icon-resource
If given more than one argument, 'which' prints the path to each one (if
found). Previously, which was passed two arguments: 'xdg-icon-resource',
and 'install'. But in the contained block of statements, 'install' is
an argument passed to 'xdg-icon-resource'. Pass only 'xdg-icon-resource'
to which.
2022-06-29 13:05:59 +01:00
Will Thompson
4120af3b5f Rename metainfo file to appdata
gettext 0.19.7 gained support for translating appdata files, whereas
support for metainfo files was added in 0.20. These file formats are
effectively the same: as documented in the AppStream specification,
desktop applications can install files with the suffix .appdata.xml
rather than .metainfo.xml and these will still be handled correctly.

It is desirable for this project to support RHEL 7, which has gettext
0.19.8.1, so let's use the older filename.

As noted in the same section of the specification, appdata files were
previously installed to /usr/share/appdata rather than
/usr/share/metainfo, but the spec asserts that the newer metainfo path
works all the way back to RHEL 7, so we keep the newer installation
path.

Thanks to Shin-ichi TOYAMA for flagging this issue.

https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
2022-06-29 13:05:40 +01:00
Will Thompson
c03b688e98 Create metainfo directory with 'install'
The -D argument to install, together with -t DEST, means "ensure DEST
exists".
2022-06-29 12:40:44 +01:00
Bill Kendrick
080d78fe45 Make sure METAINFO dir exists 2022-06-29 00:38:03 -07:00
Bill Kendrick
73d5e9b8c6 Make sure METAINFO dir exists 2022-06-29 00:33:06 -07:00
Bill Kendrick
294c42bb3f Merge branch 'master' into sdl2.0 2022-06-14 00:52:44 -07:00
Bill Kendrick
a7151c7b43 Merge commit '21bdf7de11' 2022-06-14 00:49:25 -07:00
Bill Kendrick
5532ddd2fd Merge branch 'master' into sdl2.0 2022-06-14 00:38:27 -07:00
Bill Kendrick
fbfd609665 Bumping version to 0.9.29; doc'ing recent additions
Some things snuck in to 0.9.28 binary builds, or were added
recently; making sure they're doc'd in CHANGES.txt
2022-06-14 00:15:58 -07:00
Will Thompson
74506214e7 Add appstream metainfo file
This is used by software centres such as GNOME Software to display
information about the app, both before and after it is installed.

The <id> used here follows the recommendations in the Appstream
specification, with the exception of violating the spec's strong
encouragement to use only lowercase characters. This is because the
version that is already published by Flathub uses an uppercase T in the
final component of the ID.[0] The file shipped by Fedora followed an older
convention of using the desktop file name as the ID. This is
acknowledged by the <provides> section near the bottom of the file,
which will allow software centres to associate the reverse-domain-name
ID with the older ID.[1]

Many fields in this file are translatable.  This was the motivation for
the preceeding two changes:

- By using xgettext rather than intltool, the untranslated template may
  be written using the normal appstream XML tags, rather than needing to
  use (for example) <_name>Tux Paint</_name> to mark that field for
  translation, which renders the template not valid for tools like
  'appstreamcli validate'.
- Merging translations at build time, rather than committing the
  translated XML to the repo as well, avoids another potentially
  error-prone manual step when updating the source file or translations.

The release notes are taken from the press releases on the Tuxpaint
website. They will be extracted for translation. Another option is to
replace the <description> with <url type="details">...</url>, but AFAIK
no software centres currently show these URLs.[2]

[0]: https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic
[1]: https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html#tag-id-desktopapp
[2]: https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-releases

TODO:

- align comment

Fixes: https://sourceforge.net/p/tuxpaint/feature-requests/172/
2022-06-10 21:45:44 +01:00
Will Thompson
b4aa697474 Merge desktop file at build time
Previously, both the .desktop.in template and the final .desktop file
were checked into source control.

While in some ways convenient, the manual step of updating it may be
forgotten after updating a translation or adjusting the template. It
also potentially introduces confusion as to which file to modify.

Instead, generate the .desktop file at build time. Since this is now
done using msgfmt rather than intltool, there is no additional
dependency beyond gettext, which is already used at build time to
compile .po files to .mo files.
2022-06-10 10:36:56 +01:00
dolphin6k
ff4352d575 Corrected suffix of the system-wide config file 2022-06-10 10:57:06 +09:00
Bill Kendrick
be9614f5b5 For release: This is SDL2.0 branch 2022-06-04 00:23:15 -07:00
Bill Kendrick
2af844e40c Merge branch 'master' into sdl2.0 2022-06-04 00:22:54 -07:00
Bill Kendrick
a4c894ac08 Release builds tarballs that denote branch
(SDL1.2 vs SDL2.0)
2022-06-04 00:22:32 -07:00
Pere Pujal i Carabantes
eb7f55e289 Merge branch 'master' into sdl2.0
Some things are still WIP, they need to be tested and addressed later.
2022-02-17 23:57:28 +01:00
Pere Pujal i Carabantes
63fbd45cd1 Merge branch 'master' into sdl2.0 2022-02-13 01:44:39 +01:00
dolphin6k
b71955c150 Use "<dynamic full path of current dir>\\locale" to bindtextdomain() only for the target "bdist-win32" 2022-02-09 23:12:12 +09:00
dolphin6k
f1519a2a39 Better way to install dll files and .mo files for tpconf only for the target "bdist-win32" 2022-02-07 22:26:54 +09:00
Mark Kim
c2ab6d461c merge macos.c and macos.m, update ios.*
* Merged macos.c into macos.m.
* Updated ios.h and ios.c to be compatible with the macos.* changes.
* Renamed ios.c to ios.m.
2022-02-06 11:29:19 -05:00
Mark Kim
7aa000b68a Tux Paint for macOS can localize menus (feature request #183)
Tux Paint for macOS can now localize the macOS menubar.  Translation
files (*.po) will be required for the actual translations to show.
2022-02-05 18:40:36 -05:00
Pere Pujal i Carabantes
4107ae3ecd Step 1 of Merging branch 'master' into sdl2.0 in a try to minimize conflicts 2022-01-28 22:50:04 +01:00
dolphin6k
c0bac21beb Target directory for install-dlls and install-tpconf-i18n were missing. 2022-01-28 23:35:14 +09:00
dolphin6k
10dc17d434 Install dlls and tpconf only for the target "bdist-win32" 2022-01-28 11:15:13 +09:00
Mark Kim
0175773efc macOS build tweaks
1. Building the DMG file now requires explicitly calling the 'make
   TuxPaint.dmg' target.

2. Messages output after completing a Makefile target has been
   customized on macOS.

The motivation here is Apple Silicon.  With the instruction of Apple
Silicon, the porting developer may need to sign the app bundle and/or
create the app bundle as universal before creating the DMG file, so the
Makefile no longer auto-creates the DMG file.  Instead, macOS-specific
messages have been added so the developer knows what to do next.
2022-01-22 14:46:34 -05:00
Pere Pujal i Carabantes
e9ebd54db9 Merging brush spacing work into sdl2.0 2022-01-20 21:33:57 +01:00
Mark Kim
e8bb5c80a6 Remove install stages not needed on macOS 2022-01-17 21:44:04 -05:00
Pere Pujal i Carabantes
7e9990a6d6 Merge branch 'master' into sdl2.0 2021-12-10 11:29:59 +01:00
Bill Kendrick
d6792e97c1 Bump to 0.9.28 in Makefile! 2021-12-01 22:49:12 -08:00
Pere Pujal i Carabantes
88d8252952 Merge branch 'master' into sdl2.0 2021-11-08 23:33:49 +01:00
dolphin6k
fbf206d17c Makefile: Defined platform specific install target like as other platforms.
tuxpaint.spec: Specified install target except for install-xdg.
2021-11-07 17:10:52 +09:00
Pere Pujal i Carabantes
1afe9e155c Merge branch 'master' into sdl2.0
Tons of bugfixes and improvements for Windows by Toyama Shin-Ichi
Angle rotation and some magic tools by Bill.
2021-11-06 08:59:22 +01:00
dolphin6k
c217f62470 Added clean target 2021-11-05 20:09:16 +09:00
dolphin6k
bad22db0ce Removed man, importscript and bash-completion from install target for windows. 2021-11-05 13:06:15 +09:00
dolphin6k
61ce0798d9 Initial implimentation of win32_trash() 2021-10-28 22:47:32 +09:00
Pere Pujal i Carabantes
9cf77f684c Merge branch 'master' into sdl2.0
There are problems with im that should be investigated...
2021-10-24 11:47:54 +02:00
Bill Kendrick
b8317f74e0 extern char*[] from sounds.h to new sounds.c
Move the list of Tux Paint's internal sound effect filenames
from "sounds.h" to a new "sounds.c" (that compiles to "sounds.o").
2021-10-24 01:20:07 -07:00
dolphin6k
f0bffa6202 Deleted support for Windows XP and 2000 2021-10-15 18:37:04 +09:00
Pere Pujal i Carabantes
6642ef35b8 October 2 Merge branch 'master' into sdl2.0 2021-10-03 00:16:54 +02:00
Pere Pujal i Carabantes
16f56ae9cd SDL2 also for Windows, by TOYAMA Shin-ichi 2021-09-29 20:25:56 +02:00
Bill Kendrick
79437733f2 Add Magic tool doc translations; install them
Adding snapshot of (basically untranslated) Magic tool docs
in the other locales currently supported by 'tuxpaint-docs'.

Update Makefile to install them.
2021-09-28 21:25:37 -07:00
Pere Pujal i Carabantes
b6b0636eb5 Merge branch 'master' into sdl2.0 2021-09-27 23:32:48 +02:00
Bill Kendrick
0ed588521f Add missing Fretwork magic tool docs 2021-09-20 22:55:41 -07:00
Bill Kendrick
8f17edc10e Clean up installed docs
All old, outdated, manually-generated translations of docs now
go into an "outdated" subdirectory.  The "tuxpaint-docs"/gettext-based
ones are the "first-class citizens".

Don't install the docs directory's "Makefile", or the instructions
for how to release Tux Paint, as those are not necessary to end users.
2021-09-17 00:11:33 -07:00
Shin-ichi TOYAMAA
5e5eb6d62a Tell linker to build GUI application. 2021-09-16 13:40:07 +09:00