fotoxx: Update to 20.04 ; Fix musl build
This commit is contained in:
parent
59475e2ce8
commit
3143673c94
3 changed files with 39 additions and 7 deletions
17
srcpkgs/fotoxx/patches/execinfo.patch
Normal file
17
srcpkgs/fotoxx/patches/execinfo.patch
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
diff --git Makefile Makefile
|
||||||
|
index 218aa2d..77ec75e 100644
|
||||||
|
--- Makefile
|
||||||
|
+++ 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
|
||||||
|
-
|
13
srcpkgs/fotoxx/patches/musl_build.patch
Normal file
13
srcpkgs/fotoxx/patches/musl_build.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git f.file.cc f.file.cc
|
||||||
|
index 7c4f083..f2c9c07 100644
|
||||||
|
--- f.file.cc
|
||||||
|
+++ 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,6 +1,6 @@
|
||||||
# Template file for 'fotoxx'
|
# Template file for 'fotoxx'
|
||||||
pkgname=fotoxx
|
pkgname=fotoxx
|
||||||
version=19.20
|
version=20.04
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc=fotoxx
|
wrksrc=fotoxx
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
|
@ -13,17 +13,19 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
|
homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
|
||||||
distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
|
distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
|
||||||
checksum=bfa6f20bc5121fbf521354ddf19489e0cfba1f8aa72db1e63fdb26fc5d935752
|
checksum=0d40ca190f6d9e7138a21b74e8f359068180027ebbfdecefd422070cd14ed56e
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
|
||||||
*-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
hostmakedepends+=" libchamplain-devel"
|
hostmakedepends+=" libchamplain-devel"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_LIBC" in
|
||||||
|
musl) makedepends+=" libexecinfo-devel"
|
||||||
|
esac
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
|
rm -rv ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} \
|
||||||
rm -rv ${DESTDIR}/usr/share/appdata
|
${DESTDIR}/usr/share/appdata
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue