From: David Shakaryan Date: Mon, 18 Feb 2008 00:29:59 +0000 (+0000) Subject: Fix flags; thanks to Arfrever Frehtes Taifersar Arahesis. (bug #210506) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=098a4759ff644af280b3a0fe7268e74cbffc2e6b;p=gentoo.git Fix flags; thanks to Arfrever Frehtes Taifersar Arahesis. (bug #210506) Package-Manager: portage-2.1.4.4 --- diff --git a/x11-misc/obpager/ChangeLog b/x11-misc/obpager/ChangeLog index 89e60315b512..f51f9f25fe6b 100644 --- a/x11-misc/obpager/ChangeLog +++ b/x11-misc/obpager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/obpager -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/ChangeLog,v 1.9 2007/11/27 21:21:50 angelos Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/ChangeLog,v 1.10 2008/02/18 00:29:58 omp Exp $ + + 18 Feb 2008; David Shakaryan + +files/obpager-1.8-as-needed.patch, obpager-1.8.ebuild: + Fix flags; thanks to Arfrever Frehtes Taifersar Arahesis. (bug #210506) 27 Nov 2007; Christoph Mende obpager-1.8.ebuild: Added ~amd64 diff --git a/x11-misc/obpager/Manifest b/x11-misc/obpager/Manifest index b0bb4403dce0..d6eea2db6fe4 100644 --- a/x11-misc/obpager/Manifest +++ b/x11-misc/obpager/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX obpager-1.8-as-needed.patch 595 RMD160 97ff9c6f116ee2ada9e824858d65770991f8d396 SHA1 f7ce28bd59f0c0fc1fec2e5087c9e6c844fd7242 SHA256 5685a8cca151db8f3b45551957a62e331707923ff7a2b2d88df38f7969ebd7c2 DIST obpager-1.8.tar.gz 23773 RMD160 45ca48aa8745fae522e7b0caf7b5a99d956e5413 SHA1 e97ecf8f44d5b787cdb5bfa853ab76eac919323a SHA256 160b688d757b577ae0e2c3c47f2e2504fafe35f2bfa224e344797d0953d35dc9 -EBUILD obpager-1.8.ebuild 822 RMD160 f5811684ded7817aaa015df205132c8fd06bd53c SHA1 556ecf1a977bda56b931b407c905d4849c4b5c8e SHA256 183a6a89da6235ad9165bcc1b48cd3c23c362c675e7b7edc2fd8b561748124c7 -MISC ChangeLog 1257 RMD160 ffa5871c358bf34f6e5850895abd843785a87041 SHA1 9afb835f8e6797ad0ee94b39a2ba79a91ad26b76 SHA256 a7a9ba93e9bc8a9ac063740139ad7a57cd3ce8dc43fa50e8dccb70d7809c2070 +EBUILD obpager-1.8.ebuild 878 RMD160 a668e9b4c4cf3cc0cc6d3585c011dceba52cc03a SHA1 e79eb37ad86d210d97e1a39d9f3e2140319f7cad SHA256 3f07c0d2724a833172e5239c5e6e1bb549aeeebdb26c8772743d928308003492 +MISC ChangeLog 1435 RMD160 7af0568783f62d16a51764126d5c11646896c752 SHA1 1501f51d67517b97889e87c12321e5bc350defd0 SHA256 873c9a978f6cdbf2e46bdb3f38ebba4ef22ebbfafe04ceeb530bd0e14a02b5f8 MISC metadata.xml 313 RMD160 efa9a7e5a28661291f22d7630180bdaf78d36975 SHA1 da5ce48ae19dca2621a0a07d5d75211eb681070d SHA256 b0b932eaf667db6c69049ee0f7f8f59f8cdbb35cd6af36503447e850f94bb5b4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHuNGZvSApE0uP4UsRAoz8AJwJgIgAlhRkKfazqInckS/Q3WyOgACfehdD +CQA6WJMhTu08BKNZm4NejlM= +=koX3 +-----END PGP SIGNATURE----- diff --git a/x11-misc/obpager/files/obpager-1.8-as-needed.patch b/x11-misc/obpager/files/obpager-1.8-as-needed.patch new file mode 100644 index 000000000000..e8399b357177 --- /dev/null +++ b/x11-misc/obpager/files/obpager-1.8-as-needed.patch @@ -0,0 +1,22 @@ +--- Makefile ++++ Makefile +@@ -16,8 +16,8 @@ + CPPFLAGS = -ggdb -Wall + #CPPFLAGS = -ggdb -Wall -O2 + INCLUDES = -I/usr/X11R6/include/X11 -I/usr/X11R6/include/X11/extensions -I./src +-COMPILE = $(CXX) $(CDEFS) $(INCLUDES) $(CPPFLAGS) +-LINK = $(CXX) $(LDFLAGS) $(LDLIBS) ++COMPILE = $(CXX) $(CDEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) ++LINK = $(CXX) $(LDFLAGS) + LDLIBS = -L/usr/X11R6/lib -lX11 -lXext + + +@@ -46,7 +46,7 @@ + + $(EXECUTABLE): $(OBJS) + @echo "Linking "$@ ;\ +- $(LINK) -o $(EXECUTABLE) $(OBJS) ++ $(LINK) -o $(EXECUTABLE) $(OBJS) $(LDLIBS) + + install: + @echo "Installing obpager...." ;\ diff --git a/x11-misc/obpager/obpager-1.8.ebuild b/x11-misc/obpager/obpager-1.8.ebuild index 2d71999f49f7..6effa53456e0 100644 --- a/x11-misc/obpager/obpager-1.8.ebuild +++ b/x11-misc/obpager/obpager-1.8.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/obpager-1.8.ebuild,v 1.10 2007/11/27 21:21:50 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/obpager/obpager-1.8.ebuild,v 1.11 2008/02/18 00:29:58 omp Exp $ + +inherit eutils DESCRIPTION="Lightweight pager designed to be used with NetWM-compliant window manager" HOMEPAGE="http://obpager.sourceforge.net/" @@ -21,6 +23,8 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}-as-needed.patch" + # this makes it compile :-) sed -i -e '18s/^.*$/#include /' src/main.cc sed -i -e 's,X11R6/,,g' Makefile