From 407dfc5010c7a346d4c7862aa7de9c5319e34a30 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 8 Jan 2020 20:05:46 -0600 Subject: [PATCH 1/2] libexecinfo: add pkg-config file --- .../libexecinfo/patches/libexecinfo_pc.patch | 26 +++++++++++++++++++ srcpkgs/libexecinfo/template | 9 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libexecinfo/patches/libexecinfo_pc.patch diff --git a/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch b/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch new file mode 100644 index 00000000000..041f4cae186 --- /dev/null +++ b/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch @@ -0,0 +1,26 @@ +From 90afb407bfc3c5550e7192935993c35a7447f6ae Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Wed, 8 Jan 2020 18:55:59 -0600 +Subject: [PATCH] Add pkgconfig + +--- + libexecinfo.pc | 5 +++++ + 1 file changed, 5 insertions(+) + create mode 100644 libexecinfo.pc + +diff --git a/libexecinfo.pc b/libexecinfo.pc +new file mode 100644 +index 0000000..dc61a97 +--- /dev/null ++++ libexecinfo.pc +@@ -0,0 +1,10 @@ ++prefix=/usr ++exec_prefix=${prefix} ++includedir=${prefix}/include ++libdir=${exec_prefix}/lib ++ ++Name: libexecinfo ++Description: libexecinfo library ++Version: version ++CFlags: -I${includedir} ++Libs: -L${libdir} -lexecinfo diff --git a/srcpkgs/libexecinfo/template b/srcpkgs/libexecinfo/template index 9e8801b02fb..fcedcd7828b 100644 --- a/srcpkgs/libexecinfo/template +++ b/srcpkgs/libexecinfo/template @@ -1,22 +1,24 @@ # Template file for 'libexecinfo' pkgname=libexecinfo version=1.1 -revision=2 +revision=3 archs="*-musl" build_style=gnu-makefile -short_desc="A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility" +short_desc="BSD licensed clone of the GNU libc backtrace facility" maintainer="John " -license="BSD-2" +license="BSD-2-Clause" homepage="http://www.freshports.org/devel/libexecinfo" distfiles="http://distcache.freebsd.org/local-distfiles/itetcu/libexecinfo-${version}.tar.bz2" checksum=c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f do_install() { + vsed -e "/Version:/s@version@${version}@" -i libexecinfo.pc vinstall execinfo.h 644 usr/include vinstall stacktraverse.h 644 usr/include vinstall libexecinfo.a 755 usr/lib vinstall libexecinfo.so.1 755 usr/lib ln -s libexecinfo.so.1 ${DESTDIR}/usr/lib/libexecinfo.so + vinstall libexecinfo.pc 644 usr/lib/pkgconfig head -28 execinfo.c > LICENSE vlicense LICENSE } @@ -28,5 +30,6 @@ libexecinfo-devel_package() { vmove usr/include vmove usr/lib/*.so vmove usr/lib/*.a + vmove usr/lib/pkgconfig } } From 2ba20017f89e808b5ba430816f2357ac641a833f Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 4 Jan 2020 20:48:00 -0600 Subject: [PATCH 2/2] fotoxx: Update to 20.03 ; Fix musl build --- srcpkgs/fotoxx/patches/execinfo.patch | 17 +++++++++++++++++ srcpkgs/fotoxx/patches/musl_build.patch | 13 +++++++++++++ srcpkgs/fotoxx/template | 16 ++++++++-------- 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/fotoxx/patches/execinfo.patch create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch diff --git a/srcpkgs/fotoxx/patches/execinfo.patch b/srcpkgs/fotoxx/patches/execinfo.patch new file mode 100644 index 00000000000..073c7aef1b2 --- /dev/null +++ b/srcpkgs/fotoxx/patches/execinfo.patch @@ -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 +- diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch new file mode 100644 index 00000000000..b6d9fb95b7a --- /dev/null +++ b/srcpkgs/fotoxx/patches/musl_build.patch @@ -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; diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index 9d9602e6ccf..0eef52d5123 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -1,6 +1,6 @@ # Template file for 'fotoxx' pkgname=fotoxx -version=19.20 +version=20.03 revision=1 wrksrc=fotoxx build_style=gnu-makefile @@ -13,17 +13,17 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.kornelix.net/fotoxx/fotoxx.html" distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz" -checksum=bfa6f20bc5121fbf521354ddf19489e0cfba1f8aa72db1e63fdb26fc5d935752 - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";; -esac +checksum=771c702215ab967eaff5884a5f7c3f8ec08ef709a0384a2e77c760a62f34a1cd if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libchamplain-devel" fi +case "$XBPS_TARGET_LIBC" in + musl) makedepends+=" libexecinfo-devel";; +esac + post_install() { - rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} - rm -rv ${DESTDIR}/usr/share/appdata + rm -rv ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} \ + ${DESTDIR}/usr/share/appdata }