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 9F0D4138359 for ; Sun, 22 Nov 2020 13:19:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D636E0801; Sun, 22 Nov 2020 13:19:53 +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 7F34FE0801 for ; Sun, 22 Nov 2020 13:19:53 +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 47A44340E6F for ; Sun, 22 Nov 2020 13:19:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 898B0435 for ; Sun, 22 Nov 2020 13:19:50 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1606051183.69d796c341cf1ae78d883b64e742c72b0cf97f82.juippis@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: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 69d796c341cf1ae78d883b64e742c72b0cf97f82 X-VCS-Branch: master Date: Sun, 22 Nov 2020 13:19:50 +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: f4b94f3e-bacf-4f42-b8eb-a42d29646748 X-Archives-Hash: 6b9726d770333b720d092b0be2d4f02b commit: 69d796c341cf1ae78d883b64e742c72b0cf97f82 Author: parazyd dyne org> AuthorDate: Sun Nov 22 13:18:15 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Nov 22 13:19:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d796c3 www-client/surf: Rebase 9999 patch. Signed-off-by: Ivan Jelincic dyne.org> Closes: https://github.com/gentoo/gentoo/pull/18267 Signed-off-by: Joonas Niilola gentoo.org> www-client/surf/files/surf-9999-gentoo.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch index 7b783e8feb8..30111395f00 100644 --- a/www-client/surf/files/surf-9999-gentoo.patch +++ b/www-client/surf/files/surf-9999-gentoo.patch @@ -1,5 +1,5 @@ diff --git a/config.mk b/config.mk -index 5e68e38..fa45b55 100644 +index f1910bf..55d7066 100644 --- a/config.mk +++ b/config.mk @@ -4,18 +4,18 @@ VERSION = 2.0 @@ -19,13 +19,12 @@ index 5e68e38..fa45b55 100644 -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -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` +-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` +-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-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) ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0) ++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0) # includes and libs INCS = $(X11INC) $(GTKINC) -