From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7DB3138334 for ; Thu, 7 Feb 2019 11:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FE4BE0A5D; Thu, 7 Feb 2019 11:13:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2DC9E0A5D for ; Thu, 7 Feb 2019 11:13:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C129335D91 for ; Thu, 7 Feb 2019 11:13:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DFFA463 for ; Thu, 7 Feb 2019 11:13:29 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1549537999.13df6158e43d170a0dabf8934ec909f8a6b39631.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/surf/files/surf-9999-gentoo.patch X-VCS-Directories: www-client/surf/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 13df6158e43d170a0dabf8934ec909f8a6b39631 X-VCS-Branch: master Date: Thu, 7 Feb 2019 11:13:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d04cae91-d464-482a-a50d-43ca08042dcf X-Archives-Hash: 5d59243f50fa0729e921b80ae99374b3 commit: 13df6158e43d170a0dabf8934ec909f8a6b39631 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Feb 7 11:11:10 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Feb 7 11:13:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13df6158 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 gentoo.org> www-client/surf/files/surf-9999-gentoo.patch | 47 ++++------------------------ 1 file 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 79c5964ed6a..7b783e8feb8 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) +