From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Oct 2017 18:53:29 +0100
Subject: reinit the tree, so we can have metadata

---
 www-client/surf/files/surf-2.0-gentoo.patch  | 85 ++++++++++++++++++++++++++++
 www-client/surf/files/surf-9999-gentoo.patch | 80 ++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 www-client/surf/files/surf-2.0-gentoo.patch
 create mode 100644 www-client/surf/files/surf-9999-gentoo.patch

(limited to 'www-client/surf/files')

diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
new file mode 100644
index 000000000000..07aa6568f55c
--- /dev/null
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -0,0 +1,85 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,28 +4,28 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+ LIBPREFIX = ${PREFIX}/lib/surf
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ 
+-GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0`
+-GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gthread-2.0 webkit2gtk-4.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gthread-2.0 webkit2gtk-4.0)
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include ${X11INC} ${GTKINC}
++LIBS = ${X11LIB} ${GTKLIB}
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -s ${LIBS}
++CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS = ${LIBS}
+ 
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC ?= cc
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,16 @@
+ 	@echo "CC       = ${CC}"
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.h config.mk
+ 
+ config.h:
+ 	@echo creating $@ from config.def.h
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+ surf: ${OBJ}
+-	@echo CC -o $@
+-	@${CC} -o $@ surf.o ${LDFLAGS}
++	${CC} -o $@ surf.o ${LDFLAGS}
+ 
+ clean:
+ 	@echo cleaning
+@@ -44,13 +42,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
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
new file mode 100644
index 000000000000..46f8fe3abb5d
--- /dev/null
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -0,0 +1,80 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,25 +4,25 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = $(PREFIX)/share/man
+ LIBPREFIX = $(PREFIX)/lib/surf
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++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)
+ 
+ # 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}
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \
+            -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+ SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+-SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
++SURF_LDFLAGS = $(LDFLAGS) $(LIBS)
+ 
+ # Solaris
+ #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
+--- a/Makefile
++++ b/Makefile
+@@ -16,18 +16,16 @@
+ 	@echo "CC       = $(CC)"
+ 
+ .c.o:
+-	@echo CC -c $<
+-	@$(CC) $(SURF_CFLAGS) -c $<
++	$(CC) $(SURF_CFLAGS) -c $<
+ 
+ $(OBJ): config.h config.mk
+ 
+ config.h:
+ 	@echo creating $@ from config.def.h
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+ surf: $(OBJ)
+-	@echo CC -o $@
+-	@$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
++	$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
+ 
+ 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
-- 
cgit v1.2.3