From patchwork Fri Jan 17 10:41:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 19855 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 AD60917844; Fri, 17 Jan 2020 10:42:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E726A17842 for ; Fri, 17 Jan 2020 10:42:10 +0000 (GMT) Received: from localhost ([::1]:55122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isP4s-0008Nk-Ga for patchwork@mira.cbaines.net; Fri, 17 Jan 2020 05:42:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57190) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isP4l-0008Na-VX for guix-patches@gnu.org; Fri, 17 Jan 2020 05:42:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isP4k-0002uU-Az for guix-patches@gnu.org; Fri, 17 Jan 2020 05:42:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isP4k-0002uG-6C for guix-patches@gnu.org; Fri, 17 Jan 2020 05:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isP4k-0004QL-4E for guix-patches@gnu.org; Fri, 17 Jan 2020 05:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39086] [PATCH 3/5] gnu: Add unicode-cldr-common. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jan 2020 10:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ricardo Wurmus Cc: 39086@debbugs.gnu.org Received: via spool by 39086-submit@debbugs.gnu.org id=B39086.157925767516946 (code B ref 39086); Fri, 17 Jan 2020 10:42:02 +0000 Received: (at 39086) by debbugs.gnu.org; 17 Jan 2020 10:41:15 +0000 Received: from localhost ([127.0.0.1]:38876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isP3z-0004PG-GG for submit@debbugs.gnu.org; Fri, 17 Jan 2020 05:41:15 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:11716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isP3u-0004P5-4l for 39086@debbugs.gnu.org; Fri, 17 Jan 2020 05:41:13 -0500 Received: from nijino.local (193-80-82-122.hdsl.highway.telekom.at [193.80.82.122]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 47zczl5XTMz1LgFj; Fri, 17 Jan 2020 11:41:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 47zczl5XTMz1LgFj DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1579257667; bh=sxOu1d0moFa/DiB0SzCHW7XrdHmJHxDgZdfQQiGWJkI=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=PWqtZ5KeTL/2exJnCH3bELTWVzzGq7DC0Q8Ele7lpb/4FxmFdYZTXHxhKquMcpyFx P+6dqcbMntAv8KojuHm7rjRiOVFIuVpMETIfR5Aj6/+h1msF5dClr3L/4X1qOqn5vq IRywNKMcaf2KwP5LmStOPdUq51rkVy3uDzHL+gd0= Message-ID: <3f376d87e5377a04f460f51257780c2988817ec9.camel@student.tugraz.at> From: Leo Prikler Date: Fri, 17 Jan 2020 11:41:16 +0100 In-Reply-To: <87eevyy1g5.fsf@elephly.net> References: <20200111120829.29821-1-leo.prikler@student.tugraz.at> <20200111120829.29821-3-leo.prikler@student.tugraz.at> <87imlbxg7a.fsf@elephly.net> <51f014f61bee4c453c50d954b501a3b1dc17370e.camel@student.tugraz.at> <87eevyy1g5.fsf@elephly.net> User-Agent: Evolution 3.32.4 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 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 Am Freitag, den 17.01.2020, 08:41 +0100 schrieb Ricardo Wurmus: > Leo Prikler writes: > > > Am Donnerstag, den 16.01.2020, 22:08 +0100 schrieb Ricardo Wurmus: > > > Leo Prikler writes: > > > > > > > * gnu/packages/ibus (unicode-cldr-commmon): New package. > > > > > > This should be: > > > > > > * gnu/packages/ibus.scm (unicode-cldr-commmon): New variable. > > > > > > You know, I wonder if these things really belong to ibus.scm. I > > > remember a TODO somewhere in the code that bemoaned the lack of > > > versioned Unicode data files. Perhaps we should just add a new > > > module > > > (gnu packages unicode) — what do you think? > > I don't mind either way, but these packages don't fix the > > TODO. They > > add yet unseen features. > > That’s okay. I just think we should start that new unicode.scm > module > to finally have a place for these data files. That would be a more > appropriate place than ibus.scm. I agree. Incidentally, I just coded up a ucd package to use with ibus or other packages that need the database. I copied some of the recipe from the gentoo ebuild, specifically the idea to use the zipped sources. From 20c30687c1ae0623232bd8fc41566fe271c5c20a Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 17 Jan 2020 11:35:24 +0100 Subject: [PATCH 7/7] gnu: Use new ucd package in ibus. * gnu/packages/ibus.scm (ibus)[native-inputs]: Add ucd. Remove unicode-nameslist and unicode-blocks. (arguments)[configure-flags]: Update accordingly. (phases): Remove phase. --- gnu/packages/ibus.scm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 16dfbf4888..c0766c06bd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -82,16 +82,11 @@ (assoc-ref %build-inputs "unicode-cldr-common") "/share/unicode/cldr/common/annotations") (string-append "--with-ucd-dir=" - (getcwd) "/ucd") + (assoc-ref %build-inputs "ucd") + "/share/ucd") "--enable-wayland") #:phases (modify-phases %standard-phases - (add-after 'unpack 'prepare-ucd-dir - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "../ucd") - (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") - (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") - #t)) (add-after 'unpack 'patch-python-target-directories (lambda* (#:key outputs #:allow-other-keys) (let ((root (string-append (assoc-ref outputs "out") @@ -158,22 +153,9 @@ (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler - + ("ucd" ,ucd) ("unicode-emoji" ,unicode-emoji) ("unicode-cldr-common" ,unicode-cldr-common) - ;; XXX TODO: Move Unicode data to its own (versioned) package. - ("unicode-nameslist" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/12.0.0/ucd/NamesList.txt") - (sha256 - (base32 "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")))) - ("unicode-blocks" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/12.0.0/ucd/Blocks.txt") - (sha256 - (base32 "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")))) ("vala" ,vala) ("pkg-config" ,pkg-config))) (native-search-paths -- 2.25.0