* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
@ 2019-12-27 2:51 ` voidlinux-github
2019-12-27 2:52 ` voidlinux-github
` (6 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 2:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3206 bytes --]
From 09ea471bdd24f973d96d44cd24b72360d8e1a6d2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 8 +++++--
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..a822ae33dea 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,9 +15,13 @@ 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.";;
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel"
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch
esac
+}
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
2019-12-27 2:51 ` [PR PATCH] [Updated] fotoxx: fix build on musl voidlinux-github
@ 2019-12-27 2:52 ` voidlinux-github
2019-12-27 2:53 ` voidlinux-github
` (5 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 2:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3209 bytes --]
From 4ee6ca584f3d8577e8b0952b01f7febc6f61efc8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 8 +++++--
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..1f345844b0c 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,9 +15,13 @@ 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.";;
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel"
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch ;;
esac
+}
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
2019-12-27 2:51 ` [PR PATCH] [Updated] fotoxx: fix build on musl voidlinux-github
2019-12-27 2:52 ` voidlinux-github
@ 2019-12-27 2:53 ` voidlinux-github
2019-12-27 2:53 ` voidlinux-github
` (4 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3359 bytes --]
From ea763c93e146069e616f364f8803caed63530c2d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 12 ++++++----
3 files changed, 46 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..d153f8627d7 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,14 +15,18 @@ 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
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel"
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch ;;
+esac
+}
+
post_install() {
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
rm -rv ${DESTDIR}/usr/share/appdata
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
` (2 preceding siblings ...)
2019-12-27 2:53 ` voidlinux-github
@ 2019-12-27 2:53 ` voidlinux-github
2019-12-27 4:27 ` voidlinux-github
` (3 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3360 bytes --]
From a22cb55ec7d8819c032fff550d412fe6c1d94e02 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 12 ++++++----
3 files changed, 46 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..3d4649ed146 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,14 +15,18 @@ 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
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ makedepends+=" libexecinfo-devel"
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch ;;
+ esac
+}
+
post_install() {
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
rm -rv ${DESTDIR}/usr/share/appdata
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
` (3 preceding siblings ...)
2019-12-27 2:53 ` voidlinux-github
@ 2019-12-27 4:27 ` voidlinux-github
2019-12-27 9:41 ` voidlinux-github
` (2 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3423 bytes --]
From be8faf9a1e5d03a7481c09e34ee8156b2d9926a0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 16 +++++++++----
3 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..86f0d07f925 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,14 +15,22 @@ 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
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo";;
+esac
+
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch ;;
+ esac
+}
+
post_install() {
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
rm -rv ${DESTDIR}/usr/share/appdata
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
` (4 preceding siblings ...)
2019-12-27 4:27 ` voidlinux-github
@ 2019-12-27 9:41 ` voidlinux-github
2020-01-01 2:34 ` voidlinux-github
2020-01-05 2:00 ` [PR PATCH] [Closed]: " voidlinux-github
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-12-27 9:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3401 bytes --]
From 814d3efcf58fcbb6bfaf1c092df4f1b0854f393c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 14 ++++++++----
3 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..00e92847094 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,14 +15,20 @@ 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
-
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_link.patch ;;
+ esac
+}
+
post_install() {
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
rm -rv ${DESTDIR}/usr/share/appdata
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
` (5 preceding siblings ...)
2019-12-27 9:41 ` voidlinux-github
@ 2020-01-01 2:34 ` voidlinux-github
2020-01-05 2:00 ` [PR PATCH] [Closed]: " voidlinux-github
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-01 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 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/17717
fotoxx: fix build on musl
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17717.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fotoxx-17717.patch --]
[-- Type: text/x-diff, Size: 3423 bytes --]
From be8faf9a1e5d03a7481c09e34ee8156b2d9926a0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 22 Dec 2019 21:33:27 -0600
Subject: [PATCH] fotoxx: fix build on musl
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/fotoxx/files/libexecinfo_link.patch | 13 +++++++++++
srcpkgs/fotoxx/patches/musl_build.patch | 25 +++++++++++++++++++++
srcpkgs/fotoxx/template | 16 +++++++++----
3 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/fotoxx/files/libexecinfo_link.patch
create mode 100644 srcpkgs/fotoxx/patches/musl_build.patch
diff --git a/srcpkgs/fotoxx/files/libexecinfo_link.patch b/srcpkgs/fotoxx/files/libexecinfo_link.patch
new file mode 100644
index 00000000000..858d9c3c869
--- /dev/null
+++ b/srcpkgs/fotoxx/files/libexecinfo_link.patch
@@ -0,0 +1,13 @@
+diff --git Makefile Makefile
+index e191e72..6922391 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 -lraw -ljpeg \
++ -lrt -lexecinfo -lpthread -llcms2 -ltiff -lpng -lraw -ljpeg \
+ -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 \
diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch
new file mode 100644
index 00000000000..29a6e7f302b
--- /dev/null
+++ b/srcpkgs/fotoxx/patches/musl_build.patch
@@ -0,0 +1,25 @@
+diff --git f.file.cc f.file.cc
+index ef8d59a..de26b74 100644
+--- f.file.cc
++++ f.file.cc
+@@ -3344,16 +3344,17 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit)
+
+ globflags = GLOB_NOSORT;
+ Fimages = Fthumbs = Fdirs = Frecurse = 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;
+-
++
++#ifdef __GLIBC__
+ 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..86f0d07f925 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -15,14 +15,22 @@ 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
-
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libchamplain-devel"
fi
+case "$XBPS_TARGET_LIBC" in
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo";;
+esac
+
+pre_build() {
+ case "$XBPS_TARGET_LIBC" in
+ musl)
+ patch -Np0 < "$FILESDIR"/libexecinfo_link.patch ;;
+ esac
+}
+
post_install() {
rm -v ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man}
rm -rv ${DESTDIR}/usr/share/appdata
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Closed]: fotoxx: fix build on musl
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17717@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-01-01 2:34 ` voidlinux-github
@ 2020-01-05 2:00 ` voidlinux-github
7 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-05 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
There's a closed pull request on the void-packages repository
fotoxx: fix build on musl
https://github.com/void-linux/void-packages/pull/17717
Description:
I do not have a musl system, if someone can test to see if this will run fine
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread