From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2BKnNhyf4GAz0AAAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 19:32:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mKw4Mhyf4GD3DwAAbx9fmQ (envelope-from ) for ; Sat, 03 Jul 2021 17:32:12 +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 7A6531E370 for ; Sat, 3 Jul 2021 19:32:12 +0200 (CEST) Received: from localhost ([::1]:42054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzjUx-0002HA-Cr for larch@yhetil.org; Sat, 03 Jul 2021 13:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzjUo-0002Gv-3i for guix-patches@gnu.org; Sat, 03 Jul 2021 13:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzjUn-0006xA-Rp for guix-patches@gnu.org; Sat, 03 Jul 2021 13:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzjUn-0007dc-PR for guix-patches@gnu.org; Sat, 03 Jul 2021 13:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48909] [PATCH] gnu: Add goldendict. References: <20210607200532.27565-1-sarg@sarg.org.ru> In-Reply-To: <20210607200532.27565-1-sarg@sarg.org.ru> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 17:32: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: Sergey Trofimov Received: via spool by 48909-submit@debbugs.gnu.org id=B48909.162533351529345 (code B ref 48909); Sat, 03 Jul 2021 17:32:01 +0000 Received: (at 48909) by debbugs.gnu.org; 3 Jul 2021 17:31:55 +0000 Received: from localhost ([127.0.0.1]:39789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjUc-0007d8-BH for submit@debbugs.gnu.org; Sat, 03 Jul 2021 13:31:55 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:55224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzjUZ-0007cp-2R for 48909@debbugs.gnu.org; Sat, 03 Jul 2021 13:31:48 -0400 Received: by mail-wm1-f47.google.com with SMTP id l1so8561855wme.4 for <48909@debbugs.gnu.org>; Sat, 03 Jul 2021 10:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=l4707dxryeaBUsvzJqGPhZFuzZoo/vZsDWZo7D/jxZs=; b=iwgalxroIp3D/GDEjCUwa1UB6CBgs/1nnu23eEjOcxA+k2Q/I35cUNgZjK1hVWhfcN t9+CyHhVNK5CzjEw6oi7HXE31OkezliqjzJiKCDpms4jf6QAJbaUyJiTw0McF8n8SY3B GqQFvEFcICFKmDPcmZGjI8TbDthHPJteihPhE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=l4707dxryeaBUsvzJqGPhZFuzZoo/vZsDWZo7D/jxZs=; b=iiY5oMhjPohFtcRonThOfV13o1eW5rMij2/roqDoEwR3uI42wRi9tbpnG0FUP/t4hq VIe8DKhLSQgxzelDf2bi8hqfSbpUNgukpSuF3RSsEvv42Xb2YVDOJzngvNwZgFidne8x nwhRa3k56GYpaXBwWVUymDOcRFkHtxW4QBFhDdyRV1f1MerNUHbobIPw+ZxmElBEsnGy Z6pp4P5DBqnx1FeOzv1M+2/8rzX/p2Yk5jQlFigr6mQSJtgeu9flMcilZ8RWs7rKFFK5 XCkjSu/y1pO+fxMbEe6qTLZw7FBmyPOx+usyfDQgeZ+xH5+wWBF0txe8qnNsVu50An9c J+tA== X-Gm-Message-State: AOAM532w09yB9JXQ+w3xF03DiO06lTZkElCLFOIJGhK+qtwNLReqh+We 1COBbaSQEL2CTg1QaY12cBVZp+Hlhce1Dl9I X-Google-Smtp-Source: ABdhPJz3GK44W+sxUC9W6YcbyvB1P7RKYcXd1dtpI1996ILsMF+pQgHbmbaGii9isWi3yzDh7o7vlQ== X-Received: by 2002:a05:600c:219a:: with SMTP id e26mr5628701wme.63.1625333500947; Sat, 03 Jul 2021 10:31:40 -0700 (PDT) Received: from localhost ([92.206.237.187]) by smtp.gmail.com with ESMTPSA id n2sm1480399wrx.40.2021.07.03.10.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jul 2021 10:31:40 -0700 (PDT) From: Sergey Trofimov Date: Sat, 3 Jul 2021 19:32:22 +0200 Message-Id: <20210703173222.6441-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=1625333532; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=l4707dxryeaBUsvzJqGPhZFuzZoo/vZsDWZo7D/jxZs=; b=n6xCAOTdOStd/v1sD1qADLvTzM5+rR/GOIqiVsA6JJd1RBGxDai6MPEBIeNlPHQshXBT21 Cft+jouRHN8rTxeMKuPwm7DZDiwz+1qQ/BxMChhqYX6Ec2bus6EiSEQwHLFT7ECln/7Y7Q 6sl1dOke+L5wvOZPm9dylsVQyYHrS9FoCZyt6yc3agWuqqoLLzCkOtIBisI0cFl7g/Gqjq d70dnKlAKmHZSejjz6E33S5o24IUdy6yRlhOp9w+Dfi/cp1XCajaL6rPI/KXwLTlx2HhSs /uymxpZ75PH5Ifzx5NQizwgwNowqcLIXXCL/y6kjhj1HCqlOYdAAns04LadaCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625333532; a=rsa-sha256; cv=none; b=EnJ6l2t8edspS8EE5t98euOMrBkHNIKI+udBsA62Ob+2MEdb84mgJJRW7kOfmvq8k93GCy esptF6lQc50n6gt0Ax4Q7gl3KKpjfkwg8CMq3vLIy4PtJ8FpuAjmx1mcG4rBf8zWW6DWjz mWSoEfmvVuEeAJeNQ2CU93F43Gzd7H0u+KYqCUDj0x5VA6C2mUOnT6/dlM6f1VEp5Mr4gG Ft2qVRbhUJi7aK1l0iMMyQ08mz04y/S7LHiVmQXemV1Km0QVnVSO3I7Aui0Yrs/HHv0ygp yIKZpn1S9FYFr3FLUlKiDox/T/0gr58VQS+Y8Q8xCtE4um3OizqqUCn7/b/LHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=iwgalxro; 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: 3.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=iwgalxro; 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: 7A6531E370 X-Spam-Score: 3.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: NA5g8mA1FNL4 * gnu/packages/dictionaries.scm (goldendict): New variable. --- gnu/local.mk | 1 + gnu/packages/dictionaries.scm | 72 +++++++++++++++++++ .../goldendict-remove-check-for-update.patch | 52 ++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 gnu/packages/patches/goldendict-remove-check-for-update.patch diff --git a/gnu/local.mk b/gnu/local.mk index b197ec55f9..e27af238c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1169,6 +1169,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ + %D%/packages/patches/goldendict-remove-check-for-update.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 5ca9e128ff..03cf1f3a5d 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,71 @@ intelligible and easily correctable.") (license (list license:gpl2 ; main license license:expat)))) ; utf8/* +(define-public goldendict + (let ((commit "baff02a14b3f70f0d0a55bef550dbb74dcbf0ce8") + (revision "0")) + (package + (name "goldendict") + (version (git-version "1.5.0-RC2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/goldendict/goldendict") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1l5ymxl34pw01vfq721wfgzvq4zw4iwvb73nhsb94m3l2za5k5j2")) + (patches (search-patches "goldendict-remove-check-for-update.patch")) + (modules '((guix build utils))) + (snippet '(begin + (for-each delete-file-recursively + '("winlibs" "maclibs")) + #t)))) + (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-5) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("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..84d9b1767e --- /dev/null +++ b/gnu/packages/patches/goldendict-remove-check-for-update.patch @@ -0,0 +1,52 @@ +https://github.com/NixOS/nixpkgs/blob/217b221/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch +Disable calling home for updates. + +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