From 693cc9b6e847a01c1bb692153021aaf9fb0fab25 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 25 Jan 2019 08:09:37 +0000
Subject: gentoo resync : 25.01.2019

---
 www-client/surf/Manifest                     |  2 +-
 www-client/surf/files/surf-9999-gentoo.patch | 88 ++++++++++++----------------
 2 files changed, 38 insertions(+), 52 deletions(-)

(limited to 'www-client/surf')

diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index fa83a8989215..246e41c54b66 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,5 +1,5 @@
 AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a2657370e0e9698f7e6e0862fab4780d292e5bab1a336dbffcbcde730db7474f1e11b08e98b0c54ae19ea15a SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db
-AUX surf-9999-gentoo.patch 2374 BLAKE2B cf53b82116fc0635cc0c2e3042e0e038880ce7b9626a81cda40261cb9f3f0cc3ade1b1c224dbde9788419d0a118d5cda1229a8e6f68597d24d7baf91872fb106 SHA512 d7d8c829bfb2534432e9e815dea283d97cdb77982aa6fcec2d3e5b716599cbbe14eefd75219404c35eed2d1380c2d1a1e7334fd24fd0905830dee8e1baf7c801
+AUX surf-9999-gentoo.patch 1954 BLAKE2B c0113e09e8fd477d23e3d5c2993ab8e54dffed5f2b90a0f87d1d9b339de4249609a20d809274f67ea695af6818e4f90c632f2f18da81f5a113274e4988a62c84 SHA512 57d271279bf691f8035954ba6e2de1eac0b3e25a06b0f40ba180544fdaefb5ae96c8c2ca532bb151cf8ddc7d95f26cd296270a706941757dfe8a2198ad8e49b0
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 EBUILD surf-2.0.ebuild 1472 BLAKE2B 8a85ff13f6ae02240349d6918d5a43cd6baf2391d0d5bf8863dd2e9b7d63c47eeec563a8b16dc16edbcd9e6d05c31bf1c03162794f74f4f31e74fc8f126f4ca6 SHA512 482ddab7ae4a5916a06c5c8d6a30be0947acd107413a8a175677d93664f2d8f389c2500067e511d8bb0eff2426cc14ea4ac1c3973355e99f66f43a7a17330f81
 EBUILD surf-9999.ebuild 1262 BLAKE2B 7b6edd37f53a2c490d3169134ad53fdfafeb5c93e35459692815466c6c61358c2041ca16bfc40c5011675d4becd9627f59725ba4b05032e4df61d49907b7e9b7 SHA512 bfa4c7cbf17e9abdf97e1e1c37d1c2693f135f3dcd5734f214383dac90e9921a5cd496a7c72e61cb80ff309518cf1da10a931c7896f946bac49b7096cb228e18
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)
-- 
cgit v1.2.3