From patchwork Thu Jun 22 19:33:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51190 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 2462727BBEC; Thu, 22 Jun 2023 20:34:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 552F027BBE2 for ; Thu, 22 Jun 2023 20:34:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCQ4C-0006ZF-A9; Thu, 22 Jun 2023 15:34:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCQ4A-0006Y5-55 for guix-patches@gnu.org; Thu, 22 Jun 2023 15:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCQ49-0002uc-Su for guix-patches@gnu.org; Thu, 22 Jun 2023 15:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCQ49-00064V-Ou for guix-patches@gnu.org; Thu, 22 Jun 2023 15:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60826] [PATCH gnome-team v4 1/4] gnu: shared-mime-info: Move to (gnu packages freedesktop). Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 19:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60826@debbugs.gnu.org Cc: Bruno Victal , liliana.prikler@gmail.com Received: via spool by 60826-submit@debbugs.gnu.org id=B60826.168746241323272 (code B ref 60826); Thu, 22 Jun 2023 19:34:01 +0000 Received: (at 60826) by debbugs.gnu.org; 22 Jun 2023 19:33:33 +0000 Received: from localhost ([127.0.0.1]:36810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3g-00063H-TU for submit@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:33 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:51618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCQ3f-000631-Cr for 60826@debbugs.gnu.org; Thu, 22 Jun 2023 15:33:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id BFD15202D2; Thu, 22 Jun 2023 21:33:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 151E2800A9; Thu, 22 Jun 2023 21:33:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3bQoXAUMcxvs; Thu, 22 Jun 2023 21:33:22 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 3B07B8009D; Thu, 22 Jun 2023 21:33:22 +0200 (CEST) From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:17 +0100 Message-Id: <98f418fb7aece7fe76e8d1ab86fffdd604a2fcde.1687462396.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (shared-mime-info): Move to … * gnu/packages/freedesktop.scm: … here. * gnu/packages/gnuzilla.scm: Use (gnu packages freedesktop). * gnu/packages/kde-games.scm: Ditto. * gnu/packages/kde-multimedia.scm: Ditto. * gnu/packages/kde-pim.scm: Ditto. * gnu/packages/kde-utils.scm: Ditto. * gnu/packages/maths.scm: Ditto. * gnu/packages/mp3.scm: Ditto. * gnu/packages/ruby.scm: Ditto. * guix/profiles.scm (xdg-mime-database): Adjust to new location. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 33 --------------------------------- gnu/packages/gnuzilla.scm | 1 + gnu/packages/kde-games.scm | 2 +- gnu/packages/kde-multimedia.scm | 1 + gnu/packages/kde-pim.scm | 1 + gnu/packages/kde-utils.scm | 1 + gnu/packages/maths.scm | 1 + gnu/packages/mp3.scm | 1 + gnu/packages/ruby.scm | 1 + guix/profiles.scm | 2 +- 11 files changed, 42 insertions(+), 35 deletions(-) base-commit: 909788c0aebd8098084c009afa98d1209c9ec869 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6385741d89..bd3df9ee68 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -465,6 +465,39 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +(define-public shared-mime-info + (package + (name "shared-mime-info") + (version "1.15") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" + "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version + ".tar.xz")) + (sha256 + (base32 + "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) + (build-system gnu-build-system) + (arguments + ;; The build system appears not to be parallel-safe. + '(#:parallel-build? #f)) + (inputs + (list glib libxml2)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config))) + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") + (synopsis "Database of common MIME types") + (description + "The shared-mime-info package contains the core database of common types +and the update-mime-database command used to extend it. It requires glib2 to +be installed for building the update command. Additionally, it uses intltool +for translations, though this is only a dependency for the maintainers. This +database is translated at Transifex.") + (license license:gpl2+))) + (define-public xdg-utils (package (name "xdg-utils") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6db2d6569e..ebabd1a84e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2913,39 +2913,6 @@ (define-public tango-icon-theme guidelines.") (license license:public-domain))) -(define-public shared-mime-info - (package - (name "shared-mime-info") - (version "1.15") - (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) - (sha256 - (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) - (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) - (inputs - (list glib libxml2)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) - (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") - (synopsis "Database of common MIME types") - (description - "The shared-mime-info package contains the core database of common types -and the update-mime-database command used to extend it. It requires glib2 to -be installed for building the update command. Additionally, it uses intltool -for translations, though this is only a dependency for the maintainers. This -database is translated at Transifex.") - (license license:gpl2+))) - (define-public system-config-printer (package (name "system-config-printer") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e40d2b8922..4608d3d7ae 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -63,6 +63,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 9be889f6aa..73fb88c4cb 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -30,7 +30,7 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) - #:use-module ((gnu packages gnome) #:select (shared-mime-info)) + #:use-module ((gnu packages freedesktop) #:select (shared-mime-info)) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages perl) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e3de6db432..6460345c47 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 6f3cbf2999..dc0533d24b 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 5774fa9910..35ad20f541 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-utils) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) ; dbus for tests #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f89e70c0bb..8f1b88ef6b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -122,6 +122,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..85f45d3271 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -40,6 +40,7 @@ (define-module (gnu packages mp3) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnome) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eb84367d15..44bea787a6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -60,6 +60,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) diff --git a/guix/profiles.scm b/guix/profiles.scm index 6467e464c8..2e2466ccbc 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1562,7 +1562,7 @@ (define (xdg-mime-database manifest) "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." (define shared-mime-info ; lazy reference - (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + (module-ref (resolve-interface '(gnu packages freedesktop)) 'shared-mime-info)) (mlet %store-monad ((glib (manifest-lookup-package manifest "glib"))) (define build