Hello community,
here is the log from the commit of package xpdf
checked in at Fri Jun 23 17:14:19 CEST 2006.
--------
--- xpdf/xpdf.changes 2006-03-09 11:04:31.000000000 +0100
+++ xpdf/xpdf.changes 2006-06-23 12:10:28.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 23 12:10:10 CEST 2006 - nadvornik@suse.cz
+
+- do not use freetype2 internals
+
+-------------------------------------------------------------------
New:
----
xpdf-3.01-noftinternals.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xpdf.spec ++++++
--- /var/tmp/diff_new_pack.ukv2Pg/_old 2006-06-23 17:14:03.000000000 +0200
+++ /var/tmp/diff_new_pack.ukv2Pg/_new 2006-06-23 17:14:03.000000000 +0200
@@ -11,11 +11,11 @@
# norootforbuild
Name: xpdf
-BuildRequires: freetype2-devel gcc-c++ ghostscript-fonts-std openmotif openmotif-devel update-desktop-files xorg-x11
+BuildRequires: freetype2-devel gcc-c++ ghostscript-fonts-std openmotif-devel update-desktop-files xorg-x11
License: GPL
Group: Productivity/Publishing/PDF
Version: 3.01
-Release: 12
+Release: 21
Autoreqprov: on
Requires: ghostscript-fonts-std, xpdf-tools = %{version}
Summary: A PDF File Viewer for the X Window System
@@ -57,6 +57,7 @@
Patch27: xpdf301_combined.diff
Patch28: post-3.5.1-kdegraphics-CVE-2006-0301.diff
Patch29: xpdf-%{version}-resize.patch
+Patch30: xpdf-3.01-noftinternals.patch
URL: http://www.foolabs.com/xpdf/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -108,6 +109,7 @@
%patch27 -p1
%patch28 -p2
%patch29
+%patch30 -p1
%build
%{?suse_update_config:%{suse_update_config -f }}
@@ -182,6 +184,8 @@
/usr/share/xpdf
%changelog -n xpdf
+* Fri Jun 23 2006 - nadvornik@suse.cz
+- do not use freetype2 internals
* Thu Mar 09 2006 - mmarek@suse.cz
- fixed redraw on window resize
[#155745] (resize.patch)
++++++ xpdf-3.01-noftinternals.patch ++++++
diff -urN xpdf-3.01-org/splash/SplashFTFont.cc xpdf-3.01/splash/SplashFTFont.cc
--- xpdf-3.01-org/splash/SplashFTFont.cc 2005-12-23 16:57:18.076514614 +0100
+++ xpdf-3.01/splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +0100
@@ -14,7 +14,8 @@
#include
#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,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org