community/fbida: upgrade to 2.14

3 files changed, 57 insertions, 23 deletions

diff --git a/community/fbida/APKBUILD b/community/fbida/APKBUILD
index aace298479..e7d4c26781 100644
--- a/community/fbida/APKBUILD
+++ b/community/fbida/APKBUILD
@@ -1,19 +1,31 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=fbida
-pkgver=2.13
-pkgrel=1
+pkgver=2.14
+pkgrel=0
 pkgdesc="Few applications to display and elementary edit images"
 url="https://www.kraxel.org/blog/linux/$pkgname/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="freetype-dev fontconfig-dev libdrm-dev libexif-dev
-	motif-dev libepoxy-dev libpng-dev tiff-dev giflib-dev
-	jpeg-dev linux-headers perl"
-subpackages="$pkgname-fbgs:_tool $pkgname-exiftran:_tool
-	$pkgname-fbi:_tool $pkgname-ida:_tool $pkgname-doc"
-source="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	no-pdf.patch"
+	libpng-dev tiff-dev giflib-dev pixman-dev linux-headers perl
+	libepoxy-dev motif-dev"
+subpackages="
+	$pkgname-fbgs:_tool:noarch
+	$pkgname-exiftran:_tool
+	$pkgname-fbi:_tool
+	$pkgname-ida:_tool
+	$pkgname-doc
+	"
+source="https://www.kraxel.org/releases/fbida/fbida-$pkgver.tar.gz
+	no-pdf.patch
+	ida-desktop.patch
+	"
+
+prepare() {
+	default_prepare
+	echo $pkgver > VERSION
+}
 
 build() {
 	make verbose=yes -C "$builddir"
@@ -39,11 +51,13 @@ _tool() {
 
 	if [ "$name" = "ida" ]; then
 		mv "$pkgdir"/etc/ "$subpkgdir"/etc/
+		install -Dm644 "$builddir"/desktop/ida.desktop "$subpkgdir"/usr/share/applications/ida.desktop
 	fi
 
 	rmdir "$pkgdir"/usr/bin/ 2>/dev/null || true
 	rmdir "$pkgdir"/usr/ 2>/dev/null || true
 }
 
-sha512sums="a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3  fbida-2.13.tar.gz
-574b3a2d9e184e3cb2f5534b0367fe5926cc1541b4a19d64a1ed8deb2b2a66ca91c33ded61b202b921ed5e7216a0defc8af089090c3a39c99c5b525acb704ab9  no-pdf.patch"
+sha512sums="8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec  fbida-2.14.tar.gz
+972b55541755b4b2abfe9ef3fd50e2003851b4b1798c9dafbd98d9e5b02f0508f9326b3a87c23a600d759cd3dcd4c6826844d3017f39efe1187bb741a2dcc7b9  no-pdf.patch
+cd5276b558a15f34353ebc5a51bd092142c1f5194e98d11c2ed22f4731200899fb31b95f52f884bc06a9e1fc5f9762c124e0870415a4a7e787548f19d12915e5  ida-desktop.patch"
diff --git a/community/fbida/ida-desktop.patch b/community/fbida/ida-desktop.patch
new file mode 100644
index 0000000000..d061f69229
--- /dev/null
+++ b/community/fbida/ida-desktop.patch
@@ -0,0 +1,18 @@
+--- a/desktop/ida.desktop~	2008-08-28 00:33:58.000000000 +0200
++++ b/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
+
diff --git a/community/fbida/no-pdf.patch b/community/fbida/no-pdf.patch
index 32c63797ce..d8f9fc5b59 100644
--- a/community/fbida/no-pdf.patch
+++ b/community/fbida/no-pdf.patch
@@ -1,15 +1,17 @@
---- a/GNUmakefile	2016-04-05 12:59:50.000000000 +0300
-+++ b/GNUmakefile	2016-06-10 10:31:08.242069624 +0300
-@@ -15,7 +15,7 @@
- PKGS_IDA := libexif
- PKGS_FBI := freetype2 fontconfig libdrm libexif
- PKGS_FBPDF := libdrm poppler-glib gbm epoxy cairo-gl
+diff --git a/GNUmakefile b/GNUmakefile
+index c17ece6..beec01c 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -15,7 +15,7 @@ PKG_CONFIG = pkg-config
+ PKGS_IDA := libexif libpng libtiff-4 pixman-1
+ PKGS_FBI := freetype2 fontconfig libdrm libexif libpng libtiff-4 pixman-1
+ PKGS_FBPDF := libdrm poppler-glib gbm egl epoxy pixman-1
 -HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) $(PKGS_FBPDF) && echo yes)
 +HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) && echo yes)
  
- ifeq ($(HAVE_LINUX_FB_H),yes)
- ifneq ($(HAVE_DEPS),yes)
-@@ -39,7 +39,7 @@
+ # map pkg-config names to debian packages using apt-file
+ APT_REGEX = /($(shell echo $(PKGS_FBI) $(PKGS_FBPDF) | sed -e 's/ /|/g')).pc
+@@ -46,7 +46,7 @@ all: build
  # what to build
  TARGETS := exiftran thumbnail.cgi
  ifeq ($(HAVE_LINUX_FB_H),yes)
@@ -18,12 +20,12 @@
  endif
  ifeq ($(HAVE_MOTIF),yes)
    TARGETS += ida
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,6 @@ install: build
  ifeq ($(HAVE_LINUX_FB_H),yes)
  	$(INSTALL_BINARY) fbi $(bindir)
  	$(INSTALL_SCRIPT) fbgs $(bindir)
 -	$(INSTALL_SCRIPT) fbpdf $(bindir)
-+	#$(INSTALL_SCRIPT) fbpdf $(bindir)
- 	$(INSTALL_DATA) $(srcdir)/fbi.man $(mandir)/man1/fbi.1
- 	$(INSTALL_DATA) $(srcdir)/fbgs.man $(mandir)/man1/fbgs.1
+ 	$(INSTALL_DATA) $(srcdir)/man/fbi.1 $(mandir)/man1
+ 	$(INSTALL_DATA) $(srcdir)/man/fbgs.1 $(mandir)/man1
  endif
+