rpms/xpdf/devel xpdf-3.02-additionalzoom.patch, NONE, 1.1 xpdf-3.02-mousebuttons.patch, NONE, 1.1 xpdf-3.02-x86_64-fix.patch, NONE, 1.1 xpdf.spec, 1.5, 1.6
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue Aug 28 21:13:02 UTC 2007
- Previous message: rpms/xpdf/FC-6 xpdf-3.02-additionalzoom.patch, NONE, 1.1 xpdf-3.02-mousebuttons.patch, NONE, 1.1 xpdf-3.02-x86_64-fix.patch, NONE, 1.1 xpdf.spec, 1.5, 1.6
- Next message: rpms/xarchiver/devel xarchiver.spec,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/xpdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2829/devel
Modified Files:
xpdf.spec
Added Files:
xpdf-3.02-additionalzoom.patch xpdf-3.02-mousebuttons.patch
xpdf-3.02-x86_64-fix.patch
Log Message:
Resolve outstanding xpdf bugs
xpdf-3.02-additionalzoom.patch:
--- NEW FILE xpdf-3.02-additionalzoom.patch ---
diff -up xpdf-3.02/xpdf/XPDFViewer.cc.BAD xpdf-3.02/xpdf/XPDFViewer.cc
--- xpdf-3.02/xpdf/XPDFViewer.cc.BAD 2007-08-28 14:44:09.000000000 -0400
+++ xpdf-3.02/xpdf/XPDFViewer.cc 2007-08-28 14:44:47.000000000 -0400
@@ -140,6 +140,8 @@ struct ZoomMenuInfo {
static ZoomMenuInfo zoomMenuInfo[nZoomMenuItems] = {
{ "400%", 400 },
+ { "300%", 300 },
+ { "250%", 250 },
{ "200%", 200 },
{ "150%", 150 },
{ "125%", 125 },
diff -up xpdf-3.02/xpdf/Stream.cc.BAD xpdf-3.02/xpdf/Stream.cc
diff -up xpdf-3.02/xpdf/XPDFViewer.h.BAD xpdf-3.02/xpdf/XPDFViewer.h
diff -up xpdf-3.02/xpdf/XPDFViewer.h.BAD xpdf-3.02/xpdf/XPDFViewer.h
--- xpdf-3.02/xpdf/XPDFViewer.h.BAD 2007-08-28 16:46:48.000000000 -0400
+++ xpdf-3.02/xpdf/XPDFViewer.h 2007-08-28 16:46:57.000000000 -0400
@@ -41,7 +41,7 @@ class XPDFViewer;
//------------------------------------------------------------------------
// NB: this must match the defn of zoomMenuBtnInfo in XPDFViewer.cc
-#define nZoomMenuItems 10
+#define nZoomMenuItems 12
//------------------------------------------------------------------------
xpdf-3.02-mousebuttons.patch:
--- NEW FILE xpdf-3.02-mousebuttons.patch ---
diff -up xpdf-3.02/xpdf/GlobalParams.cc.BAD xpdf-3.02/xpdf/GlobalParams.cc
--- xpdf-3.02/xpdf/GlobalParams.cc.BAD 2007-08-28 14:30:13.000000000 -0400
+++ xpdf-3.02/xpdf/GlobalParams.cc 2007-08-28 14:30:38.000000000 -0400
@@ -1574,10 +1574,10 @@ GBool GlobalParams::parseKey(GString *mo
!p0[3]) {
*code = xpdfKeyCodeF1 + 10 * (p0[1] - '0') + (p0[2] - '0') - 1;
} else if (!strncmp(p0, "mousePress", 10) &&
- p0[10] >= '1' && p0[10] <= '7' && !p0[11]) {
+ p0[10] >= '1' && p0[10] <= '9' && !p0[11]) {
*code = xpdfKeyCodeMousePress1 + (p0[10] - '1');
} else if (!strncmp(p0, "mouseRelease", 12) &&
- p0[12] >= '1' && p0[12] <= '7' && !p0[13]) {
+ p0[12] >= '1' && p0[12] <= '9' && !p0[13]) {
*code = xpdfKeyCodeMouseRelease1 + (p0[12] - '1');
} else if (*p0 >= 0x20 && *p0 <= 0x7e && !p0[1]) {
*code = (int)*p0;
diff -up xpdf-3.02/xpdf/GlobalParams.h.BAD xpdf-3.02/xpdf/GlobalParams.h
--- xpdf-3.02/xpdf/GlobalParams.h.BAD 2007-08-28 14:30:44.000000000 -0400
+++ xpdf-3.02/xpdf/GlobalParams.h 2007-08-28 14:31:12.000000000 -0400
@@ -164,6 +164,8 @@ public:
#define xpdfKeyCodeMousePress5 0x2005
#define xpdfKeyCodeMousePress6 0x2006
#define xpdfKeyCodeMousePress7 0x2007
+#define xpdfKeyCodeMousePress8 0x2008
+#define xpdfKeyCodeMousePress9 0x2009
#define xpdfKeyCodeMouseRelease1 0x2101
#define xpdfKeyCodeMouseRelease2 0x2102
#define xpdfKeyCodeMouseRelease3 0x2103
@@ -171,6 +173,8 @@ public:
#define xpdfKeyCodeMouseRelease5 0x2105
#define xpdfKeyCodeMouseRelease6 0x2106
#define xpdfKeyCodeMouseRelease7 0x2107
+#define xpdfKeyCodeMouseRelease8 0x2108
+#define xpdfKeyCodeMouseRelease9 0x2109
#define xpdfKeyModNone 0
#define xpdfKeyModShift (1 << 0)
#define xpdfKeyModCtrl (1 << 1)
diff -up xpdf-3.02/doc/xpdfrc.5.BAD xpdf-3.02/doc/xpdfrc.5
--- xpdf-3.02/doc/xpdfrc.5.BAD 2007-08-28 14:31:25.000000000 -0400
+++ xpdf-3.02/doc/xpdfrc.5 2007-08-28 14:31:35.000000000 -0400
@@ -483,8 +483,8 @@ can be a regular ASCII character, or any
pgdn
left / right / up / down (arrow keys)
f1 .. f35 (function keys)
- mousePress1 .. mousePress7 (mouse buttons)
- mouseRelease1 .. mouseRelease7 (mouse buttons)
+ mousePress1 .. mousePress9 (mouse buttons)
+ mouseRelease1 .. mouseRelease9 (mouse buttons)
.fi
.I Context
xpdf-3.02-x86_64-fix.patch:
--- NEW FILE xpdf-3.02-x86_64-fix.patch ---
diff -up xpdf-3.02/xpdf/Stream.cc.BAD xpdf-3.02/xpdf/Stream.cc
--- xpdf-3.02/xpdf/Stream.cc.BAD 2007-08-21 16:20:40.000000000 -0400
+++ xpdf-3.02/xpdf/Stream.cc 2007-08-21 16:20:44.000000000 -0400
@@ -4451,7 +4451,7 @@ void ASCII85Encoder::reset() {
}
GBool ASCII85Encoder::fillBuf() {
- Gulong t;
+ Guint t;
char buf1[5];
int c0, c1, c2, c3;
int n, i;
Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xpdf.spec 6 Aug 2007 20:00:46 -0000 1.5
+++ xpdf.spec 28 Aug 2007 21:12:28 -0000 1.6
@@ -1,7 +1,7 @@
Summary: A PDF file viewer for the X Window System
Name: xpdf
Version: 3.02
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Epoch: 1
Url: http://www.foolabs.com/xpdf/
@@ -43,6 +43,9 @@
# Patch14: xpdf-3.01-freetype-internals.patch
Patch15: xpdf-3.01-nocmap.patch
Patch16: xpdf-3.02-fontlist.patch
+Patch17: xpdf-3.02-x86_64-fix.patch
+Patch18: xpdf-3.02-mousebuttons.patch
+Patch19: xpdf-3.02-additionalzoom.patch
# Security patches
Patch100: xpdf-3.02pl1.patch
@@ -88,6 +91,9 @@
#%%patch14 -p1 -b .freetype-internals
%patch15 -p1
%patch16 -p1 -b .fontlist
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
# security patches
%patch100 -p1 -b .security
@@ -237,6 +243,12 @@
%{_datadir}/xpdf/latin2
%changelog
+* Tue Aug 28 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-3
+- fix PDF printing on x86_64 (bz 253601)
+- add mouse buttons 8 and 9 (bz 255401)
+- add extra zoom types (bz 251855)
+- rebuild for BuildID
+
* Mon Aug 6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-2
- fix font list parsing to squelch noise (bz 250709)
- cleanup add-to-xpdfrc files, update xpdfrc to include them by default
- Previous message: rpms/xpdf/FC-6 xpdf-3.02-additionalzoom.patch, NONE, 1.1 xpdf-3.02-mousebuttons.patch, NONE, 1.1 xpdf-3.02-x86_64-fix.patch, NONE, 1.1 xpdf.spec, 1.5, 1.6
- Next message: rpms/xarchiver/devel xarchiver.spec,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list