Date: Wednesday, August 17, 2011 @ 22:47:24
Author: bisson
Revision: 135716
upstream update
Added:
xpdf/trunk/char.patch
xpdf/trunk/desktop
(from rev 135705, xpdf/trunk/xpdf.desktop)
xpdf/trunk/install
(from rev 135705, xpdf/trunk/xpdf.install)
Modified:
xpdf/trunk/PKGBUILD
Deleted:
xpdf/trunk/xpdf-3.00-xfont.patch
xpdf/trunk/xpdf.desktop
xpdf/trunk/xpdf.install
-----------------------+
PKGBUILD | 104 ++++++++++++++++++++++--------------------------
char.patch | 12 +++++
desktop | 9 ++++
install | 11 +++++
xpdf-3.00-xfont.patch | 11 -----
xpdf.desktop | 9 ----
xpdf.install | 11 -----
7 files changed, 80 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-18 02:10:20 UTC (rev 135715)
+++ PKGBUILD 2011-08-18 02:47:24 UTC (rev 135716)
@@ -4,71 +4,63 @@
# Contributor: Sarah Hay <sarah...@mb.sympatico.ca>
pkgname=xpdf
-_srcver=3.02
-_patchlevel=pl6
-pkgver=${_srcver}_${_patchlevel}
+#pkgver=3.03_pl1
+pkgver=3.03
pkgrel=1
-pkgdesc="A viewer for Portable Document Format (PDF) files"
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+license=('GPL2')
arch=('i686' 'x86_64')
-license=('GPL')
-depends=('lesstif' 'gsfonts' 'libxt' 'desktop-file-utils')
-optdepends=('poppler: pdf tools that used to be included in xpdf')
+depends=('lesstif' 'gsfonts' 'libxt')
+optdepends=('poppler: tools that used to be included in xpdf'
+ 'desktop-file-utils: for desktop environments')
+# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch";
+source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz";
+ 'char.patch'
+ 'desktop')
+sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+ '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
+ '3b6fe01636253676ffa0efe1b237a75af4721f6d')
+
+install=install
backup=('etc/xpdfrc')
-url="http://www.foolabs.com/xpdf/";
-install=${pkgname}.install
-source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}.tar.gz
- ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl1.patch
- ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl2.patch
- ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl3.patch
- ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl4.patch
- ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl5.patch
- xpdf-3.00-xfont.patch
- xpdf.desktop)
-md5sums=('599dc4cc65a07ee868cf92a667a913d2'
- '877118786dfe27d1b7aa5a6759cc6e45'
- '3a5cb165ae66781e0b21e6219ae06795'
- '581963ede0fb5715e1a69f01b5b8ce63'
- '70b752716798dd341a4bf890df5f6fdc'
- '504902ca5e9d66c67eed03636ec6b163'
- '6490de55687e0d2389212c1b5bbcf916'
- '93b9df5ebef3bc56133236ef3f176bb7')
build() {
- cd "${srcdir}/${pkgname}-${_srcver}"
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
- patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl1.patch"
- patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl2.patch"
- patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl3.patch"
- patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl4.patch"
- patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl5.patch"
- patch -Np1 -i "${srcdir}/xpdf-3.00-xfont.patch"
- sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:'
xpdf/GlobalParams.cc
+# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+ patch -p1 -i ../char.patch
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --enable-multithreaded \
- --enable-wordlist \
- --with-freetype2-library=/usr/lib \
- --with-freetype2-includes=/usr/include/freetype2 \
- --x-includes=/usr/include \
- --with-Xm-library=/usr/lib \
- --with-Xm-includes=/usr/include
- make
+ sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:'
xpdf/GlobalParams.cc
+ sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:'
xpdf/XPDFViewer.cc # FS#14217
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --enable-multithreaded \
+ --enable-wordlist \
+ --with-freetype2-library=/usr/lib \
+ --with-freetype2-includes=/usr/include/freetype2 \
+ --x-includes=/usr/include \
+ --with-Xm-library=/usr/lib \
+ --with-Xm-includes=/usr/include \
+
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${_srcver}"
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
- # remove some libs and manpages provided by poppler now
- for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do
- rm -f "${pkgdir}/usr/bin/${tool}"
- rm -f "${pkgdir}/usr/share/man/man1/${tool}.1"
- done
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 "${srcdir}/xpdf.desktop" "${pkgdir}/usr/share/applications/"
- install -m755 -d ${pkgdir}/usr/share/pixmaps
- install -m644 xpdf/xpdfIcon.xpm ${pkgdir}/usr/share/pixmaps/xpdf.xpm
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 ../desktop
"${pkgdir}/usr/share/applications/xpdf.desktop"
+ install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+ # remove libs and manpages provided by poppler
+ # pdfdetach should go there too once it is in poppler
+ for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do
+ rm "${pkgdir}/usr/bin/${tool}"
+ rm "${pkgdir}/usr/share/man/man1/${tool}.1"
+ done
}
Added: char.patch
===================================================================
--- char.patch (rev 0)
+++ char.patch 2011-08-18 02:47:24 UTC (rev 135716)
@@ -0,0 +1,12 @@
+diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
+--- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
++++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
+@@ -1803,7 +1803,7 @@
+ menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
+ for (i = 0; i < nZoomMenuItems; ++i) {
+ n = 0;
+- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
++ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
+ XtSetArg(args[n], XmNlabelString, s); ++n;
+ XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
+ sprintf(buf, "zoom%d", i);
Copied: xpdf/trunk/desktop (from rev 135705, xpdf/trunk/xpdf.desktop)
===================================================================
--- desktop (rev 0)
+++ desktop 2011-08-18 02:47:24 UTC (rev 135716)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
Copied: xpdf/trunk/install (from rev 135705, xpdf/trunk/xpdf.install)
===================================================================
--- install (rev 0)
+++ install 2011-08-18 02:47:24 UTC (rev 135716)
@@ -0,0 +1,11 @@
+post_install() {
+ [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q
|| true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: xpdf-3.00-xfont.patch
===================================================================
--- xpdf-3.00-xfont.patch 2011-08-18 02:10:20 UTC (rev 135715)
+++ xpdf-3.00-xfont.patch 2011-08-18 02:47:24 UTC (rev 135716)
@@ -1,11 +0,0 @@
---- xpdf-3.00/xpdf/XPDFViewer.cc.orig 2004-10-12 12:24:57.055068037 +0200
-+++ xpdf-3.00/xpdf/XPDFViewer.cc 2004-10-12 12:24:47.707449614 +0200
-@@ -1742,7 +1742,7 @@
- aboutBigFont =
- createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
- aboutVersionFont =
-- createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
-+ createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
- aboutFixedFont =
- createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
-
Deleted: xpdf.desktop
===================================================================
--- xpdf.desktop 2011-08-18 02:10:20 UTC (rev 135715)
+++ xpdf.desktop 2011-08-18 02:47:24 UTC (rev 135716)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
Deleted: xpdf.install
===================================================================
--- xpdf.install 2011-08-18 02:10:20 UTC (rev 135715)
+++ xpdf.install 2011-08-18 02:47:24 UTC (rev 135716)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
