From 6d512b5c4d774a9853b51dae464a10cea7e3423a Mon Sep 17 00:00:00 2001
From: Peter Rustler <peter.rustler@basyskom.com>
Date: Mon, 7 Dec 2015 11:40:05 +0000
Subject: [PATCH] Add support for new webkit version 4.0 to build system

Add new configure value for option --with-webkit.
Now you can add 4.0 as value to --with-webkit.
Default is still 3.0.

https://bugzilla.gnome.org/show_bug.cgi?id=759171
---
 configure.ac | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2313c093..3d5d4823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,12 +77,12 @@ dnl ==============================WebKit=======================================
 m4_define([webkit_default], [3.0])
 
 AC_ARG_WITH([webkit],
-            [AC_HELP_STRING([--with-webkit=@<:@3.0/1.0@:>@],
+            [AC_HELP_STRING([--with-webkit=@<:@4.0/3.0/1.0@:>@],
                             [Select the Webkit backend, default=3.0])],
 	    [],
             [with_webkit=webkit_default])
 
-dnl=== support both 1.0 and 3.0 (default 3.0) ==
+dnl=== support all 1.0, 3.0 and 4.0 (default 3.0) ==
 AS_CASE([$with_webkit],
 	[3.0], [
 		WEBKIT_PC=webkitgtk-3.0
@@ -90,6 +90,12 @@ AS_CASE([$with_webkit],
 		AC_CHECK_LIB(webkitgtk-3.0, JSContextGroupCreate,,
 	                AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) 
 	],
+	[4.0], [
+		WEBKIT_PC=webkitgtk-4.0
+		SEED_GTK_VERSION=-gtk4
+		AC_CHECK_LIB(webkitgtk-4.0, JSContextGroupCreate,,
+	                AC_CHECK_LIB(javascriptcoregtk-4.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-4.0))
+	],
 	[1.0], [
 		AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0,
 	                AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, 
-- 
GitLab

<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=387ca84d52b4fb8ceefb0d8c46696017725a12c5&amp;showmsg=1'>root</a>/<a href='/guix/log/m4?id=387ca84d52b4fb8ceefb0d8c46696017725a12c5&amp;showmsg=1'>m4</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/m4?id=387ca84d52b4fb8ceefb0d8c46696017725a12c5'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2024-12-03 08:38:00 +0100'>2024-12-03</span></td><td class='logsubject'><a href='/guix/commit/m4?id=4d9c5984fee481d74c2f504094b4797bbb4104d4'>gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd.</a></td><td>Janneke Nieuwenhuizen</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
On commit:
    ec8a5ec15f898e864705e5a5c834532e3fa8d0a4
    gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd.

Run:
    ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs

Producing:
    /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/

With guix hash -r:
    15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by

* gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for
x86_64-gnu.
(%bootstrap-guile-hash, %bootstrap-coreutils&amp;co, %bootstrap-binutils,
%bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu.
* guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu.
(%cuirass-supported-systems): Remove x86_64-gnu.
* guix/utils.scm (target-64bit?): Add x86_64-gnu.
* m4/guix.m4: Add x86_64-gnu as a supported system.
* doc/guix.texi (GNU Distribution): Add x86_64-gnu.

Change-Id: I828159aedb3f66caba98e935083cc3682429f219


</td></tr>
<tr class='logheader'><td><span title='2023-11-07 18:07:11 +0200'>2023-11-07</span></td><td class='logsubject'><a href='/guix/commit/m4?id=220759226e93d76d8d80058f69f9d8b29714bbde'>build: Fix spelling in m4 macros.</a></td><td>Efraim Flashner</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Fix spelling of parameter.
(GUIX_CHECK_FILE_NAME_LIMITS): Fix spelling of maximum.

Change-Id: I93c80441393622a4bc06daa475eee13874cca527


</td></tr>
<tr class='logheader'><td><span title='2023-03-16 12:37:03 +0100'>2023-03-16</span></td><td class='logsubject'><a href='/guix/commit/m4?id=8e3dfb3d6dfc0f19bd9a9f9b163f0f3d7dccc865'>build: Correct guix_system on musl libc distros.</a></td><td>Antero Mejr</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents
the macro from mis-parsing the host OS, which causes breakage when
building from source.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>