summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2014-11-18 13:51:26 +0000
committerMichael Weber <xmw@gentoo.org>2014-11-18 13:51:26 +0000
commitbddfc839691271bf20af7d67ac140b8e25824344 (patch)
treee3c4e171c4d400b11ba109d0737a6735a2a889d4 /dev-libs/libnsfb
parentCleanup unused patches. (diff)
downloadgentoo-2-bddfc839691271bf20af7d67ac140b8e25824344.tar.gz
gentoo-2-bddfc839691271bf20af7d67ac140b8e25824344.tar.bz2
gentoo-2-bddfc839691271bf20af7d67ac140b8e25824344.zip
Re-add keywords, bug 529594 was due a skipped cvs commit.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'dev-libs/libnsfb')
-rw-r--r--dev-libs/libnsfb/ChangeLog6
-rw-r--r--dev-libs/libnsfb/files/libnsfb-0.1.2-glibc2.20.patch13
-rw-r--r--dev-libs/libnsfb/libnsfb-0.1.2.ebuild20
3 files changed, 35 insertions, 4 deletions
diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog
index dd5a9086ddff..55694b82fade 100644
--- a/dev-libs/libnsfb/ChangeLog
+++ b/dev-libs/libnsfb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libnsfb
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.11 2014/11/17 03:44:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.12 2014/11/18 13:51:26 xmw Exp $
+
+ 18 Nov 2014; Michael Weber <xmw@gentoo.org>
+ +files/libnsfb-0.1.2-glibc2.20.patch, libnsfb-0.1.2.ebuild:
+ Re-add keywords, bug 529594 was due a skipped cvs commit.
17 Nov 2014; Patrick Lauer <patrick@gentoo.org> libnsfb-0.1.2.ebuild:
Remove keywords until weirdness is fixed #529594
diff --git a/dev-libs/libnsfb/files/libnsfb-0.1.2-glibc2.20.patch b/dev-libs/libnsfb/files/libnsfb-0.1.2-glibc2.20.patch
new file mode 100644
index 000000000000..0900166cc0ee
--- /dev/null
+++ b/dev-libs/libnsfb/files/libnsfb-0.1.2-glibc2.20.patch
@@ -0,0 +1,13 @@
+--- libnsfb-0.1.2/Makefile
++++ libnsfb-0.1.2/Makefile
+@@ -20,8 +20,8 @@
+ # would like these flags but gcc earlier than 4.4 fail
+ #-pedantic -Wno-overlength-strings # For nsglobe.c
+
+-CFLAGS := -g -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \
+- -I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) -Wno-error
++CFLAGS := -g -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L \
++ -I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+
+ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
+
diff --git a/dev-libs/libnsfb/libnsfb-0.1.2.ebuild b/dev-libs/libnsfb/libnsfb-0.1.2.ebuild
index f85dee33b213..615ae44d171d 100644
--- a/dev-libs/libnsfb/libnsfb-0.1.2.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.1.2.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.2.ebuild,v 1.2 2014/11/17 03:44:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.2.ebuild,v 1.3 2014/11/18 13:51:26 xmw Exp $
EAPI=5
+NETSURF_BUILDSYSTEM=buildsystem-1.2
inherit netsurf
DESCRIPTION="framebuffer abstraction library, written in C"
@@ -11,7 +12,7 @@ HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm"
IUSE="sdl test vnc wayland xcb"
RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
@@ -23,5 +24,18 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] )
>=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch
+ "${FILESDIR}"/${P}-glibc2.20.patch )
+
DOCS=( usage )
+
+src_configure() {
+ netsurf_src_configure
+
+ netsurf_makeconf+=(
+ WITH_VNC=$(usex vnc)
+ WITH_SDL=$(usex sdl)
+ WITH_XCB=$(usex xcb)
+ WITH_WLD=$(usex wayland)
+ )
+}