From a4c4e4f3c410834c3e56f644841f5bcbb084225c Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
Date: Fri, 28 Jun 2024 11:15:16 +0200
Subject: [PATCH] clasp: Hide Event_t<T>::id_s.

This patch helps build clingo with non-local clasp while keeping the
event system working as intended.
---
 clasp/util/misc_types.h | 2 ++
 src/CMakeLists.txt      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clasp/util/misc_types.h b/clasp/util/misc_types.h
index 3677873..09c2075 100644
--- a/clasp/util/misc_types.h
+++ b/clasp/util/misc_types.h
@@ -432,7 +432,9 @@ struct Event_t : Event {
 	Event_t(Subsystem sys, Verbosity verb) : Event(sys, id_s, verb) {}
 	static const uint32 id_s;
 };
+#if _BUILDING_CLASP_
 template <class T> const uint32 Event_t<T>::id_s = Event::nextId();
+#endif
 
 template <class ToType, class EvType> const ToType* event_cast(const EvType& ev) { return ev.id == ToType::id_s ? static_cast<const ToType*>(&ev) : 0; }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8439d12..4f55990 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,6 +123,7 @@ source_group("${ide_header}\\mt" FILES ${header_mt})
 endif()
 
 add_library(libclasp ${header} ${header_util} ${header_cli} ${header_mt} ${src})
+target_compile_definitions(libclasp PRIVATE _BUILDING_CLASP_)
 if (CLASP_BUILD_WITH_THREADS)
 	target_link_libraries(libclasp PUBLIC Threads::Threads)
 	target_compile_options(libclasp PRIVATE
-- 
2.45.1

27da27edd20732911'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/orange.scm'>
<input type='hidden' name='id' value='932a60812a620c9dcc5b0e327da27edd20732911'/><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=932a60812a620c9dcc5b0e327da27edd20732911'>root</a>/<a href='/guix/log/gnu?id=932a60812a620c9dcc5b0e327da27edd20732911'>gnu</a>/<a href='/guix/log/gnu/packages?id=932a60812a620c9dcc5b0e327da27edd20732911'>packages</a>/<a href='/guix/log/gnu/packages/orange.scm?id=932a60812a620c9dcc5b0e327da27edd20732911'>orange.scm</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/orange.scm?id=932a60812a620c9dcc5b0e327da27edd20732911&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-06 16:58:13 +0200'>2022-09-06</span></td><td><a href='/guix/commit/gnu/packages/orange.scm?id=be810d414f0f5d904bb3d84793b7813b69c55cff'>gnu: orange: Fix QT_PLUGIN_PATH.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/orange.scm (orange)[arguments]: Fix QT_PLUGIN_PATH.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Greg Hogan</td></tr>
<tr><td><span title='2022-07-31 21:55:43 -0400'>2022-07-31</span></td><td><a href='/guix/commit/gnu/packages/orange.scm?id=1ef04fb2288dade3ad2883026ae286a68ef13a1e'>gnu: qtsvg: Rename variable to qtsvg-5.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is in preparation of the qtsvg update to version 6.

This change was automated via the following command:

  git grep -l '\bqtsvg\b' | xargs sed 's/qtsvg/qtsvg-5/g' -i
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-06-18 13:07:10 -0300'>2022-06-18</span></td><td><a href='/guix/commit/gnu/packages/orange.scm?id=b2f2fdb37ee0d36f04f6439fce4f5d12ac83a2eb'>gnu: orange: Update to 3.32.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/orange.scm (orange): Update to 3.32.0.
</span></span></td><td>Vinicius Monego</td></tr>
<tr><td><span title='2022-01-28 14:03:04 -0500'>2022-01-28</span></td><td><a href='/guix/commit/gnu/packages/orange.scm?id=8b7db2fb98e143092c39e315bfa100a798cca0cb'>gnu: orange: Remove a transitive dependency on QtWebKit.</a><span class='msg-avail'>...<span class='msg-tooltip'>See &lt;https://issues.guix.gnu.org/53289&gt; for more information about this change.

* gnu/packages/orange.scm (orange)[inputs]: Replace python-pyqt with
python-pyqt-without-qtwebkit.
</span></span></td><td>Leo Famulari</td></tr>