Commit graph

357 commits

Author SHA1 Message Date
Pere Pujal i Carabantes
da20be7a79 Merge 0.9.26 for sdl2.0 2021-06-29 07:21:40 +02:00
Bill Kendrick
69ccac5650 Dropping -rc1 from version 2021-06-28 16:47:13 -07:00
Mark Kim
a8177635cb Fix Haiku compilation bug
Luc Schrijvers reported on the Tux Paint Maintainers mailing list an
failure to build magic tools for Tux Paint 0.9.26 rc1 (see the mailing
list for the details).  The issue appears to stem from an interesting
interaction between my commit from March
(39cc096ece) and the quotes around
beos_PLUGIN_LIBS on line 1361:

  beos_PLUGIN_LIBS:="$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS) $(MAGIC_SDL_CPPFLAGS)"

My commit had removed a leading argument from $(MAGIC_SDL_LIBS) (whose
value is irrelevant but it was "-L/usr/local/lib"), and the second
argument resolves to nothing on Haiku, so beos_PLUGIN_LIBS now resolves
to a string with a leading space, and it appears `cc` treats a string
argument with a leading space as a single token as opposed to a list of
arguments as it was apparently doing previously.  Pere confirms removing
the second argument that resolves to nothing allows binary to compile.

I suppose removing the quotes around beos_PLUGIN_LIBS is another (and
cleaner) possible solution, but the quotes appear to be intentional and
without a Haiku build environment to test the exact behavior this will
be the safer commit to make.
2021-06-17 22:18:15 -04:00
Pere Pujal i Carabantes
a37582da69 First RC for 0.9.26 Merge branch 'master' into sdl2.0 2021-06-17 00:07:32 +02:00
Bill Kendrick
cffbd44f1f Rolling 0.9.26-rc1 2021-06-13 21:01:20 -07:00
Mark Kim
c3cce36fc0 Merge branch 'master' into sdl2.0 2021-03-23 21:22:12 -04:00
Mark Kim
5e8ccbb19e simplify ios compilation
- Merge iphoneos and iphonesimulator compilation.
- Install to package root.
2021-03-22 22:23:01 -04:00
Mark Kim
b73fb9dcdb Lazy resolution of iphone*_ARCH_LINKS
Early resolution of iphone*_ARCH_LINKS calls pkg-config even when compiling for
non-ios platforms, slowing down compilation unnecessarily and possibly raise
errors about nonexisting libraries that are not used.

This change modifies the iphone*_ARCH_LINKS to resolve lazily upon use so
pkg-config is not called unless the variables are used.
2021-03-22 22:15:09 -04:00
Mark Kim
b27ac1ddbc simplify ios compilation
- Merge iphoneos and iphonesimulator compilation.
- Install to package root.
2021-03-22 22:07:40 -04:00
Mark Kim
b05f75f10b Lazy resolution of iphone*_ARCH_LINKS
Early resolution of iphone*_ARCH_LINKS calls pkg-config even when compiling for
non-ios platforms, slowing down compilation unnecessarily and possibly raise
errors about nonexisting libraries that are not used.

This change modifies the iphone*_ARCH_LINKS to resolve lazily upon use so
pkg-config is not called unless the variables are used.
2021-03-21 23:09:32 -04:00
Mark Kim
39cc096ece iOS port initial commit
Known Issues
------------
- No printing support.
- No typing support using the OS virtual keyboard.  iOS needs to be signalled
  to bring up the virtual keyboard when the text tool is active.  We also may
  need to do some finagling to make IM work with the virtual keyboard.
- OS language detection doesn't work yet.
- Quitting doesn't close the app.  It just displays a black screen until it is
  force-closed.
- Need to include cross-compilation instructions.

Possible Issues
---------------
- No text display.  This is likely an issue with how pango and related
  libraries were cross-compiled rather than an issue with Tux Paint code.  From
  the error output it appears to be a font rendering issue.
- SVG integration couldn't be tested because RSVG library has not yet be
  cross-compiled successfully.
- Only tested under the iOS Simulator (and not on an actual iOS device yet.)
2021-03-21 23:01:49 -04:00
Mark Kim
92196bd69a iOS port initial commit
Known Issues
------------
- No printing support.
- No typing support using the OS virtual keyboard.  iOS needs to be signalled
  to bring up the virtual keyboard when the text tool is active.  We also may
  need to do some finagling to make IM work with the virtual keyboard.
- OS language detection doesn't work yet.
- Quitting doesn't close the app.  It just displays a black screen until it is
  force-closed.
- Need to include cross-compilation instructions.

Possible Issues
---------------
- No text display.  This is likely an issue with how pango and related
  libraries were cross-compiled rather than an issue with Tux Paint code.  From
  the error output it appears to be a font rendering issue.
- SVG integration couldn't be tested because RSVG library has not yet be
  cross-compiled successfully.
- Only tested under the iOS Simulator (and not on an actual iOS device yet.)
2021-03-21 20:46:03 -04:00
Pere Pujal i Carabantes
00b4aa126f Merge branch 'master' into sdl2.0. Updating with latest changes and improvements, clone, fill,... 2021-02-25 00:48:38 +01:00
Mark Kim
095b466a92 Use SDL2 for building magic tools, too 2021-02-21 09:47:49 -05:00
Mark Kim
b51145123d macOS fixes
- macos_ instead of macos.  Appears to hae been missed when merging a
  previously made change in the mainline.
- Additional linker flags required for building with SDL2.  Unclear why
  pkg-config provides these flags when building with SDL1 but not with SDL2 --
  it's inconsistent but strictly not a bug, may need to discuss with the
  MacPorts team.
2021-02-21 09:44:43 -05:00
Bill Kendrick
058191bd04 Radial gradient fill tool added
Note: Need to add to docs.
2021-02-20 18:08:06 -08:00
Bill Kendrick
7cd547e746 "xorpixel()" function added to Magic Tools API 2021-02-20 15:19:40 -08:00
Pere Pujal i Carabantes
afa562680e Merge branch 'master' into sdl2.0 2021-01-16 00:53:38 +01:00
Mark Kim
3c059ffe36 Move custom/macos* files to macos/*
Move all macOS build scripts and resources into the same directory instead of
just having the scripts in one directory and the resources in another.
2021-01-11 18:16:22 -05:00
Pere Pujal i Carabantes
2a159dd049 Merge branch 'master' into sdl2.0 2020-12-30 19:57:26 +01:00
Pere Pujal i Carabantes
dc332fc161 0.9.25
Merge branch 'master' into sdl2.0
2020-12-28 21:55:49 +01:00
Mark Kim
4019f8b963 Create Resources directory dynamically at compile time
The 'Resources' directory is used in macOS development to test the binary
without building TuxPaint.app bundle, which is helpful for rapid application
development since creating the app bundle takes a long time.

It's been reported that the symlink in the Resources directory was causing the
'release' target to copy the files in the 'data' directory twice into the
source release tarball.

This change removes the static Resources directory but creates it dynamically
when the 'tuxpaint' target is built and removes it via 'clean' target so the
'release' target does not copy the files in the 'data' directory into the
source release tarball twice.
2020-12-27 23:12:46 -05:00
Bill Kendrick
bcc233b542 Bump ver to 0.9.26; Expanded release steps
Expanded the steps for making and posting releases
(docs/RELEASE.txt).

Bumped version to 0.9.26.
2020-12-27 17:45:13 -08:00
Mark Kim
60e064b34f Change osx_ prefix to macos_ in Makefile
Apple has changed the name of their OS from OS X to macOS a loooong time ago.
It's about time to update it in the Makefile.
2020-12-10 17:40:34 -05:00
Mark Kim
c7ed85cd88 Change "echo -n" to "printf" in Makefile
The `echo` command built into the default macOS shell doesn't understand -n.
This commit changes it to use "printf" instead which should be fairly portable
across other OS's.  Feel free to change it back if it breaks anything.
2020-12-10 16:47:05 -05:00
Pere Pujal i Carabantes
3b44b4929f 2020/12/02 Merge branch 'master' into sdl2.0 2020-12-02 20:24:43 +01:00
dolphin6k
612c7cae46 install-dlls.sh does not collect all required dlls on JP's build env. 2020-11-15 22:11:18 +09:00
dolphin6k
968de6f0ea Enabled compiling on John Popplewell's build environment (for Windows 2000 & XP) 2020-11-15 13:47:29 +09:00
Pere Pujal i Carabantes
63e060afa3 Merge branch 'master' into sdl2.0 2020-10-28 17:03:05 +01:00
dolphin6k
b7c312ed5e Re-enable scripted dll install (Sorry, pushed wrong file before) 2020-10-18 21:50:20 +09:00
dolphin6k
e260456270 Re-enabled scripted dll install 2020-10-18 21:22:52 +09:00
dolphin6k
68bd1f6861 Reverting hard conded dll install because ldd does not solve dependencies on 32bit environment. 2020-10-18 16:59:38 +09:00
Bill Kendrick
b936bbc4ba make install robust to missing thumbnails
Sometimes thumbnails of starters or templates fail to generate
(ImageMagick bug; see
https://sourceforge.net/p/tuxpaint/tuxpaint/ci/9781a4723cbe5bd4d6bd7b5048d830821dda23ef/)

Avoid failing "make install" step when they are missing.
2020-10-15 22:41:17 -07:00
dolphin6k
2bde61ae46 No need to distinguish libgcc_s dll for 64/32bit. 2020-10-15 22:31:46 +09:00
Bill Kendrick
9781a4723c Ignore & clean up failed SVG thumbnails
When building Tux Paint, ImageMagick's `convert` might fail to generate
thumbnail PNGs for some Starter SVG images (e.g., "manatee.svg"),
with a "too many bezier coordinates" error.

This did not happen before, and does not happen with newer versions
of ImageMagick; there was a regression fixed in 2018:
https://github.com/ImageMagick/ImageMagick/issues/1069

However, it's occurring in Ubuntu 20.04 'focal' (I've got
version "6.9.10-23 Q16 x86_64 20190101").  Therefore, as a quick-fix,
simply ignoring errors from `convert`, and removing the (bogus)
PNG thumbmail image, and allowing the `make` process to proceed.

Tux Paint will simply open the SVG and generate a thumbnail to
display on the screen when the "New" dialog is brought up.
2020-10-14 23:44:14 -07:00
Bill Kendrick
d3212c6632 Doc'ing Shin-Ichi's Mingw64 and install-dlls.sh
Doc'ing Shin-Ichi TOYAMA's recent commits.
2020-10-14 23:27:57 -07:00
dolphin6k
18912ee8ea Find required dlls from .exe files. 2020-10-15 10:53:59 +09:00
dolphin6k
8d8405daab For new build environment including 64bit version. 2020-10-14 21:03:20 +09:00
Pere Pujal i Carabantes
436a535003 Merge branch 'master' with export features made by Bill and some updated translations into sdl2.0 2020-08-06 00:48:08 +02:00
Bill Kendrick
8c3a07294b Beginning GIF export
Beginning addition of an option to export animated GIFs
from the Open -> Slideshow dialog, after choosing the images.

Non-operable at this time, but a button has been added (and will
provide a hint to select 2 or more images, when clicked).
2020-07-25 00:18:46 -07:00
Bill Kendrick
b65d7f9da4 Bumping version to 0.9.25 2020-06-22 22:58:12 -07:00
Pere Pujal i Carabantes
e6f583bd8e Merge branch 'master' into sdl2.0 2020-04-02 16:27:42 +02:00
Mark Kim
3fa7cefa69 macOS update building procedure 2020-04-02 00:19:02 -04:00
Pere Pujal i Carabantes
70d9da8369 Halloween, Merge branch 'master' into sdl2.0 2019-11-02 01:01:11 +01:00
Bill Kendrick
2860da7668 Replace KDE icon install with Freedesktop.org
Replaced KDE (older, KDE4, in fact) specific icon and
launcher (.desktop file) installation & uninstallaton
invocations in Makefile with those that use Freedesktop.org
`xdg-...` tools.
2019-10-29 22:44:11 -07:00
Pere Pujal i Carabantes
be761daf7c Merge branch 'master' into sdl2.0 2019-10-19 17:08:37 +02:00
Bill Kendrick
acabe10e30 Unique filename when thumbnailing starters
Helps for parallel builds (e.g., `make -j12`).  h/t Pere.
2019-09-25 23:16:59 -07:00
Pere Pujal i Carabantes
a1c778135d Merge branch 'master' into sdl2.0
Merging master 2019-september-24 into sdl2.0 branch
2019-09-24 14:52:40 +02:00
Bill Kendrick
9db366237c Starter/Template thumbnails: larger
We'd rather scale down larger thumbnails, than scale up (which would
be blurry) small ones.
2019-09-21 15:59:53 -07:00
Bill Kendrick
41847ae4af FIXME note in Makefile: starter/template thumbs...
The thumbnails for starters & templates are NOT being re-generated
when the source images are modified -- only when the thumbnail is
missing.  Needs an update to the target's prerequisites
(but I'm very rusty with this level of Makefile magic).

Also, update some Starter source images so they work better with
flood fill (Bald Eagle, World map, Gecko).
2019-09-14 12:07:29 -07:00