OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Mar-2005 13:55:29
Branch: HEAD Handle: 2005031512552900
Added files:
openpkg-src/tetex tetex.patch
Modified files:
openpkg-src/tetex tetex.spec
Log:
correct illegal already defined option identifier in Linux global C
namespace, and requires Xaw3d libs when building with X11
Summary:
Revision Changes Path
1.8 +33 -0 openpkg-src/tetex/tetex.patch
1.63 +7 -3 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.patch
============================================================================
$ cvs diff -u -r0 -r1.8 tetex.patch
--- /dev/null 2005-03-15 13:55:00 +0100
+++ tetex.patch 2005-03-15 13:55:29 +0100
@@ -0,0 +1,33 @@
+Index: texk/gsftopk/gsftopk.c
+diff -Nau texk/gsftopk/gsftopk.c.orig texk/gsftopk/gsftopk.c
+--- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100
++++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100
+@@ -417,7 +417,7 @@
+ Boolean dosnames = False;
+ Boolean quiet = False;
+
+-struct option {
++struct option_loc {
+ const char *longname;
+ short shortname;
+ Boolean has_arg;
+@@ -425,7 +425,7 @@
+ int value;
+ };
+
+-static const struct option options[] = {
++static const struct option_loc options[] = {
+ {"test", 't', False, &test, True},
+ {"mapline", 0, True, &mapline, 0},
+ {"mapfile", 0, True, &mapfile, 0},
+@@ -2099,8 +2099,8 @@
+
+ argp = argv;
+ while (++argp < argv + argc && (*argp)[0] == '-') {
+- const struct option *opt_ptr;
+- const struct option *opt;
++ const struct option_loc *opt_ptr;
++ const struct option_loc *opt;
+ char *arg = *argp + 1;
+
+ if (*arg == '\0') --arg; /* this will flag an error later */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 tetex.spec
--- openpkg-src/tetex/tetex.spec 7 Feb 2005 16:19:22 -0000 1.62
+++ openpkg-src/tetex/tetex.spec 15 Mar 2005 12:55:29 -0000 1.63
@@ -39,7 +39,7 @@
Group: Text
License: GPL
Version: %{V_src}
-Release: 20050207
+Release: 20050315
# package options
%option with_x11 no
@@ -49,6 +49,7 @@
Source1:
ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-texmf-%{V_texmf}.tar.gz
Source2: http://www.tei-c.org.uk/Software/passivetex/passivetex.zip
Source3: ftp://tug.ctan.org/tex-archive/macros/xmltex/base.zip
+Patch0: tetex.patch
# build information
Prefix: %{l_prefix}
@@ -56,8 +57,8 @@
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, infozip, flex, bison,
png, zlib
PreReq: OpenPKG, openpkg >= 20040130, perl, png, zlib
%if "%{with_x11}" == "yes"
-BuildPreReq: X11
-PreReq: X11
+BuildPreReq: X11, xaw3d
+PreReq: X11, xaw3d
%endif
AutoReq: no
AutoReqProv: no
@@ -89,6 +90,7 @@
%prep
%setup -q -n tetex-src-%{V_src}
+ %patch -p0
# teTeX requires the texmf stuff to be already in place
# for building and installing the source parts.
@@ -166,6 +168,7 @@
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
./configure \
--prefix=$RPM_BUILD_ROOT%{l_prefix} \
--datadir=$RPM_BUILD_ROOT%{l_prefix}/share \
@@ -175,6 +178,7 @@
--with-x \
--with-x11 \
--with-x11win \
+ --with-xdvi-x-toolkit=xaw3d \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
%else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
