Sat Aug 20 23:14:32 UTC 2011

13 files changed, 277 insertions, 128 deletions

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index e485345f3..6b411a06d 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132630 2011-07-25 00:15:32Z andrea $
+# $Id: PKGBUILD 135830 2011-08-19 07:32:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-libkdepim'
          'kdepim-wizards')
 pkgver=4.7.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -145,7 +145,7 @@ package_kdepim-kmail() {
 	          'kdepim-mimelib' 'kdepim-plugins')
 	optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication')
 	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do
+		nepomuk_email_feeder ontologies kontact/plugins/kmail; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -237,7 +237,8 @@ package_kdepim-libkdepim() {
 	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
 		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
 		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer plugins/messageviewer plugins/ktexteditor; do
+		strigi-analyzer templateparser plugins/messageviewer \
+        plugins/ktexteditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 06eb95726..019ef8e19 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $
+# $Id: PKGBUILD 135862 2011-08-19 20:05:54Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
 pkgver=3.1.9
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD
index a3173beaa..94a5c9c25 100644
--- a/extra/php-suhosin/PKGBUILD
+++ b/extra/php-suhosin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86069 2010-07-25 11:35:16Z pierre $
+# $Id: PKGBUILD 135864 2011-08-19 20:05:56Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-suhosin
 pkgver=0.9.32.1
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc='An advanced protection system for PHP installations'
 url='http://www.hardened-php.net/suhosin/'
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 4e7f515cd..12e326423 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $
+# $Id: PKGBUILD 135860 2011-08-19 20:05:50Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -7,7 +7,6 @@ pkgname=('php'
          'php-apache'
          'php-fpm'
          'php-embed'
-         'php-pear'
          'php-curl'
          'php-enchant'
          'php-gd'
@@ -15,7 +14,7 @@ pkgname=('php'
          'php-intl'
          'php-ldap'
          'php-mcrypt'
-	 'php-mssql'
+         'php-mssql'
          'php-odbc'
          'php-pgsql'
          'php-pspell'
@@ -23,33 +22,29 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.6
-pkgrel=5
+pkgver=5.3.7
 _suhosinver=${pkgver}-0.9.10
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
              'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "suhosin-patch-${_suhosinver}.patch.gz"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('2286f5a82a6e8397955a0025c1c2ad98'
-         'fff1a38877142f3ae6036dbe5a85d0a6'
+md5sums=('2d47d003c96de4e88863ff38da61af33'
+         '08582e502fed8221c6577042ca45ddb8'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         'd50ff349da08110a7cc8c691ce2d0423'
+         '09005dabd90c48ddd392b3dbf05f8a82'
          '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
-	# ldap-sasl does not compile with --as-needed
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	export LDFLAGS="${LDFLAGS//,--as-needed}"
-
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
@@ -196,17 +191,6 @@ build() {
 		--enable-embed=shared \
 		${phpextensions}
 	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
 }
 
 # check() {
@@ -272,19 +256,6 @@ package_php-embed() {
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
 }
 
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php' 'bash')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
 package_php-curl() {
 	depends=('php' 'curl')
 	pkgdesc='curl module for PHP'
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 93c62430a..b4dd32f96 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in	2010-12-11 08:31:47.695294987 +0100
-+++ sapi/fpm/php-fpm.conf.in	2010-12-11 08:31:55.907812237 +0100
+--- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -18,7 +18,7 @@
  
  ; Error log file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -93,7 +93,8 @@
+@@ -102,7 +102,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -28,7 +28,7 @@
  
  ; Set listen(2) backlog. A value of '-1' means unlimited.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -112,9 +113,9 @@
+@@ -121,9 +122,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0666
@@ -41,7 +41,7 @@
  
  ; Unix user/group of processes
  ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -154,23 +155,23 @@
+@@ -163,23 +164,23 @@
  ; The number of child processes created on startup.
  ; Note: Used only when pm is set to 'dynamic'
  ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
@@ -69,7 +69,7 @@
  
  ; The URI to view the FPM status page. If this value is not set, no URI will be
  ; recognized as a status page. By default, the status page shows the following
-@@ -264,7 +265,7 @@
+@@ -333,7 +334,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 0debf3aa1..e628b9b0c 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 104345 2011-01-01 13:50:24Z bisson $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# $Id: PKGBUILD 135877 2011-08-20 01:28:52Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=potrace
-pkgver=1.9
-pkgrel=2
-pkgdesc='Utility for tracing a bitmap. Input: PBM, PGM, PPM, or BMP. Output: EPS, PostScript, PDF, SVG, Xfig, Gimppath, or PGM.'
-arch=('i686' 'x86_64')
+pkgver=1.10
+pkgrel=1
+pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)'
 url='http://potrace.sourceforge.net/'
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('zlib')
 options=('!libtool')
 source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c3ace609c24a0d5e03bbab5f22478c2af69cf1c4')
+sha1sums=('e6e8b64d85d30b4695d197a79187ac98c2b236f9')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 2395df342..9e5a9dc9d 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $
+# $Id: PKGBUILD 135894 2011-08-20 03:53:06Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
-depends=('libpng' 'libxml2' 'pango')
+depends=('libxml2' 'pango' 'ttf-dejavu')
 makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
@@ -21,9 +21,8 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \
-    bindings/perl-shared/Makefile.PL
-  ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL
+  PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
     --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index c273914b0..9c252849e 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125778 2011-05-29 16:38:52Z andyrtr $
+# $Id: PKGBUILD 135871 2011-08-19 21:48:29Z eric $
 # Maintainer: andyrtr <andyrtr funnychar archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="modern file manager for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -23,12 +23,12 @@ options=('!libtool')
 install=${pkgname}.install
 backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
-	org.freedesktop.udisks.pkla)
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
-         'a7ddb5eec02d9a8e91a2997862e73cd8')
+	org.freedesktop.udisks.pkla
+        fix-gvfs.patch)
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
+  patch -Np1 -i ../fix-gvfs.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -57,3 +57,9 @@ package() {
   install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
   install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
+         'a7ddb5eec02d9a8e91a2997862e73cd8'
+         '376c81af1ce5cf8b872d62a878163091')
+md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
+         'a7ddb5eec02d9a8e91a2997862e73cd8'
+         '167c79462cddc5aaa1fcdc814041350b')
diff --git a/extra/thunar/fix-gvfs.patch b/extra/thunar/fix-gvfs.patch
new file mode 100644
index 000000000..71c7dbb57
--- /dev/null
+++ b/extra/thunar/fix-gvfs.patch
@@ -0,0 +1,148 @@
+--- a/thunar/thunar-shortcuts-model.c
++++ b/thunar/thunar-shortcuts-model.c
+@@ -1,25 +1,23 @@
+-/* vi:set et ai sw=2 sts=2 ts=2: */
++/* $Id$ */
+ /*-
+  * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+- * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org>
++ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
+  *
+- * This program is free software; you can redistribute it and/or 
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2 of 
+- * the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the Free
++ * Software Foundation; either version 2 of the License, or (at your option)
++ * any later version.
+  *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+- * GNU General Public License for more details.
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++ * more details.
+  *
+- * You should have received a copy of the GNU General Public 
+- * License along with this program; if not, write to the Free 
+- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
++ * Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+@@ -219,84 +217,6 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface)
+ 
+ 
+ 
+-static gboolean
+-thunar_shortcuts_model_add_network_idle (gpointer user_data)
+-{
+-  ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (user_data);
+-  ThunarShortcut       *shortcut = NULL;
+-  GtkTreePath          *path;
+-  GtkTreeIter           iter;
+-  ThunarFile           *file = NULL;
+-  GVolume              *volume = NULL;
+-  gboolean              have_iter = FALSE;
+-  gboolean              is_separator = FALSE;
+-  gboolean              position_found = FALSE;
+-  GFile                *location = NULL;
+-
+-  /* append the network icon if browsing the network is supported */
+-  if (thunar_g_vfs_is_uri_scheme_supported ("network"))
+-    {
+-      /* load the network root file */
+-      location = g_file_new_for_uri ("network://");
+-      file = thunar_file_get (location, NULL);
+-      g_object_unref (location);
+-
+-      /* create the shortcut */
+-      shortcut = g_slice_new0 (ThunarShortcut);
+-      shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
+-      shortcut->file = file;
+-
+-      /* iterate over all rows in the model in order to find the 
+-       * first one with a volume or a separator */
+-      have_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
+-      while (have_iter && !position_found)
+-        {
+-          /* read volume and separator flag from the current row */
+-          gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
+-                              THUNAR_SHORTCUTS_MODEL_COLUMN_VOLUME, &volume,
+-                              THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &is_separator,
+-                              -1);
+-
+-          /* check if a volume row was found */
+-          if (volume != NULL)
+-            {
+-              /* stop searching */
+-              position_found = TRUE;
+-
+-              /* release the volume */
+-              g_object_unref (volume);
+-            }
+-          else if (is_separator)
+-            {
+-              /* stop searching */
+-              position_found = TRUE;
+-            }
+-          else
+-            {
+-              /* advance to the next row */
+-              have_iter = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter);
+-            }
+-        }
+-
+-      /* we always have a volume or separator row */
+-      g_assert (position_found);
+-
+-      /* get the path of the iter */
+-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+-
+-      /* append the shortcut to the list */
+-      thunar_shortcuts_model_add_shortcut (model, shortcut, path);
+-
+-      /* release the path */
+-      gtk_tree_path_free (path);
+-    }
+-
+-  /* remove this idle handler */
+-  return FALSE;
+-}
+-
+-
+-
+ static void
+ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
+ {
+@@ -339,6 +259,10 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
+   /* append the root file system */
+   system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ());
+ 
++  /* append the network icon if browsing the network is supported */
++  if (thunar_g_vfs_is_uri_scheme_supported ("network"))
++    system_paths = g_list_append (system_paths, g_file_new_for_uri ("network://"));
++
+   /* will be used to append the shortcuts to the list */
+   path = gtk_tree_path_new_from_indices (0, -1);
+ 
+@@ -416,9 +340,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
+   g_object_unref (bookmarks);
+   g_object_unref (home);
+   gtk_tree_path_free (path);
+-
+-  /* add the network item (and other slow items) in an idle handler */
+-  g_idle_add_full (G_PRIORITY_LOW, thunar_shortcuts_model_add_network_idle, model, NULL);
+ }
+ 
+
+ 
diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD
index 3fda983cf..12e63382c 100644
--- a/extra/xpdf/PKGBUILD
+++ b/extra/xpdf/PKGBUILD
@@ -1,74 +1,66 @@
-# $Id: PKGBUILD 117882 2011-04-04 21:05:28Z bisson $
+# $Id: PKGBUILD 135889 2011-08-20 02:28:50Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@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 -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
 
-  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
+	./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 \
 
-  ./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
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_srcver}"
-  make DESTDIR="${pkgdir}" install
+	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 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
+	# 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/extra/xpdf/char.patch b/extra/xpdf/char.patch
new file mode 100644
index 000000000..8e49393a6
--- /dev/null
+++ b/extra/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/extra/xpdf/desktop b/extra/xpdf/desktop
new file mode 100644
index 000000000..06830ecda
--- /dev/null
+++ b/extra/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/extra/xpdf/install b/extra/xpdf/install
new file mode 100644
index 000000000..c6cf149dd
--- /dev/null
+++ b/extra/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
+}