* [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build
@ 2020-01-05 2:50 voidlinux-github
2020-01-05 8:09 ` [PR PATCH] [Updated] " voidlinux-github
` (25 more replies)
0 siblings, 26 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 2:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is a new 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.01 ; 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: 3839 bytes --]
From 029ef749887da636328245be6eb19ae1d02cece8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 4 Jan 2020 20:48:00 -0600
Subject: [PATCH] fotoxx: Update to 20.01 ; Fix musl build
---
srcpkgs/fotoxx/files/libexecinfo.patch | 18 ++++++++++++++++++
srcpkgs/fotoxx/patches/musl.patch | 25 +++++++++++++++++++++++++
srcpkgs/fotoxx/template | 24 ++++++++++++++++--------
3 files changed, 59 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo.patch
create mode 100644 srcpkgs/fotoxx/patches/musl.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo.patch b/srcpkgs/fotoxx/files/libexecinfo.patch
new file mode 100644
index 00000000000..a98de4d7954
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo.patch
@@ -0,0 +1,18 @@
+diff --git Makefile Makefile
+index 218aa2d..64bfe26 100644
+--- Makefile
++++ Makefile
+@@ -47,7 +47,7 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
+ -I/usr/include/libchamplain-0.12/
+
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \
++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \
+ -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.patch b/srcpkgs/fotoxx/patches/musl.patch
new file mode 100644
index 00000000000..603b9f2017f
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index 7c4f083..f2c9c07 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3493,16 +3493,16 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = Fnolinks = 0;
+-
++
+ if (flags & 1) Fimages = 1;
+ if (flags & 2) Fthumbs = 1;
+ if (flags & 4) globflags += GLOB_PERIOD;
+ if (flags & 8) Fdirs = 1;
+ 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;
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 9d9602e6ccf..63aeaf5fe14 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=19.20
+version=20.01
revision=1
wrksrc=fotoxx
build_style=gnu-makefile
@@ -13,17 +13,25 @@ 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
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
-esac
+checksum=b7463c9fd9649111d428d68ca93f148650a3702958d83797e693763ce6a17963
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel";;
+esac
+
+pre_build() {
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ patch -Np0 < "$FILESDIR"/libexecinfo.patch;;
+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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
@ 2020-01-05 8:09 ` voidlinux-github
2020-01-05 18:37 ` voidlinux-github
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 8:09 UTC (permalink / raw)
To: ml
[-- 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.01 ; 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: 3839 bytes --]
From ab6358edce5711087a64aa56955e87e9898452bc Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 4 Jan 2020 20:48:00 -0600
Subject: [PATCH] fotoxx: Update to 20.01 ; Fix musl build
---
srcpkgs/fotoxx/files/libexecinfo.patch | 18 ++++++++++++++++++
srcpkgs/fotoxx/patches/musl.patch | 25 +++++++++++++++++++++++++
srcpkgs/fotoxx/template | 24 ++++++++++++++++--------
3 files changed, 59 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo.patch
create mode 100644 srcpkgs/fotoxx/patches/musl.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo.patch b/srcpkgs/fotoxx/files/libexecinfo.patch
new file mode 100644
index 00000000000..a98de4d7954
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo.patch
@@ -0,0 +1,18 @@
+diff --git Makefile Makefile
+index 218aa2d..64bfe26 100644
+--- Makefile
++++ Makefile
+@@ -47,7 +47,7 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
+ -I/usr/include/libchamplain-0.12/
+
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \
++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \
+ -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.patch b/srcpkgs/fotoxx/patches/musl.patch
new file mode 100644
index 00000000000..603b9f2017f
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index 7c4f083..f2c9c07 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3493,16 +3493,16 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = Fnolinks = 0;
+-
++
+ if (flags & 1) Fimages = 1;
+ if (flags & 2) Fthumbs = 1;
+ if (flags & 4) globflags += GLOB_PERIOD;
+ if (flags & 8) Fdirs = 1;
+ 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;
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 9d9602e6ccf..63aeaf5fe14 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=19.20
+version=20.01
revision=1
wrksrc=fotoxx
build_style=gnu-makefile
@@ -13,17 +13,25 @@ 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
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
-esac
+checksum=b7463c9fd9649111d428d68ca93f148650a3702958d83797e693763ce6a17963
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel";;
+esac
+
+pre_build() {
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ patch -Np0 < "$FILESDIR"/libexecinfo.patch;;
+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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build 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
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 18:37 UTC (permalink / raw)
To: ml
[-- 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.01 ; 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: 3839 bytes --]
From 7789aa6f93429adf57cff65d4a0d194ae9fdb6ec Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 4 Jan 2020 20:48:00 -0600
Subject: [PATCH] fotoxx: Update to 20.01 ; Fix musl build
---
srcpkgs/fotoxx/files/libexecinfo.patch | 18 ++++++++++++++++++
srcpkgs/fotoxx/patches/musl.patch | 25 +++++++++++++++++++++++++
srcpkgs/fotoxx/template | 24 ++++++++++++++++--------
3 files changed, 59 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo.patch
create mode 100644 srcpkgs/fotoxx/patches/musl.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo.patch b/srcpkgs/fotoxx/files/libexecinfo.patch
new file mode 100644
index 00000000000..a98de4d7954
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo.patch
@@ -0,0 +1,18 @@
+diff --git Makefile Makefile
+index 218aa2d..64bfe26 100644
+--- Makefile
++++ Makefile
+@@ -47,7 +47,7 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
+ -I/usr/include/libchamplain-0.12/
+
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \
++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \
+ -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.patch b/srcpkgs/fotoxx/patches/musl.patch
new file mode 100644
index 00000000000..603b9f2017f
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index 7c4f083..f2c9c07 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3493,16 +3493,16 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = Fnolinks = 0;
+-
++
+ if (flags & 1) Fimages = 1;
+ if (flags & 2) Fthumbs = 1;
+ if (flags & 4) globflags += GLOB_PERIOD;
+ if (flags & 8) Fdirs = 1;
+ 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;
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 9d9602e6ccf..63aeaf5fe14 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=19.20
+version=20.01
revision=1
wrksrc=fotoxx
build_style=gnu-makefile
@@ -13,17 +13,25 @@ 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
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
-esac
+checksum=b7463c9fd9649111d428d68ca93f148650a3702958d83797e693763ce6a17963
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel";;
+esac
+
+pre_build() {
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ patch -Np0 < "$FILESDIR"/libexecinfo.patch;;
+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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build 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
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-570937314
Comment:
I tried without, but on GLIBC systems, it does not know -lexecinfo.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (2 preceding siblings ...)
2020-01-05 18:52 ` voidlinux-github
@ 2020-01-05 18:57 ` voidlinux-github
2020-01-05 20:07 ` voidlinux-github
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-570937314
Comment:
I tried without, but on GLIBC systems, it does not know -lexecinfo.
Also tried: LDFLAGS=-lexecinfo and LIBS=-lexecinfo but those didn't take
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (3 preceding siblings ...)
2020-01-05 18:57 ` voidlinux-github
@ 2020-01-05 20:07 ` voidlinux-github
2020-01-05 20:10 ` [PR PATCH] [Updated] " voidlinux-github
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-570937314
Comment:
I tried without, but on GLIBC systems, it does not know -lexecinfo.
Also tried: LDFLAGS=-lexecinfo and LIBS=-lexecinfo but those didn't take.
Edit, have an idea I am going to try
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (4 preceding siblings ...)
2020-01-05 20:07 ` voidlinux-github
@ 2020-01-05 20:10 ` voidlinux-github
2020-01-05 20:10 ` voidlinux-github
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 20:10 UTC (permalink / raw)
To: ml
[-- 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.01 ; 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: 3746 bytes --]
From 4ac49bb7720589739543a011883be2482c3b9b2e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 4 Jan 2020 20:48:00 -0600
Subject: [PATCH] fotoxx: Update to 20.01 ; Fix musl build
---
srcpkgs/fotoxx/patches/Makefile.patch | 18 ++++++++++++++++++
srcpkgs/fotoxx/patches/musl.patch | 25 +++++++++++++++++++++++++
srcpkgs/fotoxx/template | 18 ++++++++++--------
3 files changed, 53 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/fotoxx/patches/Makefile.patch
create mode 100644 srcpkgs/fotoxx/patches/musl.patch
diff --git a/srcpkgs/fotoxx/patches/Makefile.patch b/srcpkgs/fotoxx/patches/Makefile.patch
new file mode 100644
index 00000000000..7b191c73375
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/Makefile.patch
@@ -0,0 +1,18 @@
+diff --git Makefile Makefile
+index 218aa2d..64bfe26 100644
+--- Makefile
++++ Makefile
+@@ -47,5 +47,5 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
+ -I/usr/include/libchamplain-0.12/
+
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \
++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg ${EXECINFO} \
+ -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.patch b/srcpkgs/fotoxx/patches/musl.patch
new file mode 100644
index 00000000000..603b9f2017f
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index 7c4f083..f2c9c07 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3493,16 +3493,16 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = Fnolinks = 0;
+-
++
+ if (flags & 1) Fimages = 1;
+ if (flags & 2) Fthumbs = 1;
+ if (flags & 4) globflags += GLOB_PERIOD;
+ if (flags & 8) Fdirs = 1;
+ 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;
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index 9d9602e6ccf..4e7c71e8863 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=19.20
+version=20.01
revision=1
wrksrc=fotoxx
build_style=gnu-makefile
@@ -13,17 +13,19 @@ 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
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) broken="execinfo.h is a GNU specific header, and doesn’t exist under musl.";;
-esac
+checksum=b7463c9fd9649111d428d68ca93f148650a3702958d83797e693763ce6a17963
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel"
+ export EXECINFO="-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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (5 preceding siblings ...)
2020-01-05 20:10 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-05 20:10 ` voidlinux-github
2020-01-06 18:43 ` voidlinux-github
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-05 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-570937314
Comment:
I tried without, but on GLIBC systems, it does not know -lexecinfo.
Also tried: LDFLAGS=-lexecinfo and LIBS=-lexecinfo but those didn't take.
Edit, have an idea I am going to try
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (6 preceding siblings ...)
2020-01-05 20:10 ` voidlinux-github
@ 2020-01-06 18:43 ` voidlinux-github
2020-01-08 16:53 ` voidlinux-github
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-06 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-571259021
Comment:
@xtraeme Can you relook at this please :)
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (7 preceding siblings ...)
2020-01-06 18:43 ` voidlinux-github
@ 2020-01-08 16:53 ` voidlinux-github
2020-01-08 16:56 ` voidlinux-github
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572159110
Comment:
@ndowens If you change the Makefile to add to LIBS, i.e. `LIBS += ` instead of `LIBS = `, you can then just set `LIBS="-lexecinfo"` in the template and avoid the `EXECINFO` variable which otherwise pollutes the environment.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (8 preceding siblings ...)
2020-01-08 16:53 ` voidlinux-github
@ 2020-01-08 16:56 ` voidlinux-github
2020-01-08 17:11 ` voidlinux-github
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572160042
Comment:
> @ndowens If you change the Makefile to add to LIBS, i.e. `LIBS += ` instead of `LIBS = `, you can then just set `LIBS="-lexecinfo"` in the template and avoid the `EXECINFO` variable which otherwise pollutes the environment.
Will try that at some point today.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (9 preceding siblings ...)
2020-01-08 16:56 ` voidlinux-github
@ 2020-01-08 17:11 ` voidlinux-github
2020-01-08 17:21 ` voidlinux-github
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 17:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572160042
Comment:
> @ndowens If you change the Makefile to add to LIBS, i.e. `LIBS += ` instead of `LIBS = `, you can then just set `LIBS="-lexecinfo"` in the template and avoid the `EXECINFO` variable which otherwise pollutes the environment.
Will try that at some point today.
P.S. Seems a newer version is out, so will update to that as well.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (10 preceding siblings ...)
2020-01-08 17:11 ` voidlinux-github
@ 2020-01-08 17:21 ` voidlinux-github
2020-01-08 17:27 ` voidlinux-github
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 17:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (11 preceding siblings ...)
2020-01-08 17:21 ` voidlinux-github
@ 2020-01-08 17:27 ` voidlinux-github
2020-01-08 18:04 ` voidlinux-github
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 17:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
Edit: I do have an idea to try as an alternative
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (12 preceding siblings ...)
2020-01-08 17:27 ` voidlinux-github
@ 2020-01-08 18:04 ` voidlinux-github
2020-01-08 19:41 ` voidlinux-github
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
Edit: I found a different way to do this, so will have a newer version and requested change uploaded in a little while.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (13 preceding siblings ...)
2020-01-08 18:04 ` voidlinux-github
@ 2020-01-08 19:41 ` voidlinux-github
2020-01-08 20:00 ` voidlinux-github
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
@pullmoll Ok I am not sure how to fix it otherwise, I have been researching a way to check if -lexecinfo works in Makefile or if library exists or headers, or some other method and results I have found, or lack of isn't working.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (14 preceding siblings ...)
2020-01-08 19:41 ` voidlinux-github
@ 2020-01-08 20:00 ` voidlinux-github
2020-01-09 2:28 ` [PR PATCH] [Updated] " voidlinux-github
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-08 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
@pullmoll Ok I am not sure how to fix it otherwise, I have been researching a way to check if -lexecinfo works in Makefile or if library exists or headers, or some other method and results I have found, or lack of isn't working.
Or, not sure if it would work, but add a .pc file to libexecinfo so could add it in the Makefile instead
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (15 preceding siblings ...)
2020-01-08 20:00 ` voidlinux-github
@ 2020-01-09 2:28 ` voidlinux-github
2020-01-09 2:31 ` voidlinux-github
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-09 2:28 UTC (permalink / raw)
To: ml
[-- 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.01 ; 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: 6171 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 00eef646ab2890852e7a5dea46ae97d858c73bc4 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.03 ; Fix musl build
---
srcpkgs/fotoxx/patches/execinfo.patch | 18 ++++++++++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 13 +++++++++++++
srcpkgs/fotoxx/template | 16 ++++++++--------
3 files changed, 39 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..d12f9a1c034
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/execinfo.patch
@@ -0,0 +1,18 @@
+diff --git Makefile Makefile
+index 218aa2d..77ec75e 100644
+--- Makefile
++++ Makefile
+@@ -47,5 +47,5 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
+ -I/usr/include/libchamplain-0.12/
+
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \
++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg $(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 <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
-
-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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (16 preceding siblings ...)
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
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-09 2:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-572170584
Comment:
Ok, I set LIBS = to LIBS += in Makefile and added LIBS="-lexecinfo" but that does not add -lexecinfo into LIBS in Makefile
Also tried doing make_build_args="LIBS=lexecinfo" and that caused way more link errors, as that overwrote the LIBS.
@pullmoll Ok the only other way I know to do this, is to add pkg-config file for libexecinfo(which might be beneficial later on for other pkgs)
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.01 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (17 preceding siblings ...)
2020-01-09 2:31 ` voidlinux-github
@ 2020-01-09 2:52 ` voidlinux-github
2020-01-11 12:13 ` fotoxx: Update to 20.03 " voidlinux-github
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-09 2:52 UTC (permalink / raw)
To: ml
[-- 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.01 ; 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: 6040 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 2ba20017f89e808b5ba430816f2357ac641a833f 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.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 <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
-
-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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.03 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (18 preceding siblings ...)
2020-01-09 2:52 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-11 12:13 ` voidlinux-github
2020-01-11 18:26 ` voidlinux-github
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-573311584
Comment:
Since adding the pkg-config file makes more sense, correcting my hint is redundant.
The problem was/is that `common/build-style/gnu-makefile` does not pass `LIBS="$LIBS"` in `do_build()`. It should probably do that for similar cases for when `make_use_env` is defined.
You could also have tried to set `make_build_args="LIBS=-lexecinfo`` in the template.
Adding the library like `LDFLAGS="-lexecinfo"` should also have worked while IMO this is not good style because `LIBS` is meant to be used for adding libraries, not `LDFLAGS`.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.03 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (19 preceding siblings ...)
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
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-573341955
Comment:
Yea I tried make_build_args but it made it much worse
On Sat, Jan 11, 2020 at 6:13 AM Jürgen Buchmüller <notifications@github.com>
wrote:
> Since adding the pkg-config file makes more sense, correcting my hint is
> redundant.
> The problem was/is that common/build-style/gnu-makefile does not pass
> LIBS="$LIBS" in do_build(). It should probably do that for similar cases
> for when make_use_env is defined.
>
> You could also have tried to set `make_build_args="LIBS=-lexecinfo`` in
> the template.
>
> Adding the library like LDFLAGS="-lexecinfo" should also have worked
> while IMO this is not good style because LIBS is meant to be used for
> adding libraries, not LDFLAGS.
>
> â
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/18045?email_source=notifications&email_token=AAA4X37XI6IQWOHJIZ6CFPTQ5GZVDA5CNFSM4KCZDNLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIWAUYA#issuecomment-573311584>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAA4X36WFLGMQW6IDY7ZFQLQ5GZVDANCNFSM4KCZDNLA>
> .
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.03 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (20 preceding siblings ...)
2020-01-11 18:26 ` voidlinux-github
@ 2020-01-11 18:45 ` voidlinux-github
2020-01-11 19:02 ` voidlinux-github
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-573341955
Comment:
Yea I tried make_build_args but it made it much worse and LDFLAGS was the first thing I tried when I started working on the musl build as well.
On Sat, Jan 11, 2020 at 6:13 AM Jürgen Buchmüller <notifications@github.com>
wrote:
> Since adding the pkg-config file makes more sense, correcting my hint is
> redundant.
> The problem was/is that common/build-style/gnu-makefile does not pass
> LIBS="$LIBS" in do_build(). It should probably do that for similar cases
> for when make_use_env is defined.
>
> You could also have tried to set `make_build_args="LIBS=-lexecinfo`` in
> the template.
>
> Adding the library like LDFLAGS="-lexecinfo" should also have worked
> while IMO this is not good style because LIBS is meant to be used for
> adding libraries, not LDFLAGS.
>
> â
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/18045?email_source=notifications&email_token=AAA4X37XI6IQWOHJIZ6CFPTQ5GZVDA5CNFSM4KCZDNLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIWAUYA#issuecomment-573311584>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAA4X36WFLGMQW6IDY7ZFQLQ5GZVDANCNFSM4KCZDNLA>
> .
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: fotoxx: Update to 20.03 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (21 preceding siblings ...)
2020-01-11 18:45 ` voidlinux-github
@ 2020-01-11 19:02 ` voidlinux-github
2020-01-11 19:49 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/18045#issuecomment-573341955
Comment:
Yea I tried make_build_args but it made it much worse and LDFLAGS was the first thing I tried when I started working on the musl build as well.
It appears to pass the flag with LDFLAGS: http://dpaste.com/3R4Z68D but it doesn't actually cause it to link.
On Sat, Jan 11, 2020 at 6:13 AM Jürgen Buchmüller <notifications@github.com>
wrote:
> Since adding the pkg-config file makes more sense, correcting my hint is
> redundant.
> The problem was/is that common/build-style/gnu-makefile does not pass
> LIBS="$LIBS" in do_build(). It should probably do that for similar cases
> for when make_use_env is defined.
>
> You could also have tried to set `make_build_args="LIBS=-lexecinfo`` in
> the template.
>
> Adding the library like LDFLAGS="-lexecinfo" should also have worked
> while IMO this is not good style because LIBS is meant to be used for
> adding libraries, not LDFLAGS.
>
> â
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/18045?email_source=notifications&email_token=AAA4X37XI6IQWOHJIZ6CFPTQ5GZVDA5CNFSM4KCZDNLKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIWAUYA#issuecomment-573311584>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAA4X36WFLGMQW6IDY7ZFQLQ5GZVDANCNFSM4KCZDNLA>
> .
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.03 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (22 preceding siblings ...)
2020-01-11 19:02 ` voidlinux-github
@ 2020-01-11 19:49 ` voidlinux-github
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
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 19:49 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] fotoxx: Update to 20.04 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (23 preceding siblings ...)
2020-01-11 19:49 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-11 20:12 ` voidlinux-github
2020-01-17 18:04 ` [PR PATCH] [Merged]: " voidlinux-github
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-11 20:12 UTC (permalink / raw)
To: ml
[-- 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.04 ; 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: 6098 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 3f9ccbc76f4bce6aa86dd811b5f9637a4175c08e 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 | 16 +++++++++-------
3 files changed, 39 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..1f05ac946a3 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,19 @@ 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"
+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
}
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Merged]: fotoxx: Update to 20.04 ; Fix musl build
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build voidlinux-github
` (24 preceding siblings ...)
2020-01-11 20:12 ` [PR PATCH] [Updated] fotoxx: Update to 20.04 " voidlinux-github
@ 2020-01-17 18:04 ` voidlinux-github
25 siblings, 0 replies; 27+ messages in thread
From: voidlinux-github @ 2020-01-17 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
There's a merged pull request on the void-packages repository
fotoxx: Update to 20.04 ; Fix musl build
https://github.com/void-linux/void-packages/pull/18045
Description:
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2020-01-17 18:04 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-05 2:50 [PR PATCH] fotoxx: Update to 20.01 ; Fix musl build 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 ` [PR PATCH] [Updated] " voidlinux-github
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
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).