diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-23 14:26:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-07-23 14:26:03 +0000 |
| commit | 9e14413e127fc70cb5c0ea769ccbbfee10ef088c (patch) | |
| tree | 76708c59a16e338649081bfaf8a7dfd5ad2ea8ef /testing/fotoxx | |
| parent | 589bfd5932ff3368c7aa62a7040580f8d7172079 (diff) | |
| download | aports-9e14413e127fc70cb5c0ea769ccbbfee10ef088c.tar.bz2 aports-9e14413e127fc70cb5c0ea769ccbbfee10ef088c.tar.xz | |
testing/fotoxx: upgrade to 12.07.1
Diffstat (limited to 'testing/fotoxx')
| -rw-r--r-- | testing/fotoxx/APKBUILD | 11 | ||||
| -rw-r--r-- | testing/fotoxx/no-execinfo.patch | 34 | ||||
| -rw-r--r-- | testing/fotoxx/no-xdg-desktop-menu.patch | 10 |
3 files changed, 15 insertions, 40 deletions
diff --git a/testing/fotoxx/APKBUILD b/testing/fotoxx/APKBUILD index 0edb11853..d327ae72f 100644 --- a/testing/fotoxx/APKBUILD +++ b/testing/fotoxx/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fotoxx -pkgver=11.06 +pkgver=12.07.1 pkgrel=0 pkgdesc="Photo editing and collection management" url="http://kornelix.squarespace.com/fotoxx" arch="all" license="GPL-3" depends="xdg-utils exiftool" -makedepends="gtk+-dev tiff-dev" +makedepends="gtk+3.0-dev tiff-dev" install= subpackages="$pkgname-doc" source="http://kornelix.squarespace.com/storage/downloads/fotoxx-$pkgver.tar.gz - no-execinfo.patch" + no-xdg-desktop-menu.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -23,7 +23,6 @@ prepare() { *.patch) patch -p1 -i "$srcdir"/$i || return 1;; esac done - sed -e 's:/bin/bash:/bin/sh:' -i dependencies.sh } build() { @@ -36,5 +35,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -md5sums="e636e10f6a46f0a813e704f18eac3176 fotoxx-11.06.tar.gz -981323960d1316051b898ba194085205 no-execinfo.patch" +md5sums="56022f26a3db1fdc62024027fe73901e fotoxx-12.07.1.tar.gz +8c988a8ced48cfe3a5a49be4a705b045 no-xdg-desktop-menu.patch" diff --git a/testing/fotoxx/no-execinfo.patch b/testing/fotoxx/no-execinfo.patch deleted file mode 100644 index c0e43a9f7..000000000 --- a/testing/fotoxx/no-execinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/zfuncs.cc b/zfuncs.cc -index 1398557..c504bbf 100644 ---- a/zfuncs.cc -+++ b/zfuncs.cc -@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... ) // v - - printf("zappcrash: \n %s \n",message); // output message to stdout - -+#ifndef __UCLIBC__ - nstack = backtrace(stacklist,nstack); // get traceback data - stackents = backtrace_symbols(stacklist,nstack); - -@@ -113,6 +114,7 @@ void zappcrash(cchar *pMess, ... ) // v - fclose(fid1); - - err = system("xdg-open zappcrash"); // display in editor -+#endif - abort(); - } - -diff --git a/zfuncs.h b/zfuncs.h -index e415adb..b6f02ac 100644 ---- a/zfuncs.h -+++ b/zfuncs.h -@@ -34,7 +34,9 @@ - #include <pthread.h> - #include <errno.h> - #include <signal.h> -+#ifndef __UCLIBC__ - #include <execinfo.h> -+#endif - #include <locale.h> - #include <sys/inotify.h> - diff --git a/testing/fotoxx/no-xdg-desktop-menu.patch b/testing/fotoxx/no-xdg-desktop-menu.patch new file mode 100644 index 000000000..0e2813fb8 --- /dev/null +++ b/testing/fotoxx/no-xdg-desktop-menu.patch @@ -0,0 +1,10 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -76,7 +76,6 @@ + rm -f fotoxx.1.gz + # menu (desktop) file + cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + + uninstall: + rm -f $(DESTDIR)$(BINDIR)/fotoxx |