From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fotoxx: Update to 20.03 ; Fix musl build
Date: Sat, 11 Jan 2020 20:49:42 +0100 [thread overview]
Message-ID: <20200111194942.iBdA-8YczIInkLX7j8j0ZwcmUZRYO_dl-Yjspnq3Vdo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18045@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages fotoxx
https://github.com/void-linux/void-packages/pull/18045
fotoxx: Update to 20.03 ; Fix musl build
A patch file from https://github.com/void-linux/void-packages/pull/18045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-18045.patch --]
[-- Type: text/x-diff, Size: 6162 bytes --]
From 407dfc5010c7a346d4c7862aa7de9c5319e34a30 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
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 <ndowens04@gmail.com>
+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 <johnz@posteo.net>"
-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 6656dd7bb38535ea551312ad832fc624ac16df58 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 4 Jan 2020 20:48:00 -0600
Subject: [PATCH 2/2] fotoxx: Update to 20.04 ; Fix musl build
---
srcpkgs/fotoxx/patches/execinfo.patch | 17 +++++++++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 13 +++++++++++++
srcpkgs/fotoxx/template | 18 +++++++++++-------
3 files changed, 41 insertions(+), 7 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..a361937ba32 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=19.20
+version=20.04
revision=1
wrksrc=fotoxx
build_style=gnu-makefile
@@ -13,17 +13,21 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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
+checksum=0d40ca190f6d9e7138a21b74e8f359068180027ebbfdecefd422070cd14ed56e
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
-esac
+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"
+ LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lexecinfo";;
+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
}
next prev parent reply other threads:[~2020-01-11 19:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 " voidlinux-github
2020-01-05 8:09 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-05 18:37 ` voidlinux-github
2020-01-05 18:52 ` voidlinux-github
2020-01-05 18:57 ` voidlinux-github
2020-01-05 20:07 ` voidlinux-github
2020-01-05 20:10 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-05 20:10 ` voidlinux-github
2020-01-06 18:43 ` voidlinux-github
2020-01-08 16:53 ` voidlinux-github
2020-01-08 16:56 ` voidlinux-github
2020-01-08 17:11 ` voidlinux-github
2020-01-08 17:21 ` voidlinux-github
2020-01-08 17:27 ` voidlinux-github
2020-01-08 18:04 ` voidlinux-github
2020-01-08 19:41 ` voidlinux-github
2020-01-08 20:00 ` voidlinux-github
2020-01-09 2:28 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-09 2:31 ` voidlinux-github
2020-01-09 2:52 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-11 12:13 ` fotoxx: Update to 20.03 " voidlinux-github
2020-01-11 18:26 ` voidlinux-github
2020-01-11 18:45 ` voidlinux-github
2020-01-11 19:02 ` voidlinux-github
2020-01-11 19:49 ` voidlinux-github [this message]
2020-01-11 20:12 ` [PR PATCH] [Updated] fotoxx: Update to 20.04 " voidlinux-github
2020-01-17 18:04 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200111194942.iBdA-8YczIInkLX7j8j0ZwcmUZRYO_dl-Yjspnq3Vdo@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).