From patchwork Sun Nov 13 19:21:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: florhizome X-Patchwork-Id: 44507 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 A5E8C27BBE9; Sun, 13 Nov 2022 19:22:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 210E727BBE9 for ; Sun, 13 Nov 2022 19:22:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouIYO-0000ky-BP; Sun, 13 Nov 2022 14:22:04 -0500 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 1ouIYN-0000kZ-2u for guix-patches@gnu.org; Sun, 13 Nov 2022 14:22:03 -0500 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 1ouIYM-0007Db-Qs for guix-patches@gnu.org; Sun, 13 Nov 2022 14:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ouIYM-00080c-Ms for guix-patches@gnu.org; Sun, 13 Nov 2022 14:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59105] [PATCH 1/3] gnu: cinnamon: upgrade cinnamon-desktop References: <87o7ti7r4x.fsf@posteo.net> In-Reply-To: <87o7ti7r4x.fsf@posteo.net> Resent-From: florhizome@posteo.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Nov 2022 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59105 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59105@debbugs.gnu.org Cc: florhizome Received: via spool by 59105-submit@debbugs.gnu.org id=B59105.166836729330728 (code B ref 59105); Sun, 13 Nov 2022 19:22:02 +0000 Received: (at 59105) by debbugs.gnu.org; 13 Nov 2022 19:21:33 +0000 Received: from localhost ([127.0.0.1]:48395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouIXs-0007zS-IY for submit@debbugs.gnu.org; Sun, 13 Nov 2022 14:21:33 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouIXo-0007z2-Qt for 59105@debbugs.gnu.org; Sun, 13 Nov 2022 14:21:30 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AD4D9240105 for <59105@debbugs.gnu.org>; Sun, 13 Nov 2022 20:21:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1668367282; bh=SK0ynBWgS98R5p+BTz1oelRlj/ytn3fCOJNN2/Xi6B8=; h=From:To:Cc:Subject:Date:From; b=gzdzhH+V52LDvt4ErgaNwhJ5o3Sm/gPehVKgTSdc9ARd+/s2wqsXOFosPtD7wzoQA VmLYHFWUox+hiEMUWYX5nzdBQT7smvkO8I1GsNzPUQWMP3dSMC2CD/O+LskOW24S7b lu3TDZvSCrYxYxCIs9owbVlnrP1T84rdwEtOfjkHiJRip2/8/laCAAREPf3mc6/F6F wPntuj8m/006XZPAo7DsQIcj3auOjhhJoz4A42tt6Cev+3AJwEzNoCFgz9IEds+Hkh zreVWiNDN6aRDVhRToVXWAhgbKMpRfZ+WwZmRCXcfK3Gp8XBuudmhW/tacNoMp+I7t 1Q7+D+jaiMliA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N9Mk938dTz6tr4; Sun, 13 Nov 2022 20:21:21 +0100 (CET) From: florhizome@posteo.net Date: Sun, 13 Nov 2022 19:21:15 +0000 Message-Id: <79af977f96c3628451bc191a52529a6e354e5e5c.1668366634.git.florhizome@posteo.net> 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 From: florhizome Updates cinnamon-desktop to new version and meson-build-system, adds alsa support, moves gobject-introspection to native-inputs, removes python-2 * gnu/packages/cinnamon.scm (cinnamon-desktop): Upgrade package. [arguments] configure-flags: enable alsa-support [inputs] remove python-2, remove gobject-introspection, add libext, alsa-lib [native-inputs] remove gnu-build-system related packages, add gobject-introspection --- gnu/packages/cinnamon.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index fe33e797e4..0087a41839 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2022 florhizome ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,9 +23,12 @@ (define-module (gnu packages cinnamon) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages freedesktop) @@ -32,44 +36,45 @@ (define-module (gnu packages cinnamon) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages photo) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public cinnamon-desktop (package (name "cinnamon-desktop") - (version "3.4.2") - (source (origin - (method git-fetch) + (version "5.4.2") + (source + (origin + (method git-fetch) (uri (git-reference (url "https://github.com/linuxmint/cinnamon-desktop") (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18mjy80ly9361npjhxpm3n0pkmrwviaqr2kixjb7hyxa6kzzh5xw")))) - (build-system gnu-build-system) - ;; TODO: package 'libgsystem'. + (sha256 + (base32 "03yfh1fhcs9g4qxczq1k2fi0c9354ryapvhg24210scgds4ljkjk")))) + (build-system meson-build-system) + (arguments + (list #:glib-or-gtk? #t + #:configure-flags #~(list "-Dalsa=true"))) (inputs (list accountsservice + alsa-lib gtk+ glib - gobject-introspection gnome-common libxkbfile libxrandr - python-2 + libxext pulseaudio xkeyboard-config)) (native-inputs - (list autoconf - automake + (list gobject-introspection + (list glib "bin") gettext-minimal - `(,glib "bin") ; glib-gettextize - intltool - libtool pkg-config)) (home-page "https://github.com/linuxmint/cinnamon-desktop/") (synopsis "Library for the Cinnamon Desktop")