From f1e44f77a2494499defe5f71a3f1f93d09282dc6 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Thu, 17 Dec 2009 17:05:30 +0100 Subject: [PATCH] xorg-libxfont: initial import (added patch to fix crosscompilation issues) --- xorg-libxfont/.footprint | 27 +++ xorg-libxfont/.md5sum | 2 + xorg-libxfont/Pkgfile | 30 +++ .../libXfont-1.4.0.cross_compile.patch | 201 ++++++++++++++++++ 4 files changed, 260 insertions(+) create mode 100644 xorg-libxfont/.footprint create mode 100644 xorg-libxfont/.md5sum create mode 100644 xorg-libxfont/Pkgfile create mode 100644 xorg-libxfont/libXfont-1.4.0.cross_compile.patch diff --git a/xorg-libxfont/.footprint b/xorg-libxfont/.footprint new file mode 100644 index 0000000..8964a84 --- /dev/null +++ b/xorg-libxfont/.footprint @@ -0,0 +1,27 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/X11/ +drwxr-xr-x root/root usr/include/X11/fonts/ +-rw-r--r-- root/root usr/include/X11/fonts/bdfint.h +-rw-r--r-- root/root usr/include/X11/fonts/bitmap.h +-rw-r--r-- root/root usr/include/X11/fonts/bufio.h +-rw-r--r-- root/root usr/include/X11/fonts/fntfil.h +-rw-r--r-- root/root usr/include/X11/fonts/fntfilio.h +-rw-r--r-- root/root usr/include/X11/fonts/fntfilst.h +-rw-r--r-- root/root usr/include/X11/fonts/fontconf.h +-rw-r--r-- root/root usr/include/X11/fonts/fontencc.h +-rw-r--r-- root/root usr/include/X11/fonts/fontmisc.h +-rw-r--r-- root/root usr/include/X11/fonts/fontshow.h +-rw-r--r-- root/root usr/include/X11/fonts/fontutil.h +-rw-r--r-- root/root usr/include/X11/fonts/fontxlfd.h +-rw-r--r-- root/root usr/include/X11/fonts/ft.h +-rw-r--r-- root/root usr/include/X11/fonts/ftfuncs.h +-rw-r--r-- root/root usr/include/X11/fonts/pcf.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libXfont.a +-rwxr-xr-x root/root usr/lib/libXfont.la +lrwxrwxrwx root/root usr/lib/libXfont.so -> libXfont.so.1.4.1 +lrwxrwxrwx root/root usr/lib/libXfont.so.1 -> libXfont.so.1.4.1 +-rwxr-xr-x root/root usr/lib/libXfont.so.1.4.1 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/xfont.pc diff --git a/xorg-libxfont/.md5sum b/xorg-libxfont/.md5sum new file mode 100644 index 0000000..cdc9805 --- /dev/null +++ b/xorg-libxfont/.md5sum @@ -0,0 +1,2 @@ +6e85e200a8cb2240d6e9724bcc903e65 libXfont-1.4.0.cross_compile.patch +3a8e06b25912ef339d70a8ba003da9b5 libXfont-1.4.0.tar.bz2 diff --git a/xorg-libxfont/Pkgfile b/xorg-libxfont/Pkgfile new file mode 100644 index 0000000..cffa158 --- /dev/null +++ b/xorg-libxfont/Pkgfile @@ -0,0 +1,30 @@ +# Description: xorg lib libXfont +# URL: http://xorg.freedesktop.org +# Maintainer: Tilman Sauerbeck tilman at crux dot nu +# Arch Maintainer System Team crux-arm at mikeux dot dyndns dot org +# Depends on: freetype xorg-xproto xorg-xtrans xorg-fontsproto xorg-libfontenc + +name=xorg-libxfont +version=1.4.0 +release=2 +source=(http://xorg.freedesktop.org/releases/individual/lib/libXfont-$version.tar.bz2 \ + libXfont-$version.cross_compile.patch) + +build() { + cd libXfont-$version + + patch -p1 -i $SRC/libXfont-$version.cross_compile.patch + sed -i configure \ + -e "s|FREETYPE_LIBS=.*|FREETYPE_LIBS=\"-lfreetype -lz\"|" \ + -e "s|FREETYPE_CFLAGS=.*|FREETYPE_CFLAGS=\"-I$CLFS/usr/include/freetype2\"|" + + export XFONT_LIBS="-L$CLFS/usr/lib -lm" + export XFONT_CFLAGS="-I$CLFS/usr/include" + + ./configure --build=$CHOST \ + --host=$CTARGET \ + --prefix=/usr + + make + make DESTDIR=$PKG install +} diff --git a/xorg-libxfont/libXfont-1.4.0.cross_compile.patch b/xorg-libxfont/libXfont-1.4.0.cross_compile.patch new file mode 100644 index 0000000..075df60 --- /dev/null +++ b/xorg-libxfont/libXfont-1.4.0.cross_compile.patch @@ -0,0 +1,201 @@ +diff -purN libXfont-1.4.0.orig/configure libXfont-1.4.0/configure +--- libXfont-1.4.0.orig/configure 2009-12-17 16:14:35.000000000 +0100 ++++ libXfont-1.4.0/configure 2009-12-17 16:35:11.000000000 +0100 +@@ -11491,178 +11491,19 @@ fi + + + # +-# select libraries to include +-# +- +-XFONT_FONTFILE=no +- +-# + # Scalable fonts in files: + # FreeType + # Bitstream Speedo rasterizer + # + # Check whether --enable-freetype was given. +-if test "${enable_freetype+set}" = set; then +- enableval=$enable_freetype; XFONT_FREETYPE=$enableval +-else +- XFONT_FREETYPE=yes +-fi +- +- if test x$XFONT_FREETYPE = xyes; then +- XFONT_FREETYPE_TRUE= +- XFONT_FREETYPE_FALSE='#' +-else +- XFONT_FREETYPE_TRUE='#' +- XFONT_FREETYPE_FALSE= +-fi +- +-if test x$XFONT_FREETYPE = xyes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define XFONT_FREETYPE 1 +-_ACEOF +- +- +-# Check whether --with-freetype-config was given. +-if test "${with_freetype_config+set}" = set; then +- withval=$with_freetype_config; freetype_config=$withval +-else +- freetype_config=auto +-fi +- +- +- if test "$freetype_config" = "auto" ; then +- +-pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5 +-$as_echo_n "checking for FREETYPE... " >&6; } +- +-if test -n "$FREETYPE_CFLAGS"; then +- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 +- ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$FREETYPE_LIBS"; then +- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 +- ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- + +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1` +- else +- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$FREETYPE_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- freetype_config=yes +-elif test $pkg_failed = untried; then +- freetype_config=yes +-else +- FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS +- FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- freetype_config=no +-fi +- fi +- +- if test "$freetype_config" = "yes"; then +- # Extract the first word of "freetype-config", so it can be a program name with args. +-set dummy freetype-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ft_config+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $ft_config in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ft_config="$ft_config" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ft_config="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_ft_config" && ac_cv_path_ft_config="no" +- ;; +-esac +-fi +-ft_config=$ac_cv_path_ft_config +-if test -n "$ft_config"; then +- { $as_echo "$as_me:$LINENO: result: $ft_config" >&5 +-$as_echo "$ft_config" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test "$ft_config" = "no"; then +- { { $as_echo "$as_me:$LINENO: error: You must have freetype installed; see http://www.freetype.org/" >&5 +-$as_echo "$as_me: error: You must have freetype installed; see http://www.freetype.org/" >&2;} +- { (exit 1); exit 1; }; } +- fi +- else +- ft_config="$freetype_config" +- fi +- +- if test "$freetype_config" != "no"; then +- FREETYPE_CFLAGS="`$ft_config --cflags`" +- FREETYPE_LIBS="`$ft_config --libs`" +- fi +- FREETYPE_REQUIRES="freetype2" +- XFONT_FONTFILE=yes +-else +- FREETYPE_CFLAGS="" +- FREETYPE_LIBS="" +- FREETYPE_REQUIRES="" +-fi ++FREETYPE_CFLAGS="-I/usr/include/freetype2" ++FREETYPE_LIBS="-lfreetype -lz" ++FREETYPE_REQUIRES="freetype2" ++ ++XFONT_FREETYPE=yes ++XFONT_FREETYPE_TRUE= ++XFONT_FREETYPE_FALSE='#' + + + +diff -purN libXfont-1.4.0.orig/src/fc/fserve.h libXfont-1.4.0/src/fc/fserve.h +--- libXfont-1.4.0.orig/src/fc/fserve.h 2009-12-17 16:14:35.000000000 +0100 ++++ libXfont-1.4.0/src/fc/fserve.h 2009-12-17 16:53:00.000000000 +0100 +@@ -71,6 +71,8 @@ typedef struct _fs_fpe_data *FSFpePtr; + typedef struct _fs_blocked_bitmaps *FSBlockedBitmapPtr; + typedef struct _fs_blocked_extents *FSBlockedExtentPtr; + ++typedef long fd_mask; ++ + extern void _fs_convert_char_info ( fsXCharInfo *src, xCharInfo *dst ); + extern void _fs_free_props (FontInfoPtr pfi); + extern FontPtr fs_create_font (FontPathElementPtr fpe, -- 2.26.2