From 148d26af7fe4b3fee6a23ddbe15aee55e2eae55c Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 8 Jul 2022 23:42:25 -0700 Subject: [PATCH 1/3] Trying to sync INSTALL w/ Shin-Ichi's page --- docs/en/html/INSTALL.html | 290 ++++++++++++++++------------- docs/es_ES.UTF-8/html/INSTALL.html | 290 ++++++++++++++++------------- docs/fr_FR.UTF-8/html/INSTALL.html | 290 ++++++++++++++++------------- docs/gl_ES.UTF-8/html/INSTALL.html | 290 ++++++++++++++++------------- docs/ja_JP.UTF-8/html/INSTALL.html | 290 ++++++++++++++++------------- 5 files changed, 820 insertions(+), 630 deletions(-) diff --git a/docs/en/html/INSTALL.html b/docs/en/html/INSTALL.html index f3347e43c..4daef9c8e 100644 --- a/docs/en/html/INSTALL.html +++ b/docs/en/html/INSTALL.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } @@ -96,7 +96,7 @@

- June 4, 2022

+ July 8, 2022

@@ -301,7 +301,7 @@

- May 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp <dolphin6k@wmail.plala.or.jp> + July 8, 2022 Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>

@@ -314,35 +314,48 @@

As of February 2005 (starting with Tux Paint 0.9.15), the "Makefile" includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/).

+

+ 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, which became available starting with version 0.9.28 in June 2022.

+

Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies.

-

- Download the latest MSYS2 environment from https://sourceforge.net/projects/msys2/files/Base/ and install it where you'd like (the default is "C:\msys64")

-

- Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command (press [Enter] or [Return] to accept the defaults for all questions): -

- - pacman -Syu - -
-

+
+
+

MYSYS2

+
-

- This will update core system and the window will close automatically. Repeat the steps above one more time to finish the remaining update process.

- -

- Within the MSYS2 shell, run the following command to install basic development tools:

- - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf - -
-

- -

- - Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. -

+

+ Download the latest MSYS2 environment from https://www.msys2.org/ and install it where you'd like (the default is "C:\msys64")

+

+ Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command:

+ + $ yes "" | pacman -Syu + +
+

+ +

+ This will update core system and the window will close automatically. Open the msys2 shell again and execute following command to finish remaining updating process.

+ + $ yes "" | pacman -Syu + +
+

+ +

+ Within the MSYS2 shell, run the following command to install basic development tools:

+ + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf dos2unix + +
+

+ +

+ + Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. +

+
@@ -356,7 +369,7 @@

Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools:

- pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git}

@@ -371,18 +384,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-x86_64-libvorbis
- $ pacman -S mingw-w64-x86_64-librsvg
- $ pacman -S mingw-w64-x86_64-fribidi
- $ pacman -S mingw-w64-x86_64-libimagequant
- $ pacman -S mingw-w64-x86_64-fltk
+ $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk}

@@ -393,52 +402,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment

+ Install SDL2_Pango and libunibreak on the 64bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw64 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw64 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw64 && make && make install

@@ -481,7 +465,7 @@

Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools:

- pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git}

@@ -496,18 +480,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-i686-libvorbis
- $ pacman -S mingw-w64-i686-librsvg
- $ pacman -S mingw-w64-i686-fribidi
- $ pacman -S mingw-w64-i686-libimagequant
- $ pacman -S mingw-w64-i686-fltk
+ $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk}

@@ -518,52 +498,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment

+ Install SDL2_Pango and libunibreak on the 32bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw32 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw32 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw32 && make && make install

@@ -602,7 +557,7 @@

ImageMagick is a compilation of command line tools to create, edit, compose, or convert bitmap images supporting quite a large number of image formats. Tux Paint uses two functions ("convert" and "composite") in it to generate thumbnails for startar images and templates during the build process.

- Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

+ Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

Do not forget to enable "Install legacy utilities (e.g. convert)" while installing it, because Tux Paint's build process uses them.

@@ -616,31 +571,114 @@ You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile".

-
+
-

Tux Paint

+

Tux Paint & Tux Paint Config.

- You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries using MSYS2 32bit shell, respectively.

+ You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit binaries using "MSYS2 32bit" shell, respectively.

  • Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell.
  • Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell.
-

- Compile Tux Paint with the following command:

- - $ make bdist-win32 - -
-

-

- 💡 Note: At this point, you will want to build "Tux Paint Config." for Windows, so it can be included along with "Tux Paint", if you're making an official (or test) release. The build process will look for it in a directory named "tuxpaint-config" (with no version number, e.g., "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt documentation for details.

+ +
+
+

Tux Paint Config.

+
+

+ "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz
      + $ mv tuxpaint-config-A.B.C tuxpaint-config
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint Config. as follows:

+ + $ cd tuxpaint-config
+ $ make win32
+ +
+

+
+ +
+
+

Tux Paint

+
+ +

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz
      + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone -b sdl2.0 https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint as follows:

+ + $ cd tuxpaint-sdl2
+ $ make bdist-win32
+ +
+

+
+

All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) files in the "bdist" directory.

-
+
@@ -655,7 +693,7 @@

Before building an installer, edit the "tuxpaint.iss" file and enable one of the lines starting with "#define BuildTarget=", depending on the architecture of the installer you want to create.

- Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-<arch>-installer.exe" file in the same directory.

+ Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-sdl2.0-<arch>-installer.exe" file in the same directory.

@@ -942,7 +980,7 @@

Although Tux Paint is built without the Xcode IDE, Xcode itself is still required to build Tux Paint. Download it from the App Store, and launch it once to accept its license agreements. You may also need to install the Xcode command line tools using the command:

- xcode-select --install + $ xcode-select --install

diff --git a/docs/es_ES.UTF-8/html/INSTALL.html b/docs/es_ES.UTF-8/html/INSTALL.html index 819d3dbff..78af84eef 100644 --- a/docs/es_ES.UTF-8/html/INSTALL.html +++ b/docs/es_ES.UTF-8/html/INSTALL.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } @@ -96,7 +96,7 @@

- junio 4, 2022

+ julio 8, 2022

@@ -301,7 +301,7 @@

- mayo 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp <dolphin6k@wmail.plala.or.jp> + julio 8, 2022 Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>

@@ -314,35 +314,48 @@

As of February 2005 (starting with Tux Paint 0.9.15), the "Makefile" includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/).

+

+ 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, which became available starting with version 0.9.28 in June 2022.

+

Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies.

-

- Download the latest MSYS2 environment from https://sourceforge.net/projects/msys2/files/Base/ and install it where you'd like (the default is "C:\msys64")

-

- Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command (press [Enter] or [Return] to accept the defaults for all questions): -

- - pacman -Syu - -
-

+
+
+

MYSYS2

+
-

- This will update core system and the window will close automatically. Repeat the steps above one more time to finish the remaining update process.

- -

- Within the MSYS2 shell, run the following command to install basic development tools:

- - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf - -
-

- -

- - Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. -

+

+ Download the latest MSYS2 environment from https://www.msys2.org/ and install it where you'd like (the default is "C:\msys64")

+

+ Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command:

+ + $ yes "" | pacman -Syu + +
+

+ +

+ This will update core system and the window will close automatically. Open the msys2 shell again and execute following command to finish remaining updating process.

+ + $ yes "" | pacman -Syu + +
+

+ +

+ Within the MSYS2 shell, run the following command to install basic development tools:

+ + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf dos2unix + +
+

+ +

+ + Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. +

+
@@ -356,7 +369,7 @@

Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools:

- pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git}

@@ -371,18 +384,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-x86_64-libvorbis
- $ pacman -S mingw-w64-x86_64-librsvg
- $ pacman -S mingw-w64-x86_64-fribidi
- $ pacman -S mingw-w64-x86_64-libimagequant
- $ pacman -S mingw-w64-x86_64-fltk
+ $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk}

@@ -393,52 +402,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment

+ Install SDL2_Pango and libunibreak on the 64bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw64 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw64 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw64 && make && make install

@@ -481,7 +465,7 @@

Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools:

- pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git}

@@ -496,18 +480,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-i686-libvorbis
- $ pacman -S mingw-w64-i686-librsvg
- $ pacman -S mingw-w64-i686-fribidi
- $ pacman -S mingw-w64-i686-libimagequant
- $ pacman -S mingw-w64-i686-fltk
+ $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk}

@@ -518,52 +498,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment

+ Install SDL2_Pango and libunibreak on the 32bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw32 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw32 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw32 && make && make install

@@ -602,7 +557,7 @@

ImageMagick is a compilation of command line tools to create, edit, compose, or convert bitmap images supporting quite a large number of image formats. Tux Paint uses two functions ("convert" and "composite") in it to generate thumbnails for startar images and templates during the build process.

- Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

+ Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

Do not forget to enable "Install legacy utilities (e.g. convert)" while installing it, because Tux Paint's build process uses them.

@@ -616,31 +571,114 @@ You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile".

-
+
-

Tux Paint

+

Tux Paint & Tux Paint Config.

- You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries using MSYS2 32bit shell, respectively.

+ You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit binaries using "MSYS2 32bit" shell, respectively.

  • Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell.
  • Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell.
-

- Compile Tux Paint with the following command:

- - $ make bdist-win32 - -
-

-

- 💡 Note: At this point, you will want to build "Tux Paint Config." for Windows, so it can be included along with "Tux Paint", if you're making an official (or test) release. The build process will look for it in a directory named "tuxpaint-config" (with no version number, e.g., "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt documentation for details.

+ +
+
+

Tux Paint Config.

+
+

+ "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz
      + $ mv tuxpaint-config-A.B.C tuxpaint-config
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint Config. as follows:

+ + $ cd tuxpaint-config
+ $ make win32
+ +
+

+
+ +
+
+

Tux Paint

+
+ +

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz
      + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone -b sdl2.0 https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint as follows:

+ + $ cd tuxpaint-sdl2
+ $ make bdist-win32
+ +
+

+
+

All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) files in the "bdist" directory.

-
+
@@ -655,7 +693,7 @@

Before building an installer, edit the "tuxpaint.iss" file and enable one of the lines starting with "#define BuildTarget=", depending on the architecture of the installer you want to create.

- Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-<arch>-installer.exe" file in the same directory.

+ Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-sdl2.0-<arch>-installer.exe" file in the same directory.

@@ -942,7 +980,7 @@

Although Tux Paint is built without the Xcode IDE, Xcode itself is still required to build Tux Paint. Download it from the App Store, and launch it once to accept its license agreements. You may also need to install the Xcode command line tools using the command:

- xcode-select --install + $ xcode-select --install

diff --git a/docs/fr_FR.UTF-8/html/INSTALL.html b/docs/fr_FR.UTF-8/html/INSTALL.html index e743195a8..4f2ca684e 100644 --- a/docs/fr_FR.UTF-8/html/INSTALL.html +++ b/docs/fr_FR.UTF-8/html/INSTALL.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } @@ -96,7 +96,7 @@

- juin 4, 2022

+ juillet 8, 2022

@@ -301,7 +301,7 @@

- mai 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp <dolphin6k@wmail.plala.or.jp> + juillet 8, 2022 Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>

@@ -314,35 +314,48 @@

Depuis février 2005 (à partir de Tux Paint 0.9.15), le "Makefile" inclut la prise en charge de la construction sur un système Windows à l'aide de MinGW/MSYS (https://sourceforge.net/projects/msys2/).

+

+ 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, which became available starting with version 0.9.28 in June 2022.

+

Beaucoup d'outils et de bibliothèques sont nécessaires pour élaborer Tux Paint. Le système de gestion de paquet "pacman" apporte une aide pour installer automatiquement, en résolvant les dépendances nombreuses.

-

- Téléchargez le dernier environnement MSYS2 à partir de https://sourceforge.net/projects/msys2/files/Base/ et installez-le où vous voulez (par défaut "C:\msys64")

-

- Ouvrez le shell MSYS2 via le "Menu de Démarrage" ->"MSYS2 64bit" -> "MSTS2 MSYS" et exécutez la commande suivante (pressez [Entrée] ou [Retour] pour accepter par défaut toutes les questions) : -

- - pacman -Syu - -
-

+
+
+

MYSYS2

+
-

- Ceci mettra à jour tout le système et la fenêtre de se fermera automatiquement. Répétez les étapes précédentes encore une fois pour finaliser le process restant de mise à jour.

- -

- Sous le shell MSYS2, exécutez la commande suivante pour installer outils basiques pour le développement :

- - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf - -
-

- -

- - Allez à la prochaine section "chaînes d'outils MinGW 64bit (x86_64) ", ou bien à la section "chaînes d'outils MinGW 32bit (i686)" si vous ne voulez qu'un environnement de travail 32bit. -

+

+ Téléchargez le dernier environnement MSYS2 à partir de https://www.msys2.org/ et installez-le où vous voulez (par défaut "C:\msys64")

+

+ Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command:

+ + $ yes "" | pacman -Syu + +
+

+ +

+ This will update core system and the window will close automatically. Open the msys2 shell again and execute following command to finish remaining updating process.

+ + $ yes "" | pacman -Syu + +
+

+ +

+ Sous le shell MSYS2, exécutez la commande suivante pour installer outils basiques pour le développement :

+ + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf dos2unix + +
+

+ +

+ + Allez à la prochaine section "chaînes d'outils MinGW 64bit (x86_64) ", ou bien à la section "chaînes d'outils MinGW 32bit (i686)" si vous ne voulez qu'un environnement de travail 32bit. +

+
@@ -356,7 +369,7 @@

Sous le shell MSYS2, exécutez la commande suivante pour installer 64bit compiler and basic development tools :

- pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git}

@@ -371,18 +384,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-x86_64-libvorbis
- $ pacman -S mingw-w64-x86_64-librsvg
- $ pacman -S mingw-w64-x86_64-fribidi
- $ pacman -S mingw-w64-x86_64-libimagequant
- $ pacman -S mingw-w64-x86_64-fltk
+ $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk}

@@ -393,52 +402,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment

+ Install SDL2_Pango and libunibreak on the 64bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

Cette fois-ci, utilisez le shell MinGW "64bit". Ouvrez le shell depuis le "Menu de Démarrage" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"

-
-
-
SDL_mixer
-
- -

- Télécharger fichier source de SDL_mixer-1.2.12 depuis SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw64 && make && make install - -
-

-
- -
+
SDL_Pango

- Tout d'abord, vous devrez préparer l'archive source et un patch qui est requis, dans le même répertoire.

-

-

- Compiler et installer SDL_Pango comme suit.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw64 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw64 && make && make install

@@ -481,7 +465,7 @@

Sous le shell MSYS2, exécutez la commande suivante pour installer 32bit compiler and basic development tools :

- pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git}

@@ -496,18 +480,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-i686-libvorbis
- $ pacman -S mingw-w64-i686-librsvg
- $ pacman -S mingw-w64-i686-fribidi
- $ pacman -S mingw-w64-i686-libimagequant
- $ pacman -S mingw-w64-i686-fltk
+ $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk}

@@ -518,52 +498,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment

+ Install SDL2_Pango and libunibreak on the 32bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

Cette fois-ci, utilisez le shell MinGW "32bit". Ouvrez le shell depuis le "Menu de Démarrage" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"

-
-
-
SDL_mixer
-
- -

- Télécharger fichier source de SDL_mixer-1.2.12 depuis SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw32 && make && make install - -
-

-
- -
+
SDL_Pango

- Tout d'abord, vous devrez préparer l'archive source et un patch qui est requis, dans le même répertoire.

-

-

- Compiler et installer SDL_Pango comme suit.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw32 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw32 && make && make install

@@ -602,7 +557,7 @@

ImageMagick est un ensemble d'outils en ligne de commande pour créer, éditer, composer ou convertir des images bitmap, et qui supporte un grand nombre de formats d'image. Tux Paint utilise deux fonctions ("convert" et "composite") pour générer des vignettes pour les images de démarrage et des modèles durant le process de compilation.

- L'utilisation des binaires officiels tirés de "Versions binaires pour Windows" est recommandée car les commandes installées avec "pacman" sur MinGW/MSYS ne fonctionnent pas comme elles devraient !

+ Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

N'oubliez pas de cocher "Installer les utilitaires hérités (par ex. convert)" pour l'installation, car le processus de compilation de Tux Paint les utilise.

@@ -616,31 +571,114 @@ Vous pouvez rendre ceci permanent en ajoutant ce qui précède à votre fichier de configuration du shell BASH, "~/.bash_profile".

-
+
-

Tux Paint

+

Tux Paint & Tux Paint Config.

- Vous pouvez compiler des binaires 64bit en utilisant le shell MSYS2 64bit, et des binaires 32bit en utilisant le shell MSYS2 32bit.

+ You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit binaries using "MSYS2 32bit" shell, respectively.

  • Choisissez "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" dans le "Menu de Démarrage" pour ouvrir le shell 64bit.
  • Choisissez "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" dans le "Menu de Démarrage" pour ouvrir le shell 32bit.
-

- Compilez Tux Paint avec la commande suivante :

- - $ make bdist-win32 - -
-

-

- 💡 Nota : À ce stade, vous voudrez compiler "Tux Paint Config". Pour Windows, il peut être ainsi inclus avec "Tux Paint", si vous faites une version officielle (ou de test).La compilation ira chercher un répertoire nommé "tuxpaint-config" (sans numéro de version, par ex voir "tuxpaint-config-X.Y.Z"). Voir le fichier INSTALL.txt de "Tux Paint Config" pour les détails.

+ +
+
+

Tux Paint Config.

+
+

+ "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz
      + $ mv tuxpaint-config-A.B.C tuxpaint-config
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint Config. as follows:

+ + $ cd tuxpaint-config
+ $ make win32
+ +
+

+
+ +
+
+

Tux Paint

+
+ +

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz
      + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone -b sdl2.0 https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint as follows:

+ + $ cd tuxpaint-sdl2
+ $ make bdist-win32
+ +
+

+
+

Tous les fichiers nécessaires pour démarrer Tux Paint (et Tux Paint Config) sont rassemblés dans le répertoire de la distribution binaire "bdist", répertoire situé sous "win323. Vous pouvez les démarrer en double-cliquant leurs fichiers exéctutables (.exe) dans le répertoire "bdist".

-
+
@@ -655,7 +693,7 @@

Before building an installer, edit the "tuxpaint.iss" file and enable one of the lines starting with "#define BuildTarget=", depending on the architecture of the installer you want to create.

- Alors, vous pouvez facilement construire un installateur exécutable en cliquant-droit sur l'icône "tuxpaint.iss" du répertoires "win32" et sélectionner "Compile" dans la liste. Cela prendra un certain temps, et éventuellement vous obtiendrez un fichier "tuxpaint-X.Y.Z-windows-<arch>-installer.exe" dans le même répertoire.

+ Alors, vous pouvez facilement construire un installateur exécutable en cliquant-droit sur l'icône "tuxpaint.iss" du répertoires "win32" et sélectionner "Compile" dans la liste. Cela prendra un certain temps, et éventuellement vous obtiendrez un fichier "tuxpaint-X.Y.Z-windows-sdl2.0-<arch>-installer.exe" dans le même répertoire.

@@ -942,7 +980,7 @@

Bien Tux Paint puisse être construit sans Xcode IDE, ce dernier est toujours nécessaire. Téléchargez le = partir de l' the App Store, et lancez le une fois pour accepter ses accords de licence. Vous pouvez aussi installer les outils de ligne de commande de Xcode en tapant la commande :

- xcode-select --install + $ xcode-select --install

diff --git a/docs/gl_ES.UTF-8/html/INSTALL.html b/docs/gl_ES.UTF-8/html/INSTALL.html index ae6898892..ccf1358d8 100644 --- a/docs/gl_ES.UTF-8/html/INSTALL.html +++ b/docs/gl_ES.UTF-8/html/INSTALL.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } @@ -96,7 +96,7 @@

- 4 de Xuño de 2022

+ 8 de Xullo de 2022

@@ -301,7 +301,7 @@

- 16 de Maio de 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp <dolphin6k@wmail.plala.or.jp> + 8 de Xullo de 2022 Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>

@@ -314,35 +314,48 @@

A partir de febreiro de 2005 (comezando con Tux Paint 0.9.15), o «Makefile» inclúe compatibilidade para construír nun sistema Windows usando MinGW/MSYS (https://sourceforge.net/projects/msys2/).

+

+ 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, which became available starting with version 0.9.28 in June 2022.

+

Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies.

-

- Download the latest MSYS2 environment from https://sourceforge.net/projects/msys2/files/Base/ and install it where you'd like (the default is "C:\msys64")

-

- Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command (press [Intro] or [Retorno] to accept the defaults for all questions): -

- - pacman -Syu - -
-

+
+
+

MYSYS2

+
-

- This will update core system and the window will close automatically. Repeat the steps above one more time to finish the remaining update process.

- -

- Within the MSYS2 shell, run the following command to install basic development tools:

- - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf - -
-

- -

- - Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. -

+

+ Download the latest MSYS2 environment from https://www.msys2.org/ and install it where you'd like (the default is "C:\msys64")

+

+ Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command:

+ + $ yes "" | pacman -Syu + +
+

+ +

+ This will update core system and the window will close automatically. Open the msys2 shell again and execute following command to finish remaining updating process.

+ + $ yes "" | pacman -Syu + +
+

+ +

+ Within the MSYS2 shell, run the following command to install basic development tools:

+ + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf dos2unix + +
+

+ +

+ + Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. +

+
@@ -356,7 +369,7 @@

Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools:

- pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git}

@@ -371,18 +384,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-x86_64-libvorbis
- $ pacman -S mingw-w64-x86_64-librsvg
- $ pacman -S mingw-w64-x86_64-fribidi
- $ pacman -S mingw-w64-x86_64-libimagequant
- $ pacman -S mingw-w64-x86_64-fltk
+ $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk}

@@ -393,52 +402,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment

+ Install SDL2_Pango and libunibreak on the 64bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw64 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw64 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw64 && make && make install

@@ -481,7 +465,7 @@

Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools:

- pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git}

@@ -496,18 +480,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-i686-libvorbis
- $ pacman -S mingw-w64-i686-librsvg
- $ pacman -S mingw-w64-i686-fribidi
- $ pacman -S mingw-w64-i686-libimagequant
- $ pacman -S mingw-w64-i686-fltk
+ $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk}

@@ -518,52 +498,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment

+ Install SDL2_Pango and libunibreak on the 32bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw32 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw32 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw32 && make && make install

@@ -602,7 +557,7 @@

ImageMagick is a compilation of command line tools to create, edit, compose, or convert bitmap images supporting quite a large number of image formats. Tux Paint uses two functions ("convert" and "composite") in it to generate thumbnails for startar images and templates during the build process.

- Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

+ Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

Do not forget to enable "Install legacy utilities (e.g. convert)" while installing it, because Tux Paint's build process uses them.

@@ -616,31 +571,114 @@ You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile".

-
+
-

Tux Paint

+

Tux Paint & Tux Paint Config.

- You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries using MSYS2 32bit shell, respectively.

+ You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit binaries using "MSYS2 32bit" shell, respectively.

  • Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell.
  • Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell.
-

- Compile Tux Paint with the following command:

- - $ make bdist-win32 - -
-

-

- 💡 Note: At this point, you will want to build "Tux Paint Config." for Windows, so it can be included along with "Tux Paint", if you're making an official (or test) release. The build process will look for it in a directory named "tuxpaint-config" (with no version number, e.g., "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt documentation for details.

+ +
+
+

Tux Paint Config.

+
+

+ "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz
      + $ mv tuxpaint-config-A.B.C tuxpaint-config
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint Config. as follows:

+ + $ cd tuxpaint-config
+ $ make win32
+ +
+

+
+ +
+
+

Tux Paint

+
+ +

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz
      + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone -b sdl2.0 https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint as follows:

+ + $ cd tuxpaint-sdl2
+ $ make bdist-win32
+ +
+

+
+

All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) files in the "bdist" directory.

-
+
@@ -655,7 +693,7 @@

Before building an installer, edit the "tuxpaint.iss" file and enable one of the lines starting with "#define BuildTarget=", depending on the architecture of the installer you want to create.

- Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-<arch>-installer.exe" file in the same directory.

+ Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-sdl2.0-<arch>-installer.exe" file in the same directory.

@@ -942,7 +980,7 @@

Although Tux Paint is built without the Xcode IDE, Xcode itself is still required to build Tux Paint. Download it from the App Store, and launch it once to accept its license agreements. You may also need to install the Xcode command line tools using the command:

- xcode-select --install + $ xcode-select --install

diff --git a/docs/ja_JP.UTF-8/html/INSTALL.html b/docs/ja_JP.UTF-8/html/INSTALL.html index 391ef338d..25e4ea767 100644 --- a/docs/ja_JP.UTF-8/html/INSTALL.html +++ b/docs/ja_JP.UTF-8/html/INSTALL.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } @@ -96,7 +96,7 @@

- 2022年6月 4日

+ 2022年7月 8日

@@ -301,7 +301,7 @@

- 2022年5月16日 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp <dolphin6k@wmail.plala.or.jp> + 2022年7月 8日 Shin-ichi TOYAMA <dolphin6k@wmail.plala.or.jp>

@@ -314,35 +314,48 @@

As of February 2005 (starting with Tux Paint 0.9.15), the "Makefile" includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/).

+

+ 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, which became available starting with version 0.9.28 in June 2022.

+

Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies.

-

- Download the latest MSYS2 environment from https://sourceforge.net/projects/msys2/files/Base/ and install it where you'd like (the default is "C:\msys64")

-

- Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command (press [Enter] or [Return] to accept the defaults for all questions): -

- - pacman -Syu - -
-

+
+
+

MYSYS2

+
-

- This will update core system and the window will close automatically. Repeat the steps above one more time to finish the remaining update process.

- -

- Within the MSYS2 shell, run the following command to install basic development tools:

- - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf - -
-

- -

- - Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. -

+

+ Download the latest MSYS2 environment from https://www.msys2.org/ and install it where you'd like (the default is "C:\msys64")

+

+ Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MSYS" and execute following command:

+ + $ yes "" | pacman -Syu + +
+

+ +

+ This will update core system and the window will close automatically. Open the msys2 shell again and execute following command to finish remaining updating process.

+ + $ yes "" | pacman -Syu + +
+

+ +

+ Within the MSYS2 shell, run the following command to install basic development tools:

+ + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch gperf dos2unix + +
+

+ +

+ + Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build environment. +

+
@@ -356,7 +369,7 @@

Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools:

- pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git}

@@ -371,18 +384,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-x86_64-libvorbis
- $ pacman -S mingw-w64-x86_64-librsvg
- $ pacman -S mingw-w64-x86_64-fribidi
- $ pacman -S mingw-w64-x86_64-libimagequant
- $ pacman -S mingw-w64-x86_64-fltk
+ $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk}

@@ -393,52 +402,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment

+ Install SDL2_Pango and libunibreak on the 64bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw64 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw64 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw64 && make && make install

@@ -481,7 +465,7 @@

Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools:

- pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git}

@@ -496,18 +480,14 @@

- You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, SDL_Pango and libunibreak.

+ You can install tools and libraries required for compiling Tux Paint and Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and libunibreak.

FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint".

$ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx}
- $ pacman -S mingw-w64-i686-libvorbis
- $ pacman -S mingw-w64-i686-librsvg
- $ pacman -S mingw-w64-i686-fribidi
- $ pacman -S mingw-w64-i686-libimagequant
- $ pacman -S mingw-w64-i686-fltk
+ $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk}

@@ -518,52 +498,27 @@

- Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment

+ Install SDL2_Pango and libunibreak on the 32bit environment

- SDL_mixer, SDL_Pango and libunibreak should be installed manually.

+ SDL2_Pango and libunibreak should be installed manually.

This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"

-
-
-
SDL_mixer
-
- -

- Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page.

-

- Build and install SDL_mixer as follows.

- - $ tar zxvf SDL_mixer-1.2.12.tar.gz
- $ cd SDL_mixer-1.2.12/
- $ ./configure --prefix=/mingw32 && make && make install - -
-

-
- -
+
SDL_Pango

- At first, you have to prepare source tar-ball and a required patch in the same directory.

-

-

- Build and install SDL_Pango as follows.

+ Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, then build and install SDL2_Pango as follows.
- $ tar zxvf SDL_Pango-0.1.2.tar.gz
- $ cd SDL_Pango-0.1.2/
- $ patch -p0 < ../SDL_Pango-configure-extra-api.patch
- $ ./configure --prefix=/mingw32 && make && make install + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch
+ $ git clone https://github.com/markuskimius/SDL2_Pango
+ $ cd SDL2_Pango
+ $ patch -p0 < ../SDL2_Pango-dll.patch
+ $ ./configure --prefix=/mingw32 && make && make install

@@ -602,7 +557,7 @@

ImageMagick is a compilation of command line tools to create, edit, compose, or convert bitmap images supporting quite a large number of image formats. Tux Paint uses two functions ("convert" and "composite") in it to generate thumbnails for startar images and templates during the build process.

- Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

+ Using official binary release available from "Windows Binary Release" is recommended, due to the commands installed with "pacman" on MinGW/MSYS not working as expected!

Do not forget to enable "Install legacy utilities (e.g. convert)" while installing it, because Tux Paint's build process uses them.

@@ -616,31 +571,114 @@ You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile".

-
+
-

Tux Paint

+

Tux Paint & Tux Paint Config.

- You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries using MSYS2 32bit shell, respectively.

+ You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit binaries using "MSYS2 32bit" shell, respectively.

  • Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell.
  • Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell.
-

- Compile Tux Paint with the following command:

- - $ make bdist-win32 - -
-

-

- 💡 Note: At this point, you will want to build "Tux Paint Config." for Windows, so it can be included along with "Tux Paint", if you're making an official (or test) release. The build process will look for it in a directory named "tuxpaint-config" (with no version number, e.g., "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt documentation for details.

+ +
+
+

Tux Paint Config.

+
+

+ "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's behavior. You have to build this component before compiling Tux Paint if you want to have it included in your package.

+

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz
      + $ mv tuxpaint-config-A.B.C tuxpaint-config
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config tuxpaint-config + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint Config. as follows:

+ + $ cd tuxpaint-config
+ $ make win32
+ +
+

+
+ +
+
+

Tux Paint

+
+ +

+ You can use either (a) a stable tar-ball release, or (b) the developing source tree.

    +
  1. + Using stable tar-ball release:
      +
    • + Download a source tar-ball +
      • +
    • + Expand the tar-ball and change the directory name so that the final packaging process can find related files.
      + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz
      + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2
      +       +
      +
      • +
    +
    2. +
  2. + Using the developing source tree:
      +
    • + Fetch the developing source tree from git repository:
      + + $ git clone -b sdl2.0 https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + +
      +
      • +
    +
    3. +
+

+

+ Now you can build Tux Paint as follows:

+ + $ cd tuxpaint-sdl2
+ $ make bdist-win32
+ +
+

+
+

All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) files in the "bdist" directory.

-
+
@@ -655,7 +693,7 @@

Before building an installer, edit the "tuxpaint.iss" file and enable one of the lines starting with "#define BuildTarget=", depending on the architecture of the installer you want to create.

- Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-<arch>-installer.exe" file in the same directory.

+ Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a "tuxpaint-X.Y.Z-windows-sdl2.0-<arch>-installer.exe" file in the same directory.

@@ -942,7 +980,7 @@

Although Tux Paint is built without the Xcode IDE, Xcode itself is still required to build Tux Paint. Download it from the App Store, and launch it once to accept its license agreements. You may also need to install the Xcode command line tools using the command:

- xcode-select --install + $ xcode-select --install

From 401d5805a63d850c21e4483ceb82c3abcf42ba96 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 8 Jul 2022 23:43:34 -0700 Subject: [PATCH 2/3] Trying to sync INSTALL w/ Shin-Ichi's page (TXT) --- docs/en/INSTALL.txt | 186 +++++++++++++++++---------------- docs/es_ES.UTF-8/INSTALL.txt | 186 +++++++++++++++++---------------- docs/fr_FR.UTF-8/INSTALL.txt | 195 ++++++++++++++++++----------------- docs/gl_ES.UTF-8/INSTALL.txt | 186 +++++++++++++++++---------------- docs/ja_JP.UTF-8/INSTALL.txt | 186 +++++++++++++++++---------------- 5 files changed, 479 insertions(+), 460 deletions(-) diff --git a/docs/en/INSTALL.txt b/docs/en/INSTALL.txt index 3d2e079b1..7536b57cd 100644 --- a/docs/en/INSTALL.txt +++ b/docs/en/INSTALL.txt @@ -5,7 +5,7 @@ Copyright © 2002-2022 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - June 4, 2022 + July 8, 2022 +----------------------------------------------------+ |Table of Contents | @@ -144,8 +144,7 @@ Simple DirectMedia Layer library (libSDL) Windows - May 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp - + July 8, 2022 Shin-ichi TOYAMA Compiling Set-Up @@ -153,29 +152,34 @@ Windows includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/). + 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, + which became available starting with version 0.9.28 in June 2022. + Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies. - Download the latest MSYS2 environment from - https://sourceforge.net/projects/msys2/files/Base/ and install it where - you'd like (the default is "C:\msys64") + MYSYS2 + + Download the latest MSYS2 environment from https://www.msys2.org/ and + install it where you'd like (the default is "C:\msys64") Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 - MSYS" and execute following command (press [Enter] or [Return] to accept - the defaults for all questions): + MSYS" and execute following command: - pacman -Syu + $ yes "" | pacman -Syu - This will update core system and the window will close automatically. - Repeat the steps above one more time to finish the remaining update - process. + This will update core system and the window will close automatically. Open + the msys2 shell again and execute following command to finish remaining + updating process. + + $ yes "" | pacman -Syu Within the MSYS2 shell, run the following command to install basic development tools: - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch - gperf + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git + zip patch gperf dos2unix Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build @@ -188,7 +192,7 @@ Windows Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools: - pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -197,53 +201,33 @@ Windows 64bit (x86_64) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-x86_64-libvorbis - $ pacman -S mingw-w64-x86_64-librsvg - $ pacman -S mingw-w64-x86_64-fribidi - $ pacman -S mingw-w64-x86_64-libimagequant - $ pacman -S mingw-w64-x86_64-fltk + $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment + Install SDL2_Pango and libunibreak on the 64bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw64 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw64 && make && make install libunibreak @@ -268,7 +252,7 @@ Windows Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools: - pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -277,53 +261,33 @@ Windows 32bit (i686) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-i686-libvorbis - $ pacman -S mingw-w64-i686-librsvg - $ pacman -S mingw-w64-i686-fribidi - $ pacman -S mingw-w64-i686-libimagequant - $ pacman -S mingw-w64-i686-fltk + $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment + Install SDL2_Pango and libunibreak on the 32bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw32 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw32 && make && make install libunibreak @@ -361,27 +325,66 @@ Windows You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile". - Tux Paint + Tux Paint & Tux Paint Config. - You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries - using MSYS2 32bit shell, respectively. + You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit + binaries using "MSYS2 32bit" shell, respectively. * Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell. * Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell. - Compile Tux Paint with the following command: + Tux Paint Config. + "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's + behavior. You have to build this component before compiling Tux Paint if + you want to have it included in your package. + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz + $ mv tuxpaint-config-A.B.C tuxpaint-config + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config + tuxpaint-config + + Now you can build Tux Paint Config. as follows: + + $ cd tuxpaint-config + $ make win32 + + Tux Paint + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2 + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone -b sdl2.0 + https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + + Now you can build Tux Paint as follows: + + $ cd tuxpaint-sdl2 $ make bdist-win32 - 💡 Note: At this point, you will want to build "Tux Paint Config." for - Windows, so it can be included along with "Tux Paint", if you're making an - official (or test) release. The build process will look for it in a - directory named "tuxpaint-config" (with no version number, e.g., - "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt - documentation for details. - All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) @@ -407,7 +410,8 @@ Windows Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a - "tuxpaint-X.Y.Z-windows--installer.exe" file in the same directory. + "tuxpaint-X.Y.Z-windows-sdl2.0--installer.exe" file in the same + directory. Running the Tux Paint Windows Installer @@ -604,7 +608,7 @@ macOS once to accept its license agreements. You may also need to install the Xcode command line tools using the command: - xcode-select --install + $ xcode-select --install Building Tux Paint also requires various libraries. We install them from MacPorts where possible, source code otherwise. Install MacPorts to the diff --git a/docs/es_ES.UTF-8/INSTALL.txt b/docs/es_ES.UTF-8/INSTALL.txt index 1d607762d..0bdb727a5 100644 --- a/docs/es_ES.UTF-8/INSTALL.txt +++ b/docs/es_ES.UTF-8/INSTALL.txt @@ -5,7 +5,7 @@ Copyright © 2002-2022 by various contributors; see AUTHORS.txt. https://tuxpaint.org/ - junio 4, 2022 + julio 8, 2022 +----------------------------------------------------+ |Table of Contents | @@ -144,8 +144,7 @@ Simple DirectMedia Layer library (libSDL) Windows - mayo 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp - + julio 8, 2022 Shin-ichi TOYAMA Compiling Set-Up @@ -153,29 +152,34 @@ Windows includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/). + 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, + which became available starting with version 0.9.28 in June 2022. + Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies. - Download the latest MSYS2 environment from - https://sourceforge.net/projects/msys2/files/Base/ and install it where - you'd like (the default is "C:\msys64") + MYSYS2 + + Download the latest MSYS2 environment from https://www.msys2.org/ and + install it where you'd like (the default is "C:\msys64") Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 - MSYS" and execute following command (press [Enter] or [Return] to accept - the defaults for all questions): + MSYS" and execute following command: - pacman -Syu + $ yes "" | pacman -Syu - This will update core system and the window will close automatically. - Repeat the steps above one more time to finish the remaining update - process. + This will update core system and the window will close automatically. Open + the msys2 shell again and execute following command to finish remaining + updating process. + + $ yes "" | pacman -Syu Within the MSYS2 shell, run the following command to install basic development tools: - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch - gperf + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git + zip patch gperf dos2unix Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build @@ -188,7 +192,7 @@ Windows Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools: - pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -197,53 +201,33 @@ Windows 64bit (x86_64) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-x86_64-libvorbis - $ pacman -S mingw-w64-x86_64-librsvg - $ pacman -S mingw-w64-x86_64-fribidi - $ pacman -S mingw-w64-x86_64-libimagequant - $ pacman -S mingw-w64-x86_64-fltk + $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment + Install SDL2_Pango and libunibreak on the 64bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw64 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw64 && make && make install libunibreak @@ -268,7 +252,7 @@ Windows Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools: - pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -277,53 +261,33 @@ Windows 32bit (i686) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-i686-libvorbis - $ pacman -S mingw-w64-i686-librsvg - $ pacman -S mingw-w64-i686-fribidi - $ pacman -S mingw-w64-i686-libimagequant - $ pacman -S mingw-w64-i686-fltk + $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment + Install SDL2_Pango and libunibreak on the 32bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw32 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw32 && make && make install libunibreak @@ -361,27 +325,66 @@ Windows You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile". - Tux Paint + Tux Paint & Tux Paint Config. - You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries - using MSYS2 32bit shell, respectively. + You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit + binaries using "MSYS2 32bit" shell, respectively. * Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell. * Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell. - Compile Tux Paint with the following command: + Tux Paint Config. + "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's + behavior. You have to build this component before compiling Tux Paint if + you want to have it included in your package. + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz + $ mv tuxpaint-config-A.B.C tuxpaint-config + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config + tuxpaint-config + + Now you can build Tux Paint Config. as follows: + + $ cd tuxpaint-config + $ make win32 + + Tux Paint + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2 + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone -b sdl2.0 + https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + + Now you can build Tux Paint as follows: + + $ cd tuxpaint-sdl2 $ make bdist-win32 - 💡 Note: At this point, you will want to build "Tux Paint Config." for - Windows, so it can be included along with "Tux Paint", if you're making an - official (or test) release. The build process will look for it in a - directory named "tuxpaint-config" (with no version number, e.g., - "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt - documentation for details. - All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) @@ -407,7 +410,8 @@ Windows Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a - "tuxpaint-X.Y.Z-windows--installer.exe" file in the same directory. + "tuxpaint-X.Y.Z-windows-sdl2.0--installer.exe" file in the same + directory. Running the Tux Paint Windows Installer @@ -604,7 +608,7 @@ macOS once to accept its license agreements. You may also need to install the Xcode command line tools using the command: - xcode-select --install + $ xcode-select --install Building Tux Paint also requires various libraries. We install them from MacPorts where possible, source code otherwise. Install MacPorts to the diff --git a/docs/fr_FR.UTF-8/INSTALL.txt b/docs/fr_FR.UTF-8/INSTALL.txt index b6712bbf2..aa69cc0d9 100644 --- a/docs/fr_FR.UTF-8/INSTALL.txt +++ b/docs/fr_FR.UTF-8/INSTALL.txt @@ -5,7 +5,7 @@ Copyright © 2002-2022 by divers contributeurs; see AUTHORS.txt. https://tuxpaint.org/ - juin 4, 2022 + juillet 8, 2022 +--------------------------------------------------------+ |Table des matières | @@ -147,8 +147,7 @@ Biliothèque Simple DirectMedia Layer (libSDL) Windows - mai 16, 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp - + juillet 8, 2022 Shin-ichi TOYAMA Réglages pour compilation @@ -156,29 +155,35 @@ Windows la prise en charge de la construction sur un système Windows à l'aide de MinGW/MSYS (https://sourceforge.net/projects/msys2/). + 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, + which became available starting with version 0.9.28 in June 2022. + Beaucoup d'outils et de bibliothèques sont nécessaires pour élaborer Tux Paint. Le système de gestion de paquet "pacman" apporte une aide pour installer automatiquement, en résolvant les dépendances nombreuses. + MYSYS2 + Téléchargez le dernier environnement MSYS2 à partir de - https://sourceforge.net/projects/msys2/files/Base/ et installez-le où vous - voulez (par défaut "C:\msys64") + https://www.msys2.org/ et installez-le où vous voulez (par défaut + "C:\msys64") - Ouvrez le shell MSYS2 via le "Menu de Démarrage" ->"MSYS2 64bit" -> "MSTS2 - MSYS" et exécutez la commande suivante (pressez [Entrée] ou [Retour] pour - accepter par défaut toutes les questions) : + Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 + MSYS" and execute following command: - pacman -Syu + $ yes "" | pacman -Syu - Ceci mettra à jour tout le système et la fenêtre de se fermera - automatiquement. Répétez les étapes précédentes encore une fois pour - finaliser le process restant de mise à jour. + This will update core system and the window will close automatically. Open + the msys2 shell again and execute following command to finish remaining + updating process. + + $ yes "" | pacman -Syu Sous le shell MSYS2, exécutez la commande suivante pour installer outils basiques pour le développement : - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch - gperf + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git + zip patch gperf dos2unix Allez à la prochaine section "chaînes d'outils MinGW 64bit (x86_64) ", ou bien à la section "chaînes d'outils MinGW 32bit (i686)" si vous ne voulez @@ -191,7 +196,7 @@ Windows Sous le shell MSYS2, exécutez la commande suivante pour installer 64bit compiler and basic development tools : - pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} "ntldd" est un petit outil qui examine les fichiers exécutables de windows en vue de lister les fichiers DLL (.dll) qui leur sont nécessaires. Le @@ -201,54 +206,33 @@ Windows 64bit (x86_64) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-x86_64-libvorbis - $ pacman -S mingw-w64-x86_64-librsvg - $ pacman -S mingw-w64-x86_64-fribidi - $ pacman -S mingw-w64-x86_64-libimagequant - $ pacman -S mingw-w64-x86_64-fltk + $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk} 💡 Nota : Fermez l'interpréteur de commandes avant de passer à la suite. - Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment + Install SDL2_Pango and libunibreak on the 64bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. Cette fois-ci, utilisez le shell MinGW "64bit". Ouvrez le shell depuis le "Menu de Démarrage" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" - SDL_mixer - - Télécharger fichier source de SDL_mixer-1.2.12 depuis SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw64 && make && make install - SDL_Pango - Tout d'abord, vous devrez préparer l'archive source et un patch qui est - requis, dans le même répertoire. - * Télécharger fichier source de SDL_Pango-0.1.2 depuis La page SDL_Pango - sur Sourceforge.net. - * Télécharger un fichier patch depuis La page web de John Popplewell - traitant des "instructions pour la compilation de Tux Paint - - MinGW/MSYS". (Ceci ajoute une fonctionnalité supplémentaire (requise) - à SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Compiler et installer SDL_Pango comme suit. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw64 && make && make install libunibreak @@ -274,7 +258,7 @@ Windows Sous le shell MSYS2, exécutez la commande suivante pour installer 32bit compiler and basic development tools : - pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} "ntldd" est un petit outil qui examine les fichiers exécutables de windows en vue de lister les fichiers DLL (.dll) qui leur sont nécessaires. Le @@ -284,54 +268,33 @@ Windows 32bit (i686) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-i686-libvorbis - $ pacman -S mingw-w64-i686-librsvg - $ pacman -S mingw-w64-i686-fribidi - $ pacman -S mingw-w64-i686-libimagequant - $ pacman -S mingw-w64-i686-fltk + $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk} 💡 Nota : Fermez l'interpréteur de commandes avant de passer à la suite. - Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment + Install SDL2_Pango and libunibreak on the 32bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. Cette fois-ci, utilisez le shell MinGW "32bit". Ouvrez le shell depuis le "Menu de Démarrage" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" - SDL_mixer - - Télécharger fichier source de SDL_mixer-1.2.12 depuis SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw32 && make && make install - SDL_Pango - Tout d'abord, vous devrez préparer l'archive source et un patch qui est - requis, dans le même répertoire. - * Télécharger fichier source de SDL_Pango-0.1.2 depuis La page SDL_Pango - sur Sourceforge.net. - * Télécharger un fichier patch depuis La page web de John Popplewell - traitant des "instructions pour la compilation de Tux Paint - - MinGW/MSYS". (Ceci ajoute une fonctionnalité supplémentaire (requise) - à SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Compiler et installer SDL_Pango comme suit. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw32 && make && make install libunibreak @@ -354,9 +317,9 @@ Windows "composite") pour générer des vignettes pour les images de démarrage et des modèles durant le process de compilation. - L'utilisation des binaires officiels tirés de "Versions binaires pour - Windows" est recommandée car les commandes installées avec "pacman" sur - MinGW/MSYS ne fonctionnent pas comme elles devraient ! + Using official binary release available from "Windows Binary Release" is + recommended, due to the commands installed with "pacman" on MinGW/MSYS not + working as expected! N'oubliez pas de cocher "Installer les utilitaires hérités (par ex. convert)" pour l'installation, car le processus de compilation de Tux @@ -370,27 +333,66 @@ Windows Vous pouvez rendre ceci permanent en ajoutant ce qui précède à votre fichier de configuration du shell BASH, "~/.bash_profile". - Tux Paint + Tux Paint & Tux Paint Config. - Vous pouvez compiler des binaires 64bit en utilisant le shell MSYS2 64bit, - et des binaires 32bit en utilisant le shell MSYS2 32bit. + You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit + binaries using "MSYS2 32bit" shell, respectively. * Choisissez "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" dans le "Menu de Démarrage" pour ouvrir le shell 64bit. * Choisissez "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" dans le "Menu de Démarrage" pour ouvrir le shell 32bit. - Compilez Tux Paint avec la commande suivante : + Tux Paint Config. + "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's + behavior. You have to build this component before compiling Tux Paint if + you want to have it included in your package. + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz + $ mv tuxpaint-config-A.B.C tuxpaint-config + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config + tuxpaint-config + + Now you can build Tux Paint Config. as follows: + + $ cd tuxpaint-config + $ make win32 + + Tux Paint + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2 + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone -b sdl2.0 + https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + + Now you can build Tux Paint as follows: + + $ cd tuxpaint-sdl2 $ make bdist-win32 - 💡 Nota : À ce stade, vous voudrez compiler "Tux Paint Config". Pour - Windows, il peut être ainsi inclus avec "Tux Paint", si vous faites une - version officielle (ou de test).La compilation ira chercher un répertoire - nommé "tuxpaint-config" (sans numéro de version, par ex voir - "tuxpaint-config-X.Y.Z"). Voir le fichier INSTALL.txt de "Tux Paint - Config" pour les détails. - Tous les fichiers nécessaires pour démarrer Tux Paint (et Tux Paint Config) sont rassemblés dans le répertoire de la distribution binaire "bdist", répertoire situé sous "win323. Vous pouvez les démarrer en @@ -419,7 +421,8 @@ Windows cliquant-droit sur l'icône "tuxpaint.iss" du répertoires "win32" et sélectionner "Compile" dans la liste. Cela prendra un certain temps, et éventuellement vous obtiendrez un fichier - "tuxpaint-X.Y.Z-windows--installer.exe" dans le même répertoire. + "tuxpaint-X.Y.Z-windows-sdl2.0--installer.exe" dans le même + répertoire. Running the Tux Paint Windows Installer @@ -624,7 +627,7 @@ macOS lancez le une fois pour accepter ses accords de licence. Vous pouvez aussi installer les outils de ligne de commande de Xcode en tapant la commande : - xcode-select --install + $ xcode-select --install Construire Tux Paint nécessite plusieurs bibliothèques. Nous les installons à partir de MacPorts quand c'est possible, sinon à partir du diff --git a/docs/gl_ES.UTF-8/INSTALL.txt b/docs/gl_ES.UTF-8/INSTALL.txt index 0f0aff19c..3c4db9e15 100644 --- a/docs/gl_ES.UTF-8/INSTALL.txt +++ b/docs/gl_ES.UTF-8/INSTALL.txt @@ -5,7 +5,7 @@ Copyright © 2002-2022 by varios colaboradores; see AUTHORS.txt. https://tuxpaint.org/ - 4 de Xuño de 2022 + 8 de Xullo de 2022 +----------------------------------------------------+ |Índice | @@ -147,8 +147,7 @@ Simple DirectMedia Layer library (libSDL) Windows - 16 de Maio de 2022 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp - + 8 de Xullo de 2022 Shin-ichi TOYAMA Compiling Set-Up @@ -156,29 +155,34 @@ Windows «Makefile» inclúe compatibilidade para construír nun sistema Windows usando MinGW/MSYS (https://sourceforge.net/projects/msys2/). + 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, + which became available starting with version 0.9.28 in June 2022. + Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies. - Download the latest MSYS2 environment from - https://sourceforge.net/projects/msys2/files/Base/ and install it where - you'd like (the default is "C:\msys64") + MYSYS2 + + Download the latest MSYS2 environment from https://www.msys2.org/ and + install it where you'd like (the default is "C:\msys64") Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 - MSYS" and execute following command (press [Intro] or [Retorno] to accept - the defaults for all questions): + MSYS" and execute following command: - pacman -Syu + $ yes "" | pacman -Syu - This will update core system and the window will close automatically. - Repeat the steps above one more time to finish the remaining update - process. + This will update core system and the window will close automatically. Open + the msys2 shell again and execute following command to finish remaining + updating process. + + $ yes "" | pacman -Syu Within the MSYS2 shell, run the following command to install basic development tools: - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch - gperf + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git + zip patch gperf dos2unix Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build @@ -191,7 +195,7 @@ Windows Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools: - pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -200,53 +204,33 @@ Windows 64bit (x86_64) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-x86_64-libvorbis - $ pacman -S mingw-w64-x86_64-librsvg - $ pacman -S mingw-w64-x86_64-fribidi - $ pacman -S mingw-w64-x86_64-libimagequant - $ pacman -S mingw-w64-x86_64-fltk + $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment + Install SDL2_Pango and libunibreak on the 64bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw64 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw64 && make && make install libunibreak @@ -271,7 +255,7 @@ Windows Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools: - pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -280,53 +264,33 @@ Windows 32bit (i686) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-i686-libvorbis - $ pacman -S mingw-w64-i686-librsvg - $ pacman -S mingw-w64-i686-fribidi - $ pacman -S mingw-w64-i686-libimagequant - $ pacman -S mingw-w64-i686-fltk + $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment + Install SDL2_Pango and libunibreak on the 32bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw32 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw32 && make && make install libunibreak @@ -364,27 +328,66 @@ Windows You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile". - Tux Paint + Tux Paint & Tux Paint Config. - You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries - using MSYS2 32bit shell, respectively. + You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit + binaries using "MSYS2 32bit" shell, respectively. * Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell. * Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell. - Compile Tux Paint with the following command: + Tux Paint Config. + "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's + behavior. You have to build this component before compiling Tux Paint if + you want to have it included in your package. + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz + $ mv tuxpaint-config-A.B.C tuxpaint-config + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config + tuxpaint-config + + Now you can build Tux Paint Config. as follows: + + $ cd tuxpaint-config + $ make win32 + + Tux Paint + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2 + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone -b sdl2.0 + https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + + Now you can build Tux Paint as follows: + + $ cd tuxpaint-sdl2 $ make bdist-win32 - 💡 Note: At this point, you will want to build "Tux Paint Config." for - Windows, so it can be included along with "Tux Paint", if you're making an - official (or test) release. The build process will look for it in a - directory named "tuxpaint-config" (with no version number, e.g., - "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt - documentation for details. - All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) @@ -410,7 +413,8 @@ Windows Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a - "tuxpaint-X.Y.Z-windows--installer.exe" file in the same directory. + "tuxpaint-X.Y.Z-windows-sdl2.0--installer.exe" file in the same + directory. Running the Tux Paint Windows Installer @@ -613,7 +617,7 @@ macOS once to accept its license agreements. You may also need to install the Xcode command line tools using the command: - xcode-select --install + $ xcode-select --install Building Tux Paint also requires various libraries. We install them from MacPorts where possible, source code otherwise. Install MacPorts to the diff --git a/docs/ja_JP.UTF-8/INSTALL.txt b/docs/ja_JP.UTF-8/INSTALL.txt index 53d26cb3b..1b8c4fd36 100644 --- a/docs/ja_JP.UTF-8/INSTALL.txt +++ b/docs/ja_JP.UTF-8/INSTALL.txt @@ -5,7 +5,7 @@ Copyright © 2002-2022 by various contributors; AUTHORS.txt 参照. https://tuxpaint.org/ - 2022年6月 4日 + 2022年7月 8日 +----------------------------------------------------+ |目次 | @@ -144,8 +144,7 @@ Simple DirectMedia Layer library (libSDL) Windows - 2022年5月16日 Shin-ichi TOYAMA dolphin6k@wmail.plala.or.jp - + 2022年7月 8日 Shin-ichi TOYAMA Compiling Set-Up @@ -153,29 +152,34 @@ Windows includes support for building on a Windows system using MinGW/MSYS (https://sourceforge.net/projects/msys2/). + 💡 Note: This documentation relates to the SDL2.0 version of Tux Paint, + which became available starting with version 0.9.28 in June 2022. + Many tools and libraries are required to build Tux Paint. The package management system "pacman" helps you install them automatically solving complicated dependencies. - Download the latest MSYS2 environment from - https://sourceforge.net/projects/msys2/files/Base/ and install it where - you'd like (the default is "C:\msys64") + MYSYS2 + + Download the latest MSYS2 environment from https://www.msys2.org/ and + install it where you'd like (the default is "C:\msys64") Open the MSYS2 shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 - MSYS" and execute following command (press [Enter] or [Return] to accept - the defaults for all questions): + MSYS" and execute following command: - pacman -Syu + $ yes "" | pacman -Syu - This will update core system and the window will close automatically. - Repeat the steps above one more time to finish the remaining update - process. + This will update core system and the window will close automatically. Open + the msys2 shell again and execute following command to finish remaining + updating process. + + $ yes "" | pacman -Syu Within the MSYS2 shell, run the following command to install basic development tools: - pacman -S make automake-wrapper autoconf-wrapper libtool git zip patch - gperf + $ yes "" | pacman -S make automake-wrapper autoconf-wrapper libtool git + zip patch gperf dos2unix Proceed to the next "MinGW 64bit (x86_64) toolchains" section, or skip to the "MinGW 32bit (i686) toolchains" section if you need only a 32bit build @@ -188,7 +192,7 @@ Windows Within the MSYS2 shell, run the following command to install 64bit compiler and basic development tools: - pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-x86_64-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -197,53 +201,33 @@ Windows 64bit (x86_64) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-x86_64-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-x86_64-libvorbis - $ pacman -S mingw-w64-x86_64-librsvg - $ pacman -S mingw-w64-x86_64-fribidi - $ pacman -S mingw-w64-x86_64-libimagequant - $ pacman -S mingw-w64-x86_64-fltk + $ pacman -S mingw-w64-x86_64-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 64bit environment + Install SDL2_Pango and libunibreak on the 64bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw64 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw64 && make && make install libunibreak @@ -268,7 +252,7 @@ Windows Within the MSYS2 shell, run the following command to install 32bit compiler and basic development tools: - pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} + $ yes "" | pacman -S mingw-w64-i686-{gcc,pkgconf,ntldd-git} "ntldd" is a small tool which examine windows executable files to list Dynamic Link Library (.dll) files they depends on. Tux Paint's packaging @@ -277,53 +261,33 @@ Windows 32bit (i686) dependency libraries for Tux Paint and Tux Paint Config You can install tools and libraries required for compiling Tux Paint and - Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL_mixer, - SDL_Pango and libunibreak. + Tux Paint Config on MSYS2/MINGW using "pacman" except for SDL2_Pango and + libunibreak. FLTK is a cross-platform GUI toolkit used by "Tux Paint Config". You can skip installing it if you are only building "Tux Paint". $ pacman -S mingw-w64-i686-SDL_{image,ttf,gfx} - $ pacman -S mingw-w64-i686-libvorbis - $ pacman -S mingw-w64-i686-librsvg - $ pacman -S mingw-w64-i686-fribidi - $ pacman -S mingw-w64-i686-libimagequant - $ pacman -S mingw-w64-i686-fltk + $ pacman -S mingw-w64-i686-{librsvg,fribidi,libimagequant,fltk} 💡 Note: Close the shell before proceeding to the remaining process. - Install SDL_mixer, SDL_Pango and libunibreak on the 32bit environment + Install SDL2_Pango and libunibreak on the 32bit environment - SDL_mixer, SDL_Pango and libunibreak should be installed manually. + SDL2_Pango and libunibreak should be installed manually. This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" - SDL_mixer - - Download source tar-ball of SDL_mixer-1.2.12 from SDL_mixer's page. - - Build and install SDL_mixer as follows. - - $ tar zxvf SDL_mixer-1.2.12.tar.gz - $ cd SDL_mixer-1.2.12/ - $ ./configure --prefix=/mingw32 && make && make install - SDL_Pango - At first, you have to prepare source tar-ball and a required patch in the - same directory. - * Download source tar-ball of SDL_Pango-0.1.2 from SDL_Pango's page on - Sourceforge.net. - * Download a patch file from John Popplewell's "Tux Paint - MinGW/MSYS - build instructions" webpage. (This adds some extra (required) - functionality to SDL_Pango.) + Download a patch from z1.plala.jp, which enable SDL2_Pango to create dlls, + then build and install SDL2_Pango as follows. - Build and install SDL_Pango as follows. - - $ tar zxvf SDL_Pango-0.1.2.tar.gz - $ cd SDL_Pango-0.1.2/ - $ patch -p0 < ../SDL_Pango-configure-extra-api.patch + $ wget https://z1.plala.jp/tuxpaint/SDL2_Pango-dll.patch + $ git clone https://github.com/markuskimius/SDL2_Pango + $ cd SDL2_Pango + $ patch -p0 < ../SDL2_Pango-dll.patch $ ./configure --prefix=/mingw32 && make && make install libunibreak @@ -361,27 +325,66 @@ Windows You can make this permanent by adding the above to your the BASH shell configuration file, "~/.bash_profile". - Tux Paint + Tux Paint & Tux Paint Config. - You can compile 64bit binaries using MSYS2 64bit shell, and 32bit binaries - using MSYS2 32bit shell, respectively. + You can compile 64-bit binaries using "MSYS2 64bit" shell, and 32-bit + binaries using "MSYS2 32bit" shell, respectively. * Select "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" from the "Start Menu" to open the 64bit shell. * Select "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" from the "Start Menu" to open the 32bit shell. - Compile Tux Paint with the following command: + Tux Paint Config. + "Tux Paint Config" is a useful graphical tool for tweaking Tux Paint's + behavior. You have to build this component before compiling Tux Paint if + you want to have it included in your package. + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-config-A.B.C.tar.gz + $ mv tuxpaint-config-A.B.C tuxpaint-config + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone https://git.code.sf.net/p/tuxpaint/tuxpaint-config + tuxpaint-config + + Now you can build Tux Paint Config. as follows: + + $ cd tuxpaint-config + $ make win32 + + Tux Paint + + You can use either (a) a stable tar-ball release, or (b) the developing + source tree. + a. Using stable tar-ball release: + * Download a source tar-ball + * Expand the tar-ball and change the directory name so that the + final packaging process can find related files. + + $ tar zxvf tuxpaint-A.B.C-sdl2.tar.gz + $ mv tuxpaint-A.B.C-sdl2 tuxpaint-sdl2 + + b. Using the developing source tree: + * Fetch the developing source tree from git repository: + + $ git clone -b sdl2.0 + https://git.code.sf.net/p/tuxpaint/tuxpaint tuxpaint-sdl2 + + Now you can build Tux Paint as follows: + + $ cd tuxpaint-sdl2 $ make bdist-win32 - 💡 Note: At this point, you will want to build "Tux Paint Config." for - Windows, so it can be included along with "Tux Paint", if you're making an - official (or test) release. The build process will look for it in a - directory named "tuxpaint-config" (with no version number, e.g., - "tuxpaint-config-X.Y.Z"). See "Tux Paint Config."'s INSTALL.txt - documentation for details. - All the files needed for starting Tux Paint (and Tux Paint Config.) are collected in the directory for binary distribution "bdist" directory under "win32". You can start them by double-clicking their executable (.exe) @@ -407,7 +410,8 @@ Windows Then, you can easily build an executable installer by right-clicking on the "tuxpaint.iss" icon in the "win32" directory and selecting "Compile" on the list. It will run for a while, and eventually you will find a - "tuxpaint-X.Y.Z-windows--installer.exe" file in the same directory. + "tuxpaint-X.Y.Z-windows-sdl2.0--installer.exe" file in the same + directory. Running the Tux Paint Windows Installer @@ -604,7 +608,7 @@ macOS once to accept its license agreements. You may also need to install the Xcode command line tools using the command: - xcode-select --install + $ xcode-select --install Building Tux Paint also requires various libraries. We install them from MacPorts where possible, source code otherwise. Install MacPorts to the From 4b8c57212333abffb2c6a89958b9d35a54f77095 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 8 Jul 2022 23:44:12 -0700 Subject: [PATCH 3/3] Make sure CSS changes are pulled into all relevant HTMLs --- docs/en/html/EXTENDING.html | 2 +- docs/en/html/OPTIONS.html | 2 +- docs/en/html/PNG.html | 2 +- docs/en/html/README.html | 2 +- docs/en/html/SIGNALS.html | 2 +- docs/en/html/SVG.html | 2 +- docs/es_ES.UTF-8/html/EXTENDING.html | 2 +- docs/es_ES.UTF-8/html/OPTIONS.html | 2 +- docs/es_ES.UTF-8/html/PNG.html | 2 +- docs/es_ES.UTF-8/html/README.html | 2 +- docs/es_ES.UTF-8/html/SIGNALS.html | 2 +- docs/es_ES.UTF-8/html/SVG.html | 2 +- docs/fr_FR.UTF-8/html/EXTENDING.html | 2 +- docs/fr_FR.UTF-8/html/OPTIONS.html | 2 +- docs/fr_FR.UTF-8/html/PNG.html | 2 +- docs/fr_FR.UTF-8/html/README.html | 2 +- docs/fr_FR.UTF-8/html/SIGNALS.html | 2 +- docs/fr_FR.UTF-8/html/SVG.html | 2 +- docs/gl_ES.UTF-8/html/EXTENDING.html | 2 +- docs/gl_ES.UTF-8/html/OPTIONS.html | 2 +- docs/gl_ES.UTF-8/html/PNG.html | 2 +- docs/gl_ES.UTF-8/html/README.html | 2 +- docs/gl_ES.UTF-8/html/SIGNALS.html | 2 +- docs/gl_ES.UTF-8/html/SVG.html | 2 +- docs/ja_JP.UTF-8/html/EXTENDING.html | 2 +- docs/ja_JP.UTF-8/html/OPTIONS.html | 2 +- docs/ja_JP.UTF-8/html/PNG.html | 2 +- docs/ja_JP.UTF-8/html/README.html | 2 +- docs/ja_JP.UTF-8/html/SIGNALS.html | 2 +- docs/ja_JP.UTF-8/html/SVG.html | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/en/html/EXTENDING.html b/docs/en/html/EXTENDING.html index 3bd7705ab..003ffac2e 100644 --- a/docs/en/html/EXTENDING.html +++ b/docs/en/html/EXTENDING.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index 3750a0612..e950454b0 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/en/html/PNG.html b/docs/en/html/PNG.html index ff8c4f100..7d7513e18 100644 --- a/docs/en/html/PNG.html +++ b/docs/en/html/PNG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/en/html/README.html b/docs/en/html/README.html index 4b371d529..eee3a9667 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/en/html/SIGNALS.html b/docs/en/html/SIGNALS.html index 52cc41fd6..bc0ec8859 100644 --- a/docs/en/html/SIGNALS.html +++ b/docs/en/html/SIGNALS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/en/html/SVG.html b/docs/en/html/SVG.html index 4206cc636..ceb6e49f9 100644 --- a/docs/en/html/SVG.html +++ b/docs/en/html/SVG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/EXTENDING.html b/docs/es_ES.UTF-8/html/EXTENDING.html index 24d6cd004..6b20e783c 100644 --- a/docs/es_ES.UTF-8/html/EXTENDING.html +++ b/docs/es_ES.UTF-8/html/EXTENDING.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html index 03262de18..884e318e4 100644 --- a/docs/es_ES.UTF-8/html/OPTIONS.html +++ b/docs/es_ES.UTF-8/html/OPTIONS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/PNG.html b/docs/es_ES.UTF-8/html/PNG.html index d4cc306b4..cc087eefc 100644 --- a/docs/es_ES.UTF-8/html/PNG.html +++ b/docs/es_ES.UTF-8/html/PNG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html index 15713efb0..8f06b7a2c 100644 --- a/docs/es_ES.UTF-8/html/README.html +++ b/docs/es_ES.UTF-8/html/README.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/SIGNALS.html b/docs/es_ES.UTF-8/html/SIGNALS.html index 7670f3adf..4c51cab56 100644 --- a/docs/es_ES.UTF-8/html/SIGNALS.html +++ b/docs/es_ES.UTF-8/html/SIGNALS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/es_ES.UTF-8/html/SVG.html b/docs/es_ES.UTF-8/html/SVG.html index 1c2417f24..bc18ad035 100644 --- a/docs/es_ES.UTF-8/html/SVG.html +++ b/docs/es_ES.UTF-8/html/SVG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/EXTENDING.html b/docs/fr_FR.UTF-8/html/EXTENDING.html index 8f8dfceff..bf267dd46 100644 --- a/docs/fr_FR.UTF-8/html/EXTENDING.html +++ b/docs/fr_FR.UTF-8/html/EXTENDING.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html index 883e2c2df..ebd9fede5 100644 --- a/docs/fr_FR.UTF-8/html/OPTIONS.html +++ b/docs/fr_FR.UTF-8/html/OPTIONS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/PNG.html b/docs/fr_FR.UTF-8/html/PNG.html index 9691cc238..5dcd66f68 100644 --- a/docs/fr_FR.UTF-8/html/PNG.html +++ b/docs/fr_FR.UTF-8/html/PNG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html index b751b8914..47745212e 100644 --- a/docs/fr_FR.UTF-8/html/README.html +++ b/docs/fr_FR.UTF-8/html/README.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/SIGNALS.html b/docs/fr_FR.UTF-8/html/SIGNALS.html index 1c53ee152..7ecc677a8 100644 --- a/docs/fr_FR.UTF-8/html/SIGNALS.html +++ b/docs/fr_FR.UTF-8/html/SIGNALS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/fr_FR.UTF-8/html/SVG.html b/docs/fr_FR.UTF-8/html/SVG.html index 22ccfaf05..d9b124ed9 100644 --- a/docs/fr_FR.UTF-8/html/SVG.html +++ b/docs/fr_FR.UTF-8/html/SVG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/EXTENDING.html b/docs/gl_ES.UTF-8/html/EXTENDING.html index 1b559e57d..a08b63b1c 100644 --- a/docs/gl_ES.UTF-8/html/EXTENDING.html +++ b/docs/gl_ES.UTF-8/html/EXTENDING.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html index 03774d822..13a1394af 100644 --- a/docs/gl_ES.UTF-8/html/OPTIONS.html +++ b/docs/gl_ES.UTF-8/html/OPTIONS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/PNG.html b/docs/gl_ES.UTF-8/html/PNG.html index e793d2f63..d7842f784 100644 --- a/docs/gl_ES.UTF-8/html/PNG.html +++ b/docs/gl_ES.UTF-8/html/PNG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html index 24e7263ad..432397f96 100644 --- a/docs/gl_ES.UTF-8/html/README.html +++ b/docs/gl_ES.UTF-8/html/README.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/SIGNALS.html b/docs/gl_ES.UTF-8/html/SIGNALS.html index 82017bd58..891326f15 100644 --- a/docs/gl_ES.UTF-8/html/SIGNALS.html +++ b/docs/gl_ES.UTF-8/html/SIGNALS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/gl_ES.UTF-8/html/SVG.html b/docs/gl_ES.UTF-8/html/SVG.html index 32d2d98cc..0a699dbf0 100644 --- a/docs/gl_ES.UTF-8/html/SVG.html +++ b/docs/gl_ES.UTF-8/html/SVG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/EXTENDING.html b/docs/ja_JP.UTF-8/html/EXTENDING.html index 5e4120097..db5f1f9d3 100644 --- a/docs/ja_JP.UTF-8/html/EXTENDING.html +++ b/docs/ja_JP.UTF-8/html/EXTENDING.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/OPTIONS.html b/docs/ja_JP.UTF-8/html/OPTIONS.html index e74fd4d46..98132e8e6 100644 --- a/docs/ja_JP.UTF-8/html/OPTIONS.html +++ b/docs/ja_JP.UTF-8/html/OPTIONS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/PNG.html b/docs/ja_JP.UTF-8/html/PNG.html index d1b868042..970ca3c58 100644 --- a/docs/ja_JP.UTF-8/html/PNG.html +++ b/docs/ja_JP.UTF-8/html/PNG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html index ccc659119..09ed917db 100644 --- a/docs/ja_JP.UTF-8/html/README.html +++ b/docs/ja_JP.UTF-8/html/README.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/SIGNALS.html b/docs/ja_JP.UTF-8/html/SIGNALS.html index 135793fc7..9988c4ef1 100644 --- a/docs/ja_JP.UTF-8/html/SIGNALS.html +++ b/docs/ja_JP.UTF-8/html/SIGNALS.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; } diff --git a/docs/ja_JP.UTF-8/html/SVG.html b/docs/ja_JP.UTF-8/html/SVG.html index 457397d56..82e6733c4 100644 --- a/docs/ja_JP.UTF-8/html/SVG.html +++ b/docs/ja_JP.UTF-8/html/SVG.html @@ -62,7 +62,7 @@ section.indent dl p { margin-left: 0; } - p + ul { + p + ul, p + ol { margin-left: 2em; }