r730 - in trunk: . curl gcc xpdf

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Dec 20 15:35:56 PST 2004


Author: jim
Date: 2004-12-20 16:35:56 -0700 (Mon, 20 Dec 2004)
New Revision: 730

Added:
   trunk/curl/
   trunk/curl/curl-7.12.2-uclibc-1.patch
   trunk/xpdf/xpdf-3.00-freetype_2.1.7_hack-2.patch
Modified:
   trunk/gcc/gcc-3.4.3-posix-1.patch
Log:
Added: xpdf-3.00-freetype_2.1.7_hack-2.patch curl-7.12.2-uclibc-1.patch

Added: trunk/curl/curl-7.12.2-uclibc-1.patch
===================================================================
--- trunk/curl/curl-7.12.2-uclibc-1.patch	2004-12-14 19:12:04 UTC (rev 729)
+++ trunk/curl/curl-7.12.2-uclibc-1.patch	2004-12-20 23:35:56 UTC (rev 730)
@@ -0,0 +1,21 @@
+Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
+Date: 2004-12-19
+Initial Package Version: 7.12.2
+Upstream Status: Not submitted - Fixed in curl-7.12.3-snapshot.
+Origin: http://ftp.belnet.be/linux/gentoo-portage/net-misc/curl/files/\
+	7.12.0-no-fputc.patch
+Description: fputc is already defined by stdio.h. Without this patch
+Curl will not build against uclibc's headers.
+
+diff -Naur curl-7.12.2.orig/lib/mprintf.c curl-7.12.2/lib/mprintf.c
+--- curl-7.12.2.orig/lib/mprintf.c	2004-06-24 11:54:11.000000000 +0000
++++ curl-7.12.2/lib/mprintf.c	2004-12-19 11:59:48.220600768 +0000
+@@ -1133,7 +1133,7 @@
+   return retcode;
+ }
+ 
+-#ifndef WIN32 /* not needed on win32 */
++#if !(defined(WIN32) || defined(__UCLIBC__))
+ extern int fputc(int, FILE *);
+ #endif
+ 

Modified: trunk/gcc/gcc-3.4.3-posix-1.patch
===================================================================
--- trunk/gcc/gcc-3.4.3-posix-1.patch	2004-12-14 19:12:04 UTC (rev 729)
+++ trunk/gcc/gcc-3.4.3-posix-1.patch	2004-12-20 23:35:56 UTC (rev 730)
@@ -1,13 +1,13 @@
 Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2004-11-05
+Date: 2004-12-20
 Initial Package Version: 3.4.3
 Origin: Jim Gifford
-Upstream Status: Not Accepted - Alternative to be made
-Description: Fixes all POSIX issues
+Upstream Status: On Hold
+Description: Makes GCC Posix Compliant
  
 diff -Naur gcc-3.4.3.orig/contrib/test_summary gcc-3.4.3/contrib/test_summary
 --- gcc-3.4.3.orig/contrib/test_summary	2004-08-26 05:49:13.000000000 +0000
-+++ gcc-3.4.3/contrib/test_summary	2004-11-05 18:05:58.913423424 +0000
++++ gcc-3.4.3/contrib/test_summary	2004-12-20 23:19:39.652260336 +0000
 @@ -106,7 +106,7 @@
      srcdir = configflags;
      sub(/\/configure .*/, "", srcdir);
@@ -19,7 +19,7 @@
      sub(/^[^ ]*\/configure */, " ", configflags);
 diff -Naur gcc-3.4.3.orig/gcc/configure gcc-3.4.3/gcc/configure
 --- gcc-3.4.3.orig/gcc/configure	2004-11-05 04:14:05.000000000 +0000
-+++ gcc-3.4.3/gcc/configure	2004-11-05 18:05:59.004409592 +0000
++++ gcc-3.4.3/gcc/configure	2004-12-20 23:20:41.084921152 +0000
 @@ -10631,7 +10631,7 @@
    # and we got the correct data, then succeed.
    if test x$gcc_cv_objdump != x \
@@ -31,7 +31,7 @@
    then
 diff -Naur gcc-3.4.3.orig/gcc/configure.ac gcc-3.4.3/gcc/configure.ac
 --- gcc-3.4.3.orig/gcc/configure.ac	2004-09-24 00:43:53.000000000 +0000
-+++ gcc-3.4.3/gcc/configure.ac	2004-11-05 18:05:59.028405944 +0000
++++ gcc-3.4.3/gcc/configure.ac	2004-12-20 23:20:49.551634016 +0000
 @@ -2008,7 +2008,7 @@
    # and we got the correct data, then succeed.
    if test x$gcc_cv_objdump != x \
@@ -43,7 +43,7 @@
    then
 diff -Naur gcc-3.4.3.orig/libjava/acinclude.m4 gcc-3.4.3/libjava/acinclude.m4
 --- gcc-3.4.3.orig/libjava/acinclude.m4	2003-12-31 08:58:29.000000000 +0000
-+++ gcc-3.4.3/libjava/acinclude.m4	2004-11-05 18:05:59.045403360 +0000
++++ gcc-3.4.3/libjava/acinclude.m4	2004-12-20 23:21:10.859394744 +0000
 @@ -250,8 +250,8 @@
  AC_MSG_CHECKING(whether 'ld' is at least 2.13)
  LD_PROG=`$CC --print-prog-name=ld`
@@ -57,7 +57,7 @@
  else
 diff -Naur gcc-3.4.3.orig/libjava/aclocal.m4 gcc-3.4.3/libjava/aclocal.m4
 --- gcc-3.4.3.orig/libjava/aclocal.m4	2004-11-05 04:14:05.000000000 +0000
-+++ gcc-3.4.3/libjava/aclocal.m4	2004-11-05 18:05:59.058401384 +0000
++++ gcc-3.4.3/libjava/aclocal.m4	2004-12-20 23:21:52.624045552 +0000
 @@ -262,8 +262,8 @@
  AC_MSG_CHECKING(whether 'ld' is at least 2.13)
  LD_PROG=`$CC --print-prog-name=ld`
@@ -71,7 +71,7 @@
  else
 diff -Naur gcc-3.4.3.orig/libjava/configure gcc-3.4.3/libjava/configure
 --- gcc-3.4.3.orig/libjava/configure	2004-11-05 04:14:05.000000000 +0000
-+++ gcc-3.4.3/libjava/configure	2004-11-05 18:05:59.122391656 +0000
++++ gcc-3.4.3/libjava/configure	2004-12-20 23:14:26.331892272 +0000
 @@ -3015,8 +3015,8 @@
  echo "configure:3016: checking whether 'ld' is at least 2.13" >&5
  LD_PROG=`$CC --print-prog-name=ld`
@@ -85,7 +85,7 @@
  else
 diff -Naur gcc-3.4.3.orig/libstdc++-v3/acinclude.m4 gcc-3.4.3/libstdc++-v3/acinclude.m4
 --- gcc-3.4.3.orig/libstdc++-v3/acinclude.m4	2004-10-28 21:52:33.000000000 +0000
-+++ gcc-3.4.3/libstdc++-v3/acinclude.m4	2004-11-05 18:05:59.136389528 +0000
++++ gcc-3.4.3/libstdc++-v3/acinclude.m4	2004-12-20 23:22:28.452598784 +0000
 @@ -273,7 +273,7 @@
    # Start by getting the version number.  I think the libtool test already
    # does some of this, but throws away the result.
@@ -97,7 +97,7 @@
    glibcxx_gnu_ld_version=`echo $ldver | \
 diff -Naur gcc-3.4.3.orig/libstdc++-v3/aclocal.m4 gcc-3.4.3/libstdc++-v3/aclocal.m4
 --- gcc-3.4.3.orig/libstdc++-v3/aclocal.m4	2004-10-28 21:52:37.000000000 +0000
-+++ gcc-3.4.3/libstdc++-v3/aclocal.m4	2004-11-05 18:05:59.170384360 +0000
++++ gcc-3.4.3/libstdc++-v3/aclocal.m4	2004-12-20 23:22:41.381633272 +0000
 @@ -286,7 +286,7 @@
    # Start by getting the version number.  I think the libtool test already
    # does some of this, but throws away the result.
@@ -109,7 +109,7 @@
    glibcxx_gnu_ld_version=`echo $ldver | \
 diff -Naur gcc-3.4.3.orig/libstdc++-v3/configure gcc-3.4.3/libstdc++-v3/configure
 --- gcc-3.4.3.orig/libstdc++-v3/configure	2004-10-28 21:52:02.000000000 +0000
-+++ gcc-3.4.3/libstdc++-v3/configure	2004-11-05 18:05:59.781291488 +0000
++++ gcc-3.4.3/libstdc++-v3/configure	2004-12-20 23:15:37.415085984 +0000
 @@ -7726,7 +7726,7 @@
    # Start by getting the version number.  I think the libtool test already
    # does some of this, but throws away the result.
@@ -193,7 +193,7 @@
    glibcxx_gnu_ld_version=`echo $ldver | \
 diff -Naur gcc-3.4.3.orig/libstdc++-v3/scripts/check_survey.in gcc-3.4.3/libstdc++-v3/scripts/check_survey.in
 --- gcc-3.4.3.orig/libstdc++-v3/scripts/check_survey.in	2003-07-05 06:00:05.000000000 +0000
-+++ gcc-3.4.3/libstdc++-v3/scripts/check_survey.in	2004-11-05 18:05:59.814286472 +0000
++++ gcc-3.4.3/libstdc++-v3/scripts/check_survey.in	2004-12-20 23:23:24.699048024 +0000
 @@ -182,9 +182,9 @@
      function size_command()
      {
@@ -209,7 +209,7 @@
    else
 diff -Naur gcc-3.4.3.orig/ltcf-c.sh gcc-3.4.3/ltcf-c.sh
 --- gcc-3.4.3.orig/ltcf-c.sh	2003-11-19 05:29:32.000000000 +0000
-+++ gcc-3.4.3/ltcf-c.sh	2004-11-05 18:05:59.821285408 +0000
++++ gcc-3.4.3/ltcf-c.sh	2004-12-20 23:23:40.046714824 +0000
 @@ -153,7 +153,7 @@
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.
@@ -221,7 +221,7 @@
          echo EXPORTS > $output_objdir/$soname-def;
 diff -Naur gcc-3.4.3.orig/ltcf-gcj.sh gcc-3.4.3/ltcf-gcj.sh
 --- gcc-3.4.3.orig/ltcf-gcj.sh	2003-11-19 05:29:32.000000000 +0000
-+++ gcc-3.4.3/ltcf-gcj.sh	2004-11-05 18:05:59.827284496 +0000
++++ gcc-3.4.3/ltcf-gcj.sh	2004-12-20 23:23:55.849312464 +0000
 @@ -156,7 +156,7 @@
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.

Added: trunk/xpdf/xpdf-3.00-freetype_2.1.7_hack-2.patch
===================================================================
--- trunk/xpdf/xpdf-3.00-freetype_2.1.7_hack-2.patch	2004-12-14 19:12:04 UTC (rev 729)
+++ trunk/xpdf/xpdf-3.00-freetype_2.1.7_hack-2.patch	2004-12-20 23:35:56 UTC (rev 730)
@@ -0,0 +1,55 @@
+Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org> and
+              Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2004-12-18
+Initial Package Version: 3.00
+Origin: NA
+Upstream Status: Major hack, will never be accepted upstream.
+Description: Fixed compilation with freetype-2.1.7;
+             (12-18-2004) Randy added CFLAGS for libpaper so that libpaper 
+             is properly discovered by configure
+
+diff -Naur xpdf-3.00-orig/configure xpdf-3.00/configure
+--- xpdf-3.00-orig/configure    2004-01-22 01:26:44.000000000 +0000
++++ xpdf-3.00/configure 2004-12-18 17:42:34.787719704 +0000
+@@ -9007,6 +9007,9 @@
+
+
+
++  cat >>confdefs.h <<_ACEOF
++#include <ft2build.h>
++_ACEOF
+
+
+
+@@ -9817,7 +9820,7 @@
+    { (exit 1); exit 1; }; }
+     fi
+   else
+-    libpaper_CFLAGS=
++    libpaper_CFLAGS="-I/usr/include/freetype2"
+   fi
+
+         smr_test_CPPFLAGS="${CPPFLAGS+set}"
+ 
+diff -ur xpdf-3.00.orig/splash/SplashFTFontEngine.h xpdf-3.00/splash/SplashFTFontEngine.h
+--- xpdf-3.00.orig/splash/SplashFTFontEngine.h	2004-01-21 19:26:44.000000000 -0600
++++ xpdf-3.00/splash/SplashFTFontEngine.h	2004-03-20 10:23:32.000000000 -0600
+@@ -15,6 +15,7 @@
+ #pragma interface
+ #endif
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include "gtypes.h"
+ 
+diff -ur xpdf-3.00.orig/splash/SplashFTFontFile.h xpdf-3.00/splash/SplashFTFontFile.h
+--- xpdf-3.00.orig/splash/SplashFTFontFile.h	2004-01-21 19:26:44.000000000 -0600
++++ xpdf-3.00/splash/SplashFTFontFile.h	2004-03-20 10:22:58.000000000 -0600
+@@ -15,6 +15,7 @@
+ #pragma interface
+ #endif
+ 
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include "SplashFontFile.h"
+ 




More information about the patches mailing list