Package: xpdf
Severity: important
The lesstif2 build hack is no longer needed, since the underlying
issue has been fixed in lesstif2 0.95. I've tested that anything
works still as expected with attached patch.
Cheers,
Moritz
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.23-1-686 (SMP w/1 CPU core)
Locale: LANG=C, [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages xpdf depends on:
ii xpdf-common 3.02-1.3 Portable Document Format (PDF) sui
ii xpdf-reader 3.02-1.3 Portable Document Format (PDF) sui
ii xpdf-utils 3.02-1.3 Portable Document Format (PDF) sui
xpdf recommends no packages.
diff -Naur xpdf-3.02.orig/debian/control xpdf-3.02/debian/control
--- xpdf-3.02.orig/debian/control 2008-01-02 18:09:11.000000000 +0100
+++ xpdf-3.02/debian/control 2008-01-02 18:09:19.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hamish Moffatt <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: libt1-dev (>= 5.0.2-3), libxext-dev, libxp-dev, libxt-dev,
libxpm-dev, libx11-dev, lesstif2-dev | libmotif-dev, x-dev, debhelper (>=
4.2.21), libfreetype6-dev (>= 2.1.2-1), libpaper-dev | libpaperg-dev,
pkg-config, dpatch, automake1.9, autoconf
+Build-Depends: libt1-dev (>= 5.0.2-3), libxext-dev, libxp-dev, libxt-dev,
libxpm-dev, libx11-dev, lesstif2-dev (>= 1:0.95.0-1) | libmotif-dev, x-dev,
debhelper (>= 4.2.21), libfreetype6-dev (>= 2.1.2-1), libpaper-dev |
libpaperg-dev, pkg-config, dpatch, automake1.9, autoconf
Build-Conflicts: libttf-dev, libstroke0-dev, autoconf2.13
Package: xpdf
diff -Naur xpdf-3.02.orig/debian/patches/00list xpdf-3.02/debian/patches/00list
--- xpdf-3.02.orig/debian/patches/00list 2008-01-02 18:09:11.000000000
+0100
+++ xpdf-3.02/debian/patches/00list 2008-01-02 18:09:19.000000000 +0100
@@ -10,10 +10,6 @@
#08_core_action.dpatch # Not obvious
#23_security3.dpatch # Not obvious
-# Lesstif bug#377230 workaround:
-40_lesstif_copy.dpatch
-41_lesstif_cpp.dpatch
-
# Final cleanup:
99_autoconf.dpatch
diff -Naur xpdf-3.02.orig/debian/patches/40_lesstif_copy.dpatch
xpdf-3.02/debian/patches/40_lesstif_copy.dpatch
--- xpdf-3.02.orig/debian/patches/40_lesstif_copy.dpatch 2008-01-02
18:09:11.000000000 +0100
+++ xpdf-3.02/debian/patches/40_lesstif_copy.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#! /bin/sh -e
-## DP: make local copy of lesstif headers for use in patch 41
-
-dpatch_patch ()
-{
- mkdir lesstif
- cp -a /usr/include/Xm lesstif/
-}
-
-dpatch_unpatch ()
-{
- rm -rf lesstif
-}
-
-DPATCH_LIB_NO_DEFAULT=1
-
-. /usr/share/dpatch/dpatch.lib.sh
-
diff -Naur xpdf-3.02.orig/debian/patches/41_lesstif_cpp.dpatch
xpdf-3.02/debian/patches/41_lesstif_cpp.dpatch
--- xpdf-3.02.orig/debian/patches/41_lesstif_cpp.dpatch 2008-01-02
18:09:11.000000000 +0100
+++ xpdf-3.02/debian/patches/41_lesstif_cpp.dpatch 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 41_lesstif_cpp.dpatch by <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Work around mixed C/C++ linkages in lesstif - #377230
-
[EMAIL PROTECTED]@
-diff -urNad xpdf-3.01~/lesstif/Xm/VendorSP.h xpdf-3.01/lesstif/Xm/VendorSP.h
---- xpdf-3.01~/lesstif/Xm/VendorSP.h 2006-05-28 08:30:56.000000000 +1000
-+++ xpdf-3.01/lesstif/Xm/VendorSP.h 2006-07-15 14:42:38.000000000 +1000
-@@ -30,10 +30,6 @@
- #include <Xm/VendorS.h>
- #include <X11/ShellP.h>
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
- Cardinal numResources,
- WidgetClass filterClass,
-@@ -58,8 +54,5 @@
- XMLIBEXPORT extern VendorShellClassRec vendorShellClassRec;
-
-
--#ifdef __cplusplus
--}
--#endif
-
- #endif /* _XM_VENDORSP_H */
diff -Naur xpdf-3.02.orig/debian/rules xpdf-3.02/debian/rules
--- xpdf-3.02.orig/debian/rules 2008-01-02 18:09:11.000000000 +0100
+++ xpdf-3.02/debian/rules 2008-01-02 18:10:09.000000000 +0100
@@ -17,7 +17,7 @@
--enable-opi \
--enable-wordlist \
--enable-multithreaded \
- --with-Xm-includes=$(shell pwd)/lesstif \
+ --with-Xm-includes=/usr/include/Xm \
--with-freetype2-includes=/usr/include/freetype2 \
--with-t1-includes=/usr/include
$(MAKE)
