[arch-commits] Commit in epdfview/trunk (3 files)

[Jan de Groot]

    Date: Wednesday, October 15, 2008 @ 17:25:39
  Author: jgc
Revision: 15583

upgpkg: epdfview 0.1.6-10
    Really fix FS#11733:
- Install icons with correct naming in the hicolor icon theme
- update the hicolor icon cache in post_install/upgrade/remove
- fix the desktop file so it passes desktop-file-validate

Added:
  epdfview/trunk/epdfview.desktop.patch
Modified:
  epdfview/trunk/PKGBUILD
  epdfview/trunk/epdfview.install

------------------------+
 PKGBUILD               |   23 ++++++++++++-----------
 epdfview.desktop.patch |   23 +++++++++++++++++++++++
 epdfview.install       |    1 +
 3 files changed, 36 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-15 20:00:55 UTC (rev 15582)
+++ PKGBUILD	2008-10-15 21:25:39 UTC (rev 15583)
@@ -3,31 +3,32 @@
 
 pkgname=epdfview
 pkgver=0.1.6
-pkgrel=9
+pkgrel=10
 pkgdesc="A free lightweight PDF document viewer."
 arch=('i686' 'x86_64')
 url="http://www.emma-soft.com/projects/epdfview/"
 license=('GPL')
-depends=('poppler-glib>=0.8.3' 'heimdal>=1.2-1' 'libcups>=1.3.7-2' 'gnutls>=2.4.1' 'desktop-file-utils')
+depends=('poppler-glib>=0.8.3' 'heimdal>=1.2-1' 'libcups>=1.3.7-2' 'gnutls>=2.4.1' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('pkgconfig')
 install=epdfview.install
 source=(http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${pkgver}.tar.bz2
 	epdfview-0.1.6-print-segfault.patch
-	IDocumentLink.patch)
+	IDocumentLink.patch
+	epdfview.desktop.patch)
 md5sums=('cce9edb41b4a8308e0ef0eea24b5a1ab' 'c083ee8e0e226b308e1c38cb94ee42e7'\
-         '65444f1e85b635c37a28e070fe43eeaf')
+         '65444f1e85b635c37a28e070fe43eeaf' 'c7f887fb9da98d49bb35bdde68073440')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i ../epdfview-0.1.6-print-segfault.patch || return 1
   patch -Np0 -i ../IDocumentLink.patch || return 1
+  patch -Np0 -i ../epdfview.desktop.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-# fixing icons location
-  sed -i 's/postscript-viewer.png/icon_epdfview-48.png/' ${pkgdir}/usr/share/applications/epdfview.desktop || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+
   install -d ${pkgdir}/usr/share/icons/hicolor/{24x24,32x32,48x48}/apps || return 1
-  install -m644 data/icon_epdfview-24.png ${pkgdir}/usr/share/icons/hicolor/24x24/apps || return 1
-  install -m644 data/icon_epdfview-32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps || return 1
-  install -m644 data/icon_epdfview-48.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps || return 1
+  install -m644 data/icon_epdfview-24.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/epdfview.png" || return 1
+  install -m644 data/icon_epdfview-32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/epdfview.png" || return 1
+  install -m644 data/icon_epdfview-48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/epdfview.png" || return 1
 }

Added: epdfview.desktop.patch
===================================================================
--- epdfview.desktop.patch	                        (rev 0)
+++ epdfview.desktop.patch	2008-10-15 21:25:39 UTC (rev 15583)
@@ -0,0 +1,23 @@
+--- data/epdfview.desktop	2008-10-15 23:20:01.000000000 +0200
++++ data/epdfview.desktop	2008-10-15 23:20:31.000000000 +0200
+@@ -1,17 +1,16 @@
+ [Desktop Entry]
+-Categories=Viewer;Office;GTK
++Categories=Viewer;Office;GTK;
+ Comment=Lightweight PDF document viewer
+ Comment[ca]=Visor de documents PDF lleuger
+ Comment[es]=Visor de documentos PDF ligero
+-Encoding=UTF-8
+ Exec=epdfview %f
+ GenericName=PDF Viewer
+ GenericName[ca]=Visor PDF
+ GenericName[es]=Visor PDF
+-Icon=postscript-viewer.png
++Icon=epdfview
+ Name=ePDFViewer
+ Name[ca]=ePDFViewer
+ Name[es]=ePDFViewer
+-MimeType=application/pdf
++MimeType=application/pdf;
+ Terminal=false
+ Type=Application

Modified: epdfview.install
===================================================================
--- epdfview.install	2008-10-15 20:00:55 UTC (rev 15582)
+++ epdfview.install	2008-10-15 21:25:39 UTC (rev 15583)
@@ -1,5 +1,6 @@
 post_install() {
   update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {