r3112 - trunk/patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Dec 18 12:10:04 PST 2004


Author: randy
Date: 2004-12-18 13:10:02 -0700 (Sat, 18 Dec 2004)
New Revision: 3112

Added:
   trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch
Removed:
   trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch
Log:
Commit the new Xpdf patch

Deleted: trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch
===================================================================
--- trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch	2004-12-18 19:56:41 UTC (rev 3111)
+++ trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch	2004-12-18 20:10:02 UTC (rev 3112)
@@ -1,45 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2004-03-20
-Initial Package Version: 3.00
-Origin: NA
-Upstream Status: Major hack, will never be accepted upstream.
-Description: Fixed compilation with freetype-2.1.7.
-
-$LastChangedBy$
-$Date$
-
-diff -ur xpdf-3.00.orig/configure xpdf-3.00/configure
---- xpdf-3.00.orig/configure	2004-01-21 19:26:44.000000000 -0600
-+++ xpdf-3.00/configure	2004-03-20 10:21:03.000000000 -0600
-@@ -9007,6 +9007,9 @@
- 
- 
- 
-+  cat >>confdefs.h <<_ACEOF
-+#include <ft2build.h>
-+_ACEOF
- 
- 
- 
-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"
- 

Added: trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch
===================================================================
--- trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch	2004-12-18 19:56:41 UTC (rev 3111)
+++ trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch	2004-12-18 20:10:02 UTC (rev 3112)
@@ -0,0 +1,58 @@
+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 discovered by configure
+
+$LastChangedBy$
+$Date$
+
+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"
+ 


Property changes on: trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-2.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list