[gentoo-commits] gentoo-x86 commit in dev-tex/catdvi/files: catdvi-0.14-kpathsea.patch

[gentoo-commits] gentoo-x86 commit in dev-tex/catdvi/files: catdvi-0.14-kpathsea.patch

[Ulrich Mueller (ulm)]

ulm         10/10/27 21:54:21

  Added:                catdvi-0.14-kpathsea.patch
  Log:
  Fix compilation with kpathsea-6 library, bug 342817.
  
  (Portage version: 2.1.9.21/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch?rev=1.1&content-type=text/plain

Index: catdvi-0.14-kpathsea.patch
===================================================================
http://bugs.gentoo.org/342817

--- catdvi-0.14-orig/kpathsea.c
+++ catdvi-0.14/kpathsea.c
@@ -36,7 +36,6 @@
 
 void version_findtfm(void)
 {
-        extern char * kpathsea_version_string;
         puts(kpathsea_version_string);
 }
 

[gentoo-commits] gentoo-x86 commit in dev-tex/catdvi/files: catdvi-0.14-kpathsea.patch

[Ulrich Mueller (ulm)]

ulm         10/10/28 16:40:39

  Modified:             catdvi-0.14-kpathsea.patch
  Log:
  Fix the kpathsea_version_string problem in a way that doesn't break compilation with TeX Live 2008.
  
  (Portage version: 2.1.9.21/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch?r1=1.1&r2=1.2

Index: catdvi-0.14-kpathsea.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tex/catdvi/files/catdvi-0.14-kpathsea.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catdvi-0.14-kpathsea.patch	27 Oct 2010 21:54:21 -0000	1.1
+++ catdvi-0.14-kpathsea.patch	28 Oct 2010 16:40:39 -0000	1.2
@@ -1,8 +1,56 @@
 http://bugs.gentoo.org/342817
 
+--- catdvi-0.14-orig/config.mk.in
++++ catdvi-0.14/config.mk.in
+@@ -23,6 +23,7 @@
+ 
+ CFG_HAS_GETOPT_LONG = @CFG_HAS_GETOPT_LONG@
+ CFG_HAS_KPATHSEA = @CFG_HAS_KPATHSEA@
++CFG_HAS_KPATHSEA_VERSION_H = @CFG_HAS_KPATHSEA_VERSION_H@
+ CFG_KPATHSEA_HAS_GETOPT_LONG = @CFG_KPATHSEA_HAS_GETOPT_LONG@
+ CFG_SHOW_PSE2UNIC_WARNINGS = @CFG_SHOW_PSETOUNIC_WARNINGS@
+ 
+--- catdvi-0.14-orig/configure.in
++++ catdvi-0.14/configure.in
+@@ -48,6 +48,9 @@
+     AC_MSG_ERROR([*** kpathsea library (required) not found; try to use the --with-kpathsea-prefix option ***])
+ fi
+ 
++AC_CHECK_HEADERS([kpathsea/version.h], CFG_HAS_KPATHSEA_VERSION_H=yes, CFG_HAS_KPATHSEA_VERSION_H=no)
++AC_SUBST(CFG_HAS_KPATHSEA_VERSION_H)
++
+ dnl It seem libkpathsea provides a getopt_long() implementation
+ dnl if and only if the C library does not.
+ dnl
+--- catdvi-0.14-orig/GNUmakefile
++++ catdvi-0.14/GNUmakefile
+@@ -36,6 +36,10 @@
+ endif
+ endif
+ 
++ifeq ($(CFG_HAS_KPATHSEA_VERSION_H),yes)
++CPPFLAGS += -DCFG_HAS_KPATHSEA_VERSION_H
++endif
++
+ ifeq ($(CFG_HAS_KPATHSEA),yes)
+ FINDTFM = kpathsea.o
+ LDLIBS = -lkpathsea
 --- catdvi-0.14-orig/kpathsea.c
 +++ catdvi-0.14/kpathsea.c
-@@ -36,7 +36,6 @@
+@@ -21,6 +21,12 @@
+ #include "findtfm.h"
+ #include "version.h"
+ 
++#ifdef CFG_HAS_KPATHSEA_VERSION_H
++#include <kpathsea/version.h>
++#else 
++extern char * kpathsea_version_string;
++#endif
++
+ void setup_findtfm(char const * progname)
+ {
+         kpse_set_program_name(progname, PACKAGE);
+@@ -36,7 +42,6 @@
  
  void version_findtfm(void)
  {