[arch-commits] Commit in djvulibre/trunk (PKGBUILD djvulibre.install)

[Jan de Groot]

    Date: Thursday, October 21, 2010 @ 06:21:17
  Author: jgc
Revision: 96457

upgpkg: djvulibre 3.5.23-1
Update to 3.5.23
Remove djview3 application, optdepend on djview4 instead
Merge rest of djvulibre with libdjvu, replacing it
Only install mime icons, the rest is not required anymore

Modified:
  djvulibre/trunk/PKGBUILD
  djvulibre/trunk/djvulibre.install

-------------------+
 PKGBUILD          |   45 ++++++++++++++++++---------------------------
 djvulibre.install |    2 --
 2 files changed, 18 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-21 09:37:00 UTC (rev 96456)
+++ PKGBUILD	2010-10-21 10:21:17 UTC (rev 96457)
@@ -3,41 +3,32 @@
 # Contributor: mgushee
 
 pkgname=djvulibre
-pkgver=3.5.22
-pkgrel=2
+pkgver=3.5.23
+pkgrel=1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 arch=("i686" "x86_64")
 license=('GPL')
 url="http://djvu.sourceforge.net/"
-depends=('libtiff>=3.8.2-5' 'hicolor-icon-theme' 'qt3>=3.3.8-12' 'desktop-file-utils' 
-         "libdjvu>=${pkgver}-2" 'shared-mime-info')
-makedepends=('pkgconfig')
-options=(!makeflags)
+depends=('gcc-libs' 'libtiff' 'bash' 'hicolor-icon-theme')
+makedepends=('pkg-config')
+provides=("libdjvu=${pkgver}")
+replaces=('libdjvu')
+conflicts=('libdjvu')
+optdepends=('djview4: Viewer application')
+options=('!libtool')
 install=djvulibre.install
 source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz) 
-md5sums=('d1513784ce0e4f37d71595dc34c95ec7')
+md5sums=('0053b9908b9e3d57d0d89b3d065168e9')
 
 build() {
-  [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools || return 1
-  make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools \
-       DESTDIR="${pkgdir}" plugindir=/usr/lib/mozilla/plugins \
-       install-utils install-gui install-i18n || return 1
+  ./configure --prefix=/usr --disable-desktopfiles
+  make
+  make DESTDIR="${pkgdir}" install
 
-  #Install icons, launcher files, mime-types.
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48}/mimetypes
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
-  install -m755 -d ${pkgdir}/usr/share/mime/packages/
-  install -m755 -d ${pkgdir}/usr/share/applications
-
-  install -m644 desktopfiles/hi22-djvu.png "${pkgdir}/usr/share/icons/hicolor/22x22/mimetypes/image-vnd.djvu.mime.png" || return 1
-  install -m644 desktopfiles/hi32-djvu.png "${pkgdir}/usr/share/icons/hicolor/32x32/mimetypes/image-vnd.djvu.mime.png" || return 1
-  install -m644 desktopfiles/hi48-djvu.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/image-vnd.djvu.mime.png" || return 1
-
-  install -m644 desktopfiles/djvulibre-mime.xml "${pkgdir}/usr/share/mime/packages/" || return 1
-
-  install -m644 desktopfiles/hi32-djview3.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/djvulibre-djview3.png" || return 1
-  install -m644 desktopfiles/djvulibre-djview3.desktop "${pkgdir}/usr/share/applications/" || return 1
+  #Install icons for mime-types.
+  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes
+  for sz in 22 32 48 64; do
+    install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
+  done
 }

Modified: djvulibre.install
===================================================================
--- djvulibre.install	2010-10-21 09:37:00 UTC (rev 96456)
+++ djvulibre.install	2010-10-21 10:21:17 UTC (rev 96457)
@@ -2,8 +2,6 @@
   if [ -x usr/bin/gtk-update-icon-cache ]; then  
     gtk-update-icon-cache -q -f usr/share/icons/hicolor
   fi
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
 }
 
 post_upgrade() {