From patchwork Sun Oct 1 12:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: altadil X-Patchwork-Id: 54433 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 2BB4327BBE9; Sun, 1 Oct 2023 13:42:57 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 E982D27BBE2 for ; Sun, 1 Oct 2023 13:42:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qmvmb-0003s7-AY; Sun, 01 Oct 2023 08:42:49 -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 1qmvmZ-0003rO-Ob for guix-patches@gnu.org; Sun, 01 Oct 2023 08:42:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qmvmZ-0002Tj-Gh for guix-patches@gnu.org; Sun, 01 Oct 2023 08:42:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qmvmp-0001v5-6q for guix-patches@gnu.org; Sun, 01 Oct 2023 08:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41293] [PATCH 2/5] gnu: Add pantheon-photos. References: <87tv0h0x0k.fsf@protonmail.com> In-Reply-To: <87tv0h0x0k.fsf@protonmail.com> Resent-From: altadil Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Oct 2023 12:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41293@debbugs.gnu.org Cc: altadil Received: via spool by 41293-submit@debbugs.gnu.org id=B41293.16961641467282 (code B ref 41293); Sun, 01 Oct 2023 12:43:03 +0000 Received: (at 41293) by debbugs.gnu.org; 1 Oct 2023 12:42:26 +0000 Received: from localhost ([127.0.0.1]:60815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmvmD-0001tO-BE for submit@debbugs.gnu.org; Sun, 01 Oct 2023 08:42:25 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:45903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qmvmA-0001t3-R9 for 41293@debbugs.gnu.org; Sun, 01 Oct 2023 08:42:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1696164120; x=1696423320; bh=gCI9s3vg1Bc4HxVlZc8h5wtguhalMJhHAv1gdTso30Y=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=jjyRU2UvPxY6AYahGZ2VVPCcNY1SkyYInXBicXQwTJvxwKdlzoXko55Amrg/EbskJ Fb3lD7CL+RrcxfqI4sEdbK9xiWaPr+bXzrCA2pSCKoQpA3yLPfWu53E5gExYyFDu2g jgnEaev6Uho8Ew/C4+eJJ0PtQwpGj7RDdwHDlalsTrtEGERCSBi6jvmkrZ4eB0N6Ff TDuMNMOyCoy+nvAYYcBQeqFARXuCZblHsOidpszr7Df0Gg03PYfWuBx/jkBVXH+Ilf xCOi606H1Lu995xkrvfuVNHTyx9SjISd3shNAaeb5UmDSqCUVotnU50D89nd/qkWyd tFffqtWTwj/Gw== Date: Sun, 01 Oct 2023 12:41:50 +0000 Message-ID: Feedback-ID: 3841829:user:proton 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: , Reply-to: altadil X-ACL-Warn: , altadil via Guix-patches X-Patchwork-Original-From: altadil via Guix-patches via From: altadil 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/pantheon.scm (pantheon-photos): New variable. --- guix build --rounds=2 was successfully run on a Zen4 CPU, for the following --system= options: - x86_64-linux - i686-linux - aarch64-linux. gnu/packages/pantheon.scm | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 55cb65045e..3465e5cb37 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -25,14 +25,18 @@ (define-module (gnu packages pantheon) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages image) #:use-module (gnu packages package-management) #:use-module (gnu packages pcre) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages sqlite) #:use-module (gnu packages xml) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) #:use-module (gnu packages) #:use-module (guix build-system meson) @@ -132,6 +136,61 @@ (define-public pantheon-calculator desktop.") (license license:gpl3))) +(define-public pantheon-photos + (package + (name "pantheon-photos") + (version "2.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/photos") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1aw77sdh2z7fah3vbi68145wc0xqg2afch1kswvgkmij0f0n04jn")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-schema-cache-generation + (lambda _ + (setenv "DESTDIR" "/"))) + (add-after 'install 'install-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out + "/bin/io.elementary.photos")) + (link (string-append out "/bin/pantheon-photos"))) + (symlink bin link))))))) + (native-inputs (list desktop-file-utils + `(,glib "bin") intltool pkg-config vala)) + (inputs (list geocode-glib-with-libsoup2 + gexiv2 + granite-6 + gstreamer + gst-plugins-base + gtk+ + json-glib + libexif + libgee + libgphoto2 + libgudev + libhandy + libraw + libsoup-minimal-2 + libwebp + rest + sqlite + webkitgtk-with-libsoup2)) + (synopsis "Photo viewer and organizer designed for the Pantheon desktop") + (description + "Photos is an image viewer and organizer. It originally comes +from elementary OS and is designed for the Pantheon desktop environment (but can +also be used on others.") + (home-page "https://elementary.io/open-source") + (license license:lgpl2.1+))) + (define-public pantheon-stylesheet (package (name "pantheon-stylesheet")