diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2019-02-07 12:11:10 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2019-02-07 12:13:19 +0100 |
| commit | 13df6158e43d170a0dabf8934ec909f8a6b39631 (patch) | |
| tree | e334094bddf4da9f25f70d00126288096f6c6ae8 /www-client/surf | |
| parent | app-text/docbook-dsssl-stylesheets: Drop old (diff) | |
| download | gentoo-13df6158e43d170a0dabf8934ec909f8a6b39631.tar.gz gentoo-13df6158e43d170a0dabf8934ec909f8a6b39631.tar.bz2 gentoo-13df6158e43d170a0dabf8934ec909f8a6b39631.zip | |
www-client/surf: Fix live ebuild patch
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/677402
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'www-client/surf')
| -rw-r--r-- | www-client/surf/files/surf-9999-gentoo.patch | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch index 79c5964ed6a0..7b783e8feb89 100644 --- a/www-client/surf/files/surf-9999-gentoo.patch +++ b/www-client/surf/files/surf-9999-gentoo.patch @@ -1,6 +1,8 @@ +diff --git a/config.mk b/config.mk +index 5e68e38..fa45b55 100644 --- a/config.mk +++ b/config.mk -@@ -4,18 +4,18 @@ +@@ -4,18 +4,18 @@ VERSION = 2.0 # Customize below to fit your system # paths @@ -19,48 +21,11 @@ -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0) -+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0) ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0) +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0) # includes and libs INCS = $(X11INC) $(GTKINC) -@@ -24,7 +24,7 @@ - # flags - CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ - -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE --SURFCFLAGS = $(INCS) $(CPPFLAGS) -+SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) - WEBEXTCFLAGS = -fPIC $(WEBEXTINC) - - # compiler ---- a/Makefile -+++ b/Makefile -@@ -9,7 +9,7 @@ - WEBEXTSRC = libsurf-webext.c - WEBEXTOBJ = $(WEBEXTSRC:.c=.o) - --all: options libsurf-webext.so surf -+all: libsurf-webext.so surf - - options: - @echo surf build options: -@@ -19,7 +19,7 @@ - @echo "LDFLAGS = $(LDFLAGS)" - - .c.o: -- $(CC) $(SURFCFLAGS) $(CFLAGS) -c $< -+ $(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $< - - config.h: - cp config.def.h $@ -@@ -33,7 +33,7 @@ - $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc - - surf: $(OBJ) -- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) -+ $(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) - - clean: - rm -f surf $(OBJ) + |