From patchwork Wed Mar 4 19:41:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 20529 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E4A0627BBEA; Wed, 4 Mar 2020 19:43:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5420E27BBE4 for ; Wed, 4 Mar 2020 19:43:11 +0000 (GMT) Received: from localhost ([::1]:38922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9ZvC-0007uR-NP for patchwork@mira.cbaines.net; Wed, 04 Mar 2020 14:43:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47311) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Zv7-0007uB-05 for guix-patches@gnu.org; Wed, 04 Mar 2020 14:43:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Zv4-0007fa-NO for guix-patches@gnu.org; Wed, 04 Mar 2020 14:43:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Zv4-0007fW-KS for guix-patches@gnu.org; Wed, 04 Mar 2020 14:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9Zv4-0006Cf-Hj for guix-patches@gnu.org; Wed, 04 Mar 2020 14:43:02 -0500 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 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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 = \ %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 © 2014 Marek Benc -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 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-Hebrew input +to visual-Hebrew output. This is useful for reading Hebrew mail messages, +viewing Hebrew texts, etc. It was written for Hebrew but Arabic (or other BiDi +languages) should work equally well.") + (license gpl2+))) diff --git a/gnu/packages/patches/bidiv-update-fribidi.patch b/gnu/packages/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/fribidi_019 + +Description: Fix building with fribidi 1.9 +Author: أحمد المحمودي +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]= +- 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]=((c & 037) << 6) + (c1 & 077); + newline=0; +@@ -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]= +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + #else + in[len]=c; + #endif +@@ -206,11 +208,11 @@ bidiv(FILE *fp) + rtl_line=0; + + 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. +-- +