GNU logs - #61027, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#61027] [PATCH] Add flatpak-builder. 
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Jan 2023 12:07:02 +0000
Resent-Message-ID: <handler.61027.B.16744756108790 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 61027 <at> debbugs.gnu.org
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 23 Jan 2023 13:06:31 +0100
Message-ID: <875ycxwj3s.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=87.98.184.141; envelope-from=ngraves@HIDDEN;
 helo=9.mo561.mail-out.ovh.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001,
 RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

3 patches to add the tool flatpak-builder, useful for building flatpaks.

-- 
Best regards,
Nicolas Graves

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Nicolas Graves <ngraves@HIDDEN>
Subject: bug#61027: Acknowledgement ([PATCH] Add flatpak-builder. )
Message-ID: <handler.61027.B.16744756108790.ack <at> debbugs.gnu.org>
References: <875ycxwj3s.fsf@HIDDEN>
X-Gnu-PR-Message: ack 61027
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 61027 <at> debbugs.gnu.org
Date: Mon, 23 Jan 2023 12:07:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 61027 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
61027: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D61027
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#61027] [PATCH 1/3] gnu: Add debugedit.
References: <875ycxwj3s.fsf@HIDDEN>
In-Reply-To: <875ycxwj3s.fsf@HIDDEN>
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Jan 2023 12:23:02 +0000
Resent-Message-ID: <handler.61027.B61027.167447652610494 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 61027 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 23 Jan 2023 13:21:50 +0100
Message-Id: <20230123122152.5115-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/debug.scm (debugedit): New variable.
---
 gnu/packages/debug.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 1c4f570fe4..48b927b89d 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages glib)
@@ -56,6 +57,8 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages man)
+  #:use-module (gnu packages m4)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ninja)
   #:use-module (gnu packages perl)
@@ -795,6 +798,38 @@ (define-public cgdb
 using cgdb.")
     (license license:gpl2+)))
 
+(define-public debugedit
+  (package
+    (name "debugedit")
+    (version "5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://sourceware.org/git/debugedit.git")
+             (commit (string-append name "-" version) )))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jxiizzzvx89dhs99aky48kl5s49i5zr9d7j4753gp0knk4pndjm"))))
+    (build-system gnu-build-system)
+    (arguments '(#:tests? #f))
+    (propagated-inputs (list elfutils))
+    (inputs (list zlib xz))
+    (native-inputs
+     (list
+      autoconf automake m4 util-linux libtool help2man pkg-config))
+    (home-page "https://sourceware.org/git/debugedit.git")
+    (synopsis "Tool for debugging")
+    (description
+     "The debugedit project provides programs and scripts for creating
+debuginfo and source file distributions, collect build-ids and rewrite
+source paths in DWARF data for debugging, tracing and profiling.
+
+It is based on code originally from the rpm project plus libiberty and
+binutils.  It depends on the elfutils libelf and libdw libraries to
+read and write ELF files, DWARF data and build-ids.")
+    (license license:lgpl2.1)))
+
 (define-public mspdebug
   ;; Last official release was 24 July 2017
   (let ((commit "4c4d94e43bc4a18ecf82070ff81cd38dd5641e3b")
-- 
2.39.1

Message sent to guix-patches@HIDDEN:

Subject: [bug#61027] [PATCH 2/3] gnu: Add libglnx.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Jan 2023 12:23:02 +0000
Resent-Message-ID: <handler.61027.B61027.167447653110513 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 61027 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 23 Jan 2023 13:21:51 +0100
Message-Id: <20230123122152.5115-2-ngraves@HIDDEN>
In-Reply-To: <20230123122152.5115-1-ngraves@HIDDEN>
References: <20230123122152.5115-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/package-management.scm (libglnx): New variable.
---
 gnu/packages/package-management.scm | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 708e06dfe7..6210be4d5c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1924,6 +1924,54 @@ (define-public libostree
 the boot loader configuration.")
     (license license:lgpl2.0+)))
 
+(define-public libglnx
+  (let ((commit "4e44fd9c174e4196a86fb6d954722feaff612c88")
+        (revision "0"))
+    (package
+      (name "libglnx")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.gnome.org/GNOME/libglnx.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0b1aqrls3ql2c820plwg0vnxh4xkixvxbkn8mxbyqar7ni8nz0wj"))))
+      (build-system meson-build-system)
+      (arguments
+       (list
+        ;; Using a "release" build is recommended for performance
+        #:build-type "release"
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'configure 'prepare-install
+              (lambda _
+                ;; Install lib.
+                (substitute* "meson.build"
+                  (("^  install : false)")
+                   (string-append
+                    "  install : true)" "\n"
+                    "install_headers("
+                    (string-join
+                     (map (lambda (x) (string-append "'" x "'"))
+                          (delete "config.h" (find-files "." "\\.h$")))
+                     ", ")
+                    ")" )))))
+            (add-after 'install 'install-linglnx-config
+              (lambda _
+                (install-file "libglnx-config.h"
+                              (string-append #$output "/include")))))))
+      (native-inputs (list cmake pkg-config))
+      (propagated-inputs (list glib))
+      (home-page "https://gitlab.gnome.org/GNOME/libglnx.git")
+      (synopsis "libglnx is an extension to glib")
+      (description
+       "libglnx is the successor to libgsystem.  It is used for modules which
+depend on both Glib and Linux.")
+      (license license:lgpl2.1))))
+
 (define-public flatpak
   (package
     (name "flatpak")
-- 
2.39.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#61027] [PATCH 3/3] gnu: Add flatpak-builder.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Jan 2023 12:23:03 +0000
Resent-Message-ID: <handler.61027.B61027.167447653510529 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 61027
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 61027 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 61027-submit <at> debbugs.gnu.org id=B61027.167447653510529
          (code B ref 61027); Mon, 23 Jan 2023 12:23:03 +0000
Received: (at 61027) by debbugs.gnu.org; 23 Jan 2023 12:22:15 +0000
Received: from localhost ([127.0.0.1]:53526 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pJvq2-0002jj-2h
	for submit <at> debbugs.gnu.org; Mon, 23 Jan 2023 07:22:15 -0500
Received: from 19.mo583.mail-out.ovh.net ([46.105.35.78]:55003)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ngraves@HIDDEN>) id 1pJvpx-0002jR-PU
 for 61027 <at> debbugs.gnu.org; Mon, 23 Jan 2023 07:22:11 -0500
Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.138.83])
 by mo583.mail-out.ovh.net (Postfix) with ESMTP id 0620A210DB
 for <61027 <at> debbugs.gnu.org>; Mon, 23 Jan 2023 12:22:07 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-hsrn4 (unknown [10.110.115.102])
 by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5328E1FDEB;
 Mon, 23 Jan 2023 12:22:06 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
 by ghost-submission-6684bf9d7b-hsrn4 with ESMTPSA
 id bIhFF+57zmPZhgAACTgEOg
 (envelope-from <ngraves@HIDDEN>); Mon, 23 Jan 2023 12:22:06 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-110S004f8c942a3-c1f6-4c53-bb6d-fd3a75f82c11,
 7A6B2DC6CF1E5BC5450C885858CD75716E54CEDE) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.140.142
From: Nicolas Graves <ngraves@HIDDEN>
Date: Mon, 23 Jan 2023 13:21:52 +0100
Message-Id: <20230123122152.5115-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.39.1
In-Reply-To: <20230123122152.5115-1-ngraves@HIDDEN>
References: <20230123122152.5115-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 8930356587983856354
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddukedgfeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedutddvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/package-management.scm (flatpak-builder): New variable.
---
 gnu/packages/package-management.scm | 103 ++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6210be4d5c..bfba2eeacf 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -59,9 +59,11 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages debug)
   #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages elf)
   #:use-module (gnu packages file)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages flex)
@@ -83,6 +85,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages m4)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages networking)
@@ -2077,6 +2080,106 @@ (define-public flatpak
 sandboxed desktop applications on GNU/Linux.")
     (license license:lgpl2.1+)))
 
+(define-public flatpak-builder
+  (package
+    (name "flatpak-builder")
+    (version "1.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/flatpak/flatpak-builder.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "07pih8v2i3jzyy8zccdljgi3pgj52bgycrh4h5s20lwdxgnh2hb3"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list
+        "--enable-documentation=no"
+        "--with-system-debugedit")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-submodules
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((llibglnx (assoc-ref inputs "libglnx")))
+               (substitute* "autogen.sh"
+                 (("^if ! test -f libglnx/README.md; then")
+                  "if test -f libglnx/README.md; then")
+                 ((".*subprojects/libglnx.*") ""))
+               (substitute* "configure.ac"
+                 (("LIBGLNX_CONFIGURE") ""))
+               (substitute* "src/Makefile.am.inc"
+                 (("libglnx.la") "-lglnx"))
+               (substitute* "Makefile.am"
+                 (("^include subprojects/libglnx/Makefile-libglnx.am.inc")
+                  "")
+                 ((".*libglnx_srcpath.*") "")
+                 ((".*/subprojects/debugedit.*") "")
+                 (("-I subprojects/libglnx")
+                  (string-append "-I " llibglnx "/include"))
+                 ((".*subprojects/libglnx.*")
+                  (string-append "  -I " llibglnx "/include"))
+                 (("noinst_LTLIBRARIES .=.*") "")
+                 (("libglnx_libs :=.*")
+                  (string-append "LDFLAGS += -L" llibglnx " -lglnx -static" "\n"))
+                 (("libglnx_cflags :=") "LIBGLNX_CFLAGS = -lglnx"))
+               (substitute*
+                   '("src/builder-cache.c"
+                     "src/builder-cache.h"
+                     "src/builder-extension.c"
+                     "src/builder-flatpak-utils.c"
+                     "src/builder-flatpak-utils.h"
+                     "src/builder-main.c"
+                     "src/builder-manifest.c"
+                     "src/builder-module.c"
+                     "src/builder-post-process.c")
+                 (("\"libglnx/libglnx.h\"") "<libglnx.h>")
+                 (("<libglnx/libglnx.h>") "<libglnx.h>")))))
+         ;; Test are supposed to be done in /var/tmp because of the need for
+         ;; xattrs. Nonetheless, moving it back to /tmp makes tests suceed.
+         (add-before 'check 'allow-tests
+           (lambda _
+             (substitute* '("buildutil/tap-test" "tests/libtest.sh")
+               (("\\/var\\/tmp\\/")
+                "/tmp/")))))))
+    (propagated-inputs (list flatpak debugedit libglnx elfutils))
+    (inputs
+     (list libsoup-minimal-2
+           libostree
+           json-glib
+           curl
+           libyaml))
+    (native-inputs
+     (list autoconf
+           automake
+           m4
+           libtool
+           pkg-config
+           gettext-minimal
+           which))
+    (home-page "https://github.com/flatpak/flatpak-builder.git")
+    (synopsis "Tool to build flatpaks from source")
+    (description "@code{flatpak-builder} is a wrapper around the flatpak build
+command that automates the building of applications and their dependencies.
+It is one option you can use to build applications.
+
+The goal of flatpak-builder is to push as much knowledge about how to build
+modules to the individual upstream projects.  An invocation of flatpak-builder
+proceeds in these stages, each being specified in detail in json format in
+the file MANIFEST :
+
+@itemize
+@item Download all sources
+@item Initialize the application directory with flatpak build-init
+@item Build and install each module with flatpak build
+@item Clean up the final build tree by removing unwanted files and
+e.g. stripping binaries
+@item Finish the application directory with flatpak build-finish
+@end itemize")
+    (license license:lgpl2.1)))
+
 (define-public akku
   (package
     (name "akku")
-- 
2.39.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#61027] [PATCH 3/3] gnu: Add flatpak-builder.
Resent-From: Jelle Licht <jlicht@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Apr 2023 21:06:01 +0000
Resent-Message-ID: <handler.61027.B61027.1680642343485 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 61027
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 61027 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 61027-submit <at> debbugs.gnu.org id=B61027.1680642343485
          (code B ref 61027); Tue, 04 Apr 2023 21:06:01 +0000
Received: (at 61027) by debbugs.gnu.org; 4 Apr 2023 21:05:43 +0000
Received: from localhost ([127.0.0.1]:50389 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pjnqY-00007k-3i
	for submit <at> debbugs.gnu.org; Tue, 04 Apr 2023 17:05:43 -0400
Received: from mail1.fsfe.org ([217.69.89.151]:51808)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jlicht@HIDDEN>) id 1pjnqT-00007V-Py
 for 61027 <at> debbugs.gnu.org; Tue, 04 Apr 2023 17:05:40 -0400
From: Jelle Licht <jlicht@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501;
 t=1680642334;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=tvJl2gHRBt0noWRUT8c+ddcKwokwm2CahliSmwNDjbk=;
 b=IvT5EpYP51q36/AjcIMtXwKhdtSLKF195giD211k/wngr8kIU8EEy9e8zuzPbWqWAobet+
 b89iL+JaPUuwY0kO6aDWFaaOLS5m7LaKcJ0hLR7FvsMLht3+73AUivR5mEceKcdkvc1DFA
 ttdR4BP5kO6aq/DIA/CgCXCqnFkNDS8=
In-Reply-To: <20230123122152.5115-3-ngraves@HIDDEN>
References: <20230123122152.5115-1-ngraves@HIDDEN>
 <20230123122152.5115-3-ngraves@HIDDEN>
Date: Tue, 04 Apr 2023 23:05:33 +0200
Message-ID: <87zg7n73z6.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Nicolas,

This particular patch does not apply cleanly (anymore).

I think it may introduce module import cycles as well; any chance you
could have a look at that? If it becomes too much of a mess, moving this
package (and eventually other packages as well) into a new
'gnu/packages/flatpak.scm' file could work.

Some additional nitpicks follow inline.

Nicolas Graves via Guix-patches via <guix-patches@HIDDEN> writes:

> * gnu/packages/package-management.scm (flatpak-builder): New variable.
> ---
>  gnu/packages/package-management.scm | 103 ++++++++++++++++++++++++++++
>  1 file changed, 103 insertions(+)
>
> diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
> index 6210be4d5c..bfba2eeacf 100644
> --- a/gnu/packages/package-management.scm
> +++ b/gnu/packages/package-management.scm

You are missing a copyright line :-)

> @@ -59,9 +59,11 @@ (define-module (gnu packages package-management)
>    #:use-module (gnu packages crypto)
>    #:use-module (gnu packages curl)
>    #:use-module (gnu packages databases)
> +  #:use-module (gnu packages debug)
>    #:use-module (gnu packages dejagnu)
>    #:use-module (gnu packages dbm)
>    #:use-module (gnu packages docbook)
> +  #:use-module (gnu packages elf)
>    #:use-module (gnu packages file)
>    #:use-module (gnu packages freedesktop)
>    #:use-module (gnu packages flex)
> @@ -83,6 +85,7 @@ (define-module (gnu packages package-management)
>    #:use-module (gnu packages lisp)
>    #:use-module (gnu packages lua)
>    #:use-module (gnu packages man)
> +  #:use-module (gnu packages m4)
>    #:use-module (gnu packages markup)
>    #:use-module (gnu packages nettle)
>    #:use-module (gnu packages networking)
> @@ -2077,6 +2080,106 @@ (define-public flatpak
>  sandboxed desktop applications on GNU/Linux.")
>      (license license:lgpl2.1+)))
>  
> +(define-public flatpak-builder
> +  (package
> +    (name "flatpak-builder")
> +    (version "1.2.3")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/flatpak/flatpak-builder.git")
> +             (commit version)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32 "07pih8v2i3jzyy8zccdljgi3pgj52bgycrh4h5s20lwdxgnh2hb3"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:configure-flags
> +       (list
> +        "--enable-documentation=no"

Enabling documentation should be workable in a way similar to what we do
for gtk-doc, and I've noticed nix already has a similar patch as well as
the one both us and them use for gtk-doc [1].

Adding docbook-xsl, docbook-xml-4.3, libxslt and libxml2 to
native-inputs should do the trick afterwards (untested).


> +        "--with-system-debugedit")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'disable-submodules
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let ((llibglnx (assoc-ref inputs "libglnx")))
> +               (substitute* "autogen.sh"
> +                 (("^if ! test -f libglnx/README.md; then")
> +                  "if test -f libglnx/README.md; then")
Instead of inverting the test, why not substitute with something like
"if false; then" (untested)?

> +                 ((".*subprojects/libglnx.*") ""))
> +               (substitute* "configure.ac"
> +                 (("LIBGLNX_CONFIGURE") ""))
> +               (substitute* "src/Makefile.am.inc"
> +                 (("libglnx.la") "-lglnx"))
> +               (substitute* "Makefile.am"
> +                 (("^include subprojects/libglnx/Makefile-libglnx.am.inc")
> +                  "")
> +                 ((".*libglnx_srcpath.*") "")
> +                 ((".*/subprojects/debugedit.*") "")
> +                 (("-I subprojects/libglnx")
> +                  (string-append "-I " llibglnx "/include"))
> +                 ((".*subprojects/libglnx.*")
> +                  (string-append "  -I " llibglnx "/include"))
> +                 (("noinst_LTLIBRARIES .=.*") "")
> +                 (("libglnx_libs :=.*")
> +                  (string-append "LDFLAGS += -L" llibglnx " -lglnx -static" "\n"))
> +                 (("libglnx_cflags :=") "LIBGLNX_CFLAGS = -lglnx"))
> +               (substitute*
> +                   '("src/builder-cache.c"
> +                     "src/builder-cache.h"
> +                     "src/builder-extension.c"
> +                     "src/builder-flatpak-utils.c"
> +                     "src/builder-flatpak-utils.h"
> +                     "src/builder-main.c"
> +                     "src/builder-manifest.c"
> +                     "src/builder-module.c"
> +                     "src/builder-post-process.c")
> +                 (("\"libglnx/libglnx.h\"") "<libglnx.h>")
> +                 (("<libglnx/libglnx.h>") "<libglnx.h>")))))
> +         ;; Test are supposed to be done in /var/tmp because of the need for
> +         ;; xattrs. Nonetheless, moving it back to /tmp makes tests suceed.
> +         (add-before 'check 'allow-tests
> +           (lambda _
> +             (substitute* '("buildutil/tap-test" "tests/libtest.sh")
> +               (("\\/var\\/tmp\\/")
> +                "/tmp/")))))))
> +    (propagated-inputs (list flatpak debugedit libglnx elfutils))
> +    (inputs
> +     (list libsoup-minimal-2
> +           libostree
> +           json-glib
> +           curl
> +           libyaml))
> +    (native-inputs
> +     (list autoconf
> +           automake
> +           m4
> +           libtool
> +           pkg-config
> +           gettext-minimal
> +           which))
> +    (home-page "https://github.com/flatpak/flatpak-builder.git")
> +    (synopsis "Tool to build flatpaks from source")
> +    (description "@code{flatpak-builder} is a wrapper around the flatpak build
> +command that automates the building of applications and their dependencies.
> +It is one option you can use to build applications.
This 
> +
> +The goal of flatpak-builder is to push as much knowledge about how to build
> +modules to the individual upstream projects.  An invocation of flatpak-builder
> +proceeds in these stages, each being specified in detail in json format in
> +the file MANIFEST :
> +
> +@itemize
> +@item Download all sources
> +@item Initialize the application directory with flatpak build-init
> +@item Build and install each module with flatpak build
> +@item Clean up the final build tree by removing unwanted files and
> +e.g. stripping binaries
> +@item Finish the application directory with flatpak build-finish
> +@end itemize")
> +    (license license:lgpl2.1)))
> +
>  (define-public akku
>    (package
>      (name "akku")
> -- 
> 2.39.1

[1]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch.

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#61027] [PATCH 3/3] gnu: Add flatpak-builder.
Resent-From: Jelle Licht <jlicht@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Apr 2023 21:08:02 +0000
Resent-Message-ID: <handler.61027.B61027.1680642445647 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 61027
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 61027 <at> debbugs.gnu.org
Cc: ngraves@HIDDEN
Received: via spool by 61027-submit <at> debbugs.gnu.org id=B61027.1680642445647
          (code B ref 61027); Tue, 04 Apr 2023 21:08:02 +0000
Received: (at 61027) by debbugs.gnu.org; 4 Apr 2023 21:07:25 +0000
Received: from localhost ([127.0.0.1]:50393 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1pjnsD-0000AM-0M
	for submit <at> debbugs.gnu.org; Tue, 04 Apr 2023 17:07:25 -0400
Received: from mail1.fsfe.org ([217.69.89.151]:42770)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <jlicht@HIDDEN>) id 1pjnsB-0000AD-6G
 for 61027 <at> debbugs.gnu.org; Tue, 04 Apr 2023 17:07:23 -0400
From: Jelle Licht <jlicht@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501;
 t=1680642442;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=aqOYBhZI7TtoVLjf1wcpLwsxX8YnhJKU5p2doYnwTHc=;
 b=jv47pIZvG32GRUA7fphAaydB1ioXd4aRrD4OuVDknmcgpp9yewY1HXLqinjW8Grsjhy+rn
 O9As5VWkIojQKpl4KuVRFX10GsIRkkSndyP2FCZGSI/IF8u5zdpTb33gkPcLo+0u2zX0a8
 TE3edIO6hjK9MU7HmTmExkYAuwENAIE=
In-Reply-To: <87zg7n73z6.fsf@HIDDEN>
References: <20230123122152.5115-1-ngraves@HIDDEN>
 <20230123122152.5115-3-ngraves@HIDDEN> <87zg7n73z6.fsf@HIDDEN>
Date: Tue, 04 Apr 2023 23:07:22 +0200
Message-ID: <87wn2r73w5.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Jelle Licht <jlicht@HIDDEN> writes:

> Hi Nicolas,
> [snip]
>> +    (home-page "https://github.com/flatpak/flatpak-builder.git")
>> +    (synopsis "Tool to build flatpaks from source")
>> +    (description "@code{flatpak-builder} is a wrapper around the flatpak build
>> +command that automates the building of applications and their dependencies.
>> +It is one option you can use to build applications.
> This 
Complete sentence:
This particular sentence can be removed, as it is implied.

Thanks!
- Jelle

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#61027] [PATCH] Add flatpak-builder.
References: <875ycxwj3s.fsf@HIDDEN>
In-Reply-To: <875ycxwj3s.fsf@HIDDEN>
Resent-From: Vasilii Smirnov <vasilii.smirnov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 09 Jan 2025 05:47:03 +0000
Resent-Message-ID: <handler.61027.B61027.17364015786838 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 61027
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 61027 <at> debbugs.gnu.org
Received: via spool by 61027-submit <at> debbugs.gnu.org id=B61027.17364015786838
          (code B ref 61027); Thu, 09 Jan 2025 05:47:03 +0000
Received: (at 61027) by debbugs.gnu.org; 9 Jan 2025 05:46:18 +0000
Received: from localhost ([127.0.0.1]:50058 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tVlN3-0001m8-TA
	for submit <at> debbugs.gnu.org; Thu, 09 Jan 2025 00:46:18 -0500
Received: from mout-p-102.mailbox.org ([2001:67c:2050:0:465::102]:43116)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <vasilii.smirnov@HIDDEN>)
 id 1tVciP-0001u2-3M
 for 61027 <at> debbugs.gnu.org; Wed, 08 Jan 2025 15:31:47 -0500
Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4YT01z1fk9z9slB
 for <61027 <at> debbugs.gnu.org>; Wed,  8 Jan 2025 21:31:35 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org;
 s=mail20150812; t=1736368295;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding;
 bh=41y8WG0gti/5/PXVlPm6DiFIxdu0hEhY2Uo8fW7ImVw=;
 b=i9ORMCBJBw3AZgamD075X+FAdcxu+fHdDmei6cGQwJE4JsJj1kte2FemAboRw673LCSehr
 EezPup/nnbtUXI7mgq4514f+bZnYvkRcRlKOm2oFx1WLNCt6+fEVYB0n6Antx5FYNqb6rc
 i3LXx9QOHHB3iiMd8gIHfp6o7XCu4mU6XV3e49OJ9l2gPX4g+D4KX6QNouoaGaEhtLHaV/
 bl79v74hl8/H9y+fmJoYFFfnwA4ilGvqX55C5bofMim9R+1VjLG47Lz96TBm+52z/TnOL1
 tAx0PfkJKW7tILSfw9Lu7jypdDrOcpsvU5b70Xl/Lc6v0T0smXQVeD3VTtROkg==
Message-ID: <47524ee3-8767-49a9-9f75-cf4872e98e1e@HIDDEN>
Date: Wed, 8 Jan 2025 21:31:33 +0100
MIME-Version: 1.0
Content-Language: en-US
From: Vasilii Smirnov <vasilii.smirnov@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-MBO-RS-ID: b293c08b6b711ec6433
X-MBO-RS-META: r89jggep5zenqjrfzyjeyieq5bad414r
X-Spam-Score: -0.7 (/)
X-Mailman-Approved-At: Thu, 09 Jan 2025 00:46:13 -0500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

FYI, flatpak-builder is currently unable to build any flatpaks that
contain icons due to broken flatpak-validate-icon in the base flatpak
package. I attempted to fix that in #75396.

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.