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 00000000000..ec13b39bd36 --- /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 +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 dd5ccfd7c58..bacbfa432cb 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 " 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" }