pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/38446: fontforge 2008Q1 blows up in compilation with undefined references



Hi Matthias,

I can't get the patch to apply to patch-ae (everything else patches
correctly).  My patch-ae has a different RCS comment on line 1; I
hacked that to match the RCS header in your patch but it still doesn't
apply.  I've attached my patch-ae.  Maybe you could send me the
complete file to replace it with?

As a reminder, I'm using 2008Q1 and my fontforge VERSION var (in
Makefile) says: 20080302 .

Thanks for your efforts!

$NetBSD: patch-ae,v 1.11 2008/02/26 09:34:32 adam Exp $

--- configure.orig      2008-01-13 21:26:16.000000000 +0100
+++ configure
@@ -22054,7 +22054,7 @@ fi
 
 # Standard set of common directories for X headers.
 # Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
+ac_x_header_dirs="
 /usr/X11/include
 /usr/X11R6/include
 /usr/X11R5/include
@@ -22065,29 +22065,29 @@ ac_x_header_dirs='
 /usr/include/X11R5
 /usr/include/X11R4
 
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
+${prefix}/X11/include
+${prefix}/X11R6/include
+${prefix}/X11R5/include
+${prefix}/X11R4/include
+
+${prefix}/include/X11
+${prefix}/include/X11R6
+${prefix}/include/X11R5
+${prefix}/include/X11R4
 
 /usr/X386/include
 /usr/x386/include
 /usr/XFree86/include/X11
 
 /usr/include
-/usr/local/include
+${prefix}/include
 /usr/unsupported/include
 /usr/athena/include
-/usr/local/x11r5/include
+${prefix}/x11r5/include
 /usr/lpp/Xamples/include
 
 /usr/openwin/include
-/usr/openwin/share/include'
+/usr/openwin/share/include"
 
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
@@ -25015,7 +25015,7 @@ if test "$gww_has_gettext" = "yes" >/dev
 
  cat </dev/null >$ac_confdir/po/Makefile.in
  echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> 
$ac_confdir/po/Makefile.in
  echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
  echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
  echo '' >> $ac_confdir/po/Makefile.in
--- Begin Message ---
The problem you are seeing doesn't show up on NetBSD-current.
I'm assuming this is due to different compiler versions. There
a use of an undefined function in a "static" function which
is appearently optimized away in -current but not in 3.x.

This is the immediate problem. If there wasn't another bug in
the pkg it wouldn't show up: libxml is not recognized, due
to some shortcomings in the "configure" script.

Could you try the appended patch which is kind of "belt
and suspender" because it fixes both issues?

best regards
Matthias





-------------------------------------------------------------------
-------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich

Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDir'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr. Harald Bolt,
Dr. Sebastian M. Schmidt
-------------------------------------------------------------------
-------------------------------------------------------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontforge/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile    21 Apr 2008 14:52:58 -0000      1.47
+++ Makefile    21 Apr 2008 19:06:12 -0000
@@ -23,6 +23,7 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-freetype-src
 CONFIGURE_ARGS+=       --without-python
+CONFIGURE_ENV+=                LOCALBASE=${LOCALBASE}
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 
 # checks for X11/Intrinsic.h
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontforge/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- distinfo    21 Apr 2008 14:52:58 -0000      1.39
+++ distinfo    21 Apr 2008 19:06:12 -0000
@@ -5,4 +5,5 @@
 Size (fontforge_full-20080330.tar.bz2) = 4774776 bytes
 SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 212a77a52e16fe9b8897ab501a8b63ef4ad3addc
+SHA1 (patch-ae) = 35f05515b8f6d1426d1464ac8ff5418740ce59d0
+SHA1 (patch-af) = ddf487cf9a2252a67f7afbcaa62fdbdf7b68c8ae
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontforge/patches/patch-ae,v
retrieving revision 1.12
diff -u -r1.12 patch-ae
--- patches/patch-ae    21 Apr 2008 14:52:58 -0000      1.12
+++ patches/patch-ae    21 Apr 2008 19:06:12 -0000
@@ -1,7 +1,36 @@
-$NetBSD: patch-ae,v 1.12 2008/04/21 14:52:58 adam Exp $
+$NetBSD$
 
 --- configure.orig     2008-03-29 23:33:58.000000000 +0100
 +++ configure
+@@ -19201,8 +19201,8 @@ if test $ac_cv_file__usr_include_libxml2
+   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
+ else
+ 
+- echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
+-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for ${LOCALBASE}/include/libxml2/libxml" >&5
++echo $ECHO_N "checking for ${LOCALBASE}/include/libxml2/libxml... $ECHO_C" >&6
+ if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -19210,7 +19210,7 @@ else
+   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross 
compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" 
>&2;}
+    { (exit 1); exit 1; }; }
+-if test -r "/usr/local/include/libxml2/libxml"; then
++if test -r "${LOCALBASE}/include/libxml2/libxml"; then
+   ac_cv_file__usr_local_include_libxml2_libxml=yes
+ else
+   ac_cv_file__usr_local_include_libxml2_libxml=no
+@@ -19219,7 +19219,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" 
>&5
+ echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6
+ if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
+-  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
++  CFLAGS="$CFLAGS -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2/"
+ else
+   cat >>confdefs.h <<\_ACEOF
+ #define _NO_LIBXML 1
 @@ -22079,7 +22079,7 @@ fi
  
  # Standard set of common directories for X headers.
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-af    21 Apr 2008 19:06:12 -0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- fontforge/cvimportdlg.c.orig       2008-04-17 14:36:53.000000000 +0200
++++ fontforge/cvimportdlg.c
+@@ -51,6 +51,7 @@ return;
+     fclose(plate);
+ }
+ 
++#ifndef _NO_LIBXML
+ static void ImportSVG(CharView *cv,char *path) {
+     SCImportSVG(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
+ }
+@@ -58,6 +59,7 @@ static void ImportSVG(CharView *cv,char 
+ static void ImportGlif(CharView *cv,char *path) {
+     SCImportGlif(cv->b.sc,CVLayer((CharViewBase *) cv),path,NULL,0,false);
+ }
++#endif
+ 
+ static void ImportFig(CharView *cv,char *path) {
+     SCImportFig(cv->b.sc,CVLayer((CharViewBase *) cv),path,false);

--- End Message ---


Home | Main Index | Thread Index | Old Index