From unknown Fri Sep 05 08:43:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#39913] [PATCH] gnu: Add bidiv. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 19:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39913@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158335097723832 (code B ref -1); Wed, 04 Mar 2020 19:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2020 19:42:57 +0000 Received: from localhost ([127.0.0.1]:41850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9Zuy-0006CJ-O1 for submit@debbugs.gnu.org; Wed, 04 Mar 2020 14:42:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:39316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9Zuv-0006CA-2R for submit@debbugs.gnu.org; Wed, 04 Mar 2020 14:42:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47252) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Zut-0007tD-Hd for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:52 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Zuq-0007bR-32 for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:51 -0500 Received: from flashner.co.il ([178.62.234.194]:55894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j9Zup-0007Er-Ta for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:48 -0500 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id BC535400B5; Wed, 4 Mar 2020 19:42:15 +0000 (UTC) From: Efraim Flashner Date: Wed, 4 Mar 2020 21:41:40 +0200 Message-Id: <20200304194144.10610-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.62.234.194 X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/fribidi.scm (bidiv): New variable. * gnu/packages/patches/bidiv-update-fribidi.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/fribidi.scm | 54 ++++++++++++++++++- .../patches/bidiv-update-fribidi.patch | 50 +++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bidiv-update-fribidi.patch diff --git a/gnu/local.mk b/gnu/local.mk index cbb7d2b2f0..d5e5ac1e12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -758,6 +758,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ + %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 61aa6fd726..345529b73a 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Marek Benc -;;; Copyright =C2=A9 2016, 2019 Efraim Flashner +;;; Copyright =C2=A9 2016, 2019, 2020 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -54,3 +54,55 @@ or right-to-left ordering as necessary.") (source (origin (inherit (package-source fribidi)) (patches (search-patches "fribidi-CVE-2019-18397.patch")))= ))) + +(define-public bidiv + (package + (name "bidiv") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/b/bidiv/bidiv_" + version ".orig.tar.gz")) + (sha256 + (base32 + "05p5m2ihxbmc1qsgs8rjlww08fy9859fhl7xf196p8g5qygqd7cv")) + (patches (search-patches "bidiv-update-fribidi.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'unpack 'misc-fixes + (lambda _ + (substitute* "bidiv.c" + (("FriBidiCharType") "FriBidiParType") + (("&c") "(char *)&c")) + #t)) + ;; We don't want to use the handwritten makefile + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((fribidi (assoc-ref inputs "fribidi"))) + (invoke "gcc" "-o" "bidiv" "bidiv.c" + ;; pkg-config --cflags fribidi + (string-append "-I" fribidi "/include/fribidi") + ;; pkg-config --libs fribidi + (string-append "-L" fribidi "/lib") "-lfribidi"))= )) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "bidiv" bin) + (install-file "bidiv.1" man)) + #t))) + #:tests? #f)) ; no tests + (inputs + `(("fribidi" ,fribidi))) + (home-page "https://tracker.debian.org/pkg/bidiv") + (synopsis "BiDi viewer - command-line tool displaying logical Hebrew= /Arabic") + (description "bidiv is a simple utility for converting logical-Hebre= w input +to visual-Hebrew output. This is useful for reading Hebrew mail message= s, +viewing Hebrew texts, etc. It was written for Hebrew but Arabic (or oth= er BiDi +languages) should work equally well.") + (license gpl2+))) diff --git a/gnu/packages/patches/bidiv-update-fribidi.patch b/gnu/packag= es/patches/bidiv-update-fribidi.patch new file mode 100644 index 0000000000..d000cfeda4 --- /dev/null +++ b/gnu/packages/patches/bidiv-update-fribidi.patch @@ -0,0 +1,50 @@ +https://sources.debian.org/data/main/b/bidiv/1.5-6/debian/patches/fribid= i_019 + +Description: Fix building with fribidi 1.9 +Author: =D8=A3=D8=AD=D9=85=D8=AF =D8=A7=D9=84=D9=85=D8=AD=D9=85=D9=88=D8= =AF=D9=8A +Bug-Debian: http://bugs.debian.org/568130 + +--- a/bidiv.c ++++ b/bidiv.c +@@ -141,8 +141,9 @@ bidiv(FILE *fp) + */ + if(c1<0x80||c1>0xbf){ + ungetc(c1, fp); +- unicode_in[len]=3D +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + } else + unicode_in[len]=3D((c & 037) << 6) + (c1 & 077); + newline=3D0; +@@ -153,8 +154,9 @@ bidiv(FILE *fp) + In the future we will have a language + option, which will control this (as well + as the output encoding). */ +- unicode_in[len]=3D +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + #else + in[len]=3Dc; + #endif +@@ -206,11 +208,11 @@ bidiv(FILE *fp) + rtl_line=3D0; +=20 + if(out_utf8) +- fribidi_unicode_to_utf8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, ++ unicode_out, len, out); + else +- fribidi_unicode_to_iso8859_8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, ++ unicode_out, len, out); + /* if rtl_line (i.e., base_dir is RL), and we didn't fill the + entire width, we need to pad with spaces. Maybe in the + future this should be an option. +-- + --=20 2.25.1 From unknown Fri Sep 05 08:43:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Efraim Flashner Subject: bug#39913: closed (Re: bug#39913: Acknowledgement ([PATCH] gnu: Add bidiv.)) Message-ID: References: <20200315065142.GB927@E5400> <20200304194144.10610-1-efraim@flashner.co.il> X-Gnu-PR-Message: they-closed 39913 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 39913@debbugs.gnu.org Date: Sun, 15 Mar 2020 06:53:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1584255182-865-1" This is a multi-part message in MIME format... ------------=_1584255182-865-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #39913: [PATCH] gnu: Add bidiv. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 39913@debbugs.gnu.org. --=20 39913: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D39913 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1584255182-865-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 39913-done) by debbugs.gnu.org; 15 Mar 2020 06:52:22 +0000 Received: from localhost ([127.0.0.1]:34190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jDN8I-0000Cw-Lk for submit@debbugs.gnu.org; Sun, 15 Mar 2020 02:52:22 -0400 Received: from flashner.co.il ([178.62.234.194]:48634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jDN8G-0000Ci-SF for 39913-done@debbugs.gnu.org; Sun, 15 Mar 2020 02:52:21 -0400 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id 92CF840103 for <39913-done@debbugs.gnu.org>; Sun, 15 Mar 2020 06:52:13 +0000 (UTC) Date: Sun, 15 Mar 2020 08:51:42 +0200 From: Efraim Flashner To: 39913-done@debbugs.gnu.org Subject: Re: bug#39913: Acknowledgement ([PATCH] gnu: Add bidiv.) Message-ID: <20200315065142.GB927@E5400> References: <20200304194144.10610-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="cmJC7u66zC7hs+87" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39913-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --cmJC7u66zC7hs+87 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch pushed. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --cmJC7u66zC7hs+87 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl5t0H4ACgkQQarn3Mo9 g1FtLw//XqYHogOS24qsXvnQjXJKt9RBFeuDqrqf9f7QKP0JxZM4zmr3DeJnZE6a YRQ194iJ0uzjH6PtFQC5YkSpqtETCvdhnwj/cuJlmr4raqM2MplahayNAa4BTHbB /RPpLE0qB9TkAF+NSEW+n9+wZbF9ICyHAot1LnyZpasor6vUJMJaIMOGkOcEBSp0 7FAWhr2wmF0MyiqdxyuWuQ0ZhSDMyAyWB4IO2LMvWbnoSQD+mdb3m07+lLYuTuiD PPtbWPhPjDl/Ej/O0qADX50On4fqdxrEhKPlrbVjVydOGPmNa7KJamwpzipayOUD KvH9lE24mYvEFY0M3EPJbchRUnDsBaxGB89u1ZrwnYYK2P07XJKWKZvMXLFXXZ7c FIrblm9HbIlSVKz1KOV/5hRlSvBN8XljccJR8PV2q5ZZOI9vcJYYcciWhknm3QO4 klE2vD+6F8LSmeMgOt0o5y8O1QYp3e61sPUzfMxnNz/2JHhVPhR6pMcpxhGvnKVw cHf6+Ma9kt7aznA0c2uRodVB3svvuEwTI5t8UB9IXJ4WqT2Mvyp6lmn/xT6dkRJD fzSw7DF6HZy+WkGOwCmx8WSaCxxc5fQpIF60oRQETRusCpKKW2s+z+ZTSlQ0BMxM D6npOOMZ19h30B927YgRDdzWLXl1uY9b3/p3IUKUf3dOZ4R77fk= =4elh -----END PGP SIGNATURE----- --cmJC7u66zC7hs+87-- ------------=_1584255182-865-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Mar 2020 19:42:57 +0000 Received: from localhost ([127.0.0.1]:41850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9Zuy-0006CJ-O1 for submit@debbugs.gnu.org; Wed, 04 Mar 2020 14:42:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:39316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9Zuv-0006CA-2R for submit@debbugs.gnu.org; Wed, 04 Mar 2020 14:42:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47252) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Zut-0007tD-Hd for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:52 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Zuq-0007bR-32 for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:51 -0500 Received: from flashner.co.il ([178.62.234.194]:55894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j9Zup-0007Er-Ta for guix-patches@gnu.org; Wed, 04 Mar 2020 14:42:48 -0500 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id BC535400B5; Wed, 4 Mar 2020 19:42:15 +0000 (UTC) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH] gnu: Add bidiv. Date: Wed, 4 Mar 2020 21:41:40 +0200 Message-Id: <20200304194144.10610-1-efraim@flashner.co.il> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 178.62.234.194 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/fribidi.scm (bidiv): New variable. * gnu/packages/patches/bidiv-update-fribidi.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/fribidi.scm | 54 ++++++++++++++++++- .../patches/bidiv-update-fribidi.patch | 50 +++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bidiv-update-fribidi.patch diff --git a/gnu/local.mk b/gnu/local.mk index cbb7d2b2f0..d5e5ac1e12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -758,6 +758,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ + %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 61aa6fd726..345529b73a 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2014 Marek Benc -;;; Copyright =C2=A9 2016, 2019 Efraim Flashner +;;; Copyright =C2=A9 2016, 2019, 2020 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -54,3 +54,55 @@ or right-to-left ordering as necessary.") (source (origin (inherit (package-source fribidi)) (patches (search-patches "fribidi-CVE-2019-18397.patch")))= ))) + +(define-public bidiv + (package + (name "bidiv") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/b/bidiv/bidiv_" + version ".orig.tar.gz")) + (sha256 + (base32 + "05p5m2ihxbmc1qsgs8rjlww08fy9859fhl7xf196p8g5qygqd7cv")) + (patches (search-patches "bidiv-update-fribidi.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'unpack 'misc-fixes + (lambda _ + (substitute* "bidiv.c" + (("FriBidiCharType") "FriBidiParType") + (("&c") "(char *)&c")) + #t)) + ;; We don't want to use the handwritten makefile + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((fribidi (assoc-ref inputs "fribidi"))) + (invoke "gcc" "-o" "bidiv" "bidiv.c" + ;; pkg-config --cflags fribidi + (string-append "-I" fribidi "/include/fribidi") + ;; pkg-config --libs fribidi + (string-append "-L" fribidi "/lib") "-lfribidi"))= )) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "bidiv" bin) + (install-file "bidiv.1" man)) + #t))) + #:tests? #f)) ; no tests + (inputs + `(("fribidi" ,fribidi))) + (home-page "https://tracker.debian.org/pkg/bidiv") + (synopsis "BiDi viewer - command-line tool displaying logical Hebrew= /Arabic") + (description "bidiv is a simple utility for converting logical-Hebre= w input +to visual-Hebrew output. This is useful for reading Hebrew mail message= s, +viewing Hebrew texts, etc. It was written for Hebrew but Arabic (or oth= er BiDi +languages) should work equally well.") + (license gpl2+))) diff --git a/gnu/packages/patches/bidiv-update-fribidi.patch b/gnu/packag= es/patches/bidiv-update-fribidi.patch new file mode 100644 index 0000000000..d000cfeda4 --- /dev/null +++ b/gnu/packages/patches/bidiv-update-fribidi.patch @@ -0,0 +1,50 @@ +https://sources.debian.org/data/main/b/bidiv/1.5-6/debian/patches/fribid= i_019 + +Description: Fix building with fribidi 1.9 +Author: =D8=A3=D8=AD=D9=85=D8=AF =D8=A7=D9=84=D9=85=D8=AD=D9=85=D9=88=D8= =AF=D9=8A +Bug-Debian: http://bugs.debian.org/568130 + +--- a/bidiv.c ++++ b/bidiv.c +@@ -141,8 +141,9 @@ bidiv(FILE *fp) + */ + if(c1<0x80||c1>0xbf){ + ungetc(c1, fp); +- unicode_in[len]=3D +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + } else + unicode_in[len]=3D((c & 037) << 6) + (c1 & 077); + newline=3D0; +@@ -153,8 +154,9 @@ bidiv(FILE *fp) + In the future we will have a language + option, which will control this (as well + as the output encoding). */ +- unicode_in[len]=3D +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + #else + in[len]=3Dc; + #endif +@@ -206,11 +208,11 @@ bidiv(FILE *fp) + rtl_line=3D0; +=20 + if(out_utf8) +- fribidi_unicode_to_utf8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, ++ unicode_out, len, out); + else +- fribidi_unicode_to_iso8859_8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, ++ unicode_out, len, out); + /* if rtl_line (i.e., base_dir is RL), and we didn't fill the + entire width, we need to pad with spaces. Maybe in the + future this should be an option. +-- + --=20 2.25.1 ------------=_1584255182-865-1--