updated makefile patch

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 11 insertions, 7 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 13a78a7f4f95..c1265787f915 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.13 2009/12/16 07:42:15 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.14 2009/12/20 18:26:30 wired Exp $
+
+  20 Dec 2009; Alex Alexander <wired@gentoo.org>
+  files/uzbl-9999-makefile-cleanup.patch:
+  updated makefile patch
 
   16 Dec 2009; Alex Alexander <wired@gentoo.org>
   files/uzbl-9999-makefile-cleanup.patch:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 133361aca5a1..4025e549d24c 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,7 +1,7 @@
-AUX uzbl-9999-makefile-cleanup.patch 2352 RMD160 863646859c860653a6a40eb5d7b0d5b1a08c65c7 SHA1 45ab03252aefec78db5f97b2ea44459a7ae4568e SHA256 2de000d44bf332ec9a9f5ff126eea3c0a8689031ef686c6bf9143806dc77d001
+AUX uzbl-9999-makefile-cleanup.patch 2252 RMD160 b15afc7e602c8212e24d0f1ec791cbedf0314581 SHA1 cd3a2eb545e8747e63b6bb8d0f2bbea550ca52de SHA256 c1e7d25c8e2da937a746945c16f19b0bbc9078ea0426004b6ae1a113affba7b1
 AUX uzbl-makefile-cleanup.patch 2737 RMD160 f507286836df2c37f18f172b6ce01de55036524b SHA1 636d54fb4e776f7b0225b1981b24f963c0abca41 SHA256 48360118ff3b433affda66aee8c3d88d838c7169387373c3a632651d9a1cb268
 DIST uzbl-0_pre20091130.tar.gz 131275 RMD160 f5e38a1be15e25c3fe9e12acb5f0c2c45428daa6 SHA1 8b693deec92c9ead53dce2d4f86282a49214008c SHA256 0b09bb22903da53dd04abe0344696d31b3908540249d5d0fa592c36bac79f3f2
 EBUILD uzbl-0_pre20091130-r1.ebuild 2672 RMD160 1d45c89c0d31fcb82c74b0fd444bd81c7e0a5537 SHA1 6181181cb1f3ffaf1389d7fb6d01e43cc74eba68 SHA256 2405b6e03b058beb400607aba2f3175789c740d10801fa125e59d8913b2a8ac6
 EBUILD uzbl-9999.ebuild 2632 RMD160 1d3077f20701d2698670cf2ab7d2bc580ee656f9 SHA1 ad0c05da6fd8acd7a5805b7b196cc9e85528cb41 SHA256 4a0977c5f784bfb8d9db6ba90acfbee5284a81706bc38213a75e7bffbc412e63
-MISC ChangeLog 2493 RMD160 5c1c39d379f97ba4ebd2ce927faf4efa364c7a52 SHA1 719827f9e01c2e960f43ac48d4127a2c5c7b9d14 SHA256 1d5e32bfa9c104856674980f00f2592bc698b2e5ac29ed4012b20c9a7a76cb21
+MISC ChangeLog 2610 RMD160 3a585936b4447180e45eb7701e331442cf224e89 SHA1 51d1ea98c3eb017674c75871ac3c31cc26359086 SHA256 9e7933c1553bf6a4e26e21af67fe66f6c0f83827a6acc452285bc40cb7ebc679
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
index 9f72a95d1c22..73561349986d 100644
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
@@ -3,10 +3,10 @@
 @@ -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 git log | head -n1 | sed "s/.* //")\"" $(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='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(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 git log | head -n1 | sed "s/.* //")\"" $(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='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(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 ./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
  
  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)