Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (2aa58269c6568ec814f5f7a45b3abad847f15178)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (2aa58269c6568ec814f5f7a45b3abad847f15178)
  • Date: Fri, 25 Apr 2008 00:44:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/xorg/HISTORY | 6 ++++
x11-libs/xorg/PRE_BUILD | 2 +
x11-libs/xorg/ft-2.3.5.patch | 64
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+)

New commits:
commit 2aa58269c6568ec814f5f7a45b3abad847f15178
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg: Apply patch to allow compilation with freetype2
2.3.5 (remove unused function FTcheckForTTCName)
Fixes Bug #14007 to not require freetype2 reversion

diff --git a/x11-libs/xorg/HISTORY b/x11-libs/xorg/HISTORY
index bfc6bd6..3093ab2 100644
--- a/x11-libs/xorg/HISTORY
+++ b/x11-libs/xorg/HISTORY
@@ -1,3 +1,9 @@
+2008-04-24 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply ft-2.3.5.patch
+ * ft-2.3.5.patch: Apply patch to allow compilation with freetype2
+ 2.3.5 (remove unused function FTcheckForTTCName)
+ Fixes Bug #14007 to not require freetype2 reversion
+
2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: glide drivers fails to compile, disable by default

diff --git a/x11-libs/xorg/PRE_BUILD b/x11-libs/xorg/PRE_BUILD
index 41a30a6..333ccac 100755
--- a/x11-libs/xorg/PRE_BUILD
+++ b/x11-libs/xorg/PRE_BUILD
@@ -9,6 +9,8 @@ if [[ $X_LATEST != y ]]; then
patch -p0 < $SCRIPT_DIRECTORY/x11r6.9.0-cidfonts.diff
fi &&

+patch -p1 < $SCRIPT_DIRECTORY/ft-2.3.5.patch &&
+
cp $SOURCE_DIRECTORY/config/cf/xorgsite.def \
$SOURCE_DIRECTORY/config/cf/host.def &&
# the default xorgsite.def contains BuildXterm commented, so add it
explicitly
diff --git a/x11-libs/xorg/ft-2.3.5.patch b/x11-libs/xorg/ft-2.3.5.patch
new file mode 100644
index 0000000..157cb0a
--- /dev/null
+++ b/x11-libs/xorg/ft-2.3.5.patch
@@ -0,0 +1,64 @@
+diff -Naur xc.orig/lib/font/FreeType/ft.h xc/lib/font/FreeType/ft.h
+--- xc.orig/lib/font/FreeType/ft.h 2008-04-24 20:29:15.000000000 -0700
++++ xc/lib/font/FreeType/ft.h 2008-04-24 21:48:32.000000000 -0700
+@@ -89,7 +89,6 @@
+
+ int FTtoXReturnCode(int);
+ int FTGetEnglishName(FT_Face, int, char *, int);
+-int FTcheckForTTCName(char*, char**, int*);
+
+ extern void ErrorF(const char*, ...);
+
+diff -Naur xc.orig/lib/font/FreeType/fttools.c xc/lib/font/FreeType/fttools.c
+--- xc.orig/lib/font/FreeType/fttools.c 2008-04-24 20:29:15.000000000
-0700
++++ xc/lib/font/FreeType/fttools.c 2008-04-24 21:48:42.000000000 -0700
+@@ -153,49 +153,3 @@
+ return -1;
+ }
+
+-int
+-FTcheckForTTCName(char *fileName, char **realFileName, int *faceNumber)
+-{
+- int length;
+- int fn;
+- int i, j;
+- char *start, *realName;
+-
+- length = strlen(fileName);
+- if(length < 4)
+- return 0;
+-
+- if(strcasecmp(fileName + (length-4), ".ttc") != 0 &&
+- strcasecmp(fileName + (length-4), ".otc") != 0)
+- return 0;
+-
+- realName = xalloc(length + 1);
+- if(realName == NULL)
+- return 0;
+-
+- strcpy(realName, fileName);
+- *realFileName=realName;
+- start = strchr(realName, ':');
+- if(start) {
+- fn=0;
+- i=1;
+- while(ft_isdigit(start[i])) {
+- fn *= 10;
+- fn += start[i]-'0';
+- i++;
+- }
+- if(start[i]==':') {
+- *faceNumber = fn;
+- i++;
+- j = 0;
+- while(start[i]) {
+- start[j++] = start[i++];
+- }
+- start[j] = '\0';
+- return 1;
+- }
+- }
+-
+- *faceNumber = 0;
+- return 1;
+-}



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (2aa58269c6568ec814f5f7a45b3abad847f15178), Eric Sandall, 04/25/2008

Archive powered by MHonArc 2.6.24.

Top of Page