[gentoo-commits] gentoo-x86 commit in www-client/uzbl/files: uzbl-9999-makefile-cleanup.patch - gentoo-commits

From:	"Alex Alexander (wired)" <wired@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in www-client/uzbl/files: uzbl-9999-makefile-cleanup.patch
Date:	Wed, 27 Jan 2010 15:33:14
Message-Id:	`E1Na9tG-00086q-1e@stork.gentoo.org`

1

wired       10/01/27 15:33:10

2

3

  Modified:             uzbl-9999-makefile-cleanup.patch

4

  Log:

5

  fixed live ebuild && patch - bug 302331

6

  (Portage version: 2.2_rc61/cvs/Linux x86_64)

7

8

Revision  Changes    Path

9

1.7                  www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch

10

11

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?rev=1.7&view=markup

12

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?rev=1.7&content-type=text/plain

13

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?r1=1.6&r2=1.7

14

15

Index: uzbl-9999-makefile-cleanup.patch

16

===================================================================

17

RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch,v

18

retrieving revision 1.6

19

retrieving revision 1.7

20

diff -u -r1.6 -r1.7

21

--- uzbl-9999-makefile-cleanup.patch	20 Dec 2009 18:26:31 -0000	1.6

22

+++ uzbl-9999-makefile-cleanup.patch	27 Jan 2010 15:33:09 -0000	1.7

23

@@ -1,39 +1,38 @@

24

---- Makefile.old	2009-12-05 19:22:12.079131232 +0200

25

-+++ Makefile	2009-12-05 19:24:51.863115587 +0200

26

+--- Makefile.orig	2010-01-27 17:28:15.809737445 +0200

27

++++ Makefile	2010-01-27 17:28:12.985756931 +0200

28

 @@ -1,7 +1,7 @@

29

  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html

30

31

--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

32

--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

33

-+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 

34

-+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

35

+-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

36

+-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

37

++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

38

++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

39

40

  LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)

41

  LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)

42

-@@ -32,10 +32,6 @@

43

+@@ -34,9 +34,6 @@

44

  	@echo LINKING object files

45

  	@${CC} -o $@ ${OBJ} ${LDFLAGS}

46

  	@echo ... done.

47

 -	@echo Stripping binary

48

 -	@strip $@

49

 -	@echo ... done.

50

--

51

52

- uzbl-browser: uzbl-core

53

54

-@@ -88,14 +84,10 @@

55

+ uzbl-browser: uzbl-core

56

+@@ -96,14 +93,10 @@

57

58

  install-uzbl-core: all

59

  	install -d $(INSTALLDIR)/bin

60

 -	install -d $(INSTALLDIR)/share/uzbl/docs

61

  	install -d $(INSTALLDIR)/share/uzbl/examples

62

--	cp -rp docs     $(INSTALLDIR)/share/uzbl/

63

--	cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/

64

-+	cp -rp config.h $(INSTALLDIR)/share/uzbl/

65

- 	cp -rp examples $(INSTALLDIR)/share/uzbl/

66

+-	cp -rp docs         $(INSTALLDIR)/share/uzbl/

67

+-	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/

68

++	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/

69

+ 	cp -rp examples     $(INSTALLDIR)/share/uzbl/

70

  	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core

71

 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs

72

 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs

73

- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config

74

+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config

75

76

- install-uzbl-browser: all

77

+ install-uzbl-browser:

1	wired 10/01/27 15:33:10
2
3	Modified: uzbl-9999-makefile-cleanup.patch
4	Log:
5	fixed live ebuild && patch - bug 302331
6	(Portage version: 2.2_rc61/cvs/Linux x86_64)
7
8	Revision Changes Path
9	1.7 www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?rev=1.7&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?rev=1.7&content-type=text/plain
13	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch?r1=1.6&r2=1.7
14
15	Index: uzbl-9999-makefile-cleanup.patch
16	===================================================================
17	RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch,v
18	retrieving revision 1.6
19	retrieving revision 1.7
20	diff -u -r1.6 -r1.7
21	--- uzbl-9999-makefile-cleanup.patch 20 Dec 2009 18:26:31 -0000 1.6
22	+++ uzbl-9999-makefile-cleanup.patch 27 Jan 2010 15:33:09 -0000 1.7
23	@@ -1,39 +1,38 @@
24	---- Makefile.old 2009-12-05 19:22:12.079131232 +0200
25	-+++ Makefile 2009-12-05 19:24:51.863115587 +0200
26	+--- Makefile.orig 2010-01-27 17:28:15.809737445 +0200
27	++++ Makefile 2010-01-27 17:28:12.985756931 +0200
28	@@ -1,7 +1,7 @@
29	# first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
30
31	--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
32	--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
33	-+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
34	-+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
35	+-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
36	+-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
37	++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
38	++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
39
40	LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
41	LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
42	-@@ -32,10 +32,6 @@
43	+@@ -34,9 +34,6 @@
44	@echo LINKING object files
45	@${CC} -o $@ ${OBJ} ${LDFLAGS}
46	@echo ... done.
47	- @echo Stripping binary
48	- @strip $@
49	- @echo ... done.
50	--
51
52	- uzbl-browser: uzbl-core
53
54	-@@ -88,14 +84,10 @@
55	+ uzbl-browser: uzbl-core
56	+@@ -96,14 +93,10 @@
57
58	install-uzbl-core: all
59	install -d $(INSTALLDIR)/bin
60	- install -d $(INSTALLDIR)/share/uzbl/docs
61	install -d $(INSTALLDIR)/share/uzbl/examples
62	-- cp -rp docs $(INSTALLDIR)/share/uzbl/
63	-- cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/
64	-+ cp -rp config.h $(INSTALLDIR)/share/uzbl/
65	- cp -rp examples $(INSTALLDIR)/share/uzbl/
66	+- cp -rp docs $(INSTALLDIR)/share/uzbl/
67	+- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
68	++ cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
69	+ cp -rp examples $(INSTALLDIR)/share/uzbl/
70	install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
71	- install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs
72	- install -m644 README $(INSTALLDIR)/share/uzbl/docs
73	- sed -i 's#^set prefix.=.#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
74	+ sed -i 's#^set prefix.=.#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
75
76	- install-uzbl-browser: all
77	+ install-uzbl-browser:

Gentoo Archives: gentoo-commits