From 2c5b0d5d6eba3bda4e83f489da546060fa8f3a2b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 26 Mar 2022 16:54:43 +0800
Subject: [PATCH] Unbundle robin-map.

This patch makes libobjc2 use robin-map header from system instead of cloning
from submodule.
---
 CMakeLists.txt | 8 --------
 arc.mm         | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2746e9..cf731f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,14 +86,6 @@ else ()
 	list(APPEND libobjc_C_SRCS eh_personality.c)
 endif (WIN32)
 
-if (NOT EXISTS "${CMAKE_SOURCE_DIR}/third_party/robin-map/include/tsl/robin_map.h")
-	message(FATAL_ERROR "Git submodules not present, please run:\n\n"
-						" $ git submodule init && git submodule update\n\n"
-						"If you did not checkout via git, you will need to"
-						"fetch the submodule's contents from"
-						"https://github.com/Tessil/robin-map/")
-endif ()
-
 # For release builds, we disable spamming the terminal with warnings about
 # selector type mismatches
 if (CMAKE_BUILD_TYPE STREQUAL Release)
diff --git a/arc.mm b/arc.mm
index c96681f..cc93e7f 100644
--- a/arc.mm
+++ b/arc.mm
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "third_party/robin-map/include/tsl/robin_map.h"
+#include <tsl/robin_map.h>
 #import "lock.h"
 #import "objc/runtime.h"
 #import "objc/blocks_runtime.h"
-- 
2.34.0

a href='/guix/commit/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>commit</a><a href='/guix/diff/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch'>
<input type='hidden' name='id' value='ab9f9b582e510e3d1133ec29242e70fca1d2997a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<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=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>root</a>/<a href='/guix/log/gnu?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>gnu</a>/<a href='/guix/log/gnu/packages?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>patches</a>/<a href='/guix/log/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a'>llvm-3.6-fix-build-with-gcc-10.patch</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/gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch?id=ab9f9b582e510e3d1133ec29242e70fca1d2997a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-02 07:57:18 +0100'>2023-12-02</span></td><td><a href='/guix/commit/gnu/packages/patches/python-sphinx-prompt-docutils-0.19.patch?id=877086a8649a86f1556bddd430e9478b2562f365'>gnu: python-sphinx-prompt: Fix tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>docutils&gt;=0.19 broke the tests, which upstream fixed in a newer
commit. Cherry-pick it.

* gnu/packages/patches/python-sphinx-prompt-docutils-0.19.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/sphinx.scm (python-sphinx-prompt)[origin]: Use it.

Change-Id: I597387a35e6a1da01063b4812e0f919788a13b54
</span></span></td><td>Lars-Dominik Braun</td></tr>