| 1 |
commit: 3d7526126438321b384896854714614d0f15a755 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 24 11:15:43 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 24 11:15:54 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d752612 |
| 7 |
|
| 8 |
www-client/surf: Update live ebuild patch |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/669188 |
| 11 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
www-client/surf/files/surf-9999-gentoo.patch | 88 ++++++++++++---------------- |
| 15 |
1 file changed, 37 insertions(+), 51 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch |
| 18 |
index 46f8fe3abb5..79c5964ed6a 100644 |
| 19 |
--- a/www-client/surf/files/surf-9999-gentoo.patch |
| 20 |
+++ b/www-client/surf/files/surf-9999-gentoo.patch |
| 21 |
@@ -1,80 +1,66 @@ |
| 22 |
--- a/config.mk |
| 23 |
+++ b/config.mk |
| 24 |
-@@ -4,25 +4,25 @@ |
| 25 |
+@@ -4,18 +4,18 @@ |
| 26 |
# Customize below to fit your system |
| 27 |
|
| 28 |
# paths |
| 29 |
-PREFIX = /usr/local |
| 30 |
+PREFIX = /usr |
| 31 |
MANPREFIX = $(PREFIX)/share/man |
| 32 |
- LIBPREFIX = $(PREFIX)/lib/surf |
| 33 |
+ LIBPREFIX = $(PREFIX)/lib |
| 34 |
+ LIBDIR = $(LIBPREFIX)/surf |
| 35 |
|
| 36 |
--X11INC = /usr/X11R6/include |
| 37 |
--X11LIB = /usr/X11R6/lib |
| 38 |
+-X11INC = `pkg-config --cflags x11` |
| 39 |
+-X11LIB = `pkg-config --libs x11` |
| 40 |
+X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
| 41 |
+X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
| 42 |
|
| 43 |
-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` |
| 44 |
-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` |
| 45 |
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0) |
| 46 |
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0) |
| 47 |
+-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0` |
| 48 |
+-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0` |
| 49 |
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0) |
| 50 |
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0) |
| 51 |
++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0) |
| 52 |
++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0) |
| 53 |
|
| 54 |
# includes and libs |
| 55 |
--INCS = -I$(X11INC) $(GTKINC) |
| 56 |
--LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0 |
| 57 |
-+INCS = -I. -I/usr/include ${X11INC} ${GTKINC} |
| 58 |
-+LIBS = ${X11LIB} ${GTKLIB} |
| 59 |
- |
| 60 |
+ INCS = $(X11INC) $(GTKINC) |
| 61 |
+@@ -24,7 +24,7 @@ |
| 62 |
# flags |
| 63 |
- CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \ |
| 64 |
+ CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ |
| 65 |
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE |
| 66 |
- SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) |
| 67 |
--SURF_LDFLAGS = $(LIBS) $(LDFLAGS) |
| 68 |
-+SURF_LDFLAGS = $(LDFLAGS) $(LIBS) |
| 69 |
+-SURFCFLAGS = $(INCS) $(CPPFLAGS) |
| 70 |
++SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) |
| 71 |
+ WEBEXTCFLAGS = -fPIC $(WEBEXTINC) |
| 72 |
|
| 73 |
- # Solaris |
| 74 |
- #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\" |
| 75 |
+ # compiler |
| 76 |
--- a/Makefile |
| 77 |
+++ b/Makefile |
| 78 |
-@@ -16,18 +16,16 @@ |
| 79 |
- @echo "CC = $(CC)" |
| 80 |
+@@ -9,7 +9,7 @@ |
| 81 |
+ WEBEXTSRC = libsurf-webext.c |
| 82 |
+ WEBEXTOBJ = $(WEBEXTSRC:.c=.o) |
| 83 |
|
| 84 |
- .c.o: |
| 85 |
-- @echo CC -c $< |
| 86 |
-- @$(CC) $(SURF_CFLAGS) -c $< |
| 87 |
-+ $(CC) $(SURF_CFLAGS) -c $< |
| 88 |
+-all: options libsurf-webext.so surf |
| 89 |
++all: libsurf-webext.so surf |
| 90 |
+ |
| 91 |
+ options: |
| 92 |
+ @echo surf build options: |
| 93 |
+@@ -19,7 +19,7 @@ |
| 94 |
+ @echo "LDFLAGS = $(LDFLAGS)" |
| 95 |
|
| 96 |
- $(OBJ): config.h config.mk |
| 97 |
+ .c.o: |
| 98 |
+- $(CC) $(SURFCFLAGS) $(CFLAGS) -c $< |
| 99 |
++ $(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $< |
| 100 |
|
| 101 |
config.h: |
| 102 |
- @echo creating $@ from config.def.h |
| 103 |
-- @cp config.def.h $@ |
| 104 |
-+ cp config.def.h $@ |
| 105 |
+ cp config.def.h $@ |
| 106 |
+@@ -33,7 +33,7 @@ |
| 107 |
+ $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc |
| 108 |
|
| 109 |
surf: $(OBJ) |
| 110 |
-- @echo CC -o $@ |
| 111 |
-- @$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS) |
| 112 |
-+ $(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS) |
| 113 |
+- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) |
| 114 |
++ $(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) |
| 115 |
|
| 116 |
clean: |
| 117 |
- @echo cleaning |
| 118 |
-@@ -49,13 +47,13 @@ |
| 119 |
- |
| 120 |
- install: all |
| 121 |
- @echo installing executable file to $(DESTDIR)$(PREFIX)/bin |
| 122 |
-- @mkdir -p $(DESTDIR)$(PREFIX)/bin |
| 123 |
-- @cp -f surf $(DESTDIR)$(PREFIX)/bin |
| 124 |
-- @chmod 755 $(DESTDIR)$(PREFIX)/bin/surf |
| 125 |
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin |
| 126 |
-+ cp -f surf $(DESTDIR)$(PREFIX)/bin |
| 127 |
-+ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf |
| 128 |
- @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1 |
| 129 |
-- @mkdir -p $(DESTDIR)$(MANPREFIX)/man1 |
| 130 |
-- @sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 131 |
-- @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 132 |
-+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1 |
| 133 |
-+ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 134 |
-+ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 135 |
- |
| 136 |
- uninstall: |
| 137 |
- @echo removing executable file from $(DESTDIR)$(PREFIX)/bin |
| 138 |
+ rm -f surf $(OBJ) |
Archives