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-Jul-2007 23:12:26
Branch: HEAD Handle: 2007070522122600
Modified files:
openpkg-src/ploticus ploticus.spec
Log:
make sure the includes are found and the necessary libs are picked up
Summary:
Revision Changes Path
1.7 +6 -6 openpkg-src/ploticus/ploticus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ploticus/ploticus.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 ploticus.spec
--- openpkg-src/ploticus/ploticus.spec 1 Jan 2007 17:41:05 -0000
1.6
+++ openpkg-src/ploticus/ploticus.spec 5 Jul 2007 21:12:26 -0000
1.7
@@ -37,7 +37,7 @@
Group: Diagram
License: GPL
Version: %{V_opkg}
-Release: 20061013
+Release: 20070705
# package options
%option with_x11 no
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: gd, png, zlib, freetype
-PreReq: gd, png, zlib, freetype
+BuildPreReq: gd, png, zlib, freetype, fontconfig
+PreReq: gd, png, zlib, freetype, fontconfig
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
@@ -84,16 +84,16 @@
-e 's;^\(CC =\).*;\1 %{l_cc} %{l_cflags -O};' \
%if "%{with_x11}" == "yes"
-e "s;^\\(XLIBS =\\).*;\\1 -L$x11_libdir -lX11;" \
- -e "s;^\\(INCLUDEDIRS =\\).*;\\1 -I$x11_incdir;" \
+ -e "s;^\\(INCLUDEDIRS =\\).*;\\1 -I$x11_incdir %{l_cppflags};" \
%else
-e "s;^\\(XLIBS =\\).*;\\1;" \
- -e "s;^\\(INCLUDEDIRS =\\).*;\\1;" \
+ -e "s;^\\(INCLUDEDIRS =\\).*;\\1 %{l_cppflags};" \
-e 's;^# \(NOXFLAG = -DNOX11.*\)$;\1;' \
-e 's;^# \(XOBJ =\).*;\1;' \
%endif
-e 's;^\(ploticus:.*\)$;# \1;' \
-e 's;^# \(ploticus: plgd18.*\)$;\1;' \
- -e 's;^# \(GD18LIBS =\)\( -lgd -lpng -lz -ljpeg -lfreetype.*\)$;\1
%{l_ldflags} \2;' \
+ -e 's;^# \(GD18LIBS =\)\( -lgd -lpng -lz -ljpeg -lfreetype.*\)$;\1
%{l_ldflags} \2 -lfontconfig -lfreetype -liconv -lexpat;' \
-e 's;^# \(GD18H =\).*;\1 %{l_cppflags};' \
-e 's;^# \(GDFREETYPE = -DGDFREETYPE.*\)$;\1;' \
-e 's;^# \(PREFABS_DIR =\).*$;\1 %{l_prefix}/share/ploticus;' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
