From patchwork Sat Oct 14 12:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 54822 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 3AB7C27BBE2; Sat, 14 Oct 2023 13:07: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,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 5302227BBE9 for ; Sat, 14 Oct 2023 13:07:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrdQk-0000HF-Lp; Sat, 14 Oct 2023 08:07:42 -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 1qrdQi-0000Gy-EQ for guix-patches@gnu.org; Sat, 14 Oct 2023 08:07:40 -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 1qrdQh-0001yn-Uu for guix-patches@gnu.org; Sat, 14 Oct 2023 08:07:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrdR3-0003BI-Vy; Sat, 14 Oct 2023 08:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66536] [PATCH 1/1] gnu: unison: Update to 2.53.3. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sat, 14 Oct 2023 12:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66536 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66536@debbugs.gnu.org Cc: pukkamustard , Andreas Enge , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 66536-submit@debbugs.gnu.org id=B66536.169728523512172 (code B ref 66536); Sat, 14 Oct 2023 12:08:01 +0000 Received: (at 66536) by debbugs.gnu.org; 14 Oct 2023 12:07:15 +0000 Received: from localhost ([127.0.0.1]:48058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdQI-0003AF-IH for submit@debbugs.gnu.org; Sat, 14 Oct 2023 08:07:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrdQF-0003A2-GM for 66536@debbugs.gnu.org; Sat, 14 Oct 2023 08:07:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 32C57240028 for <66536@debbugs.gnu.org>; Sat, 14 Oct 2023 14:06:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1697285202; bh=Sxnpbb6vHCsGz/zPIzJzTFzCXTUQluYS4Dx8i//zW5Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=VBPxXnhK8/5Dr/4P2cBRPeEmwujS1rsf5aMnj6/cAHmx2nARxmCCCA8FzB9oJNhbg NxFdfzBoT9qk7HLx8440ZwFAcln3K5+iL6rEWhDq3/KHA4LuNMMXbhYosCE8TmFqCD uhKvOWTxXlOmutuxkJ55rNrGqvY7dowXAq+//gN1kE1uDdssZBJURo1b1OjKexCs+D SzQ3X0qbx9kx+Fp7+9qUErfSw02sedpOg9aF52G34EDrbkIyOXQn8BvUK91tCKzGjo rzy3I8kQzb+nr8u+FnEK37OON9FySE799y3Ky+ZBqJqsh7Kf49Y528Ulv+iVfGprRN P0350yVbM+RxQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4S72D128qDz6txL; Sat, 14 Oct 2023 14:06:41 +0200 (CEST) From: pukkamustard Date: Sat, 14 Oct 2023 12:06:32 +0000 Message-ID: <96c87152df219478aa55fdebef563d72c018089f.1697284367.git.pukkamustard@posteo.net> 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/ocaml.scm (unison): Update to 2.53.0. [source]: Remove patch. [build-system]: Use dune-build-system. [outputs]: Remove "doc" output. [native-inputs]: Update package style. [propagated-inputs]: Add lablgtk3 and zlib. [arguments]: Enable tests. <#:phases>: Remove prepare-install and install-fsmonitor phases. * gnu/packages/patches/unison-fix-ocaml-4.08.patch: Remove file. * gnu/local.mk: Unregister. --- gnu/local.mk | 1 - gnu/packages/ocaml.scm | 50 ++---------- .../patches/unison-fix-ocaml-4.08.patch | 81 ------------------- 3 files changed, 8 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/unison-fix-ocaml-4.08.patch diff --git a/gnu/local.mk b/gnu/local.mk index 13c2b94944..2b8cdbf181 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2062,7 +2062,6 @@ dist_patch_DATA = \ %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ %D%/packages/patches/ungoogled-chromium-system-ffmpeg.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ - %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8543505dbb..7993dbaa73 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1359,7 +1359,7 @@ (define-public ocaml4.07-lablgtk (define-public unison (package (name "unison") - (version "2.51.2") + (version "2.53.3") (source (origin (method git-fetch) (uri (git-reference @@ -1368,52 +1368,18 @@ (define-public unison (file-name (git-file-name name version)) (sha256 (base32 - "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")) - (patches (search-patches "unison-fix-ocaml-4.08.patch")))) - (build-system gnu-build-system) - (outputs '("out" - "doc")) ; 1.9 MiB of documentation - (native-inputs - `(("ocaml" ,ocaml-4.09) - ;; For documentation - ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg)) - ("hevea" ,hevea) - ("lynx" ,lynx) - ("which" ,which))) - (arguments - `(#:parallel-build? #f - #:parallel-tests? #f - #:test-target "selftest" - #:tests? #f ; Tests require writing to $HOME. - ; If some $HOME is provided, they fail with the message - ; "Fatal error: Skipping some tests -- remove me!" - #:phases + "05ihxk1yynw08586i06w19xab9r24h9hr6v9bknqm98qrlshm92w")))) + (build-system dune-build-system) + (propagated-inputs (list lablgtk3 zlib)) + (native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which)) + (arguments + `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'prepare-install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (setenv "HOME" out) ; forces correct INSTALLDIR in Makefile - #t))) - (add-after 'install 'install-fsmonitor - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; 'unison-fsmonitor' is used in "unison -repeat watch" mode. - (install-file "src/unison-fsmonitor" bin) - #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") + (let ((doc (string-append (assoc-ref outputs "out") "/share/doc/unison"))) (mkdir-p doc) - ;; Remove an '\n' that prevents the doc to be generated - ;; correctly with newer hevea. - (substitute* "doc/local.tex" - (("----SNIP----.*") "----SNIP----")) ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) diff --git a/gnu/packages/patches/unison-fix-ocaml-4.08.patch b/gnu/packages/patches/unison-fix-ocaml-4.08.patch deleted file mode 100644 index 811f590721..0000000000 --- a/gnu/packages/patches/unison-fix-ocaml-4.08.patch +++ /dev/null @@ -1,81 +0,0 @@ -This patch is taken from the opam repository: -https://github.com/ocaml/opam-repository/blob/master/packages/unison/unison.2.51.2/files/ocaml48.patch - -It fixes compatibility with changes introduced in OCaml 4.08. - -diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml -index 7cefa2e..378fc8b 100644 ---- a/src/Makefile.OCaml -+++ b/src/Makefile.OCaml -@@ -272,7 +272,7 @@ endif - - # Gtk GUI - ifeq ($(UISTYLE), gtk) -- CAMLFLAGS+=-I +lablgtk -+ CAMLFLAGS+=-I $(LABLGTKLIB) - OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo - OCAMLLIBS+=lablgtk.cma - endif -@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) - - ifeq ($(UISTYLE), gtk2) - ifndef OCAMLFIND -- CAMLFLAGS+=-I +lablgtk2 -+ CAMLFLAGS+=-I $(LABLGTK2LIB) - else - CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) - endif -diff --git a/src/files.ml b/src/files.ml -index 5ff1881..1d1fbcc 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -734,7 +734,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 2c619bb..2412c18 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -661,8 +661,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 453027d..c2288b8 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index fbc5d8f..4e82cc2 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -94,7 +94,7 @@ let icon = - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch =