diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2019-01-24 12:15:43 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2019-01-24 12:15:54 +0100 |
| commit | 3d7526126438321b384896854714614d0f15a755 (patch) | |
| tree | 08dc9eb189d933b71779ee1903c82f0a55ccc0a1 | |
| parent | net-dns/bind-tools: Version bump (diff) | |
| download | gentoo-3d752612.tar.gz gentoo-3d752612.tar.bz2 gentoo-3d752612.zip | |
www-client/surf: Update live ebuild patch
Fixes: https://bugs.gentoo.org/669188
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
| -rw-r--r-- | www-client/surf/files/surf-9999-gentoo.patch | 88 |
1 files changed, 37 insertions, 51 deletions
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch index 46f8fe3abb5d..79c5964ed6a0 100644 --- a/www-client/surf/files/surf-9999-gentoo.patch +++ b/www-client/surf/files/surf-9999-gentoo.patch @@ -1,80 +1,66 @@ --- a/config.mk +++ b/config.mk -@@ -4,25 +4,25 @@ +@@ -4,18 +4,18 @@ # Customize below to fit your system # paths -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = $(PREFIX)/share/man - LIBPREFIX = $(PREFIX)/lib/surf + LIBPREFIX = $(PREFIX)/lib + LIBDIR = $(LIBPREFIX)/surf --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib +-X11INC = `pkg-config --cflags x11` +-X11LIB = `pkg-config --libs x11` +X11INC = $(shell $(PKG_CONFIG) --cflags x11) +X11LIB = $(shell $(PKG_CONFIG) --libs x11) -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0) -+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0 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) ++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 = -I$(X11INC) $(GTKINC) --LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0 -+INCS = -I. -I/usr/include ${X11INC} ${GTKINC} -+LIBS = ${X11LIB} ${GTKLIB} - + INCS = $(X11INC) $(GTKINC) +@@ -24,7 +24,7 @@ # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \ + CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE - SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) --SURF_LDFLAGS = $(LIBS) $(LDFLAGS) -+SURF_LDFLAGS = $(LDFLAGS) $(LIBS) +-SURFCFLAGS = $(INCS) $(CPPFLAGS) ++SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) + WEBEXTCFLAGS = -fPIC $(WEBEXTINC) - # Solaris - #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\" + # compiler --- a/Makefile +++ b/Makefile -@@ -16,18 +16,16 @@ - @echo "CC = $(CC)" +@@ -9,7 +9,7 @@ + WEBEXTSRC = libsurf-webext.c + WEBEXTOBJ = $(WEBEXTSRC:.c=.o) - .c.o: -- @echo CC -c $< -- @$(CC) $(SURF_CFLAGS) -c $< -+ $(CC) $(SURF_CFLAGS) -c $< +-all: options libsurf-webext.so surf ++all: libsurf-webext.so surf + + options: + @echo surf build options: +@@ -19,7 +19,7 @@ + @echo "LDFLAGS = $(LDFLAGS)" - $(OBJ): config.h config.mk + .c.o: +- $(CC) $(SURFCFLAGS) $(CFLAGS) -c $< ++ $(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $< config.h: - @echo creating $@ from config.def.h -- @cp config.def.h $@ -+ cp config.def.h $@ + cp config.def.h $@ +@@ -33,7 +33,7 @@ + $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc surf: $(OBJ) -- @echo CC -o $@ -- @$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS) -+ $(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS) +- $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) ++ $(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) clean: - @echo cleaning -@@ -49,13 +47,13 @@ - - install: all - @echo installing executable file to $(DESTDIR)$(PREFIX)/bin -- @mkdir -p $(DESTDIR)$(PREFIX)/bin -- @cp -f surf $(DESTDIR)$(PREFIX)/bin -- @chmod 755 $(DESTDIR)$(PREFIX)/bin/surf -+ mkdir -p $(DESTDIR)$(PREFIX)/bin -+ cp -f surf $(DESTDIR)$(PREFIX)/bin -+ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf - @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1 -- @mkdir -p $(DESTDIR)$(MANPREFIX)/man1 -- @sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 -- @chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 -+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1 -+ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 -+ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 - - uninstall: - @echo removing executable file from $(DESTDIR)$(PREFIX)/bin + rm -f surf $(OBJ) |