commit: 0a22ad5e10ecb7b4c739cc33febfa9f1b7bba983
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 17:06:00 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 17:06:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a22ad5e
www-client/surf: Switch live ebuild to 2.0 branch.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
www-client/surf/files/surf-9999-gentoo.patch | 80 ++++++++++++++++++++++++++++
www-client/surf/surf-9999.ebuild | 6 ++-
2 files changed, 84 insertions(+), 2 deletions(-)
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 00000000000..46f8fe3abb5
--- /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
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 0d9f1a3dc18..7d8051ce2c7 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -7,15 +7,17 @@ inherit git-r3 savedconfig toolchain-funcs
DESCRIPTION="a simple web browser based on WebKit/GTK+"
HOMEPAGE="http://surf.suckless.org/";
EGIT_REPO_URI="git://git.suckless.org/surf"
+EGIT_BRANCH="surf-webkit2"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
COMMON_DEPEND="
+ app-crypt/gcr
dev-libs/glib:2
net-libs/libsoup
- net-libs/webkit-gtk:3
+ net-libs/webkit-gtk:4
x11-libs/gtk+:3
x11-libs/libX11
"
@@ -34,7 +36,7 @@ RDEPEND="
)
"
PATCHES=(
- "${FILESDIR}"/${PN}-2.0-gentoo.patch
+ "${FILESDIR}"/${PN}-9999-gentoo.patch
)
pkg_setup() {
