Xorg update part1

4 files changed, 7 insertions, 150 deletions

diff --git a/abs/core/xorg-font-utils/PKGBUILD b/abs/core/xorg-font-utils/PKGBUILD
index 6fbb899..e646d3e 100644
--- a/abs/core/xorg-font-utils/PKGBUILD
+++ b/abs/core/xorg-font-utils/PKGBUILD
@@ -1,58 +1,12 @@
-# $Id: PKGBUILD 57485 2009-10-31 18:25:03Z jgc $
+# $Id: PKGBUILD 150983 2012-02-24 12:38:10Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-font-utils
-pkgver=7.5
+pkgver=7.6
 pkgrel=3
-pkgdesc="X.Org font utilities"
-arch=('i686' 'x86_64')
+pkgdesc="Transitional package depending on xorg font utilities"
+arch=(any)
 url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.16')
-makedepends=('pkgconfig' 'bigreqsproto>=1.1.0')
-replaces=('font-util')
-provides=('font-util')
-conflicts=('font-util')
-install=xorg-font-utils.install
-source=(${url}/releases/individual/app/bdftopcf-1.0.2.tar.bz2
-        ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-        ${url}/releases/individual/app/mkfontdir-1.0.5.tar.bz2
-        ${url}/releases/individual/app/mkfontscale-1.0.7.tar.bz2
-        ${url}/releases/individual/font/font-util-1.1.1.tar.bz2
-        http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
-        ttmkfdir.patch
-        gcc-4.3.patch)
-md5sums=('148f20d28caaa69bbe7dcca7c2674fb6'
-         '07607b26fce3bdc2b204ff3bc43d3ac3'
-         '9365ac66d19186eaf030482d312fca06'
-         '96ca346f185c0ab48e42bf5bb0375da5'
-         '5c735ae6916b65186f3c876d76c27ce3'
-         '79e0401393c9728865aa73bb2bd68dd4'
-         '099278628ad63631e872bc5590bade74'
-         '92ef5f77a467cc188f8dec87b0fdb664')
-
-build() {
-  cd "${srcdir}"
-
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      if [ "${i}" = "ttmkfdir2" ]; then
-        patch -Np0 -i "${srcdir}/ttmkfdir.patch" || return 1
-        patch -Np1 -i "${srcdir}/gcc-4.3.patch" || return 1
-        make || return 1
-        install -m755 -d "${pkgdir}/usr/bin"
-        install -m755 ttmkfdir "${pkgdir}/usr/bin/" || return 1
-        install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-        echo "Unknown license" > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.ttmkfdir2" || return 1
-	    else
-        ./configure --prefix=/usr --mandir=/usr/share/man \
-            --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts || return 1
-        make || return 1
-        make DESTDIR="${pkgdir}" install || return 1
-        install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
-      fi
-      popd
-    fi
-  done
-}
+license=('GPL')
+depends=('xorg-bdftopcf' 'xorg-mkfontdir' 'xorg-mkfontscale' 'xorg-font-util')
+md5sums=()
diff --git a/abs/core/xorg-font-utils/gcc-4.3.patch b/abs/core/xorg-font-utils/gcc-4.3.patch
deleted file mode 100644
index 817df3a..0000000
--- a/abs/core/xorg-font-utils/gcc-4.3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ttmkfdir2/directory.cpp.orig	2008-12-05 10:45:28.000000000 +0100
-+++ ttmkfdir2/directory.cpp	2008-12-05 10:45:38.000000000 +0100
-@@ -1,4 +1,5 @@
- #include <cctype>
-+#include <cstring>
- #include <dirent.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/abs/core/xorg-font-utils/ttmkfdir.patch b/abs/core/xorg-font-utils/ttmkfdir.patch
deleted file mode 100644
index 983c18b..0000000
--- a/abs/core/xorg-font-utils/ttmkfdir.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- encoding.cpp.orig	Tue Mar 12 15:40:09 2002
-+++ encoding.cpp	Sun Mar 21 22:33:00 2004
-@@ -2,7 +2,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
--#include "freetype/freetype.h"
-+#include <ft2build.h>
- 
- #include "ttmkfdir.h"
- #include "encoding.h"
-
---- encoding.h.orig	Tue Mar 12 15:41:27 2002
-+++ encoding.h	Sun Mar 21 22:35:15 2004
-@@ -6,7 +6,8 @@
- #include <map>
- #include <string>
- 
--#include "freetype/freetype.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include "util.h"
- 
---- ttf.h.orig	Wed Mar 13 19:16:38 2002
-+++ ttf.h	Sun Mar 21 22:30:16 2004
-@@ -3,15 +3,18 @@
- #define TTF_H__
- 
- #include <string>
--#include "freetype/freetype.h"
--#include "freetype/tttables.h"
--#include "freetype/ftsnames.h"
--#include "freetype/ttnameid.h"
--#include "freetype/fterrors.h"
--#include "freetype/ftmodule.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_SFNT_NAMES_H
-+#include FT_TRUETYPE_IDS_H
-+#include FT_ERRORS_H
-+#include FT_MODULE_H
- 
- #include "util.h"
- #include "encoding.h"
-+
-+using namespace std;
- 
- namespace ttf {
- 
---- Makefile.orig	Thu Mar 14 14:03:49 2002
-+++ Makefile	Sun Jan 22 20:15:17 2006
-@@ -1,10 +1,7 @@
--FREETYPE_BASE=/usr/include/freetype2
--FREETYPE_INCL=-I$(FREETYPE_BASE)/.
--FREETYPE_LIB=/usr/lib/libfreetype.so
--
--DEBUG=-ggdb
--CXX=g++
--CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
-+FREETYPE_INCL=`freetype-config --cflags`
-+FREETYPE_LIB=`freetype-config --libs`
- 
--LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
-+CXXFLAGS+=$(FREETYPE_INCL)
-+
-+LDFLAGS+=$(FREETYPE_LIB)
- 
-@@ -21,3 +18,3 @@
- parser.cpp: encoding.l
--	    flex -i -8 -o$@ $<
-+	    lex -i -8 -o$@ $<
- 
---- ttf.cpp.orig	2002-11-07 06:30:04.000000000 +0100
-+++ ttf.cpp
-@@ -226,7 +226,7 @@ Face::FontFamilyName (void) const
- 	for (i = 0; i < n; i++) {
- 	    if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
-                     std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
--	            return;
-+	            return "unknown";
-             };
-             platform = NamePtr.platform_id;
-             encoding = NamePtr.encoding_id;
-
diff --git a/abs/core/xorg-font-utils/xorg-font-utils.install b/abs/core/xorg-font-utils/xorg-font-utils.install
deleted file mode 100644
index 067a3a2..0000000
--- a/abs/core/xorg-font-utils/xorg-font-utils.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  ldconfig -r .
-}