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

tcl/tk, bump version, enable secondary architecture (#6912)

Browse Source 
Fix detection for freetype
Since we pretend to be regular tk, rename the library names in the config files
This commit is contained in:
Schrijvers Luc
2022-05-21 16:48:53 +02:00
committed by GitHub
parent 7454871daa
commit d66b4c2cbc
6 changed files with 343 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
dev-lang/tk/patches/tk-8.6.10.patchset
View File

@@ -1,4 +1,4 @@
From 2aceca35462c26243dfdf9c76963a03172fc7355 Mon Sep 17 00:00:00 2001
From 0a9f983ba0dcb10cac6559810e0f8f70f30f26aa Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 17 Nov 2021 17:42:17 -0500
Subject: Fixes for Haiku.
@@ -186,5 +186,40 @@ index e40eab2..e2ae821 100644
* We need the SDL event handling run in the main thread,
* which seems to be a Cocoa requirement. Therefore Tk_MainEx()
--
2.30.2
2.36.1
From e52458cf0424ef1318143c41cc816101ff6678b7 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 12 May 2022 14:20:59 +0200
Subject: tk fails to find freetype's header ft2build.h
Haikuports version for freetype doesn't provide freetype-config
Change order to check with pkg-config prior to check with freetype-config
diff --git a/sdl/configure b/sdl/configure
old mode 100755
new mode 100644
index 691c0cd..889c7f0
--- a/sdl/configure
+++ b/sdl/configure
@@ -10060,12 +10060,12 @@ fi
{ $as_echo "$as_me:$LINENO: checking for freetype" >&5
$as_echo_n "checking for freetype... " >&6; }
found_ft=yes
-FT_CFLAGS=`freetype-config --cflags 2>/dev/null` || found_ft="no"
-FT_LIBS=`freetype-config --libs 2>/dev/null` || found_ft="no"
+FT_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null` || found_ft="no"
+FT_LIBS=`pkg-config --libs freetype2 2>/dev/null` || found_ft="no"
if test "$found_xft" = "no" ; then
found_ft=yes
- FT_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null` || found_ft="no"
- FT_LIBS=`pkg-config --libs freetype2 2>/dev/null` || found_ft="no"
+ FT_CFLAGS=`freetype-config --cflags 2>/dev/null` || found_ft="no"
+ FT_LIBS=`freetype-config --libs 2>/dev/null` || found_ft="no"
fi
{ $as_echo "$as_me:$LINENO: result: $found_ft" >&5
$as_echo "$found_ft" >&6; }
--
2.36.1