From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 841521386F2 for ; Mon, 10 Aug 2015 21:38:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD518957BF; Mon, 10 Aug 2015 21:38:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B4EB957BF for ; Mon, 10 Aug 2015 21:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 162B6340967 for ; Mon, 10 Aug 2015 21:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5640D144 for ; Mon, 10 Aug 2015 21:38:45 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1439242697.c28cf799ee244b6b75999924f1d04cff9060f58d.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/netsurf/files/netsurf-3.2-glibc2.20.patch www-client/netsurf/files/netsurf-3.3-CFLAGS.patch www-client/netsurf/netsurf-3.3-r1.ebuild X-VCS-Directories: www-client/netsurf/ www-client/netsurf/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: c28cf799ee244b6b75999924f1d04cff9060f58d X-VCS-Branch: master Date: Mon, 10 Aug 2015 21:38:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fbf4c64d-b864-497f-a0dd-103aca96da8b X-Archives-Hash: 91954c2767d9f84d158e7251a5efc7a7 commit: c28cf799ee244b6b75999924f1d04cff9060f58d Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Aug 10 21:38:04 2015 +0000 Commit: Sergei Trofimovich gentoo 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