diff options
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/uzbl/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch | 31 | ||||
| -rw-r--r-- | www-client/uzbl/uzbl-9999.ebuild | 6 |
3 files changed, 23 insertions, 20 deletions
diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog index 550010001594..dc0b7237885f 100644 --- a/www-client/uzbl/ChangeLog +++ b/www-client/uzbl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/uzbl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.17 2010/01/05 20:35:59 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.18 2010/01/27 15:33:08 wired Exp $ + + 27 Jan 2010; Alex Alexander <wired@gentoo.org> uzbl-9999.ebuild, + files/uzbl-9999-makefile-cleanup.patch: + fixed live ebuild && patch - bug 302331 *uzbl-2010.01.05 (05 Jan 2010) diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch index 73561349986d..a0cf9506dad3 100644 --- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch +++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch @@ -1,39 +1,38 @@ ---- Makefile.old 2009-12-05 19:22:12.079131232 +0200 -+++ Makefile 2009-12-05 19:24:51.863115587 +0200 +--- Makefile.orig 2010-01-27 17:28:15.809737445 +0200 ++++ Makefile 2010-01-27 17:28:12.985756931 +0200 @@ -1,7 +1,7 @@ # first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html --CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic --CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic +-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic +-CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ++CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS) -@@ -32,10 +32,6 @@ +@@ -34,9 +34,6 @@ @echo LINKING object files @${CC} -o $@ ${OBJ} ${LDFLAGS} @echo ... done. - @echo Stripping binary - @strip $@ - @echo ... done. -- - uzbl-browser: uzbl-core -@@ -88,14 +84,10 @@ + uzbl-browser: uzbl-core +@@ -96,14 +93,10 @@ install-uzbl-core: all install -d $(INSTALLDIR)/bin - install -d $(INSTALLDIR)/share/uzbl/docs install -d $(INSTALLDIR)/share/uzbl/examples -- cp -rp docs $(INSTALLDIR)/share/uzbl/ -- cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/ -+ cp -rp config.h $(INSTALLDIR)/share/uzbl/ - cp -rp examples $(INSTALLDIR)/share/uzbl/ +- cp -rp docs $(INSTALLDIR)/share/uzbl/ +- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/ ++ cp -rp src/config.h $(INSTALLDIR)/share/uzbl/ + cp -rp examples $(INSTALLDIR)/share/uzbl/ install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core - install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs - install -m644 README $(INSTALLDIR)/share/uzbl/docs - sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config + sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config - install-uzbl-browser: all + install-uzbl-browser: diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild index 2993d77de129..6e5ce03342bb 100644 --- a/www-client/uzbl/uzbl-9999.ebuild +++ b/www-client/uzbl/uzbl-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.8 2009/12/12 10:06:32 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.9 2010/01/27 15:33:08 wired Exp $ EAPI="2" @@ -89,7 +89,7 @@ src_prepare() { # adjust path in default config file to /usr/share sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \ - examples/config/uzbl/config || + examples/config/config || die "config path sed failed" } |