OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Apr-2005 20:36:15
Branch: HEAD Handle: 2005040519361500
Added files:
openpkg-src/xft xft.patch
Modified files:
openpkg-src/xft xft.spec
Log:
upgrading package: xft 2.1.2 -> 2.1.6
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/xft/xft.patch
1.14 +12 -10 openpkg-src/xft/xft.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xft/xft.patch
============================================================================
$ cvs diff -u -r0 -r1.1 xft.patch
--- /dev/null 2005-04-05 20:33:00 +0200
+++ xft.patch 2005-04-05 20:36:15 +0200
@@ -0,0 +1,12 @@
+Index: xftfreetype.c
+--- xftfreetype.c.orig Sun Mar 27 18:51:12 2005
++++ xftfreetype.c Sun Mar 27 18:51:53 2005
+@@ -289,7 +289,7 @@
+ if (f->face)
+ FT_Done_Face (f->face);
+ }
+- XftMemFree (XFT_MEM_FILE, sizeof (XftFtFile) + strlen (f->file) + 1);
++ XftMemFree (XFT_MEM_FILE, sizeof (XftFtFile) + (f->file ? strlen
(f->file) + 1 : 0));
+ free (f);
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xft/xft.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 xft.spec
--- openpkg-src/xft/xft.spec 24 Mar 2005 11:20:45 -0000 1.13
+++ openpkg-src/xft/xft.spec 5 Apr 2005 18:36:15 -0000 1.14
@@ -32,19 +32,20 @@
Class: PLUS
Group: XWindow
License: GPL
-Version: 2.1.2
-Release: 20040920
+Version: 2.1.6
+Release: 20050405
# list of sources
-Source0:
http://freedesktop.org/software/fontconfig/releases/xft-%{version}.tar.gz
+Source0:
http://freedesktop.org/~ajax/xlibs-release/libXft-%{version}.tar.bz2
+Patch0: xft.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, fontconfig >= 2.2.90
-BuildPreReq: freetype >= 2.1.7, pkgconfig, xrender, expat
-PreReq: OpenPKG, openpkg >= 20040130, X11, fontconfig >= 2.2.90
-PreReq: freetype >= 2.1.7, pkgconfig, xrender, expat
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: X11, fontconfig >= 2.2.90, freetype >= 2.1.7, pkgconfig,
xrender, expat
+PreReq: X11, fontconfig >= 2.2.90, freetype >= 2.1.7, pkgconfig,
xrender, expat
AutoReq: no
AutoReqProv: no
@@ -56,12 +57,13 @@
%track
prog xft = {
version = %{version}
- url = http://freedesktop.org/software/fontconfig/releases/
- regex = xft-(__VER__)\.tar\.gz
+ url = http://freedesktop.org/~ajax/xlibs-release/
+ regex = libXft-(__VER__)\.tar\.(gz|bz2)
}
%prep
- %setup -q
+ %setup -q -n libXft-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
