1 |
commit: 83e529a3c3b7f7c6ad88338e0211a9c680718c4a |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 28 07:36:18 2015 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 07:38:46 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e529a3 |
7 |
|
8 |
www-client/surf: Version bump. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
www-client/surf/Manifest | 1 + |
13 |
www-client/surf/files/surf-0.7-gentoo.patch | 84 +++++++++++++++++++++++++++++ |
14 |
www-client/surf/surf-0.7.ebuild | 71 ++++++++++++++++++++++++ |
15 |
3 files changed, 156 insertions(+) |
16 |
|
17 |
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest |
18 |
index cea1d6f..18ff0ad 100644 |
19 |
--- a/www-client/surf/Manifest |
20 |
+++ b/www-client/surf/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99 |
23 |
+DIST surf-0.7.tar.gz 18792 SHA256 95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a SHA512 a6a0e172d99f8ce5a7eb63bd34ef3e55ae26059cc94148cf7c50ac665a5e64d90f4a6b1e71b73c1fa763dfaef9b50aaae79e924724f564b2ddf2b8aef4268ff6 WHIRLPOOL 6dbda75a102e108fb0d2910018b0b622189d3729326ba7ce69c4995c599f0d041bc5add771bdd27444752b6e627fcff6c546259e8605189f465e825578a9949b |
24 |
|
25 |
diff --git a/www-client/surf/files/surf-0.7-gentoo.patch b/www-client/surf/files/surf-0.7-gentoo.patch |
26 |
new file mode 100644 |
27 |
index 0000000..0be4598 |
28 |
--- /dev/null |
29 |
+++ b/www-client/surf/files/surf-0.7-gentoo.patch |
30 |
@@ -0,0 +1,84 @@ |
31 |
+--- a/config.mk |
32 |
++++ b/config.mk |
33 |
+@@ -4,27 +4,27 @@ |
34 |
+ # Customize below to fit your system |
35 |
+ |
36 |
+ # paths |
37 |
+-PREFIX = /usr/local |
38 |
++PREFIX = /usr |
39 |
+ MANPREFIX = ${PREFIX}/share/man |
40 |
+ |
41 |
+-X11INC = /usr/X11R6/include |
42 |
+-X11LIB = /usr/X11R6/lib |
43 |
++X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
44 |
++X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
45 |
+ |
46 |
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` |
47 |
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` |
48 |
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0) |
49 |
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0) |
50 |
+ |
51 |
+ # includes and libs |
52 |
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} |
53 |
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 |
54 |
++INCS = -I. -I/usr/include ${X11INC} ${GTKINC} |
55 |
++LIBS = ${X11LIB} ${GTKLIB} |
56 |
+ |
57 |
+ # flags |
58 |
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE |
59 |
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
60 |
+-LDFLAGS = -g ${LIBS} |
61 |
++CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} |
62 |
++LDFLAGS = ${LIBS} |
63 |
+ |
64 |
+ # Solaris |
65 |
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
66 |
+ #LDFLAGS = ${LIBS} |
67 |
+ |
68 |
+ # compiler and linker |
69 |
+-CC = cc |
70 |
++CC ?= cc |
71 |
+--- a/Makefile |
72 |
++++ b/Makefile |
73 |
+@@ -15,18 +15,16 @@ |
74 |
+ @echo "CC = ${CC}" |
75 |
+ |
76 |
+ .c.o: |
77 |
+- @echo CC $< |
78 |
+- @${CC} -c ${CFLAGS} $< |
79 |
++ ${CC} -c ${CFLAGS} $< |
80 |
+ |
81 |
+ ${OBJ}: config.h config.mk |
82 |
+ |
83 |
+ config.h: |
84 |
+ @echo creating $@ from config.def.h |
85 |
+- @cp config.def.h $@ |
86 |
++ cp config.def.h $@ |
87 |
+ |
88 |
+ surf: ${OBJ} |
89 |
+- @echo CC -o $@ |
90 |
+- @${CC} -o $@ surf.o ${LDFLAGS} |
91 |
++ ${CC} -o $@ surf.o ${LDFLAGS} |
92 |
+ |
93 |
+ clean: |
94 |
+ @echo cleaning |
95 |
+@@ -44,13 +42,13 @@ |
96 |
+ |
97 |
+ install: all |
98 |
+ @echo installing executable file to ${DESTDIR}${PREFIX}/bin |
99 |
+- @mkdir -p ${DESTDIR}${PREFIX}/bin |
100 |
+- @cp -f surf ${DESTDIR}${PREFIX}/bin |
101 |
+- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
102 |
++ mkdir -p ${DESTDIR}${PREFIX}/bin |
103 |
++ cp -f surf ${DESTDIR}${PREFIX}/bin |
104 |
++ chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
105 |
+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 |
106 |
+- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
107 |
+- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
108 |
+- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
109 |
++ mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
110 |
++ sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
111 |
++ chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
112 |
+ |
113 |
+ uninstall: |
114 |
+ @echo removing executable file from ${DESTDIR}${PREFIX}/bin |
115 |
|
116 |
diff --git a/www-client/surf/surf-0.7.ebuild b/www-client/surf/surf-0.7.ebuild |
117 |
new file mode 100644 |
118 |
index 0000000..834dd70 |
119 |
--- /dev/null |
120 |
+++ b/www-client/surf/surf-0.7.ebuild |
121 |
@@ -0,0 +1,71 @@ |
122 |
+# Copyright 1999-2014 Gentoo Foundation |
123 |
+# Distributed under the terms of the GNU General Public License v2 |
124 |
+# $Id$ |
125 |
+ |
126 |
+EAPI=5 |
127 |
+inherit eutils savedconfig toolchain-funcs |
128 |
+ |
129 |
+DESCRIPTION="a simple web browser based on WebKit/GTK+" |
130 |
+HOMEPAGE="http://surf.suckless.org/" |
131 |
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz" |
132 |
+ |
133 |
+LICENSE="MIT" |
134 |
+SLOT="0" |
135 |
+KEYWORDS="~amd64 ~x86" |
136 |
+ |
137 |
+COMMON_DEPEND=" |
138 |
+ dev-libs/glib |
139 |
+ net-libs/libsoup |
140 |
+ net-libs/webkit-gtk:2 |
141 |
+ x11-libs/gtk+:2 |
142 |
+ x11-libs/libX11 |
143 |
+" |
144 |
+DEPEND=" |
145 |
+ ${COMMON_DEPEND} |
146 |
+ virtual/pkgconfig |
147 |
+" |
148 |
+RDEPEND=" |
149 |
+ !sci-chemistry/surf |
150 |
+ ${COMMON_DEPEND} |
151 |
+ x11-apps/xprop |
152 |
+ x11-misc/dmenu |
153 |
+ !savedconfig? ( |
154 |
+ net-misc/curl |
155 |
+ x11-terms/st |
156 |
+ ) |
157 |
+" |
158 |
+ |
159 |
+pkg_setup() { |
160 |
+ if ! use savedconfig; then |
161 |
+ elog "The default config.h assumes you have" |
162 |
+ elog " net-misc/curl" |
163 |
+ elog " x11-terms/st" |
164 |
+ elog "installed to support the download function." |
165 |
+ elog "Without those, downloads will fail (gracefully)." |
166 |
+ elog "You can fix this by:" |
167 |
+ elog "1) Installing these packages, or" |
168 |
+ elog "2) Setting USE=savedconfig and changing config.h accordingly." |
169 |
+ fi |
170 |
+} |
171 |
+ |
172 |
+src_prepare() { |
173 |
+ epatch "${FILESDIR}"/${PN}-0.7-gentoo.patch |
174 |
+ |
175 |
+ epatch_user |
176 |
+ |
177 |
+ restore_config config.h |
178 |
+ |
179 |
+ tc-export CC PKG_CONFIG |
180 |
+} |
181 |
+ |
182 |
+src_install() { |
183 |
+ default |
184 |
+ save_config config.h |
185 |
+} |
186 |
+ |
187 |
+pkg_postinst() { |
188 |
+ if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then |
189 |
+ ewarn "Please correct the permissions of your \$HOME/.surf/ directory" |
190 |
+ ewarn "and its contents to no longer be world readable (see bug #404983)" |
191 |
+ fi |
192 |
+} |