Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (a2717fef9b7d4971bc61267d4e31270faead6155)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (a2717fef9b7d4971bc61267d4e31270faead6155)
  • Date: Sun, 12 Nov 2006 05:37:10 -0600

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

doc/xpdf/DETAILS | 2
doc/xpdf/HISTORY | 5 ++
doc/xpdf/PRE_BUILD | 4 +
doc/xpdf/xpdf-3.01-noftinternals.patch | 78
+++++++++++++++++++++++++++++++++
4 files changed, 87 insertions(+), 2 deletions(-)

New commits:
commit a2717fef9b7d4971bc61267d4e31270faead6155
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

xpdf: Added patch for to use proper API's for freetype2

diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 0799a6b..3efb31b 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e

SOURCE2_HASH=sha512:a6752adc588168562ddcfe5c1de9ef0ce4a196622ccf8825f2e69f5ecc5df2c6a401a9fd21f7119b9062fdcd489cd9cc9e26dde633152c9356f966ab9b8316ef
ENTERED=20010923
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE=GPL
KEYWORDS="pdf doc"
SHORT="xpdf: a PDF viewer for X11R6."
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index 61d452c..10be4f7 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,8 @@
+2006-11-12 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated PATCH_LEVEL
+ * PRE_BUILD: Added patch
+ * xpdf-3.01-noftinternals.patch: uses proper freetype2 api
+
2006-09-20 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: made MOTIF and X11 optional

diff --git a/doc/xpdf/PRE_BUILD b/doc/xpdf/PRE_BUILD
index b7256da..31b01a9 100755
--- a/doc/xpdf/PRE_BUILD
+++ b/doc/xpdf/PRE_BUILD
@@ -1,2 +1,4 @@
default_pre_build &&
-unpack_file 2
+unpack_file 2 &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/xpdf-3.01-noftinternals.patch
diff --git a/doc/xpdf/xpdf-3.01-noftinternals.patch
b/doc/xpdf/xpdf-3.01-noftinternals.patch
new file mode 100644
index 0000000..29a65b2
--- /dev/null
+++ b/doc/xpdf/xpdf-3.01-noftinternals.patch
@@ -0,0 +1,78 @@
+diff -urN splash/SplashFTFont.cc splash/SplashFTFont.cc
+--- splash/SplashFTFont.cc 2005-12-23 16:57:18.076514614 +0100
++++ splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +0100
+@@ -14,7 +14,8 @@
+
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#include FT_SIZES_H // needed for FT_New_Size decl
++#include FT_GLYPH_H
+ #include "gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"
+@@ -25,11 +26,12 @@
+
+ //------------------------------------------------------------------------
+
+-static int glyphPathMoveTo(FT_Vector *pt, void *path);
+-static int glyphPathLineTo(FT_Vector *pt, void *path);
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+- FT_Vector *pt, void *path);
++static int glyphPathMoveTo( const FT_Vector *pt, void *path);
++static int glyphPathLineTo( const FT_Vector *pt, void *path);
++static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
++ void* path );
++static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++ const FT_Vector *pt, void *path);
+
+ //------------------------------------------------------------------------
+ // SplashFTFont
+@@ -210,7 +212,7 @@
+ };
+
+ SplashPath *SplashFTFont::getGlyphPath(int c) {
+- static FT_Outline_Funcs outlineFuncs = {
++ static const FT_Outline_Funcs outlineFuncs = {
+ &glyphPathMoveTo,
+ &glyphPathLineTo,
+ &glyphPathConicTo,
+@@ -249,7 +251,7 @@
+ return path.path;
+ }
+
+-static int glyphPathMoveTo(FT_Vector *pt, void *path) {
++static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ if (p->needClose) {
+@@ -260,7 +262,7 @@
+ return 0;
+ }
+
+-static int glyphPathLineTo(FT_Vector *pt, void *path) {
++static int glyphPathLineTo(const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
+@@ -268,7 +270,7 @@
+ return 0;
+ }
+
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
++static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt,
void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+ SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
+
+@@ -306,8 +308,8 @@
+ return 0;
+ }
+
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+- FT_Vector *pt, void *path) {
++static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++ const FT_Vector *pt, void *path) {
+ SplashFTFontPath *p = (SplashFTFontPath *)path;
+
+ p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (a2717fef9b7d4971bc61267d4e31270faead6155), George Sherwood, 11/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page