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