[arch-commits] Commit in fbida/repos (10 files)
Eric Bélanger
eric at nymeria.archlinux.org
Wed May 28 20:08:21 UTC 2014
Date: Wednesday, May 28, 2014 @ 22:08:21
Author: eric
Revision: 213734
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
fbida/repos/staging-i686/
fbida/repos/staging-i686/PKGBUILD
(from rev 213733, fbida/trunk/PKGBUILD)
fbida/repos/staging-i686/fbida.install
(from rev 213733, fbida/trunk/fbida.install)
fbida/repos/staging-i686/ida-PrintGifError.patch
(from rev 213733, fbida/trunk/ida-PrintGifError.patch)
fbida/repos/staging-i686/ida-desktop.patch
(from rev 213733, fbida/trunk/ida-desktop.patch)
fbida/repos/staging-x86_64/
fbida/repos/staging-x86_64/PKGBUILD
(from rev 213733, fbida/trunk/PKGBUILD)
fbida/repos/staging-x86_64/fbida.install
(from rev 213733, fbida/trunk/fbida.install)
fbida/repos/staging-x86_64/ida-PrintGifError.patch
(from rev 213733, fbida/trunk/ida-PrintGifError.patch)
fbida/repos/staging-x86_64/ida-desktop.patch
(from rev 213733, fbida/trunk/ida-desktop.patch)
----------------------------------------+
staging-i686/PKGBUILD | 40 ++++++++++++++
staging-i686/fbida.install | 11 ++++
staging-i686/ida-PrintGifError.patch | 83 +++++++++++++++++++++++++++++++
staging-i686/ida-desktop.patch | 17 ++++++
staging-x86_64/PKGBUILD | 40 ++++++++++++++
staging-x86_64/fbida.install | 11 ++++
staging-x86_64/ida-PrintGifError.patch | 83 +++++++++++++++++++++++++++++++
staging-x86_64/ida-desktop.patch | 17 ++++++
8 files changed, 302 insertions(+)
Copied: fbida/repos/staging-i686/PKGBUILD (from rev 213733, fbida/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=fbida
+pkgver=2.09
+pkgrel=4
+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' 'desktop-file-utils')
+makedepends=('libxpm' 'imagemagick')
+optdepends=('ghostscript: to use fbgs')
+install=fbida.install
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ ida-desktop.patch ida-PrintGifError.patch)
+sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
+ 'SKIP'
+ 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
+ 'a5644d75e868bfc23bc462c3b4bc84c1a168146c')
+
+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 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/staging-i686/fbida.install (from rev 213733, fbida/trunk/fbida.install)
===================================================================
--- staging-i686/fbida.install (rev 0)
+++ staging-i686/fbida.install 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: fbida/repos/staging-i686/ida-PrintGifError.patch (from rev 213733, fbida/trunk/ida-PrintGifError.patch)
===================================================================
--- staging-i686/ida-PrintGifError.patch (rev 0)
+++ staging-i686/ida-PrintGifError.patch 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,83 @@
+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) {
+@@ -165,7 +165,7 @@
+ oops:
+ if (debug)
+ fprintf(stderr,"gif: fatal error, aborting\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ free(h->row);
+ free(h);
+@@ -202,10 +202,11 @@
+ gif_done(void *data)
+ {
+ struct gif_state *h = data;
++ int Error;
+
+ if (debug)
+ fprintf(stderr,"gif: done, cleaning up\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ if (h->il)
+ free(h->il);
Copied: fbida/repos/staging-i686/ida-desktop.patch (from rev 213733, fbida/trunk/ida-desktop.patch)
===================================================================
--- staging-i686/ida-desktop.patch (rev 0)
+++ staging-i686/ida-desktop.patch 2014-05-28 20:08:21 UTC (rev 213734)
@@ -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
Copied: fbida/repos/staging-x86_64/PKGBUILD (from rev 213733, fbida/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=fbida
+pkgver=2.09
+pkgrel=4
+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' 'desktop-file-utils')
+makedepends=('libxpm' 'imagemagick')
+optdepends=('ghostscript: to use fbgs')
+install=fbida.install
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ ida-desktop.patch ida-PrintGifError.patch)
+sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
+ 'SKIP'
+ 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
+ 'a5644d75e868bfc23bc462c3b4bc84c1a168146c')
+
+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 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/staging-x86_64/fbida.install (from rev 213733, fbida/trunk/fbida.install)
===================================================================
--- staging-x86_64/fbida.install (rev 0)
+++ staging-x86_64/fbida.install 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: fbida/repos/staging-x86_64/ida-PrintGifError.patch (from rev 213733, fbida/trunk/ida-PrintGifError.patch)
===================================================================
--- staging-x86_64/ida-PrintGifError.patch (rev 0)
+++ staging-x86_64/ida-PrintGifError.patch 2014-05-28 20:08:21 UTC (rev 213734)
@@ -0,0 +1,83 @@
+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) {
+@@ -165,7 +165,7 @@
+ oops:
+ if (debug)
+ fprintf(stderr,"gif: fatal error, aborting\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ free(h->row);
+ free(h);
+@@ -202,10 +202,11 @@
+ gif_done(void *data)
+ {
+ struct gif_state *h = data;
++ int Error;
+
+ if (debug)
+ fprintf(stderr,"gif: done, cleaning up\n");
+- DGifCloseFile(h->gif);
++ DGifCloseFile(h->gif, &Error);
+ fclose(h->infile);
+ if (h->il)
+ free(h->il);
Copied: fbida/repos/staging-x86_64/ida-desktop.patch (from rev 213733, fbida/trunk/ida-desktop.patch)
===================================================================
--- staging-x86_64/ida-desktop.patch (rev 0)
+++ staging-x86_64/ida-desktop.patch 2014-05-28 20:08:21 UTC (rev 213734)
@@ -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