[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    TESTERS WANTED! - kdvi with updated kpathsea. (Urgent for 1.1.2?
From:       Duncan Haldane <f.d.m.haldane () mciworld ! com>
Date:       2001-02-04 19:38:21
[Download RAW message or body]

This message is in MIME format

Hi, 

The fixes to kdvi to make it work with the recent kpathsea library
(instated of the really old one it comes with..)  turn out to be very
small - a few lines  (Thanks to Mark Davies, mark@MCS.VUW.AC.NZ )

It fixes the glibc-2.1.1 issue that has broken kdvi, and puts in 
more font substitution stuff (Truetype etc) that some people need...



I think we should get this into KDE-1.1.2.


Please could people test, using the kdegraphics-1.1.2pre-19990720.tar.bz2
snapshot from ftp.kde.org/pub/kde/unstable/...   plus the
attached patch, plus the latest  kpathsea distribution.


and I put a 220K bz2'ed tarfile kdegraphics-kpathsea-update.tar.bz2 at
ftp.kde.org/pub/kde/Incoming  for your convenience.
(ignore kdegraphics-kpathsea.tar.bz2, which I uploaded earlier, its missing some
stuff).

to make the source:
(1) take the kdegraphics-1.1.2pre-19990720.tar.bz2 snapshot from 
ftp,kde.org/pub/kde/unstable/snapshots

unpack it, and delete the directories kdegraphics/kdvi/kpathsea and 
kdegraphics/kdvi/make

(2) untar the file kdegraphics-kpathsea-update.tar.bz2  which I put at
ftp.kde.org/pub/kde/Incoming.  It contains  kpathsea from the latest
teTeX-1.0.6 distribution at 
ftp://ctan.tug.org/tex-archives/systems/unix/teTeX/1.0/sources

This puts in the new kdvi/kpathsea and kdvi/make

(3) apply the small attached patch, with Mark's fix to adjust kdvi/dviwin.cpp
to the new kpathsea.

(apply the patch last.)

Please compile and test kdvi in the usual way.


Thanks


Duncan
duncan@kde.org


----------------------------------
E-Mail: Duncan  Haldane <f.d.m.haldane@mciworld.com>
Date: 03-Aug-99
Time: 05:07:53

This message was sent by XFMail
----------------------------------

["kdegraphics-kpathsea.patch" (kdegraphics-kpathsea.patch)]

diff -uNr kdegraphics/kdvi/Makefile.am kdegraphics-updated/kdvi/Makefile.am
--- kdegraphics/kdvi/Makefile.am	Sun Jul 11 12:22:53 1999
+++ kdegraphics-updated/kdvi/Makefile.am	Tue Aug  3 07:17:40 1999
@@ -1,5 +1,5 @@
 
-kpathsea = kpathsea/kpathsea.a
+kpathsea = kpathsea/STATIC/libkpathsea.a
 
 # this 10 paths are KDE specific. Use them:
 # kde_htmldir       Where your docs should go to. (contains lang subdirs)
diff -uNr kdegraphics/kdvi/Makefile.in kdegraphics-updated/kdvi/Makefile.in
--- kdegraphics/kdvi/Makefile.in	Tue Jul 20 05:19:45 1999
+++ kdegraphics-updated/kdvi/Makefile.in	Tue Aug  3 07:17:40 1999
@@ -157,7 +157,7 @@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 
-kpathsea = kpathsea/kpathsea.a
+kpathsea = kpathsea/STATIC/libkpathsea.a
 
 # this 10 paths are KDE specific. Use them:
 # kde_htmldir       Where your docs should go to. (contains lang subdirs)
@@ -221,7 +221,7 @@
 printSetup.o printSetupData.o pushbutton.o scrbox.o psheader.o \
 dvi_draw.o dvi_init.o font-open.o gf.o new.o pk.o psgs.o special.o \
 util.o vf.o
-kdvi_DEPENDENCIES =  kpathsea/kpathsea.a
+kdvi_DEPENDENCIES =  kpathsea/STATIC/libkpathsea.a
 squeeze_OBJECTS =  squeeze.o
 squeeze_LDADD = $(LDADD)
 squeeze_DEPENDENCIES = 
diff -uNr kdegraphics/kdvi/dviwin.cpp kdegraphics-updated/kdvi/dviwin.cpp
--- kdegraphics/kdvi/dviwin.cpp	Mon Dec 28 09:38:50 1998
+++ kdegraphics-updated/kdvi/dviwin.cpp	Tue Aug  3 07:17:40 1999
@@ -66,8 +66,8 @@
 int			useAlpha;
 
 extern "C" void 	draw_page(void);
-extern "C" void 	kpse_set_progname(const char*);
-extern "C" void 	kpse_init_prog(const char*, unsigned, const char*, bool, const char*);
+// extern "C" void 	kpse_set_progname(const char*);
+// extern "C" void 	kpse_init_prog(const char*, unsigned, const char*, bool, const char*);
 extern "C" Boolean 	check_dvi_file();
 extern "C" void 	reset_fonts();
 extern "C" void 	init_page();
@@ -223,7 +223,10 @@
 	return makepk;	
 }
 	
-extern char * kpse_font_override_path;
+// extern char * kpse_font_override_path;
+extern "C" {
+#include <kpathsea/kpathsea.h>
+}
 
 void dviWindow::setFontPath( const char *s )
 {
@@ -393,8 +396,15 @@
 	prog = "kdvi";
 	n_files_left = OPEN_MAX;
 	kpse_set_progname ("xdvi");
-	kpse_init_prog ("XDVI", basedpi, MetafontMode.data(), makepk,"cmr10");
-	*(const_cast<char**>(&kpse_font_override_path)) = FontPath.data();
+	kpse_init_prog ("XDVI", basedpi, MetafontMode.data(), "cmr10");
+	kpse_set_program_enabled (kpse_any_glyph_format,
+				  makepk, kpse_src_client_cnf);
+//	*(const_cast<char**>(&kpse_font_override_path)) = FontPath.data();
+	kpse_format_info[kpse_pk_format].override_path
+		= kpse_format_info[kpse_gf_format].override_path
+                = kpse_format_info[kpse_any_glyph_format].override_path
+                = kpse_format_info[kpse_tfm_format].override_path
+		= FontPath.data();
 	ChangesPossible = 0;
 }
 
diff -uNr kdegraphics/kdvi/make/common.mk kdegraphics-updated/kdvi/make/common.mk
--- kdegraphics/kdvi/make/common.mk	Thu Jun 24 02:17:23 1999
+++ kdegraphics-updated/kdvi/make/common.mk	Tue Aug  3 07:18:50 1999
@@ -11,7 +11,7 @@
 DEFS = @DEFS@ $(XDEFS)
 
 # Kpathsea needs this for compiling, programs need it for linking.
-LIBTOOL = $(kpathsea_srcdir_parent)/klibtool
+LIBTOOL = $(kpathsea_srcdir)/klibtool
 
 # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
 # please don't change ALL_CPPFLAGS or ALL_CFLAGS.

End of MIME message

>> Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]