From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qOemLfHNv2DVggEAgWs5BA (envelope-from ) for ; Tue, 08 Jun 2021 22:07:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YBzTKPHNv2BYTwAAB5/wlQ (envelope-from ) for ; Tue, 08 Jun 2021 20:07:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1B4942010A for ; Tue, 8 Jun 2021 22:07:13 +0200 (CEST) Received: from localhost ([::1]:36888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqi0G-0007CW-3I for larch@yhetil.org; Tue, 08 Jun 2021 16:07:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqi05-0007By-W0 for guix-patches@gnu.org; Tue, 08 Jun 2021 16:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqi05-0000Ry-Ow for guix-patches@gnu.org; Tue, 08 Jun 2021 16:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqi05-0005El-LN for guix-patches@gnu.org; Tue, 08 Jun 2021 16:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48909] [PATCH] gnu: Add goldendict. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Jun 2021 20:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48909 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48909@debbugs.gnu.org Cc: mail@brendan.scot Received: via spool by 48909-submit@debbugs.gnu.org id=B48909.162318281620120 (code B ref 48909); Tue, 08 Jun 2021 20:07:01 +0000 Received: (at 48909) by debbugs.gnu.org; 8 Jun 2021 20:06:56 +0000 Received: from localhost ([127.0.0.1]:59851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqhzv-0005EN-Ee for submit@debbugs.gnu.org; Tue, 08 Jun 2021 16:06:56 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:42837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqhzp-0005E3-0K for 48909@debbugs.gnu.org; Tue, 08 Jun 2021 16:06:50 -0400 Received: by mail-wm1-f42.google.com with SMTP id l7-20020a05600c1d07b02901b0e2ebd6deso2707019wms.1 for <48909@debbugs.gnu.org>; Tue, 08 Jun 2021 13:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:message-id :date:mime-version; bh=KNnfaDxQfGsa+a+ctxo4pphtuRKbxI0g9e41/sfYveE=; b=dpou5RFxZpOucNDhl50hCIhyS91p4sOBR/+5aIdLC/DBGIa2AEUA7r1B6IUBki5Ni8 NeeMsyfFOIpwUlFGHDJoTP1922/+kPqLbvoeJ3Q74dzXbxvY0JZ93/V73VGshVuXW0Af nUau6/EWtUv1n+h/03QWkVdjrr0AI22QHE8fo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:message-id:date:mime-version; bh=KNnfaDxQfGsa+a+ctxo4pphtuRKbxI0g9e41/sfYveE=; b=tESgQJKS8TD3Q6usPzHgoK/kQtMNVGikgfHfXpik5qEDGKwfjOf8ibW6m5ZJG8vA7y pnV21qXq59Aw1ZHzAP/fC1sTWyTv0UuZCb9v4auVe8dLvFqU/trtGkStNHABzLgD/NGw DB1N7rBj71ESmUBGbfZ3FktuWGF1InNTl2EfrxHQHceL4QSmQQ1vZSoX8vTBo/5x7u63 661t1FEZcRmSRBkFUaoMEW4crhVPtcd/dwhUQMXreN+Q4fqPE2jZjmejlo7gwkyC0D8z gmUPJ6YbcXEjJJanqQfoqWsiB7yrdeer4E3i3xpC+AK3Pxv4Evd8M/rMclb9wz3TPhrg kU/Q== X-Gm-Message-State: AOAM530SGI/uCMGLXHdExl5yoZtAVTqnMszkOPQE8Sy/7a6B1j2Tbsqc mKP/MjcmEE4y9+acZZZQl1zQeu4niWtTEw== X-Google-Smtp-Source: ABdhPJy1hg5mPtQp0HSTinvswDfzPzAzgHCfNLV0WQmRMvecDG6b1DR7jegqW+sqG4PpK38ptQ465g== X-Received: by 2002:a1c:9804:: with SMTP id a4mr24368307wme.34.1623182799039; Tue, 08 Jun 2021 13:06:39 -0700 (PDT) Received: from localhost ([92.206.237.187]) by smtp.gmail.com with ESMTPSA id q11sm20557759wrx.80.2021.06.08.13.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 13:06:38 -0700 (PDT) References: <1051806061.54116.1623162973231@office.mailbox.org> User-agent: mu4e 1.4.15; emacs 28.0.50 From: Sergey Trofimov In-reply-to: <1051806061.54116.1623162973231@office.mailbox.org> Message-ID: <87tum8qfwo.fsf@sarg.org.ru> Date: Tue, 08 Jun 2021 22:07:19 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623182833; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=KNnfaDxQfGsa+a+ctxo4pphtuRKbxI0g9e41/sfYveE=; b=eRAihTg7vSqRnXzNrTF/7TpIrTV7ggNneq2Lfkoe4RXIkKbE4RkHVD8yIcrBqmeDgOibc0 WGE/3uRGAt/r+56AW58TqSNzFJHpj73qKthQdE4V4xRCB1PJGIXMKmSy3e0UH7KYwLRzfB AN8QKwEpZHCZYZLrOux06vbv2yA6cfX7kJITTT2Bn/37MHfK36QN98bFELTUBkCwS3klUD 1xBzk+zpO0QuWKiPxZ//paq8EuD6+wDFwvtu12omUMbkIQalMcaw0nAyOinS4ntSRUqLkI WgnEDwl1t/yG3/vZ6CXpoeWTWA/IsR7bOa9h64oZXIxGXy+CRO1xOpAepEpuxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623182833; a=rsa-sha256; cv=none; b=ZwuSjRsRi+6uoP37ch9q5D8AXuuTu6ZwziYpoJElUeUnx/4rzGzkRu3tVz8DhQwAsohYY3 E2gnl+xXVmuLBxdEDri1n7yEU/EKsobBI4rN/VJtSPRqRVoCk19pB4YR+L0Q51wuqoYwg4 ekBNArqpqMzqrGKBudICVjHIuQ01hPt2Pykk0mHJkTtlViZhQ8VeaaguiBotdPMZITelNM SwJ6SAsS4aDcN75xGfMeh16p0Z2xNkW9FMYHOd+7aX1Y444XHMT8cP9GYXNIKHFT4n798w 7j+46YC9vriZ10RmRD0M/biXR2yYMGAXjfT/9iirPCtdgHd6K5glrceHJsdkgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=dpou5RFx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=dpou5RFx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1B4942010A X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: pYNbxaaUACYy --=-=-= Content-Type: text/plain; format=flowed I've reused the patch from nixpkgs and added opencc dependency. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-goldendict.patch >From e5c96b58f23f56da605b4ccdf3cef7d04ef379c9 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Mon, 7 Jun 2021 21:50:30 +0200 Subject: [PATCH] gnu: Add goldendict. --- gnu/packages/dictionaries.scm | 65 +++++++++++++++++++ .../goldendict-remove-check-for-update.patch | 49 ++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 gnu/packages/patches/goldendict-remove-check-for-update.patch diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 2b1f7f0ad1..92c6d6d742 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -52,6 +52,13 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages compression) #:use-module (gnu packages tcl) + #:use-module (gnu packages xiph) + #:use-module (gnu packages libreoffice) + #:use-module (gnu packages xorg) + #:use-module (gnu packages image) + #:use-module (gnu packages textutils) + #:use-module (gnu packages qt) + #:use-module (gnu packages video) #:use-module (gnu packages xml)) @@ -398,6 +405,64 @@ intelligible and easily correctable.") (license (list license:gpl2 ; main license license:expat)))) ; utf8/* +(define-public goldendict + (package + (name "goldendict") + (version "2020-12-09") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/goldendict/goldendict.git") + (commit "261e45a5d79f9df2fbc050292410bed0f4ef3132"))) + (sha256 + (base32 "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n")) + (patches (search-patches "goldendict-remove-check-for-update.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "qmake" "goldendict.pro" + "CONFIG+=no_epwing_support" + "CONFIG+=chinese_conversion_support" + "QMAKE_LRELEASE=lrelease" + (string-append "PREFIX=" + (assoc-ref outputs "out")))))))) + + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("ao" ,ao) + ("bzip2" ,bzip2) + ("hunspell" ,hunspell) + ("ffmpeg" ,ffmpeg) + ("libtiff" ,libtiff) + ("libvorbis" ,libvorbis) + ("libxtst" ,libxtst) + ("opencc" ,opencc) + ("qtx11extras" ,qtx11extras) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools) + ("qtwebkit" ,qtwebkit) + ("qtwebview" ,qtwebview) + ("lzo" ,lzo) + ("x11proto-record-x11" ,xproto) + ("zlib" ,zlib))) + (synopsis "Feature-rich dictionary lookup program") + (description + "GoldenDict is a feature-rich dictionary lookup program, +supporting multiple dictionary formats (StarDict, Babylon, Lingvo, Dictd, AARD, +MDict, SDict) and online dictionaries, featuring perfect article rendering with +the complete markup, illustrations and other content retained, and allowing you +to type in words without any accents or correct case.") + (home-page "http://goldendict.org/") + (license license:gpl3+))) + (define-public sdcv (package (name "sdcv") diff --git a/gnu/packages/patches/goldendict-remove-check-for-update.patch b/gnu/packages/patches/goldendict-remove-check-for-update.patch new file mode 100644 index 0000000000..c5984963c3 --- /dev/null +++ b/gnu/packages/patches/goldendict-remove-check-for-update.patch @@ -0,0 +1,49 @@ +diff --git i/config.cc w/config.cc +index 04b63f5..7a453d9 100644 +--- i/config.cc ++++ w/config.cc +@@ -182,7 +182,7 @@ Preferences::Preferences(): + pronounceOnLoadPopup( false ), + useInternalPlayer( InternalPlayerBackend::anyAvailable() ), + internalPlayerBackend( InternalPlayerBackend::defaultBackend() ), +- checkForNewReleases( true ), ++ checkForNewReleases( false ), + disallowContentFromOtherSites( false ), + enableWebPlugins( false ), + hideGoldenDictHeader( false ), +@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError ) + c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text(); + } + +- if ( !preferences.namedItem( "checkForNewReleases" ).isNull() ) +- c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" ); ++ //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() ) ++ // c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" ); + + if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() ) + c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" ); +@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError ) + proxy.appendChild( opt ); + } + +- opt = dd.createElement( "checkForNewReleases" ); +- opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) ); +- preferences.appendChild( opt ); ++ //opt = dd.createElement( "checkForNewReleases" ); ++ //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) ); ++ //preferences.appendChild( opt ); + + opt = dd.createElement( "disallowContentFromOtherSites" ); + opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) ); +diff --git i/preferences.cc w/preferences.cc +index 72c3147..7e48f00 100644 +--- i/preferences.cc ++++ w/preferences.cc +@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ): + this, SLOT( customProxyToggled( bool ) ) ); + + ui.checkForNewReleases->setChecked( p.checkForNewReleases ); ++ ui.checkForNewReleases->setEnabled( false ); + ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites ); + ui.enableWebPlugins->setChecked( p.enableWebPlugins ); + ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader ); -- 2.32.0 --=-=-= Content-Type: text/plain; format=flowed Brendan Tildesley writes: > The program phones home to check for updates at this url > Also consider adding opencc as an input and adding > "CONFIG+=chinese_conversion_support" --=-=-=--