[gtk/wip/smcv/roaring-license: 49/49] Move roaring bitmaps code to gtk/roaring/ and add a README
- From: Simon McVittie <smcv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/smcv/roaring-license: 49/49] Move roaring bitmaps code to gtk/roaring/ and add a README
- Date: Sat, 8 Aug 2020 17:31:25 +0000 (UTC)
commit 95cd8c1eb91d34954eacde65832a4bd7002da309
Author: Simon McVittie <smcv debian org>
Date: Sat Aug 8 16:17:59 2020 +0100
Move roaring bitmaps code to gtk/roaring/ and add a README
As suggested by Matthias Clasen on gtk!2408. This keeps the
Apache-licensed stuff together.
As per the discussion on gtk!2408 and gtk!2409, replacing this with
upstream CRoaring is specifically not supported by the GTK maintainers.
Signed-off-by: Simon McVittie <smcv debian org>
gtk/gtkbitset.c | 2 +-
COPYING.Apache-2.0 => gtk/roaring/COPYING | 0
gtk/roaring/README.md | 16 ++++++++++++++++
gtk/{ => roaring}/roaring.c | 0
gtk/{ => roaring}/roaring.h | 0
5 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c
index 7a390aaddd..80d494f066 100644
--- a/gtk/gtkbitset.c
+++ b/gtk/gtkbitset.c
@@ -21,7 +21,7 @@
#include "gtkbitset.h"
-#include "roaring.c"
+#include "roaring/roaring.c"
/**
* SECTION:gtkbitset
diff --git a/COPYING.Apache-2.0 b/gtk/roaring/COPYING
similarity index 100%
rename from COPYING.Apache-2.0
rename to gtk/roaring/COPYING
diff --git a/gtk/roaring/README.md b/gtk/roaring/README.md
new file mode 100644
index 0000000000..9404a84bb0
--- /dev/null
+++ b/gtk/roaring/README.md
@@ -0,0 +1,16 @@
+Roaring bitmaps implementation
+==============================
+
+This directory contains code modified for GTK, based on the Roaring
+bitmaps reference implementation
+[CRoaring](https://github.com/RoaringBitmap/CRoaring).
+
+It is not necessarily compatible with past or future versions of CRoaring,
+and replacing it with a different version or linking to a system copy
+is not supported.
+
+See the source files for copyright and licensing information, and the
+`COPYING` file for the full text of the Apache license, version 2.0.
+
+When proposing modifications for these files, please consider whether they
+are also suitable for submission to CRoaring.
diff --git a/gtk/roaring.c b/gtk/roaring/roaring.c
similarity index 100%
rename from gtk/roaring.c
rename to gtk/roaring/roaring.c
diff --git a/gtk/roaring.h b/gtk/roaring/roaring.h
similarity index 100%
rename from gtk/roaring.h
rename to gtk/roaring/roaring.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]