From patchwork Mon Jun 27 07:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 40352 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 4D86327BBEA; Mon, 27 Jun 2022 08:09:34 +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=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 2414427BBE9 for ; Mon, 27 Jun 2022 08:09:33 +0100 (BST) Received: from localhost ([::1]:48858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5isG-0000y6-93 for patchwork@mira.cbaines.net; Mon, 27 Jun 2022 03:09:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5irn-0000xY-4R for guix-patches@gnu.org; Mon, 27 Jun 2022 03:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5irm-0002J6-3r for guix-patches@gnu.org; Mon, 27 Jun 2022 03:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o5irl-0003uP-VN for guix-patches@gnu.org; Mon, 27 Jun 2022 03:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51737] [PATCH v2 1/7] gnu: Add linux-libre-waydroid. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Jun 2022 07:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , "51737@debbugs.gnu.org" <51737@debbugs.gnu.org> Received: via spool by 51737-submit@debbugs.gnu.org id=B51737.165631369414965 (code B ref 51737); Mon, 27 Jun 2022 07:09:01 +0000 Received: (at 51737) by debbugs.gnu.org; 27 Jun 2022 07:08:14 +0000 Received: from localhost ([127.0.0.1]:49624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5iqs-0003tB-Lk for submit@debbugs.gnu.org; Mon, 27 Jun 2022 03:08:14 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:34932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5iqn-0003se-SW for 51737@debbugs.gnu.org; Mon, 27 Jun 2022 03:08:05 -0400 Date: Mon, 27 Jun 2022 07:07:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1656313674; x=1656572874; bh=+MKEjd6HX80dxIOGguuvCCZbMmo+bcMAx1sS08ZNb9E=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=bvtRpGGFYhGu8OkXy/mznRbe4DlWzNFyTqkzPisjnegYOM4IYtfkPKJH3oNOud5Bo ytVKnjzs6An6+7cyIYP7PZ8FRTAsIWqm/jN8Axir+oFqOdRjXigr3ACQy/DcrrzBDK 9OvDoZjSs2R50eXI/pnJGkAiZ/W/AP3eV3ZO5o1BbVzo6pG+AuF1Sa+gPxF79jS9br jxpVlbfUnvlKhY/pLXnpxxf0YrSRaawAHju6Nkc9SobKislZ2Qf0kkET6Gw9VPAOGW 7nj0KBh7yk82VrgxREPBIxPee7b9Gtg/AHzO9tx8pKLqaeLjidiI6/+dgJ2BHDFJNY /tFf4E96qSO6w== Message-ID: In-Reply-To: References: <6DHjUMqjMoW-JFxyBmViVrNgl6CjM63WJ5vn4bejvkbXWdkQa_NSI1l2lfluy4q_PMSinz3DdOq5mM5oVsuoHsrDzMKEqjcUTQ_R7NpAYp0=@protonmail.com> Feedback-ID: 14143818: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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Maxime, > > > +                                (string-append "DESTDIR=" > > +                                               #$output)) > > > DESTDIR is for staged installation, which Guix doesn't do, so set > DESTDIR=/ or don't set it at all (maybe PREFIX or prefix is what you > need to set instead?). Likewise for other packages. > > Greetings, > Maxime. I packaged it this way as at that time was the simples solution. Now I switched to substitution in Makefile itself. Also there's fix for waydroid package as I mistakenly send old patch. Should I also create a service for waydroid + test to check it's running? ---- Petr From 9f9dbbfed1d8b7f999c92d940740b478d8d082a8 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 9 Nov 2021 22:34:39 +0100 Subject: [PATCH v3 3/6] gnu: Add libglibutil. * gnu/packages/glib.scm (libglibutil): New variable. diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 98267fcee5..19f69b3a5c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ (define-module (gnu packages glib) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -848,6 +850,53 @@ (define-public glibmm-2.64 (modify-inputs (package-propagated-inputs glibmm) (replace "libsigc++" libsigc++-2))))) +(define-public libglibutil + (package + (name "libglibutil") + (version "1.0.65") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sailfishos.org/mer-core/libglibutil") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sc8xw5cbxcicipjp6ycbgqppn31lzsll4r9j6b0zxd747dziv54")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list (string-append "CC=" + #$(cc-for-target))) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'remove-usr-prefix + (lambda* _ + (substitute* "libglibutil.pc.in" + (("/usr/include") (string-append #$output + "/include"))) + (substitute* "Makefile" + (("\\$\\(DESTDIR\\)") #$output) + (("usr/") "")))) + (add-after 'install 'install-dev + (lambda* _ + (invoke "make" "install-dev" + (string-append "DESTDIR=" + #$output)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (chdir "test") + (invoke "make" + (string-append "CC=" + #$(cc-for-target))) + (chdir ".."))))))) + (native-inputs (list pkg-config)) + (inputs (list glib)) + (home-page "https://git.sailfishos.org/mer-core/libglibutil") + (synopsis "GLib utilites") + (description "This package provides library of glib utilities.") + (license license:bsd-3))) + (define-public python-pygobject (package (name "python-pygobject") -- 2.36.1