[arch-commits] Commit in fbida/repos/community-x86_64 (4 files)

[Antonio Rojas]

    Date: Wednesday, January 17, 2018 @ 08:57:52
  Author: arojas
Revision: 283581

archrelease: copy trunk to community-x86_64

Added:
  fbida/repos/community-x86_64/PKGBUILD
    (from rev 283580, fbida/trunk/PKGBUILD)
  fbida/repos/community-x86_64/ida-desktop.patch
    (from rev 283580, fbida/trunk/ida-desktop.patch)
Deleted:
  fbida/repos/community-x86_64/PKGBUILD
  fbida/repos/community-x86_64/ida-desktop.patch

-------------------+
 PKGBUILD          |   81 ++++++++++++++++++++++++++--------------------------
 ida-desktop.patch |   34 ++++++++++-----------
 2 files changed, 59 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-17 08:57:19 UTC (rev 283580)
+++ PKGBUILD	2018-01-17 08:57:52 UTC (rev 283581)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=fbida
-pkgver=2.13
-pkgrel=2
-pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=('i686' 'x86_64')
-url="http://www.kraxel.org/blog/linux/fbida/"
-license=('GPL2')
-depends=('giflib' 'libtiff' 'libexif' 'openmotif' 'libpng' 'fontconfig' 'curl' 'libepoxy' 'poppler-glib')
-makedepends=('libxpm' 'imagemagick')
-optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        ida-desktop.patch)
-sha1sums=('1560606e7694844a3c83d61f709b02fd469573f8'
-          'SKIP'
-          'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717')
-validpgpkeys=('A0328CFFB93A17A79901FE7D4CB6D8EED3E87138')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -i 's/ungif/gif/' GNUmakefile
-  patch -p0 -i "${srcdir}/ida-desktop.patch"
-  echo 2.13 > VERSION
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  make verbose=yes
-  convert -resize 25% logo.jpg ida.png
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install
-  install -D -m644 desktop/ida.desktop "${pkgdir}/usr/share/applications/ida.desktop"
-  install -D -m644 ida.png "${pkgdir}/usr/share/pixmaps/ida.png"
-}

Copied: fbida/repos/community-x86_64/PKGBUILD (from rev 283580, fbida/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-17 08:57:52 UTC (rev 283581)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=fbida
+pkgver=2.13
+pkgrel=4
+pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
+arch=('x86_64')
+url="http://www.kraxel.org/blog/linux/fbida/"
+license=('GPL2')
+depends=('giflib' 'libtiff' 'libexif' 'openmotif' 'libpng' 'fontconfig' 'curl'
+         'libepoxy' 'libxpm' 'poppler-glib' 'libwebp' 'mesa')
+makedepends=('libxpm' 'imagemagick')
+optdepends=('ghostscript: to use fbgs')
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        ida-desktop.patch)
+sha1sums=('1560606e7694844a3c83d61f709b02fd469573f8'
+          'SKIP'
+          'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717')
+validpgpkeys=('A0328CFFB93A17A79901FE7D4CB6D8EED3E87138')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's/ungif/gif/' GNUmakefile 
+  sed -e 's/fbi fbpdf kbdtest/fbi kbdtest/' -e '/^PKGS_FBPDF/d' -e '/$(INSTALL_SCRIPT) fbpdf/d' \
+    -i GNUmakefile # fbpdf requires cairo-gl
+  patch -p0 -i "${srcdir}/ida-desktop.patch"
+  echo 2.13 > VERSION
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make verbose=yes
+  convert -resize 25% logo.jpg ida.png
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install
+  install -D -m644 desktop/ida.desktop "${pkgdir}/usr/share/applications/ida.desktop"
+  install -D -m644 ida.png "${pkgdir}/usr/share/pixmaps/ida.png"
+}

Deleted: ida-desktop.patch
===================================================================
--- ida-desktop.patch	2018-01-17 08:57:19 UTC (rev 283580)
+++ ida-desktop.patch	2018-01-17 08:57:52 UTC (rev 283581)
@@ -1,17 +0,0 @@
---- desktop/ida.desktop~	2008-08-28 00:33:58.000000000 +0200
-+++ desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
-@@ -1,9 +1,10 @@
- [Desktop Entry]
- Type=Application
--Encoding=UTF-8
- Name=ida
- GenericName=Image Viewer
-+Comment=Image Viewer
- Exec=ida %F
--Terminal=no
--Categories=Motif;Graphics;Viewer
--MimeType=image/jpeg;image/tiff;image/png
-+Terminal=false
-+Categories=Motif;Graphics;Viewer;
-+MimeType=image/jpeg;image/tiff;image/png;
-+Icon=ida

Copied: fbida/repos/community-x86_64/ida-desktop.patch (from rev 283580, fbida/trunk/ida-desktop.patch)
===================================================================
--- ida-desktop.patch	                        (rev 0)
+++ ida-desktop.patch	2018-01-17 08:57:52 UTC (rev 283581)
@@ -0,0 +1,17 @@
+--- desktop/ida.desktop~	2008-08-28 00:33:58.000000000 +0200
++++ desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
+@@ -1,9 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+-Encoding=UTF-8
+ Name=ida
+ GenericName=Image Viewer
++Comment=Image Viewer
+ Exec=ida %F
+-Terminal=no
+-Categories=Motif;Graphics;Viewer
+-MimeType=image/jpeg;image/tiff;image/png
++Terminal=false
++Categories=Motif;Graphics;Viewer;
++MimeType=image/jpeg;image/tiff;image/png;
++Icon=ida