[arch-commits] Commit in xorg-font-utils/trunk (4 files)
Jan de Groot
jgc at archlinux.org
Wed Mar 16 08:25:01 UTC 2011
Date: Wednesday, March 16, 2011 @ 04:25:01
Author: jgc
Revision: 114872
upgpkg: xorg-font-utils 7.6-2
Replace with dummy package. Drop fonttosfnt and ttmkfdir
Modified:
xorg-font-utils/trunk/PKGBUILD
Deleted:
xorg-font-utils/trunk/gcc-4.3.patch
xorg-font-utils/trunk/ttmkfdir.patch
xorg-font-utils/trunk/xorg-font-utils.install
-------------------------+
PKGBUILD | 69 +++---------------------------------
gcc-4.3.patch | 8 ----
ttmkfdir.patch | 86 ----------------------------------------------
xorg-font-utils.install | 3 -
4 files changed, 6 insertions(+), 160 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-16 08:21:42 UTC (rev 114871)
+++ PKGBUILD 2011-03-16 08:25:01 UTC (rev 114872)
@@ -3,70 +3,13 @@
pkgname=xorg-font-utils
pkgver=7.6
-pkgrel=1
-pkgdesc="X.Org font utilities"
-arch=(i686 x86_64)
+pkgrel=2
+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.3.tar.bz2
- ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
- ${url}/releases/individual/app/mkfontdir-1.0.6.tar.bz2
- ${url}/releases/individual/app/mkfontscale-1.0.8.tar.bz2
- ${url}/releases/individual/font/font-util-1.2.0.tar.bz2
- http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
- ttmkfdir.patch
- gcc-4.3.patch)
-md5sums=('4a7a4a848c43c42f7d499b60666434a4'
- '07607b26fce3bdc2b204ff3bc43d3ac3'
- 'dc342dd8858416254bb5f71a9ddce589'
- '5210c9385c6cc4a00ce829d8dc9c819b'
- '1bdd8ed070e02b2165d7b0f0ed93280b'
- '79e0401393c9728865aa73bb2bd68dd4'
- '099278628ad63631e872bc5590bade74'
- '92ef5f77a467cc188f8dec87b0fdb664')
+license=('GPL')
+depends=('xorg-bdftopcf' 'xorg-mkfontdir' 'xorg-mkfontscale' 'xorg-font-util')
build() {
- cd "${srcdir}"
-
- for i in *; do
- if [ -d "${i}" ]; then
- pushd "${i}"
- if [ "${i}" = "ttmkfdir2" ]; then
- patch -Np0 -i "${srcdir}/ttmkfdir.patch"
- patch -Np1 -i "${srcdir}/gcc-4.3.patch"
- make
- else
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts
- make
- fi
- popd
- fi
- done
+ return 0
}
-
-package() {
- cd "${srcdir}"
-
- for i in *; do
- if [ -d "${i}" ]; then
- pushd "${i}"
- if [ "${i}" = "ttmkfdir2" ]; then
- install -m755 -d "${pkgdir}/usr/bin"
- install -m755 ttmkfdir "${pkgdir}/usr/bin/"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- echo "Unknown license" > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.ttmkfdir2"
- else
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
- fi
- popd
- fi
- done
-}
\ No newline at end of file
Deleted: gcc-4.3.patch
===================================================================
--- gcc-4.3.patch 2011-03-16 08:21:42 UTC (rev 114871)
+++ gcc-4.3.patch 2011-03-16 08:25:01 UTC (rev 114872)
@@ -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>
Deleted: ttmkfdir.patch
===================================================================
--- ttmkfdir.patch 2011-03-16 08:21:42 UTC (rev 114871)
+++ ttmkfdir.patch 2011-03-16 08:25:01 UTC (rev 114872)
@@ -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;
-
Deleted: xorg-font-utils.install
===================================================================
--- xorg-font-utils.install 2011-03-16 08:21:42 UTC (rev 114871)
+++ xorg-font-utils.install 2011-03-16 08:25:01 UTC (rev 114872)
@@ -1,3 +0,0 @@
-post_install() {
- ldconfig -r .
-}
More information about the arch-commits
mailing list