OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 16-Nov-2003 18:39:05
Branch: HEAD Handle: 2003111617390302
Modified files:
openpkg-src/xft xft.spec
openpkg-web news.txt
Log:
depends on new xrender package; correctly find X11 location
Summary:
Revision Changes Path
1.2 +7 -4 openpkg-src/xft/xft.spec
1.7430 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xft/xft.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 xft.spec
--- openpkg-src/xft/xft.spec 16 Nov 2003 11:54:27 -0000 1.1
+++ openpkg-src/xft/xft.spec 16 Nov 2003 17:39:05 -0000 1.2
@@ -41,8 +41,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, fontconfig >= 2.2.90, freetype >=
2.1.7
-PreReq: OpenPKG, openpkg >= 20030103, X11, fontconfig >= 2.2.90, freetype >=
2.1.7
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, fontconfig >= 2.2.90, freetype >=
2.1.7, xrender
+PreReq: OpenPKG, openpkg >= 20030103, X11, fontconfig >= 2.2.90, freetype >=
2.1.7, xrender
AutoReq: no
AutoReqProv: no
@@ -57,10 +57,13 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ CPPFLAGS="%{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`" \
+ LDFLAGS="%{l_ldflags} -I`%{l_prefix}/etc/rc --query x11_libdir`" \
./configure \
--prefix=%{l_prefix} \
+ --with-x \
+ --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7429 -r1.7430 news.txt
--- openpkg-web/news.txt 16 Nov 2003 17:31:04 -0000 1.7429
+++ openpkg-web/news.txt 16 Nov 2003 17:39:03 -0000 1.7430
@@ -1,3 +1,4 @@
+16-Nov-2003: Upgraded package: P<xft-2.1.2-20031116>
16-Nov-2003: Upgraded package: P<xrender-0.8.3-20031116>
16-Nov-2003: New package: P<xrender-0.8.3-20031116>
16-Nov-2003: Upgraded package: P<gtk2-2.2.4-20031116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
