haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved beporter to haikuporter, updated tuxpaint patch, fixed sdl-ttf so that it now builds the .so lib.

Browse Source
This commit is contained in:
Scott McCreary
2009-11-08 21:59:55 +00:00
parent 9fa3c1d996
commit 35ee2ecf41
2 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
media-gfx/tuxpaint/patches/tuxpaint-0.9.21.patch
View File

@@ -1,6 +1,6 @@
diff -urN tuxpaint-0.9.21/Makefile tuxpaint-0.9.21-haiku/Makefile
--- tuxpaint-0.9.21/Makefile 2009-04-29 05:18:57.000000000 +0000
+++ tuxpaint-0.9.21-haiku/Makefile 2009-11-02 06:54:48.000000000 +0000
--- tuxpaint-0.9.21/Makefile 2009-04-28 22:18:57.000000000 -0700
+++ tuxpaint-0.9.21-haiku/Makefile 2009-11-07 21:26:50.000000000 -0800
@@ -46,7 +46,7 @@
echo "$(1)"; \
fi ;)
@@ -19,7 +19,7 @@ diff -urN tuxpaint-0.9.21/Makefile tuxpaint-0.9.21-haiku/Makefile
linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
ARCH_LINKS:=$($(OS)_ARCH_LINKS)
@@ -92,7 +92,7 @@
@@ -92,11 +92,10 @@
# Where things will go when ultimately installed:
windows_PREFIX:=/usr/local
osx_PREFIX:=/usr/local
@@ -28,9 +28,24 @@ diff -urN tuxpaint-0.9.21/Makefile tuxpaint-0.9.21-haiku/Makefile
linux_PREFIX:=/usr/local
PREFIX:=$($(OS)_PREFIX)
-
# Root directory to place files when creating packages.
# PKG_ROOT is the old name for this, and should be undefined.
# "TuxPaint-1" is the OLPC XO name. Installing to ./ is bad!
@@ -137,6 +136,10 @@
CONFDIR:=$(DESTDIR)$(PREFIX)/etc/tuxpaint
endif
+ifeq ($(SYSNAME),Haiku)
+ CONFDIR:=$(shell finddir B_USER_SETTINGS_DIRECTORY)/TuxPaint
+endif
+
# Icons and launchers:
ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
diff -urN tuxpaint-0.9.21/src/fonts.c tuxpaint-0.9.21-haiku/src/fonts.c
--- tuxpaint-0.9.21/src/fonts.c 2009-06-06 18:22:00.000000000 +0000
+++ tuxpaint-0.9.21-haiku/src/fonts.c 2009-11-02 06:54:48.000000000 +0000
--- tuxpaint-0.9.21/src/fonts.c 2009-06-06 11:22:00.000000000 -0700
+++ tuxpaint-0.9.21-haiku/src/fonts.c 2009-11-08 13:52:07.000000000 -0800
@@ -67,6 +67,11 @@
#include "win32_print.h"
#endif
@@ -43,16 +58,17 @@ diff -urN tuxpaint-0.9.21/src/fonts.c tuxpaint-0.9.21-haiku/src/fonts.c
#ifdef __APPLE__
#include "wrapperdata.h"
extern WrapperData macosx;
@@ -456,7 +461,7 @@
@@ -456,7 +461,9 @@
close(sv[1]);
return;
}
- nice(42); // be nice, letting the main thread get the CPU
+ // nice(42); // be nice, letting the main thread get the CPU
+#ifndef __HAIKU__
nice(42); // be nice, letting the main thread get the CPU
+#endif
sched_yield(); // try to let the parent run right now
prctl(PR_SET_PDEATHSIG, 9); // get killed if parent exits
font_socket_fd = sv[1];
@@ -699,6 +704,14 @@
@@ -699,6 +706,14 @@
loadfonts(screen, "/boot/home/config/font/ttffonts");
loadfonts(screen, "/usr/share/fonts");
loadfonts(screen, "/usr/X11R6/lib/X11/fonts");
@@ -68,8 +84,8 @@ diff -urN tuxpaint-0.9.21/src/fonts.c tuxpaint-0.9.21-haiku/src/fonts.c
loadfonts(screen, "/System/Library/Fonts");
loadfonts(screen, "/Library/Fonts");
diff -urN tuxpaint-0.9.21/src/tuxpaint.c tuxpaint-0.9.21-haiku/src/tuxpaint.c
--- tuxpaint-0.9.21/src/tuxpaint.c 2009-06-18 20:51:58.000000000 +0000
+++ tuxpaint-0.9.21-haiku/src/tuxpaint.c 2009-11-02 07:42:33.000000000 +0000
--- tuxpaint-0.9.21/src/tuxpaint.c 2009-06-18 13:51:58.000000000 -0700
+++ tuxpaint-0.9.21-haiku/src/tuxpaint.c 2009-11-07 15:40:44.000000000 -0800
@@ -212,7 +212,7 @@
#include <locale.h>
@@ -242,8 +258,8 @@ diff -urN tuxpaint-0.9.21/src/tuxpaint.c tuxpaint-0.9.21-haiku/src/tuxpaint.c
{
const struct paper * ppr;
diff -urN tuxpaint-0.9.21/src/tuxpaint.rdef tuxpaint-0.9.21-haiku/src/tuxpaint.rdef
--- tuxpaint-0.9.21/src/tuxpaint.rdef 1970-01-01 00:00:00.000000000 +0000
+++ tuxpaint-0.9.21-haiku/src/tuxpaint.rdef 2009-11-02 08:15:44.000000000 +0000
--- tuxpaint-0.9.21/src/tuxpaint.rdef 1969-12-31 16:00:00.000000000 -0800
+++ tuxpaint-0.9.21-haiku/src/tuxpaint.rdef 2009-11-07 15:40:44.000000000 -0800
@@ -0,0 +1,123 @@
+
+resource large_icon array {

9
media-libs/sdl-ttf/sdl-ttf-2.0.10.bep
View File

@@ -3,10 +3,17 @@ HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf"
SRC_URI="http://www.libsdl.org/tmp/SDL_ttf-2.0.10.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
DEPEND="libsdl >= 1.2.12, pkgconfig >= 0.9"
BUILD {
cd SDL_ttf-2.0.10
rm -f acinclude.m4
libtoolize --copy --force --install
cp /boot/common/share/aclocal/libtool.m4 acinclude
cp /boot/common/share/aclocal/ltoptions.m4 acinclude
cp /boot/common/share/aclocal/ltversion.m4 acinclude
cp /boot/common/share/aclocal/ltsugar.m4 acinclude
cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude
echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in"
./autogen.sh
./configure --prefix=/boot/common
make