commit: c28cf799ee244b6b75999924f1d04cff9060f58d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 21:38:04 2015 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 21:38:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28cf799
www-client/netsurf: fix 'src_install' failure, bug #552562
- do not drop _BSD_SOURCE define as 'timeradd' is defined
only under _BSD_SOURCE on old glibc
- use nullglob when we install single binary, bug #552562
by Anthony Parsons, w0rm and others.
Package-Manager: portage-2.2.20
www-client/netsurf/files/netsurf-3.2-glibc2.20.patch | 6 +++---
www-client/netsurf/files/netsurf-3.3-CFLAGS.patch | 4 ++--
www-client/netsurf/netsurf-3.3-r1.ebuild | 12 ++++++++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
index e63ec70..b521aeb 100644
--- a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
+++ b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
@@ -5,7 +5,7 @@
CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
$(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
@@ -16,7 +16,7 @@
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
$(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
@@ -24,7 +24,7 @@
+++ netsurf-3.2/test/Makefile
@@ -1,4 +1,4 @@
-CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
-+CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
diff --git a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
index 3f1c216..7a3f234 100644
--- a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
+++ b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
@@ -57,7 +57,7 @@
+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
$(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
@@ -65,7 +65,7 @@
+++ netsurf-3.3/test/Makefile
@@ -1,8 +1,8 @@
-CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
-+CFLAGS := -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
++CFLAGS := -std=c99 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \
$(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz
diff --git a/www-client/netsurf/netsurf-3.3-r1.ebuild
b/www-client/netsurf/netsurf-3.3-r1.ebuild
index 6d32981..8e7d6a6 100644
--- a/www-client/netsurf/netsurf-3.3-r1.ebuild
+++ b/www-client/netsurf/netsurf-3.3-r1.ebuild
@@ -119,7 +119,11 @@ src_install() {
netsurf_src_install
elog "framebuffer binary has been installed as netsurf-fb"
pushd "${ED}"usr/bin >/dev/null || die
- for f in netsurf{,.*} ; do
+ eshopts_push -s nullglob
+ # bug 552562
+ local binaries=(netsurf{,.*})
+ eshopts_pop
+ for f in "${binaries[@]}" ; do
mv -v $f ${f/netsurf/netsurf-fb} || die
make_desktop_entry
"${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf}
netsurf "Network;WebBrowser"
done
@@ -134,7 +138,11 @@ src_install() {
netsurf_src_install
elog "netsurf gtk version has been installed as netsurf-gtk"
pushd "${ED}"usr/bin >/dev/null || die
- for f in netsurf{,.*} ; do
+ eshopts_push -s nullglob
+ # bug 552562
+ local binaries=(netsurf{,.*})
+ eshopts_pop
+ for f in "${binaries[@]}" ; do
mv -v $f ${f/netsurf/netsurf-gtk} || die
make_desktop_entry
"${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf
"Network;WebBrowser"
done
