oasis

commit: 0eea2ddc78b26afd26a24ab86a31cdeea83021c3
parent 8402acb9b9565b0844070bdfdf2e1d1a915e7915
Author: Michael Forney <mforney@mforney.org>
Date:   Sun,  7 Jul 2019 19:18:49 -0700

Revert "fribidi: Make function declarations match definitions"

This reverts commit d80bac0f9daa0b16494dfacdc200323da374cad5.

Diffstat:
M
.gitmodules
1
-
D
pkg/fribidi/patch/0001-Make-parameter-qualifiers-match-between-declaration-.patch
26
--------------------------
M
pkg/fribidi/ver
2
+-

3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -68,7 +68,6 @@
 [submodule "pkg/fribidi/src"]
 	path = pkg/fribidi/src
 	url = https://github.com/fribidi/fribidi
-	ignore = all
 [submodule "pkg/fuse/src"]
 	path = pkg/fuse/src
 	url = https://github.com/libfuse/libfuse
diff --git a/pkg/fribidi/patch/0001-Make-parameter-qualifiers-match-between-declaration-.patch b/pkg/fribidi/patch/0001-Make-parameter-qualifiers-match-between-declaration-.patch
@@ -1,26 +0,0 @@
-From b9d6b372273896085f435dd7060395d631b808b1 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 4 Jun 2019 10:57:44 -0700
-Subject: [PATCH] Make parameter qualifiers match between declaration and
- definition
-
----
- lib/fribidi-deprecated.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
-index 12a13d2..b57c69e 100644
---- a/lib/fribidi-deprecated.c
-+++ b/lib/fribidi-deprecated.c
-@@ -184,7 +184,7 @@ FRIBIDI_ENTRY FriBidiLevel
- fribidi_log2vis (
-   /* input */
-   const FriBidiChar *str,
--  FriBidiStrIndex len,
-+  const FriBidiStrIndex len,
-   /* input and output */
-   FriBidiParType *pbase_dir,
-   /* output */
--- 
-2.20.1
-
diff --git a/pkg/fribidi/ver b/pkg/fribidi/ver
@@ -1 +1 @@
-1.0.5 r1
+1.0.5 r2