New package: fotocx-24.21
This commit is contained in:
parent
874ef20a0f
commit
6517d978cd
|
@ -0,0 +1,73 @@
|
||||||
|
--- a/zfuncs.cc
|
||||||
|
+++ b/zfuncs.cc
|
||||||
|
@@ -19,6 +19,9 @@
|
||||||
|
*********************************************************************************/
|
||||||
|
|
||||||
|
#include "zfuncs.h"
|
||||||
|
+#ifdef __GLIBC__
|
||||||
|
+#include <execinfo.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/********************************************************************************
|
||||||
|
|
||||||
|
@@ -714,12 +717,14 @@ void zexit(int popup, ch *errmess, ...)
|
||||||
|
|
||||||
|
void zbacktrace()
|
||||||
|
{
|
||||||
|
+#ifdef __GLIBC__
|
||||||
|
int nstack = 100;
|
||||||
|
void *stacklist[100];
|
||||||
|
|
||||||
|
nstack = backtrace(stacklist,nstack); // get backtrace data
|
||||||
|
if (nstack > 100) nstack = 100;
|
||||||
|
backtrace_symbols_fd(stacklist,nstack,STDOUT_FILENO); // backtrace records to STDOUT
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
@@ -766,7 +771,11 @@ void zappcrash(ch *format, ... )
|
||||||
|
arch, OS2, OS3, zappvers, build_date_time, message);
|
||||||
|
Plog(0,"*** zappcrash context: %s | %s \n",zappcrash_context1, zappcrash_context2);
|
||||||
|
|
||||||
|
+#ifdef __GLIBC__
|
||||||
|
nstack = backtrace(stacklist,nstack); // get backtrace data
|
||||||
|
+#else
|
||||||
|
+ nstack = 0;
|
||||||
|
+#endif
|
||||||
|
if (nstack <= 0) zexit(0,"zappcrash backtrace() failure");
|
||||||
|
if (nstack > 100) nstack = 100;
|
||||||
|
|
||||||
|
@@ -774,7 +783,9 @@ void zappcrash(ch *format, ... )
|
||||||
|
if (! fid1) zexit(0,"zappcrash fopen() failure");
|
||||||
|
|
||||||
|
fd = fileno(fid1);
|
||||||
|
+#ifdef __GLIBC__
|
||||||
|
backtrace_symbols_fd(stacklist,nstack,fd); // write backtrace data
|
||||||
|
+#endif
|
||||||
|
fclose(fid1); // (use of malloc() is avoided)
|
||||||
|
|
||||||
|
fid1 = fopen("zbacktrace","r"); // open backtrace data file
|
||||||
|
--- a/f.file.cc
|
||||||
|
+++ b/f.file.cc
|
||||||
|
@@ -3755,9 +3755,10 @@ int find_imagefiles(ch *folder, int flag
|
||||||
|
if (flags & 16) Frecurse = 1;
|
||||||
|
if (flags & 32) Fnolinks = 1;
|
||||||
|
|
||||||
|
+#ifdef GLOB_ONLYDIR
|
||||||
|
if (Fdirs && ! Fimages && ! Fthumbs)
|
||||||
|
globflags += GLOB_ONLYDIR;
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
globdata.gl_pathc = 0; // glob() setup
|
||||||
|
globdata.gl_offs = 0;
|
||||||
|
globdata.gl_pathc = 0;
|
||||||
|
--- a/zfuncs.h
|
||||||
|
+++ b/zfuncs.h
|
||||||
|
@@ -37,7 +37,6 @@
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <signal.h>
|
||||||
|
-#include <execinfo.h>
|
||||||
|
#include <locale.h>
|
||||||
|
#include <glob.h>
|
||||||
|
#include <gtk/gtk.h>
|
|
@ -0,0 +1,22 @@
|
||||||
|
# Template file for 'fotocx'
|
||||||
|
pkgname=fotocx
|
||||||
|
version=24.21
|
||||||
|
revision=1
|
||||||
|
build_style=gnu-makefile
|
||||||
|
make_use_env=yes
|
||||||
|
hostmakedepends="pkg-config"
|
||||||
|
makedepends="libchamplain-devel"
|
||||||
|
depends="desktop-file-utils exiftool xdg-utils dcraw"
|
||||||
|
short_desc="Free open source program for image editing and collection management"
|
||||||
|
maintainer="Benjamín Albiñana <benalb@gmail.com>"
|
||||||
|
license="GPL-3.0-or-later"
|
||||||
|
homepage="https://www.kornelix.net/fotocx/fotocx.html"
|
||||||
|
changelog="https://www.kornelix.net/downloads/recent_changes.txt"
|
||||||
|
distfiles="https://www.kornelix.net/downloads/downloads/fotocx-${version}-source.tar.gz"
|
||||||
|
checksum=0acb68e32956a3f1b2a28025e42d35e5072403e6183ffa1de5cebc3e09a6f32c
|
||||||
|
|
||||||
|
fotoxx_package() {
|
||||||
|
build_style=meta
|
||||||
|
depends="fotocx"
|
||||||
|
short_desc+=" - old package"
|
||||||
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
fotocx
|
|
@ -1,17 +0,0 @@
|
||||||
diff --git Makefile Makefile
|
|
||||||
index 218aa2d..77ec75e 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -47,4 +47,4 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
|
|
||||||
-I/usr/include/libchamplain-0.12/
|
|
||||||
|
|
||||||
-LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
|
|
||||||
+LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` $(shell pkg-config --libs libexecinfo) \
|
|
||||||
-lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12
|
|
||||||
|
|
||||||
ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.area.o f.meta.o \
|
|
||||||
@@ -146,4 +146,3 @@ uninstall:
|
|
||||||
clean:
|
|
||||||
rm -f fotoxx
|
|
||||||
rm -f *.o
|
|
||||||
-
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git f.file.cc f.file.cc
|
|
||||||
index 7c4f083..f2c9c07 100644
|
|
||||||
--- a/f.file.cc
|
|
||||||
+++ b/f.file.cc
|
|
||||||
@@ -3493,6 +3493,7 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
|
|
||||||
+#ifdef GLOB_ONLYDIR
|
|
||||||
if (Fdirs && ! Fimages && ! Fthumbs)
|
|
||||||
globflags += GLOB_ONLYDIR;
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
globdata.gl_pathc = 0; // glob() setup
|
|
||||||
globdata.gl_offs = 0;
|
|
||||||
globdata.gl_pathc = 0;
|
|
|
@ -1,26 +0,0 @@
|
||||||
# Template file for 'fotoxx'
|
|
||||||
pkgname=fotoxx
|
|
||||||
version=23.74
|
|
||||||
revision=1
|
|
||||||
build_style=gnu-makefile
|
|
||||||
make_use_env=yes
|
|
||||||
hostmakedepends="pkg-config"
|
|
||||||
makedepends="libchamplain-devel"
|
|
||||||
depends="desktop-file-utils exiftool xdg-utils dcraw"
|
|
||||||
short_desc="Free open source program for image editing and collection management"
|
|
||||||
maintainer="Benjamín Albiñana <benalb@gmail.com>"
|
|
||||||
license="GPL-3.0-or-later"
|
|
||||||
homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
|
|
||||||
changelog="https://www.kornelix.net/downloads/recent_changes.txt"
|
|
||||||
distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}-source.tar.gz"
|
|
||||||
checksum=f0dc0879d448f743d7df38ef8d7ef865abe5feb730809267d83fb278f8e92476
|
|
||||||
|
|
||||||
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
|
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
|
||||||
hostmakedepends+=" libchamplain-devel"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$XBPS_TARGET_LIBC" in
|
|
||||||
musl) makedepends+=" libexecinfo-devel"
|
|
||||||
esac
|
|
Loading…
Reference in New Issue