[arch-commits] Commit in fbida/trunk (4 files)
Eric Bélanger
eric at nymeria.archlinux.org
Mon Jul 29 21:20:37 UTC 2013
Date: Monday, July 29, 2013 @ 23:20:37
Author: eric
Revision: 191735
upgpkg: fbida 2.09-3
Rebuild against giflib 5.0, Add build fix, Install desktop file and icon
Added:
fbida/trunk/fbida.install
fbida/trunk/ida-PrintGifError.patch
fbida/trunk/ida-desktop.patch
Modified:
fbida/trunk/PKGBUILD
-------------------------+
PKGBUILD | 21 +++++++++++----
fbida.install | 11 ++++++++
ida-PrintGifError.patch | 61 ++++++++++++++++++++++++++++++++++++++++++++++
ida-desktop.patch | 17 ++++++++++++
4 files changed, 104 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-29 19:57:36 UTC (rev 191734)
+++ PKGBUILD 2013-07-29 21:20:37 UTC (rev 191735)
@@ -3,29 +3,38 @@
pkgname=fbida
pkgver=2.09
-pkgrel=2
+pkgrel=3
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' 'lesstif' 'libpng' 'fontconfig' 'curl')
-makedepends=('libxpm')
+depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl' 'desktop-file-utils')
+makedepends=('libxpm' 'imagemagick')
optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+install=fbida.install
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ ida-desktop.patch ida-PrintGifError.patch)
sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
- '18f5660301201326bd9426ce55e9fc217bf720d8')
+ 'SKIP'
+ 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
+ '4e7ed05fbfba46296aae11a9768680109bee8ac5')
prepare() {
cd ${pkgname}-${pkgver}
sed -i 's/ungif/gif/' GNUmakefile
+ patch -p0 -i "${srcdir}/ida-desktop.patch"
+ patch -p1 -i "${srcdir}/ida-PrintGifError.patch"
}
build() {
cd ${pkgname}-${pkgver}
- make
+ 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"
}
Added: fbida.install
===================================================================
--- fbida.install (rev 0)
+++ fbida.install 2013-07-29 21:20:37 UTC (rev 191735)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Added: ida-PrintGifError.patch
===================================================================
--- ida-PrintGifError.patch (rev 0)
+++ ida-PrintGifError.patch 2013-07-29 21:20:37 UTC (rev 191735)
@@ -0,0 +1,61 @@
+diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c
+--- fbida-2.09-orig/rd/read-gif.c 2013-07-29 16:43:26.949362012 -0400
++++ fbida-2.09/rd/read-gif.c 2013-07-29 16:43:43.669166969 -0400
+@@ -13,6 +13,14 @@
+ int w,h;
+ };
+
++static void
++localPrintGifError(void)
++{
++ int ErrorCode=0;
++ GifErrorString(ErrorCode);
++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
++}
++
+ static GifRecordType
+ gif_fileread(struct gif_state *h)
+ {
+@@ -25,7 +33,7 @@
+ if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
+ if (debug)
+ fprintf(stderr,"gif: DGifGetRecordType failed\n");
+- PrintGifError();
++ localPrintGifError();
+ return -1;
+ }
+ switch (RecordType) {
+@@ -42,7 +50,7 @@
+ if (rc == GIF_ERROR) {
+ if (debug)
+ fprintf(stderr,"gif: DGifGetExtension failed\n");
+- PrintGifError();
++ localPrintGifError();
+ return -1;
+ }
+ if (debug) {
+@@ -93,12 +101,13 @@
+ struct gif_state *h;
+ GifRecordType RecordType;
+ int i, image = 0;
+-
++ int Error;
++
+ h = malloc(sizeof(*h));
+ memset(h,0,sizeof(*h));
+
+ h->infile = fp;
+- h->gif = DGifOpenFileHandle(fileno(fp));
++ h->gif = DGifOpenFileHandle(fileno(fp), &Error);
+ h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
+
+ while (0 == image) {
+@@ -108,7 +117,7 @@
+ if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
+ if (debug)
+ fprintf(stderr,"gif: DGifGetImageDesc failed\n");
+- PrintGifError();
++ localPrintGifError();
+ }
+ if (NULL == h->gif->SColorMap &&
+ NULL == h->gif->Image.ColorMap) {
Added: ida-desktop.patch
===================================================================
--- ida-desktop.patch (rev 0)
+++ ida-desktop.patch 2013-07-29 21:20:37 UTC (rev 191735)
@@ -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
More information about the arch-commits
mailing list