summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-02-03 09:35:14 +0000
committerAlex Alexander <wired@gentoo.org>2010-02-03 09:35:14 +0000
commit5d7dc675055511e7332b6c28164fa7c34f519aec (patch)
treed3a054f723b518cbe9c037cd5b9cc14181d048a3 /www-client/uzbl/files
parentMarked ~x86-macos and ~ppc-macos, 1.2.0 is masked due to compilation failures. (diff)
downloadgentoo-2-5d7dc675055511e7332b6c28164fa7c34f519aec.tar.gz
gentoo-2-5d7dc675055511e7332b6c28164fa7c34f519aec.tar.bz2
gentoo-2-5d7dc675055511e7332b6c28164fa7c34f519aec.zip
uzbl-2010.02.02 version bump
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'www-client/uzbl/files')
-rw-r--r--www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
new file mode 100644
index 000000000000..dc1f0a89f057
--- /dev/null
+++ b/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig 2010-02-03 11:20:21.616804753 +0200
++++ Makefile 2010-02-03 11:21:17.385747630 +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 ./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)
+@@ -100,14 +100,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 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/config
+
+ install-uzbl-browser: