6 files changed, 158 insertions, 0 deletions
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
new file mode 100644
index 000000000..81cd69fd4
--- /dev/null
+++ b/testing/usbutils/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 135703 2011-08-17 16:07:01Z tpowa $
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
+pkgname=usbutils
+pkgver=004
+pkgrel=1
+_usb_ids_date=2011.08.17
+pkgdesc="USB Device Utilities"
+arch=(i686 x86_64)
+license=('GPL')
+groups=('base')
+makedepends=('wget')
+depends=('glibc' 'libusb')
+optdepends=('python2: for lsusb.py usage'
+           'coreutils: for lsusb.py usage')
+url="http://linux-usb.sourceforge.net/"
+source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+        fix-python2.patch
+        usb.ids-${_usb_ids_date})  # from http://linux-usb.sourceforge.net/usb.ids
+md5sums=('481e1de453bcabbd5f43125bb4df2ab7'
+         '45766196895b4cc50b53cd56e1bbf3d1'
+         'f04c301b5363ef618f0ec776deff3117')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  rm usb.ids
+  cp $srcdir/usb.ids-${_usb_ids_date} usb.ids
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i $srcdir/fix-python2.patch
+  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  # fix pkgconfig file
+  install -dm755 $pkgdir/usr/lib
+  mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/
+}
+md5sums=('481e1de453bcabbd5f43125bb4df2ab7'
+         '45766196895b4cc50b53cd56e1bbf3d1'
+         'f04c301b5363ef618f0ec776deff3117')
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
new file mode 100644
index 000000000..7e2875e99
--- /dev/null
+++ b/testing/usbutils/fix-python2.patch
@@ -0,0 +1,17 @@
+--- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
++++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # lsusb.py
+ # Displays your USB devices in reasonable form.
+ # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
+@@ -16,7 +16,7 @@
+ warnsort = False
+ 
+ prefix = "/sys/bus/usb/devices/"
+-usbids = "/usr/share/usb.ids"
++usbids = "/usr/share/hwdata/usb.ids"
+ 
+ esc = chr(27)
+ norm = esc + "[0;0m"
diff --git a/testing/xpdf/PKGBUILD b/testing/xpdf/PKGBUILD
new file mode 100644
index 000000000..a14ff1f34
--- /dev/null
+++ b/testing/xpdf/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 135716 2011-08-18 02:47:24Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+
+pkgname=xpdf
+#pkgver=3.03_pl1
+pkgver=3.03
+pkgrel=1
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+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')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+#	patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+	patch -p1 -i ../char.patch
+
+	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}-${pkgver%_*}"
+
+	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
+}
diff --git a/testing/xpdf/char.patch b/testing/xpdf/char.patch
new file mode 100644
index 000000000..8e49393a6
--- /dev/null
+++ b/testing/xpdf/char.patch
@@ -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);
diff --git a/testing/xpdf/desktop b/testing/xpdf/desktop
new file mode 100644
index 000000000..06830ecda
--- /dev/null
+++ b/testing/xpdf/desktop
@@ -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;
diff --git a/testing/xpdf/install b/testing/xpdf/install
new file mode 100644
index 000000000..c6cf149dd
--- /dev/null
+++ b/testing/xpdf/install
@@ -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
+}