[PR PATCH] tuxpaint: update to 0.9.31.

[PR PATCH] tuxpaint: update to 0.9.31.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org tuxpaint
https://github.com/void-linux/void-packages/pull/46093

tuxpaint: update to 0.9.31.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/46093.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tuxpaint-46093.patch --]
[-- Type: text/x-diff, Size: 7437 bytes --]

From 8cad3a1f2a5e7a091d64042d1a3c905e6cdccf1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 16 Sep 2023 23:02:02 +0200
Subject: [PATCH 1/3] New package: SDL2_Pango-2.1.5

---
 common/shlibs               |  1 +
 srcpkgs/SDL2_Pango-devel    |  1 +
 srcpkgs/SDL2_Pango/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/SDL2_Pango-devel
 create mode 100644 srcpkgs/SDL2_Pango/template

diff --git a/common/shlibs b/common/shlibs
index 4ee2d172e6617..c8279b0c13c7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -881,6 +881,7 @@ libcogl-pango.so.20 cogl-1.18.0_1
 libcogl-gst.so.20 cogl-1.18.0_1
 libcogl-gles2.so.20 cogl-1.18.0_1
 libcogl-path.so.20 cogl-1.18.0_1
+libSDL2_Pango.so.4 SDL2_Pango-2.1.5_1
 libp11-kit.so.0 p11-kit-0.7_1
 librest-0.7.so.0 rest0-0.8.1_1
 librest-1.0.so.0 rest-0.9.1_1
diff --git a/srcpkgs/SDL2_Pango-devel b/srcpkgs/SDL2_Pango-devel
new file mode 120000
index 0000000000000..082032afb4438
--- /dev/null
+++ b/srcpkgs/SDL2_Pango-devel
@@ -0,0 +1 @@
+SDL2_Pango
\ No newline at end of file
diff --git a/srcpkgs/SDL2_Pango/template b/srcpkgs/SDL2_Pango/template
new file mode 100644
index 0000000000000..70123822825fe
--- /dev/null
+++ b/srcpkgs/SDL2_Pango/template
@@ -0,0 +1,29 @@
+# Template file for 'SDL2_Pango'
+pkgname=SDL2_Pango
+version=2.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="freetype-devel pango-devel SDL2-devel"
+short_desc="Graphically rendering internationalized and tagged text in SDL2"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/markuskimius/SDL2_Pango"
+changelog="https://raw.githubusercontent.com/markuskimius/SDL2_Pango/master/ChangeLog"
+distfiles="https://github.com/markuskimius/SDL2_Pango/archive/refs/tags/v${version}.tar.gz"
+checksum=3b3fe6008445feb1fca61b17b9d950d688e49dcca60dbbf8667c0f980ddfc563
+
+post_patch() {
+	vsed -i SDL2_Pango.pc.in -e 's/Requires: pango/&, freetype2/'
+}
+
+SDL2_Pango-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 22ac02a6592e6e1f1ebdd964934faa16ec18e20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 16 Sep 2023 23:04:53 +0200
Subject: [PATCH 2/3] tuxpaint: update to 0.9.31.

---
 srcpkgs/tuxpaint/patches/0.9.31--cflags.patch | 39 +++++++++++++++++++
 srcpkgs/tuxpaint/template                     | 11 +++---
 2 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/tuxpaint/patches/0.9.31--cflags.patch

diff --git a/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch b/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch
new file mode 100644
index 0000000000000..ec13b39bd36db
--- /dev/null
+++ b/srcpkgs/tuxpaint/patches/0.9.31--cflags.patch
@@ -0,0 +1,39 @@
+From 9763b983f7490bbe85d05fc8fbdbe72827a94410 Mon Sep 17 00:00:00 2001
+From: Piotr Wójcik <chocimier@tlen.pl>
+Date: Sat, 16 Sep 2023 18:13:39 +0200
+Subject: cflags
+
+
+diff --git a/Makefile b/Makefile
+index 196c595..5da42bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1252,7 +1252,7 @@ obj/tuxpaint.o:	src/tuxpaint.c \
+ 		$(ARCH_HEADERS)
+ 	@echo
+ 	@echo "...Compiling Tux Paint from source..."
+-	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
++	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(FRIBIDI_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
+ 		-c src/tuxpaint.c -o obj/tuxpaint.o
+ 
+ # Broke gperf|sed up into two steps so that it will fail properly if gperf is not installed; there's probably a more elegant solution -bjk 2009.11.20
+@@ -1299,14 +1299,14 @@ obj/fonts.o:	src/fonts.c src/fonts.h src/dirwalk.h src/progressbar.h \
+ 		src/get_fname.h src/debug.h
+ 	@echo
+ 	@echo "...Compiling font support..."
+-	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
++	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SDL2_PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
+ 		-c src/fonts.c -o obj/fonts.o
+ 
+ obj/dirwalk.o:	src/dirwalk.c src/dirwalk.h src/progressbar.h src/fonts.h \
+ 		src/debug.h
+ 	@echo
+ 	@echo "...Compiling directory-walking support..."
+-	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
++	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SDL2_PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
+ 		-c src/dirwalk.c -o obj/dirwalk.o
+ 
+ obj/cursor.o:	src/cursor.c src/cursor.h src/debug.h
+-- 
+2.42.0
+
diff --git a/srcpkgs/tuxpaint/template b/srcpkgs/tuxpaint/template
index dd5ccfd7c585e..bacbfa432cb66 100644
--- a/srcpkgs/tuxpaint/template
+++ b/srcpkgs/tuxpaint/template
@@ -1,20 +1,22 @@
 # Template file for 'tuxpaint'
 pkgname=tuxpaint
-version=0.9.29
+version=0.9.31
 revision=1
 build_style=gnu-makefile
 conf_files="/etc/tuxpaint/tuxpaint.conf"
 hostmakedepends="gettext gperf pkg-config ImageMagick"
-makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel cairo-devel
- SDL2_gfx-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
+makedepends="SDL2-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
+ SDL2_gfx-devel SDL2_Pango-devel
+ cairo-devel fribidi-devel libimagequant-devel libpaper-devel librsvg-devel"
 short_desc="Free, award-winning drawing program for children ages 3 to 12"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.tuxpaint.org/"
 distfiles="${SOURCEFORGE_SITE}/tuxpaint/${version}/tuxpaint-${version}.tar.gz"
-checksum=575403c54c7243e5b269a71fc1aa0738e3937764787e2acf89686bd77c5ae6ca
+checksum=1a85c04fa5c9ae6b3ffd2ca8fa86a84c0c8b462b5059fa1fc2c445b5cfa857ee
 replaces="tuxpaint-data>=0"
 python_version=2
+CFLAGS="-D_GNU_SOURCE -D_POSIX_PRIORITY_SCHEDULING"
 
 pre_build() {
 	vsed -i Makefile -e s,/etc/bash_completion.d,/usr/share/bash-completion/completions,
@@ -22,5 +24,4 @@ pre_build() {
 
 post_install() {
 	vinstall src/tuxpaint.desktop 644 usr/share/applications
-	rm "${DESTDIR}/usr/share/doc/tuxpaint-0.9.29/en/tp_magic_example.so"
 }

From 3292b1196e64625b4dfafb43614f2ae8555c49c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 16 Sep 2023 23:04:58 +0200
Subject: [PATCH 3/3] tuxpaint-stamps: update to 2023.07.20.

---
 srcpkgs/tuxpaint-stamps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tuxpaint-stamps/template b/srcpkgs/tuxpaint-stamps/template
index 92d203ab18225..d108a52dede99 100644
--- a/srcpkgs/tuxpaint-stamps/template
+++ b/srcpkgs/tuxpaint-stamps/template
@@ -1,6 +1,6 @@
 # Template file for 'tuxpaint-stamps'
 pkgname=tuxpaint-stamps
-version=2023.04.02
+version=2023.07.20
 revision=1
 build_style=gnu-makefile
 make_install_target="install-all"
@@ -9,7 +9,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.tuxpaint.org/"
 distfiles="${SOURCEFORGE_SITE}/tuxpaint/tuxpaint-stamps/${version//./-}/tuxpaint-stamps-${version}.tar.gz"
-checksum=42924b70298e0a86978cd121b1e0a8be930fa126e1ee6209e5f8c50b4ee33fac
+checksum=0fb420617451759a4ddcd8bfe255e85c2b6c24e453f93da11da2d41698037842
 
 pre_configure() {
 	vsed -i Makefile -e 's,DATA_PREFIX=,&$(DESTDIR),'

Re: [PR PATCH] [Merged]: tuxpaint: update to 0.9.31.

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There's a merged pull request on the void-packages repository

tuxpaint: update to 0.9.31.
https://github.com/void-linux/void-packages/pull/46093

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->