From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 19:17:30 2023 Received: (at submit) by debbugs.gnu.org; 26 Jan 2023 00:17:30 +0000 Received: from localhost ([127.0.0.1]:60221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKpxK-0002CO-6Z for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:17:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:56110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKpxG-0002CE-SF for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:17:28 -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 1pKpxG-0002MT-GC for guix-patches@gnu.org; Wed, 25 Jan 2023 19:17:26 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKpxE-0006uA-5J for guix-patches@gnu.org; Wed, 25 Jan 2023 19:17:26 -0500 Date: Thu, 26 Jan 2023 00:17:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674692239; x=1674951439; bh=ghq7NTrroq1US3HgY6UQgHXl3QEtJtSoFi0zdHfe0uY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=dFO39EnT4iz6LRZ8uJ/Ul4cK9wIR6TX1lSWG69yON5QeQOdBKkfm+yL36AxU6ECnf yFt6xzPVeazU9SLsouhYiIUB60u+/jy4GVtjB+HbZ0vk4MUaKnY17p1HDXW4u2mFC0 QehIQDsWtrzFyh1A5Vhbu33U7ZyDtFfyELBCBQQhMADAAqpcqSDFAes+m+SyO/pLGg OboNlpy+ZozJE4PsAsb7YPxy840CgiNA9dfD8Q4hWTNjnHYGOpkopEncFKDhi/rdJm 3Ydom0N0LMfmmWUqowbDiPEWJFFO2abpRiS1csJXGSf5l9BmiEQPo6G477V+Lon2pr Xfv+CP+jraMcQ== To: guix-patches@gnu.org From: Kaelyn Takata Subject: [PATCH 0/3] Update wine and wine-staging packages to 8.0 Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.134; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Here is a patchset to update the various wine and wine-staging packages to = the latest release. Aside from the basic version bumping, the changes include: * Dropping an unneeded LDFLAGS variable as the rpath being set is not usefu= l (it contains only subdirectories), * Fixing the edits to tools/makedep.c to account for a renamed variable. * Adding a small phase to set the environment variable WIDL_TIME_OVERRIDE s= o that the widl tool dosn't embed the build date and time in the files it generates as part of the wine build. Cheers, Kaelyn Kaelyn Takata (3): gnu: wine: Update to 8.0. gnu: wine: Build more reproducibly. gnu: wine-staging: Update to 8.0. gnu/packages/wine.scm | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) base-commit: ebcb5c8e120b39a3dd07c27bc17d520ee653ec23 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 19:24:05 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 00:24:05 +0000 Received: from localhost ([127.0.0.1]:60227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3h-0002MR-6J for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:05 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:24953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3d-0002Lv-Im for 61067@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:04 -0500 Date: Thu, 26 Jan 2023 00:23:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674692635; x=1674951835; bh=noNnhKfnrIelVtH4HiGt/nB6N5/18iJ+isFu8jxTdQs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=zh5ahP6iUjA8IjGGb9IzaCE/SQyLT9rf6SkZHnXgXWFhWtqtdEtk6TZ6q/kD6Xi/Y IzKP4XfyCswyHYbZ6WJ1mujekGLBJopZkUm1TyZzIVWxebMYONpJZ0wHJY/FPQfgJn iyKPpqx6V0klWq3ccMlMC3Mq1fgD11tmyipsqvE1LaCa/MTJTKvOyRhrRwcYU9LehA apiKbf25M9Inu4A5MVRnTnBCKumzHhYfaeNJtqW5M/bDcLjx0KHvfYPaeZl9qnOqdD 8LbXJStK103LG9sRDxgoeuwN++efsm4r4r8fPh8RMT9rOtxGrwfpTtrXtM23U5GXxf pwGJz9sIjOzHA== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH 1/3] gnu: wine: Update to 8.0. Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine): Update to 8.0. [arguments]: Remove superfluous rpath setting in configure-flags. --- gnu/packages/wine.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e86add4e3..7ca2ac5bdf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2018=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Pierre Neidhardt ;;; Copyright =C2=A9 2022 Liliana Marie Prikler +;;; Copyright =C2=A9 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "7.19") + (version "8.0") (source (origin (method url-fetch) @@ -88,7 +89,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) (native-inputs (list bison flex gettext-minimal perl pkg-config)) @@ -142,9 +143,6 @@ (define-public wine ;; pass. #:tests? #f - #:configure-flags - #~(list (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/win= e32")) - #:make-flags #~(list "SHELL=3Dbash" (string-append "libdir=3D" #$output "/lib/wine32")) @@ -197,7 +195,7 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir )= ;")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -260,7 +258,7 @@ (define-public wine64 (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir );= "))))) + "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -293,8 +291,7 @@ (define-public wine64 (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))))))) #:configure-flags - #~(list "--enable-win64" - (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/wine= 64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine)))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 19:24:16 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 00:24:17 +0000 Received: from localhost ([127.0.0.1]:60231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3s-0002Mv-K8 for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:16 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:12253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq3o-0002MZ-0U for 61067@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:14 -0500 Date: Thu, 26 Jan 2023 00:24:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674692645; x=1674951845; bh=xx+B0SHTA7oPCULrlXcPsgfyQkXp6ky7Stqf/oHm7R0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=dRnPKFWUSJOGQu9Ji9lojJ7cZ/ynaRuR4nDU4rGd+j1UU7vtCPFvu/zodIGpg6rEF 7No9QJhWoYOkAVK3diixCTlwt6b4EQzlai5HMbrF47ojmrcAugUB9eyAQRFEyW1ddK ONxHSGIoOpomivp0owF0Y8HOTNjbteb1GbR4R7nNaK62fUVeO6LJmZd4Th4AvtJPWu 9GezcBzaGFTa21moa+w3aqF/hbXVrMJLUIZTV8jrLNif3vaxuvWPIZwXi/7ntMZO3F 9s62skLU/vErhW90ZSbtiOKqMV0Ku5I8Blqu0OpFvqMLGSUeiXq8LyNL38NEwvGm42 jk4uHsQqqik7Q== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH 2/3] gnu: wine: Build more reproducibly. Message-ID: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time-override p= hase. --- gnu/packages/wine.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..0de34e320d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -195,7 +195,12 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date= in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -289,7 +294,12 @@ (define-public wine64 (search-path library-path soname)))) (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date = in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases @@ -326,7 +336,12 @@ (define-public wine-minimal (search-path library-path soname)))) (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date i= n + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags (list "--without-freetype" "--without-x") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 25 19:24:27 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 00:24:27 +0000 Received: from localhost ([127.0.0.1]:60235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq42-0002NI-WF for submit@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:27 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:43567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKq41-0002N4-Cj for 61067@debbugs.gnu.org; Wed, 25 Jan 2023 19:24:25 -0500 Date: Thu, 26 Jan 2023 00:24:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674692659; x=1674951859; bh=Nw2DsrUUdapnoXme1P2JDGSSJ/5r/GXYaZzMWX4p55I=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=cQJbDDkgBgco4W118TNo+Gdk9/YGBJK1PbolHBX9sPtXFsF26fCGUyKBlA4Kch1pt fw2OFUzAnnNkTRJaTgHiJMobnwoYI3w+9JgOo1vj5ApxorxydzC/S3Q9rzeUQJsoR7 MUn8oC5SxjcTnda5MRfIt+6+Yr+pz+ItgRqyY56rRnls8Eu6/IbIgGimAzRx0Uu64Z fLMjwCqEp+UdrjkMWI478kppyRssHa21FGPmAJZuOoB3EanaOtc7HLQtYpP5wmF1M5 ov9v2Dj6rUvM9deugBSoGMYz2L5RHQhgAlaC5R4o/WLlALoZfXuG/Jx3lGgbQWSj32 Azs1jOykjP85Q== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH 3/3] gnu: wine-staging: Update to 8.0. Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine-staging): Update to 8.0. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 0de34e320d..7f89017e79 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -351,7 +351,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "7.8") + (version "8.0") (source (origin (method git-fetch) @@ -360,7 +360,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) + (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -410,7 +410,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))= ))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))= ))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 14:28:36 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 19:28:36 +0000 Received: from localhost ([127.0.0.1]:36236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL7vI-0000z6-6k for submit@debbugs.gnu.org; Thu, 26 Jan 2023 14:28:36 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:38860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL7vG-0000yq-5K for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 14:28:34 -0500 Received: by mail-ed1-f66.google.com with SMTP id m12so2835261edq.5 for <61067@debbugs.gnu.org>; Thu, 26 Jan 2023 11:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=bmeOjwL0l4fQlgkviGdejVqO8u5FFVPqAw2sNorvf5Y=; b=ZCLiJLeiGIxnomm1jJWbkGLaQ2CIhhB29ugOE0dSuHFsGeKYhKHj0gYMfgUzqcyI2S Qqgx8s+oNSGNVgUkliSwHHRFHyvXBU6uxgJjYRy1HkIln1cjH5wBf2ZVT2T/MuPWQVzX i68CfAyz+flhcxsxRbJGd8yzlrrECXYaRpvZqhRo1iniUZn4mGKLU241d5w2s78V3sEU C6g2+BhzEWJlWkPT0CgjXmteeHQFilhtgS+Z/SPw72VYMdYpe5m5IWFP+MncaQ39me5N GhEj1X5TKzJgtwFEVMDJZnujIRtkCBpurBZVVlY01ExHSfAfx0SJ6Bn3wGk6Z1LQDgxn F/qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bmeOjwL0l4fQlgkviGdejVqO8u5FFVPqAw2sNorvf5Y=; b=2GCLQrrTAkvpNyaMgjwrV/h2ycwwKCHZsdodWrfxlHKNGtvp85sbOgz+xhmuf7ftj3 6Pi3LYspideKKmxiHATcp73yJNJbUZmYWVORvSoybVCl37zD6SSPM89d7WnES3RvnA+U qIGN3IoZQjCqxVM1CptKfDE7U/XKZCIaR+k0y/2TQf95jyiTPjZQYelfR5CsHu7ecwux 3OknV72et1As/5ySKTcczYE9xoI0f6JDG4sYtXW+Hsagv1Tr4tOKYdIqdr9uHRU6vMOg QCPX5AR1yGiBWuYuumt2w5ID1RSnnZLRh5e2C4wjEYveNPO96RkH2UX/Wq8YdSMoWR80 hxjw== X-Gm-Message-State: AO0yUKW2GMQXHAFCagzl1zh/49A6Yq5fiPD1iLyd2oFz2I7b2T3j2H2p Dmc/Uk2O+/vHYh0XeyzwNH8= X-Google-Smtp-Source: AK7set/q5OwdiIUaJhs3mq4t4rdsJmLP6UoBEO8V1Hy5O44B0OJbC5v2Ud/2Hf1gp6kL1X69b5snOg== X-Received: by 2002:a05:6402:50e:b0:4a0:89b4:d011 with SMTP id m14-20020a056402050e00b004a089b4d011mr11618632edv.38.1674761308112; Thu, 26 Jan 2023 11:28:28 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g5-20020a056402320500b0048a31c1743asm1165115eda.25.2023.01.26.11.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 11:28:27 -0800 (PST) Message-ID: Subject: Re: [PATCH 2/3] gnu: wine: Build more reproducibly. From: Liliana Marie Prikler To: Kaelyn Takata , 61067@debbugs.gnu.org Date: Thu, 26 Jan 2023 20:28:26 +0100 In-Reply-To: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> References: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Donnerstag, dem 26.01.2023 um 00:24 +0000 schrieb Kaelyn Takata: > * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time- > override phase. You're doing this for three packages, so there should be three packages in the ChangeLog as well. On that note, it's somewhat odd that the wine packages can't share some common phases. Perhaps we should refactor them a little to make that possible. Cheers=20 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 15:47:16 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 20:47:16 +0000 Received: from localhost ([127.0.0.1]:36310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL99Q-000319-0T for submit@debbugs.gnu.org; Thu, 26 Jan 2023 15:47:16 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:30577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL99O-00030w-GA for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 15:47:15 -0500 Date: Thu, 26 Jan 2023 20:46:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674766028; x=1675025228; bh=xijOUCWZMFmLraHcsbytoHiQFJpItnYlI2komffn7O0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ReJtpl4W9dn9pVVJXqF/B+NNjTIFQZoUT3J2p+heB6KDzDcjqs8qmsA5lmDO6qjGq fCqpzWKEnVE2PWsTnsePRAbFGYsic8iQnMMYpMw59AkXf9oEgx7QbcA/Uc+/LzpeEF xJUM5yt1tVzneWd7HYsc9AYBdkcrIMrvqCIoR1sIwiVxbfpIU7jqSVpfombwSU65Il NgzUEZ8uhTJcwuxoJ/X2UAfuInfrq5UUQB44+mCURmYbYq89als7JyXTfCD2iQDoCJ 9OnLwebqovLA4Ck9DrQTm6qAnhxx+80I1eQmcQyGtpROt6PM6kXfDAwSXSGZJ7IwrS aNTb61fZhwo1w== To: Liliana Marie Prikler From: Kaelyn Subject: Re: [PATCH 2/3] gnu: wine: Build more reproducibly. Message-ID: In-Reply-To: References: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------- Original Message ------- On Thursday, January 26th, 2023 at 7:28 PM, Liliana Marie Prikler wrote: >=20 >=20 > Hi, >=20 > Am Donnerstag, dem 26.01.2023 um 00:24 +0000 schrieb Kaelyn Takata: >=20 > > * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time- > > override phase. >=20 > You're doing this for three packages, so there should be three packages > in the ChangeLog as well. I wasn't quite sure how to handle the changelog for the three packages sinc= e the various packages are variations of the same piece of software. If sep= arate changelogs are desired, the existing can be copied and pasted for eac= h of the three with the package name tweaked accordingly. > On that note, it's somewhat odd that the wine packages can't share some > common phases. Perhaps we should refactor them a little to make that > possible. I agree they could and should be refactored to share more of the phases--I = just haven't been brave enough to try because of the weird mixed-architectu= re nature of the builds. Cheers, Kaelyn >=20 > Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 16:09:17 2023 Received: (at 61067) by debbugs.gnu.org; 26 Jan 2023 21:09:17 +0000 Received: from localhost ([127.0.0.1]:36322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL9Uj-0003aa-Hg for submit@debbugs.gnu.org; Thu, 26 Jan 2023 16:09:17 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:37559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL9Uh-0003aN-Iz for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 16:09:16 -0500 Received: by mail-ej1-f68.google.com with SMTP id ud5so8596350ejc.4 for <61067@debbugs.gnu.org>; Thu, 26 Jan 2023 13:09:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=APuANV+2AHzOg0Rm4SOVKUwimLOjbLOmgM3SUoZ2D7Q=; b=KfbkupLk3uIwFwRSpQYKg/RM2TnOPYMkboVdenh5Sb/HwZ0L5ml14qNbchgHnLJt91 pjmJZTiTJRlgUY0FAonR0kecu0hTzTgUTh0hjdMKvmPIwDmgVewtqBYIxsf0IIyBtcjo Nw9hD2QiDrahLHHHV1Y8slRLRXcfMF1fofrfc92Dx+OYvCRUaspfOuOc4Bv31alDtTEq hYkvHWwHoflYn7Ul2nQeNJ6HX6xqMGyGm2nOWoZr81K+XFu6VdVOqYHsfk6nYT5HNzYr yrhek5XT+URKJ7ewIyZVzJNhNjQ8i2x4m28B3G5xQHxF9IjSDueo71g8DmW0XtY9Yy7P NiyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=APuANV+2AHzOg0Rm4SOVKUwimLOjbLOmgM3SUoZ2D7Q=; b=K3H56gVvoktbzEVLc41Lff2C7Vsijc4jwgsDu/IlAY1qGPH/Lt8xauOC6WR/8pc3pU MuzebwPgw5J3hBPNt6hZe3jz5CfS/ZcM7gTWrQITGgR23H22WZFGjLsRRNHWqr+TVoBB tNaBYufmUkAh3aHYs5t3eaTMI+kkBML08Qo/zra/f1o3pZAesnvzoZbkleasouceTZjB qeBfXM2Lm2siCLpr5rd+rRkd9KGBxTg2LSLc/vcB/xnAMz5g3nHQgfTBys8gJvh+uwes WXP2CiUherYDJj+skPnaUIvOzErYMuggcHil07c0pLN8mdLWtS0W+aaq3jkPAQmCRcBF uLTg== X-Gm-Message-State: AFqh2kqBS4VCmJaJu1Ja93HWZDiybYOnk8xHRWWSEui2V2WsAI4j826N YIoERA3w7KD+7u5Nkcde6QA= X-Google-Smtp-Source: AMrXdXuGtOsw2Ygm4RrXKZWrzyF6uO7KVDSJYC9ygOrIeE4reqfNzzAOfswAX6z2Wwvxs8bGbOK9iA== X-Received: by 2002:a17:907:d15:b0:862:e612:effe with SMTP id gn21-20020a1709070d1500b00862e612effemr55805124ejc.14.1674767349540; Thu, 26 Jan 2023 13:09:09 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j11-20020a170906830b00b00852e0bbed1dsm1152412ejx.17.2023.01.26.13.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 13:09:09 -0800 (PST) Message-ID: <5f9118b2e770ad5e9e6d38249de08dddf1ea0fef.camel@gmail.com> Subject: Re: [PATCH 2/3] gnu: wine: Build more reproducibly. From: Liliana Marie Prikler To: Kaelyn Date: Thu, 26 Jan 2023 22:09:07 +0100 In-Reply-To: References: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 26.01.2023 um 20:46 +0000 schrieb Kaelyn: > ------- Original Message ------- > On Thursday, January 26th, 2023 at 7:28 PM, Liliana Marie Prikler > wrote: >=20 >=20 > >=20 > >=20 > > Hi, > >=20 > > Am Donnerstag, dem 26.01.2023 um 00:24 +0000 schrieb Kaelyn Takata: > >=20 > > > * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time- > > > override phase. > >=20 > > You're doing this for three packages, so there should be three > > packages > > in the ChangeLog as well. >=20 > I wasn't quite sure how to handle the changelog for the three > packages since the various packages are variations of the same piece > of software. If separate changelogs are desired, the existing can be > copied and pasted for each of the three with the package name tweaked > accordingly. You can simply write (wine, wine64, wine-minimal)[#:phases]. It's just to mark all the places that have changed. > > On that note, it's somewhat odd that the wine packages can't share > > some common phases. Perhaps we should refactor them a little to > > make that possible. >=20 > I agree they could and should be refactored to share more of the > phases--I just haven't been brave enough to try because of the weird > mixed-architecture nature of the builds. I feel you. I can try to figure something out and reply to this thread or open another one once I'm done. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:07:53 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:07:54 +0000 Received: from localhost ([127.0.0.1]:36449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDDd-0003gj-LG for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:07:53 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:45921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDDb-0003gW-G1 for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:07:52 -0500 Date: Fri, 27 Jan 2023 01:07:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781665; x=1675040865; bh=tYv1QCrUJFzsnE0cpD8rp0H4akXQU5oQffdilsyR1S8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=oIsFqRXxj+fCRg9v5uyAk9+hvQPR55JR1y2sKZnnryjDGARSIcwsLtT9lgs/SfngC GVSX4ABE3l6MyNlnYArgNp97pdBEbGgZiu28iQSd8PoEjhfbjF06EWCS3XxPvlD30R Lpi6UmLXtCHiqEwHIiRFaNZgQ/vXYpSTd3H3lDNy7QtVzZgJ8hdZKkznvVD4piv8y+ /VcnVqTUdb9FfkBsev3yS89oykr5dLRnEnMQbYBgJUpWZ3EpQ410b1h6T906xqMdun Hh6CBDQ/PgH9hORo59fTHchY0NOcJA6gK5/2ByzvisAmrLl9bUPnQEgKEwteh68tEp Qukw0KIK6accA== To: Liliana Marie Prikler From: Kaelyn Subject: Re: [PATCH 2/3] gnu: wine: Build more reproducibly. Message-ID: In-Reply-To: <5f9118b2e770ad5e9e6d38249de08dddf1ea0fef.camel@gmail.com> References: <5be364a38001818326d78d586a918938c0da0c81.1674691809.git.kaelyn.alexi@protonmail.com> <5f9118b2e770ad5e9e6d38249de08dddf1ea0fef.camel@gmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------- Original Message ------- On Thursday, January 26th, 2023 at 9:09 PM, Liliana Marie Prikler wrote: >=20 >=20 > Am Donnerstag, dem 26.01.2023 um 20:46 +0000 schrieb Kaelyn: >=20 > > ------- Original Message ------- > > On Thursday, January 26th, 2023 at 7:28 PM, Liliana Marie Prikler > > liliana.prikler@gmail.com wrote: > >=20 > > > Hi, > > >=20 > > > Am Donnerstag, dem 26.01.2023 um 00:24 +0000 schrieb Kaelyn Takata: > > >=20 > > > > * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time- > > > > override phase. > > >=20 > > > You're doing this for three packages, so there should be three > > > packages > > > in the ChangeLog as well. > >=20 > > I wasn't quite sure how to handle the changelog for the three > > packages since the various packages are variations of the same piece > > of software. If separate changelogs are desired, the existing can be > > copied and pasted for each of the three with the package name tweaked > > accordingly. >=20 > You can simply write (wine, wine64, wine-minimal)[#:phases]. It's just > to mark all the places that have changed. >=20 > > > On that note, it's somewhat odd that the wine packages can't share > > > some common phases. Perhaps we should refactor them a little to > > > make that possible. > >=20 > > I agree they could and should be refactored to share more of the > > phases--I just haven't been brave enough to try because of the weird > > mixed-architecture nature of the builds. >=20 > I feel you. I can try to figure something out and reply to this thread > or open another one once I'm done. I felt a bit of inspiration, and tried my hand at unifying the phase lists.= I'll be mailing the v2 patches momentarily. I _think_ the new version of t= he package definitions is equivalent to the old, but I also appreciate all = of the extra eyes and testing those changes can get. :) Thank you for the review and feedback! Cheers, Kaelyn >=20 > Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:08:07 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:07 +0000 Received: from localhost ([127.0.0.1]:36454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDDq-0003hW-VW for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:07 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:52423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDDo-0003gw-U8 for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:05 -0500 Date: Fri, 27 Jan 2023 01:07:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781679; x=1675040879; bh=ncYU55wIL2PAjVthcUydhNNT3alO1cyOK/pfORVd5wo=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=U+mJxezXFQCjAhwSJbEkaNo3s+MndqpflxBu11jJh3IAb/EuGYTvgvv9++i8djfv9 lXMIEA2BtU2tsaZ+KvuUKfYUkctTKwZZZ/ho9xu/sEwarOurSNPZjvHubq2PKbd1qW Y2YpkYLP4xwEfStijwah/Wlm7S9yy810eRbV9KbcZ8MRtrBhKnK6mnJjQPM7TwRz63 73l9Vnz7je7TJWe9nKHw9CJ+ctwFfSsPIWtVkaCzY5hTw45xNs1Fww1c7KkT3squ7K D88pByAlP4DFk1kSLk87CYAH1vm9DuZBkRrODZGVSKHlkFLw5Ss+GVNZn0WbwDCMBu SKWJ+PkvtBAbw== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 0/5] Update wine and wine-staging packages to 8.0 Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) New in v2: * Tweaked the commit messages of the main 8.0 update patches to better fit = the guidelines. * Added two patches to make wine-minimal and wine64 share more of their package definition with the parent wine package, especially phases. * Move the reproducibility patch to the end of the series, to take advantag= e of the better shared phase definitions. Cheers, Kaelyn Kaelyn Takata (5): gnu: wine: Update to 8.0. gnu: wine-staging: Update to 8.0. gnu: wine-minimal: Share phases with parent wine package. gnu: wine64: Share phases with parent wine package. gnu: wine: Build more reproducibly. gnu/packages/wine.scm | 187 +++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 112 deletions(-) base-commit: c2b40b4b4c9e0227e47730ebe73a653b89d1e568 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:08:18 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:18 +0000 Received: from localhost ([127.0.0.1]:36458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDE2-0003hu-7n for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:18 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:23553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDE0-0003hh-IT for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:17 -0500 Date: Fri, 27 Jan 2023 01:08:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781690; x=1675040890; bh=HHvNkOgjDdFQV6CrFK/7OIG4zfMa6Ip/MzmwjKM0t0Q=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=O8gjDUgM72vRRE9H37jVZjtPHVmzI08p8XpqmRyfsRbs0NXcGnHVlG7d5cOFzkaMS 45NFmYexQnhJ14gRobEXwW/9g8JrrJqwwrUClmakJ+2Yr5mxcMIMdXTgM5tcbtoYVw cgQQXLCgUEfVd0de0kd9HUq8pMcHzCRy4MSwNmWiOc3jECtpevyoKjN8S8fdC4UQEV 9wXHQ7GAHN+dbj0V+oKTwfrlYYpZ/MTRYj9C7uMxLkrS80XxMJuO84mDfONxTyXfuQ cGDWTjurB7NBVcyEwwYXQKZNRnxGuc+8FrzrZs4GwzGp5AG8e1bDy3zVsyHo1+51tm GNcR+uUuJCv3A== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 1/5] gnu: wine: Update to 8.0. Message-ID: <11be5fb96c13b55f8185fcbf8256e9b440187816.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0. [arguments]: Remove superfluous rpath setting in configure-flags. --- gnu/packages/wine.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e86add4e3..7ca2ac5bdf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2018=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Pierre Neidhardt ;;; Copyright =C2=A9 2022 Liliana Marie Prikler +;;; Copyright =C2=A9 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "7.19") + (version "8.0") (source (origin (method url-fetch) @@ -88,7 +89,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) (native-inputs (list bison flex gettext-minimal perl pkg-config)) @@ -142,9 +143,6 @@ (define-public wine ;; pass. #:tests? #f - #:configure-flags - #~(list (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/win= e32")) - #:make-flags #~(list "SHELL=3Dbash" (string-append "libdir=3D" #$output "/lib/wine32")) @@ -197,7 +195,7 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir )= ;")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -260,7 +258,7 @@ (define-public wine64 (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir );= "))))) + "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -293,8 +291,7 @@ (define-public wine64 (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))))))) #:configure-flags - #~(list "--enable-win64" - (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/wine= 64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine)))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:08:35 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:35 +0000 Received: from localhost ([127.0.0.1]:36462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEI-0003iP-N1 for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:34 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:60225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEH-0003iB-C5 for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:33 -0500 Date: Fri, 27 Jan 2023 01:08:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781707; x=1675040907; bh=NU+uBePYo9ejiZYdZ7WgvfMbcCLORwW/Gw3XNUMqtwA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=SOGJPm/O/G7FOGtW/7hjSS1DXicnGSb+cs9sV3FpvvHlWUIAam65PZWffQ1Rajwy6 qFMzL5qbJGRvoADm0nJKJ8smgJOyXfp/lL3sEO288JSbEriNn6OsiEZVutiX0WSjCV 1Yv5ZAMEU+xGN2LFCejVFUlUtRjZGhaIG7U+HARALQ6q2BNLqJreSd8CUR0KvvDWkd EwmXoGoYQ6XKzFoLIUwBG/PvvHDDQySayMsVQvn4DWwuO/hjuaTxUM8fwfIeB4DNIs kT5K5DrP5qIjqo7sla/sf97OgZGQu3zJirh+ZAZzoTXAsTwSJ1hQqhqCrw73XsFcaI iTWScNGGsMHRw== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 2/5] gnu: wine-staging: Update to 8.0. Message-ID: <0c388c2f56254ce14335bf7542f2f4bc946e5e2f.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine-staging,wine64-staging): Update to 8.0. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..6e43494c68 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -336,7 +336,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "7.8") + (version "8.0") (source (origin (method git-fetch) @@ -345,7 +345,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) + (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -395,7 +395,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))= ))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))= ))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:08:41 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:41 +0000 Received: from localhost ([127.0.0.1]:36466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEP-0003ii-0e for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:41 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:62467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEN-0003iI-7s for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:39 -0500 Date: Fri, 27 Jan 2023 01:08:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781712; x=1675040912; bh=wMjzQnbl7T1j8J3ZaIX3bA7xh62hrZlVAGWkuhfEWAI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=s6ZTmzeVOOOWzPIYbVw4klz5RgpuaiyV7/k7lyINS5D2baPjVONxJ8SuncPQ3jT7Z N/Be60adxmohHTC12DskreZPxFUockgbD6+3ZoyC9UA2upDJlo4ny7ZsA57Nv65pcT bELeOxcIIUa7vvZUHwzKkUn+C3K+5B5KAj+UJZg6PY4749Ea1YKM3WQ8n5UaMpV5vu v4Xe1MotISZl30yPPN0wwKh3GDGmwiyzi1qkke7xJAbFiVc99aPCU72ibruDinPA2J nwZprVmenzyQWrciovbzZ01mv3XqjQoz1d+0sPWGA4f+a7aH7VdfCPDv7EiwxFuUpO sYR7KPMNm0TIQ== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Message-ID: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine-minimal): Share phases with parent wine packa= ge. --- gnu/packages/wine.scm | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e43494c68..b9a8396b75 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -308,30 +308,13 @@ (define-public wine-minimal (delete "gettext" "perl" "pkg-config"))) (inputs `()) (arguments - `(#:validate-runpath? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL la= ter. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - (list "--without-freetype" - "--without-x") - ,@(strip-keyword-arguments '(#:configure-flags #:phases) - (package-arguments wine)))))) + (substitute-keyword-arguments (package-arguments wine) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'wrap-executable))) ;; Don't reference Vulkan ICD file= s. + ((#:configure-flags _ '()) + #~(list "--without-freetype" + "--without-x")))))) (define-public wine-staging-patchset-data (package -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:08:51 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:52 +0000 Received: from localhost ([127.0.0.1]:36470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEZ-0003j5-Co for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:51 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:36561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEX-0003is-Jn for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:50 -0500 Date: Fri, 27 Jan 2023 01:08:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781723; x=1675040923; bh=DVSGeYq6q9yeTDb25Sfur4zzOxrzKAigp/8DmekqhrU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=MDFw8DyITamSomm+pOU+nPp+vuMfzG6PHz31DN3BcNZkrvboo6fKmbsS5JaqQei7k EjvvvnTpQKN9AQviZAGbVI4RVMjYgx7Yc1vI+8fHA8KWyvBsLg6yP6QEcXF1le+Tlc TAgBKGSIq7rNZIAdhXmUcOJHU+MUorvLmCV7vkYN2MLbSQoU5EmIAvko7xG+v/sKWY XqeRkYhcv+owzI0MBCG7VNnzwoifHgUKN+Jqz+lSPuWOwTGjI1li4Hsg2yLSo5vH2P 0Z/HSucMgPGFNuGR4vJ9W6ZBrbXUyw6xuujeT4ONZWjSppE/Gs/gSGbGNz8phd9qlU zLZSkxupuKfCQ== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 4/5] gnu: wine64: Share phases with parent wine package. Message-ID: <7f816cebacd3a33ec675fbe75bcee4f311efa3ac.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine64): Share phases with parent wine package. --- gnu/packages/wine.scm | 134 ++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b9a8396b75..263ec80416 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -217,84 +217,62 @@ (define-public wine64 (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - (cons* - #:make-flags - #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine64")) - #:phases - #~(modify-phases %standard-phases - ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-= loader - ;; when installing to x86_64-linux so both are available. - ;; TODO: Add more JSON files as they become available in Mesa. - #$@(match (%current-system) - ((or "x86_64-linux") - `((add-after 'copy-wine32-binaries 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd-files (map - (lambda (basename) - (search-input-file - inputs - (string-append "/share/vulkan/= icd.d/" - basename))) - '("radeon_icd.x86_64.json" - "intel_icd.x86_64.json" - "radeon_icd.i686.json" - "intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine-preloa= der") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) - (wrap-program (string-append out "/bin/wine64-prel= oader") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files))))))) - (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL l= ater. - (("/bin/sh") - (which "bash"))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (search-input-file inputs "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrap= ped - ;; version. - (copy-file (search-input-file inputs "/bin/.wine-preloader= -real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - (copy-recursively (search-input-directory inputs "/lib/win= e32") - (string-append out "/lib/wine32"))))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from wine= . - (copy-file (search-input-file inputs "/share/man/man1/wine= .1.gz") - (string-append out "/share/man/man1/wine.1.gz")= )))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - #~(list "--enable-win64") - (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (substitute-keyword-arguments + (strip-keyword-arguments '(#:system) (package-arguments wine)) + ((#:make-flags _) + #~(list "SHELL=3Dbash" + (string-append "libdir=3D" #$output "/lib/wine64")) + ) + ((#:phases phases) + #~(modify-phases #$phases + ;; Explicitly set both the 64-bit and 32-bit versions of vulka= n-loader + ;; when installing to x86_64-linux so both are available. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "x86_64-linux") + `((delete 'wrap-executable) + (add-after 'copy-wine32-binaries 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd-files (map + (lambda (basename) + (search-input-file + inputs + (string-append "/share/vulka= n/icd.d/" + basename))) + '("radeon_icd.x86_64.json" + "intel_icd.x86_64.json" + "radeon_icd.i686.json" + "intel_icd.i686.json")))) + (wrap-program (string-append out "/bin/wine-prel= oader") + `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) + (wrap-program (string-append out "/bin/wine64-pr= eloader") + `("VK_ICD_FILENAMES" ":" =3D ,icd-files))))))) + (_ + `())) + (add-after 'install 'copy-wine32-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + ;; Copy the 32-bit binaries needed for WoW64. + (copy-file (search-input-file inputs "/bin/wine") + (string-append out "/bin/wine")) + ;; Copy the real 32-bit wine-preloader instead of the wr= apped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preload= er-real") + (string-append out "/bin/wine-preloader"))))) + (add-after 'install 'copy-wine32-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + (copy-recursively (search-input-directory inputs "/lib/w= ine32") + (string-append out "/lib/wine32"))))) + (add-after 'compress-documentation 'copy-wine32-manpage + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + ;; Copy the missing man file for the wine binary from wi= ne. + (copy-file (search-input-file inputs "/share/man/man1/wi= ne.1.gz") + (string-append out "/share/man/man1/wine.1.gz= "))))))) + ((#:configure-flags configure-flags '()) + #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 26 20:09:00 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:09:00 +0000 Received: from localhost ([127.0.0.1]:36474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEh-0003jQ-TZ for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:09:00 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:32719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEg-0003jD-3d for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:58 -0500 Date: Fri, 27 Jan 2023 01:08:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781732; x=1675040932; bh=kSglZduQyOGvJGVgsEB02gPdnZO2DjSqJd/uDvHC7sg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=VKL5QQjQ5HlfJMYqThJ7WwSlaJQdl2ri2CqC8TnuJhQG8ngqXeul1Go3ygvo6Mwlk iFJdSGnV9V8WMzB9l3qcGHDOyvkvLS4xVD2nH7cJxp6OMTZ+SqGCA1uLWuGZlq16o8 3OoDfc32eNKg/Z3ur053zmDrtvLdfqWFhYmfcvpYBbJ5NSVWAt+2ceXc7OTtWlG1Ze 8WKWl14xG+g74SP5kCQtjDEBQ4DfWaKTwj5fHkpthOuepuXsUyvC/Z7h+OZQvKyas2 d04VbMDdPy4AqnGLGK9GA1mfKE0eUrFb1Xh6/rM/5f0IipECs7My5YIxvC/fZxOaXo edDZ9CIX/IVWg== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v2 5/5] gnu: wine: Build more reproducibly. Message-ID: <74e8a897c40d4f68ee36875b87ad6113af80f792.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine)[phases]: Add a new 'set-widl-time-override p= hase. --- gnu/packages/wine.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 263ec80416..10cae76ed8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -195,7 +195,12 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date= in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 27 13:03:25 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 18:03:25 +0000 Received: from localhost ([127.0.0.1]:38419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLT4P-0002JS-0J for submit@debbugs.gnu.org; Fri, 27 Jan 2023 13:03:25 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:46849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLT4N-0002JF-75 for 61067@debbugs.gnu.org; Fri, 27 Jan 2023 13:03:23 -0500 Received: by mail-ej1-f65.google.com with SMTP id p26so4615148ejx.13 for <61067@debbugs.gnu.org>; Fri, 27 Jan 2023 10:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=dBJvhjFom0psWeniTj+mHTIuTWzLS9PE8eyIoj4Or0M=; b=oq4MoIeLGIvcgv3i+cKLEKKEAHw5ObD0F0YIDxn3rMg8pXQ0MTcNN1M8yjFCJ8f+Zj KkAONsPfEse4hYjgVCowu+hjFlyI7vFE11mx955tHAFr8aP9sLMBDIR3inph2n0/hkLF cHR4tsL9Vbt0pmwH3tU4zb8o0V3iy9DAWme1vy3lvspuDIs9y9JIKiTvJRXU65ttUV6q Jj3ijY6MuuxKlGuUjDMrBRIkIC4bcMgIbWqxjmp3bVJ9T9o3R4eMC/VhVKAtSn4NWuA9 GGjJNTk7zLq5dbf6G8IclZTsgvedz2Pq2dT875SJMp9sbGktFdk78Gf0cSbRfqh7lTHE KM6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dBJvhjFom0psWeniTj+mHTIuTWzLS9PE8eyIoj4Or0M=; b=4Jb6nB3QuYZMmi8fHSMJbVbvb5pSVZFsgQ+nkZg6sQ7Wp6yHmo8nzkzZfrH/wXC8t1 1e6dFtk1k5BrC/kLV4sPVbyDX9TenxRPLA2T607XapOyqklMeCG4fV2sOl6+OxmFt7Hc ZphTTqj00y74WKPFsMxcUfow3gu37u0myoIc6yWaLz7/mxUlFLoM/+ahIUdH2iYPs/OW uE3e9r/wZ2+msw0dr2asD7nv2F592hHVO0o0m45tTkevZhEr2WC3fYTH2E+rLmKjZsRi E4y68aS28tJwOglsXG3rc/aWz4YDCKs2XUH11vonECVMCI6ahiwxacwKaSJRh+w/j8fX 4y2A== X-Gm-Message-State: AO0yUKXQ+SAiweRrixwkFi+rD8/tg4kx08FK6gEaXDqyaRxX32Zs4Fu5 qxMl9caJweuTR9up3DyHisQ= X-Google-Smtp-Source: AK7set/kUrjg1TyllamyxR4l+nmUfOck52yDbqGsHGnt3mgONhUw++YnyuRZRaSvYg3WuFUau+QAtA== X-Received: by 2002:a17:907:d8c:b0:7c1:4d35:a143 with SMTP id go12-20020a1709070d8c00b007c14d35a143mr502532ejc.3.1674842597445; Fri, 27 Jan 2023 10:03:17 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id 26-20020a170906319a00b0087ba20a816asm1428787ejy.152.2023.01.27.10.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 10:03:17 -0800 (PST) Message-ID: <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Subject: Re: [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. From: Liliana Marie Prikler To: Kaelyn Takata , 61067@debbugs.gnu.org Date: Fri, 27 Jan 2023 19:03:15 +0100 In-Reply-To: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gRnJlaXRhZywgZGVtIDI3LjAxLjIwMjMgdW0gMDE6MDggKzAwMDAgc2NocmllYiBLYWVseW4g VGFrYXRhOgo+ICogZ251L3BhY2thZ2VzL3dpbmUuc2NtICh3aW5lLW1pbmltYWwpOiBTaGFyZSBw aGFzZXMgd2l0aCBwYXJlbnQgd2luZQo+IHBhY2thZ2UuCj4gLS0tCj4gwqBnbnUvcGFja2FnZXMv d2luZS5zY20gfCAzMSArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gwqAxIGZpbGUg Y2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZ251L3BhY2thZ2VzL3dpbmUuc2NtIGIvZ251L3BhY2thZ2VzL3dpbmUuc2NtCj4gaW5kZXgg NmU0MzQ5NGM2OC4uYjlhODM5NmI3NSAxMDA2NDQKPiAtLS0gYS9nbnUvcGFja2FnZXMvd2luZS5z Y20KPiArKysgYi9nbnUvcGFja2FnZXMvd2luZS5zY20KPiBAQCAtMzA4LDMwICszMDgsMTMgQEAg KGRlZmluZS1wdWJsaWMgd2luZS1taW5pbWFsCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChkZWxldGUgImdldHRleHQiICJwZXJsIiAicGtnLWNvbmZpZyIpKSkK PiDCoMKgwqDCoCAoaW5wdXRzIGAoKSkKPiDCoMKgwqDCoCAoYXJndW1lbnRzCj4gLcKgwqDCoMKg IGAoIzp2YWxpZGF0ZS1ydW5wYXRoPyAjZgo+IC3CoMKgwqDCoMKgwqAgIzpwaGFzZXMKPiAtwqDC oMKgwqDCoMKgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKPiAtwqDCoMKgwqDCoMKg wqDCoCAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLVNIRUxMCj4gLcKgwqDCoMKgwqDCoMKgwqDC oMKgIChsYW1iZGEgXwo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJj b25maWd1cmUiCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgY29uZmlndXJlIGZp cnN0IHJlc3BlY3RzIENPTkZJR19TSEVMTCwgY2xvYmJlcnMKPiBTSEVMTCBsYXRlci4KPiAtwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIvYmluL3NoIikKPiAtwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICh3aGljaCAiYmFzaCIpKSkpKQo+IC3CoMKgwqDCoMKgwqDCoMKgIChh ZGQtYWZ0ZXIgJ2NvbmZpZ3VyZSAncGF0Y2gtZGxvcGVuLXBhdGhzCj4gLcKgwqDCoMKgwqDCoMKg wqDCoMKgIDs7IEhhcmRjb2RlIGRsb3BlbmVkIHNvbmFtZXMgdG8gYWJzb2x1dGUgcGF0aHMuCj4g LcKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGxldCogKChsaWJyYXJ5LXBhdGggKHNlYXJjaC1wYXRoLWFzLXN0cmluZy0+bGlzdAo+IC3C oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZ2V0ZW52ICJMSUJSQVJZX1BBVEgiKSkpCj4gLcKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmaW5kLXNvIChsYW1iZGEgKHNvbmFtZSkKPiAtwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChz ZWFyY2gtcGF0aCBsaWJyYXJ5LXBhdGggc29uYW1lKSkpKQo+IC3CoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdWJzdGl0dXRlKiAiaW5jbHVkZS9jb25maWcuaCIKPiAtwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiKCNkZWZpbmUgU09OQU1FXy4qIClcIiguKilcIiIgXyBk ZWZzbyBzb25hbWUpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZvcm1h dCAjZiAifmFcIn5hXCIiIGRlZnNvIChmaW5kLXNvCj4gc29uYW1lKSkpKSkpKSkKPiAtwqDCoMKg wqDCoMKgICM6Y29uZmlndXJlLWZsYWdzCj4gLcKgwqDCoMKgwqDCoCAobGlzdCAiLS13aXRob3V0 LWZyZWV0eXBlIgo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIi0td2l0aG91dC14IikKPiAt wqDCoMKgwqDCoMKgICxAKHN0cmlwLWtleXdvcmQtYXJndW1lbnRzICcoIzpjb25maWd1cmUtZmxh Z3MgIzpwaGFzZXMpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocGFja2FnZS1hcmd1bWVudHMgd2luZSkpKSkpKQo+ ICvCoMKgwqDCoCAoc3Vic3RpdHV0ZS1rZXl3b3JkLWFyZ3VtZW50cyAocGFja2FnZS1hcmd1bWVu dHMgd2luZSkKPiArwqDCoMKgwqDCoMKgICgoIzpwaGFzZXMgcGhhc2VzKQo+ICvCoMKgwqDCoMKg wqDCoCAjfihtb2RpZnktcGhhc2VzICMkcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGRlbGV0ZSAnd3JhcC1leGVjdXRhYmxlKSkpIDs7IERvbid0IHJlZmVyZW5jZSBWdWxrYW4KPiBJ Q0QgZmlsZXMuCj4gK8KgwqDCoMKgwqDCoCAoKCM6Y29uZmlndXJlLWZsYWdzIF8gJygpKQo+ICvC oMKgwqDCoMKgwqDCoCAjfihsaXN0ICItLXdpdGhvdXQtZnJlZXR5cGUiCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAiLS13aXRob3V0LXgiKSkpKSkpCj4gCj4gwqAoZGVmaW5lLXB1 YmxpYyB3aW5lLXN0YWdpbmctcGF0Y2hzZXQtZGF0YQo+IMKgwqAgKHBhY2thZ2UKPiAtLQpEb2lu ZyBpdCB0aGlzIHdheSBpcyBhY3R1YWxseSBkYW5nZXJvdXMsIGJlY2F1c2UgY2hhbmdlcyBpbiB3 aW5lIGdldApwcm9wYWdhdGVkIHRvIHdpbmUtbWluaW1hbCBldmVuIGlmIHRoZXkgZG9uJ3QgYWZm ZWN0IGl0ICh3ZSBoYWQgYQpzaW1pbGFyIGVycm9yIGluIGVtYWNzIGJsb3dpbmcgdXAgdGhlIHNp emUgb2YgZW1hY3MtbWluaW1hbCByZWNlbnRseSkuClRoZXJlIGFyZSB0d28gcG9zc2libGUgc29s dXRpb25zOiBCaW5kIHRoZSBjb21tb24gcGhhc2VzIHRvIGEgdmFyaWFibGUKYW5kIHVzZSB0aGF0 IGluc3RlYWQgb2YgJXN0YW5kYXJkLXBoYXNlcywgb3IgbWFrZSB3aW5lIGluaGVyaXQgd2luZS0K bWluaW1hbC4KClNpZGUgbm90ZTogUUEgZmFpbGVkIDooCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 27 13:15:48 2023 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 18:15:48 +0000 Received: from localhost ([127.0.0.1]:38425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLTGO-0002bF-DK for submit@debbugs.gnu.org; Fri, 27 Jan 2023 13:15:48 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:21491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLTGI-0002ax-Ii for 61067@debbugs.gnu.org; Fri, 27 Jan 2023 13:15:46 -0500 Date: Fri, 27 Jan 2023 18:15:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674843335; x=1675102535; bh=kpq4BUEOaTRa57OnXtu8QVVCGlc7/wbjOQUlqmo/ZPY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=H6Mt+of5KpHjv/P88Bdgq3KebBNbNzUH2iWUIb4sHhkVF5c3lWBLciL5LdNqHLWck tFdJWttdW6XX1mA4zVyOhpd1hnC5+2/kgfcRXcJXQD8zVOAaGAxcwdixSFusW+g1j3 NPKdx30bREXfrZ/Uln3CpRlSjQveaJ/nHWwTwV0ANETL/mDPlEWctmmPC9Ph88EumR 9e+fNSTFTpjkg2sbBYvy/jjQF0bzPCobXruUXBqEPsgfBEOKVoPr4WvQwM7PxEjGKy 3BqcUAEz4LBR0uMjciG8a06Md2zu8d793thKsojYjBB3bcdxLk4WxvveuzzZjxe7+u bOiyW0r8lACAg== To: Liliana Marie Prikler From: Kaelyn Subject: Re: [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Message-ID: In-Reply-To: <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------- Original Message ------- On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler wrote: >=20 >=20 > Am Freitag, dem 27.01.2023 um 01:08 +0000 schrieb Kaelyn Takata: >=20 > > * gnu/packages/wine.scm (wine-minimal): Share phases with parent wine > > package. > > --- > > gnu/packages/wine.scm | 31 +++++++------------------------ > > 1 file changed, 7 insertions(+), 24 deletions(-) > >=20 > > diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm > > index 6e43494c68..b9a8396b75 100644 > > --- a/gnu/packages/wine.scm > > +++ b/gnu/packages/wine.scm > > @@ -308,30 +308,13 @@ (define-public wine-minimal > > (delete "gettext" "perl" "pkg-config"))) > > (inputs `()) (arguments -` (#:validate-runpath? #f > > - #:phases > > - (modify-phases %standard-phases > > - (add-after 'unpack 'patch-SHELL > > - (lambda _ > > - (substitute* "configure" > > - ;; configure first respects CONFIG_SHELL, clobbers > > SHELL later. > > - (("/bin/sh") > > - (which "bash"))))) > > - (add-after 'configure 'patch-dlopen-paths > > - ;; Hardcode dlopened sonames to absolute paths. > > - (lambda _ > > - (let* ((library-path (search-path-as-string->list > > - (getenv "LIBRARY_PATH"))) > > - (find-so (lambda (soname) > > - (search-path library-path soname)))) > > - (substitute* "include/config.h" > > - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) > > - (format #f "~a\"~a\"" defso (find-so > > soname)))))))) > > - #:configure-flags > > - (list "--without-freetype" > > - "--without-x") > > - ,@(strip-keyword-arguments '(#:configure-flags #:phases) > > - (package-arguments wine)))))) > > + (substitute-keyword-arguments (package-arguments wine) > > + ((#:phases phases) > > + #~(modify-phases #$phases > > + (delete 'wrap-executable))) ;; Don't reference Vulkan > > ICD files. > > + ((#:configure-flags _ '()) > > + #~(list "--without-freetype" > > + "--without-x")))))) > >=20 > > (define-public wine-staging-patchset-data > > (package > > -- >=20 > Doing it this way is actually dangerous, because changes in wine get > propagated to wine-minimal even if they don't affect it (we had a > similar error in emacs blowing up the size of emacs-minimal recently). > There are two possible solutions: Bind the common phases to a variable > and use that instead of %standard-phases, or make wine inherit wine- > minimal. I'm not sure I'll be able to work on this today, but I am fine with either = approach. I suspect flipping the packages so that wine depends on wine-mini= mal and adds inputs and extra phases and replaces the configure flags will = be simpler from a maintenance perspective since it would keep the wine and = wine-minimal versions in sync automatically. >From the comment in wine.scm, the wine-minimal package is only needed for b= uilding vkd3d to avoid a dependency loop between wine and vkd3d. (A comment= on that package suggests it's the widl tool needed from wine, but wine-min= imal is also an input instead of a native-input so maybe a bit more than a = build-time tool is needed?) Cheers, Kaelyn >=20 > Side note: QA failed :( >=20 > Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 30 15:35:56 2023 Received: (at 61067) by debbugs.gnu.org; 30 Jan 2023 20:35:56 +0000 Received: from localhost ([127.0.0.1]:50666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMasd-0005zl-AG for submit@debbugs.gnu.org; Mon, 30 Jan 2023 15:35:55 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:51269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMasb-0005zV-DA for 61067@debbugs.gnu.org; Mon, 30 Jan 2023 15:35:54 -0500 Date: Mon, 30 Jan 2023 20:35:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675110946; x=1675370146; bh=9Sfb6aB7bvWvgjQGjTwhiDnsuWwD/XvhvCd8EYmJpM8=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=spEJz3sd74fygXewiC4sj2n2u76wwr5knrug2YOOLGEK1PJhSRui9Pkjl/4PrtTJP ol/qoZXh+TMyCl+FduNs3tucmhqGLaQkzMpbPqGY/vvHmOawg4sswOJXqCLjnIII+8 rPvXwZ//qBzVsjxXaFOHG3ICdGD0yTxXolvrYhPPY9jbB2BH8kiTIriXuLGi//qRut wJN1gv1P3JsF5gDQI6GH50h2R2G2oclcD6aNwIcQ9YFj9cFOSozk1RHRFZHuvhz7e0 bm6JBgkDCZg3MQLMeNuuOSPKV1t3TzkMxc40AG1TmrMPWAElZoHsEES6Zrf1PxgAIa rxFwrdpgxK7Dg== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH] gnu: wine: Invert the relationship between wine and wine-minimal. Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine,wine-minimal): Have wine expand upon the package definition of wine-minimal instead of having wine-minimal trim down the package definition of wine. --- gnu/packages/wine.scm | 162 +++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 10cae76ed8..3299059968 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -74,9 +74,11 @@ (define-module (gnu packages wine) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -(define-public wine +;; This minimal build of Wine is needed to prevent a circular dependency w= ith +;; vkd3d. +(define-public wine-minimal (package - (name "wine") + (name "wine-minimal") (version "8.0") (source (origin @@ -91,8 +93,77 @@ (define-public wine (sha256 (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) + (native-inputs (list bison flex)) + (inputs `()) + (arguments + (list + ;; Force a 32-bit build targeting a similar architecture, i.e.: + ;; armhf for armhf/aarch64, i686 for i686/x86_64. + #:system (match (%current-system) + ((or "armhf-linux" "aarch64-linux") "armhf-linux") + (_ "i686-linux")) + + ;; XXX: There's a test suite, but it's unclear whether it's suppose= d to + ;; pass. + #:tests? #f + + #:make-flags + #~(list "SHELL=3Dbash" + (string-append "libdir=3D" #$output "/lib/wine32")) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-SHELL + (lambda _ + (substitute* "configure" + ;; configure first respects CONFIG_SHELL, clobbers SHELL = later. + (("/bin/sh") + (which "bash"))))) + (add-after 'configure 'patch-dlopen-paths + ;; Hardcode dlopened sonames to absolute paths. + (lambda _ + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path library-path soname)))) + (substitute* "include/config.h" + (("(#define SONAME_.* )\"(.*)\"" _ defso soname) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-after 'patch-generated-file-shebangs 'patch-makedep + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "tools/makedep.c" + (("output_filenames\\( unix_libs \\);" all) + (string-append all + "output ( \" -Wl,-rpath=3D%s \", arch_install_dirs[arch= ] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date= in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) + #:configure-flags + #~(list "--without-freetype" + "--without-x"))) + (home-page "https://www.winehq.org/") + (synopsis "Implementation of the Windows API (32-bit only)") + (description + "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a +compatibility layer capable of running Windows applications. Instead of +simulating internal Windows logic like a virtual machine or emulator, Wine +translates Windows API calls into POSIX calls on-the-fly, eliminating the +performance and memory penalties of other methods and allowing you to clea= nly +integrate Windows applications into your desktop.") + ;; Any platform should be able to build wine, but based on '#:system' = these + ;; are the ones we currently support. + (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) + (license license:lgpl2.1+))) + +(define-public wine + (package + (inherit wine-minimal) + (name "wine") (native-inputs - (list bison flex gettext-minimal perl pkg-config)) + (modify-inputs (package-native-inputs wine-minimal) + (prepend gettext-minimal perl pkg-config))) (inputs ;; Some libraries like libjpeg are now compiled into native PE object= s. ;; The ELF objects provided by Guix packages are of no use. Whilst t= his @@ -100,6 +171,7 @@ (define-public wine ;; to build some of these from Guix PACKAGE-SOURCE but attempts were = not ;; fruitful so far. See . (list alsa-lib + bash-minimal cups dbus eudev @@ -132,23 +204,9 @@ (define-public wine vkd3d vulkan-loader)) (arguments - (list - ;; Force a 32-bit build targeting a similar architecture, i.e.: - ;; armhf for armhf/aarch64, i686 for i686/x86_64. - #:system (match (%current-system) - ((or "armhf-linux" "aarch64-linux") "armhf-linux") - (_ "i686-linux")) - - ;; XXX: There's a test suite, but it's unclear whether it's suppose= d to - ;; pass. - #:tests? #f - - #:make-flags - #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine32")) - - #:phases - #~(modify-phases %standard-phases + (substitute-keyword-arguments (package-arguments wine-minimal) + ((#:phases phases) + #~(modify-phases #$phases ;; Explicitly set the 32-bit version of vulkan-loader when inst= alling ;; to i686-linux or x86_64-linux. ;; TODO: Add more JSON files as they become available in Mesa. @@ -173,47 +231,8 @@ (define-public wine "/radeon_icd.i686.json" ":" icd "/intel_icd.i686.json"))= ))))))) (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL = later. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname))))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );"))))) - (add-before 'build 'set-widl-time-override - ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date= in - ;; files generated by WIDL. - (lambda _ - (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) - (home-page "https://www.winehq.org/") - (synopsis "Implementation of the Windows API (32-bit only)") - (description - "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a -compatibility layer capable of running Windows applications. Instead of -simulating internal Windows logic like a virtual machine or emulator, Wine -translates Windows API calls into POSIX calls on-the-fly, eliminating the -performance and memory penalties of other methods and allowing you to clea= nly -integrate Windows applications into your desktop.") - ;; Any platform should be able to build wine, but based on '#:system' = these - ;; are thr ones we currently support. - (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) - (license license:lgpl2.1+))) + `())))) + ((#:configure-flags _ '()) #~'()))))) (define-public wine64 (package @@ -226,8 +245,7 @@ (define-public wine64 (strip-keyword-arguments '(#:system) (package-arguments wine)) ((#:make-flags _) #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine64")) - ) + (string-append "libdir=3D" #$output "/lib/wine64"))) ((#:phases phases) #~(modify-phases #$phases ;; Explicitly set both the 64-bit and 32-bit versions of vulka= n-loader @@ -281,24 +299,6 @@ (define-public wine64 (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -;; This minimal build of Wine is needed to prevent a circular dependency w= ith -;; vkd3d. -(define-public wine-minimal - (package - (inherit wine) - (name "wine-minimal") - (native-inputs (modify-inputs (package-native-inputs wine) - (delete "gettext" "perl" "pkg-config"))) - (inputs `()) - (arguments - (substitute-keyword-arguments (package-arguments wine) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'wrap-executable))) ;; Don't reference Vulkan ICD file= s. - ((#:configure-flags _ '()) - #~(list "--without-freetype" - "--without-x")))))) - (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") base-commit: c2b40b4b4c9e0227e47730ebe73a653b89d1e568 prerequisite-patch-id: a4f31b7648d1a378604724327efd615cfaf30deb prerequisite-patch-id: 61c258aa83aa60b83e2b9e44ff0f88ecc4277ff0 prerequisite-patch-id: 151abf5b65589e5721ffc2607e884f5375150108 prerequisite-patch-id: c3046a4e9ad075f3013aafda88cec6a22341ac7c prerequisite-patch-id: 19a15bb5b766f40a985df7677db0866ad8c28069 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 30 15:39:30 2023 Received: (at 61067) by debbugs.gnu.org; 30 Jan 2023 20:39:31 +0000 Received: from localhost ([127.0.0.1]:50677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMaw6-00065X-GC for submit@debbugs.gnu.org; Mon, 30 Jan 2023 15:39:30 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:62605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMaw5-00065G-Kh for 61067@debbugs.gnu.org; Mon, 30 Jan 2023 15:39:30 -0500 Date: Mon, 30 Jan 2023 20:39:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675111163; x=1675370363; bh=C5i5BAZeQITK/VlPmseg3XusJmFcwBEc9RBjnzYHZSI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=sSqlPE5vxNLquSbuu4UujUyQVRmZfy4cxxd1kJ8hh4BDLRXUoFfenlYsFUFrExKpt Fda2Zuse20ZbTz2a3dEzP+TBBq7/RXyxQ8LIeK/jMaMi/at124b2QcR2Y7xhiXap4l CGr+KM2+TCxmLmojIeEh79C0tyK2KklCM9ACKhqHJMPNEfYlwoz+Ss4vDc/wVoIeCW fR8dtmB+Xgh0wlVcvpBXk+/mS/tp1HFURSnaCO6Mk2tzaJhfp9b6Yo1EQNchF0moI4 gcH/43rs1j3FKP5PC5TOlsshyjw5dQPhxDAo7uMsyF3KfLWsFFMWwZkuLnBOqwP3Px czqHNCZu4l2iw== To: Liliana Marie Prikler From: Kaelyn Subject: Re: [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Message-ID: In-Reply-To: <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------- Original Message ------- On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler wrote: >=20 >=20 > Am Freitag, dem 27.01.2023 um 01:08 +0000 schrieb Kaelyn Takata: >=20 > > * gnu/packages/wine.scm (wine-minimal): Share phases with parent wine > > package. > > --- > > gnu/packages/wine.scm | 31 +++++++------------------------ > > 1 file changed, 7 insertions(+), 24 deletions(-) > >=20 > > diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm > > index 6e43494c68..b9a8396b75 100644 > > --- a/gnu/packages/wine.scm > > +++ b/gnu/packages/wine.scm > > @@ -308,30 +308,13 @@ (define-public wine-minimal > > (delete "gettext" "perl" "pkg-config"))) > > (inputs `()) (arguments -` (#:validate-runpath? #f > > - #:phases > > - (modify-phases %standard-phases > > - (add-after 'unpack 'patch-SHELL > > - (lambda _ > > - (substitute* "configure" > > - ;; configure first respects CONFIG_SHELL, clobbers > > SHELL later. > > - (("/bin/sh") > > - (which "bash"))))) > > - (add-after 'configure 'patch-dlopen-paths > > - ;; Hardcode dlopened sonames to absolute paths. > > - (lambda _ > > - (let* ((library-path (search-path-as-string->list > > - (getenv "LIBRARY_PATH"))) > > - (find-so (lambda (soname) > > - (search-path library-path soname)))) > > - (substitute* "include/config.h" > > - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) > > - (format #f "~a\"~a\"" defso (find-so > > soname)))))))) > > - #:configure-flags > > - (list "--without-freetype" > > - "--without-x") > > - ,@(strip-keyword-arguments '(#:configure-flags #:phases) > > - (package-arguments wine)))))) > > + (substitute-keyword-arguments (package-arguments wine) > > + ((#:phases phases) > > + #~(modify-phases #$phases > > + (delete 'wrap-executable))) ;; Don't reference Vulkan > > ICD files. > > + ((#:configure-flags _ '()) > > + #~(list "--without-freetype" > > + "--without-x")))))) > >=20 > > (define-public wine-staging-patchset-data > > (package > > -- >=20 > Doing it this way is actually dangerous, because changes in wine get > propagated to wine-minimal even if they don't affect it (we had a > similar error in emacs blowing up the size of emacs-minimal recently). > There are two possible solutions: Bind the common phases to a variable > and use that instead of %standard-phases, or make wine inherit wine- > minimal. I just sent a patch to this issue to make wine inherit from wine-minimal in= stead of vice versa. If it seems fairly reasonable, I'll rebase and reorder= the patch series to include the change (essentially to fold it into the co= mmit that updates wine-minimal to share phases with wine). BTW, the patch also addresses a few lint messages. Cheers, Kaelyn >=20 > Side note: QA failed :( >=20 > Cheers From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 31 14:19:30 2023 Received: (at 61067) by debbugs.gnu.org; 31 Jan 2023 19:19:30 +0000 Received: from localhost ([127.0.0.1]:55034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMwAE-0000SB-0N for submit@debbugs.gnu.org; Tue, 31 Jan 2023 14:19:30 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMwAA-0000Ru-3a for 61067@debbugs.gnu.org; Tue, 31 Jan 2023 14:19:28 -0500 Received: by mail-ej1-f65.google.com with SMTP id m2so44221471ejb.8 for <61067@debbugs.gnu.org>; Tue, 31 Jan 2023 11:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=HKbO0Tz+3aus5A+DxQK5Yba1QaDOb6/EIS32NwUhEhM=; b=iOE4Jeae37u7ndSVdcGaT4jMVBMEmMD5QR7CSjCH2CzznzX+PwyY7ohDS0fO5Dlc/6 yEJRhvsSF9A1ClUsQUpNaEq5t3SKpByC82U/WtBkustdQyO7veH3br0FxwrObjWKIOKK BhXUUhwTz0+4RP6zRlhRTB5cwKhgVpt+HUyCE7nUDXM2k+45DX4eEGbOwi4TyQCc48vg wytpxf5bo95a40ula7bC+6zRcQbI+ixWV3GcRBqV9CzWvLuRHVANmVz4z2DpZjUmwvtJ rXRj8NchOk/thdRGNAxJ8Ou1RSsR2qgrG02Xx/WXks0t9z+SAhbhvKOupDQo6weIpLov PWXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HKbO0Tz+3aus5A+DxQK5Yba1QaDOb6/EIS32NwUhEhM=; b=hiuIZEl5+0kSt3aTW+m9sIeWaTT8VYDU/peHLHJvfz1tbB/0jrvlEBW+BR9xlA00Ko lCNanxb0VOp9k7jtjKr+C+Ngh1PXn5ohxHgGAW0D2UPNewgesyFGLci6UqY0PB4JWyL4 QIupXsIchP6vGknKqM5Z/Rrz/8xQWWfwp8cnb/pLomAg1O7X3ETxJR6fjdJFUid2Be6V /T5F3B88wVwyxacIsmi4/RjBSij6Cs3DLO8JUPw+T7YYCxPy+JgYq3HUJISc3QaLqHiA kgAB8e+RWvHjlTctEz/q2aBCwIMyNeSvMXJjZqsPTpq2SftP7Adc7L+rL6SLqax9GVsw 3UwQ== X-Gm-Message-State: AO0yUKV+Q8f0ODKfOIPddVk+n7u2s70qg/1uLE7ZCZLkMn92BiIDAXPh M9xJv52qsCLUlZyZSLmrxSI= X-Google-Smtp-Source: AK7set+wZBEeCwzNqTmIL0s+LOySP21dzghvvDYDzZQQH472ycBOT1MCgTUs1brNK2AVmaPnq4SoYQ== X-Received: by 2002:a17:907:78ce:b0:87b:d3dd:e0ca with SMTP id kv14-20020a17090778ce00b0087bd3dde0camr4031786ejc.26.1675192760004; Tue, 31 Jan 2023 11:19:20 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c23-20020a170906155700b00869f2ca6a87sm8776020ejd.135.2023.01.31.11.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 11:19:19 -0800 (PST) Message-ID: <1674132a10aba74f838a1cd80c76a1864bf52c19.camel@gmail.com> Subject: Re: [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. From: Liliana Marie Prikler To: Kaelyn Date: Tue, 31 Jan 2023 20:19:18 +0100 In-Reply-To: References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: 61067@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 30.01.2023 um 20:39 +0000 schrieb Kaelyn: > ------- Original Message ------- > On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler > wrote: >=20 >=20 > >=20 > >=20 > > Am Freitag, dem 27.01.2023 um 01:08 +0000 schrieb Kaelyn Takata: > >=20 > > > * gnu/packages/wine.scm (wine-minimal): Share phases with parent > > > wine > > > package. > > > --- > > > gnu/packages/wine.scm | 31 +++++++------------------------ > > > 1 file changed, 7 insertions(+), 24 deletions(-) > > >=20 > > > diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm > > > index 6e43494c68..b9a8396b75 100644 > > > --- a/gnu/packages/wine.scm > > > +++ b/gnu/packages/wine.scm > > > @@ -308,30 +308,13 @@ (define-public wine-minimal > > > (delete "gettext" "perl" "pkg-config"))) > > > (inputs `()) (arguments -` (#:validate-runpath? #f > > > - #:phases > > > - (modify-phases %standard-phases > > > - (add-after 'unpack 'patch-SHELL > > > - (lambda _ > > > - (substitute* "configure" > > > - ;; configure first respects CONFIG_SHELL, clobbers > > > SHELL later. > > > - (("/bin/sh") > > > - (which "bash"))))) > > > - (add-after 'configure 'patch-dlopen-paths > > > - ;; Hardcode dlopened sonames to absolute paths. > > > - (lambda _ > > > - (let* ((library-path (search-path-as-string->list > > > - (getenv "LIBRARY_PATH"))) > > > - (find-so (lambda (soname) > > > - (search-path library-path soname)))) > > > - (substitute* "include/config.h" > > > - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) > > > - (format #f "~a\"~a\"" defso (find-so > > > soname)))))))) > > > - #:configure-flags > > > - (list "--without-freetype" > > > - "--without-x") > > > - ,@(strip-keyword-arguments '(#:configure-flags #:phases) > > > - (package-arguments wine)))))) > > > + (substitute-keyword-arguments (package-arguments wine) > > > + ((#:phases phases) > > > + #~(modify-phases #$phases > > > + (delete 'wrap-executable))) ;; Don't reference Vulkan > > > ICD files. > > > + ((#:configure-flags _ '()) > > > + #~(list "--without-freetype" > > > + "--without-x")))))) > > >=20 > > > (define-public wine-staging-patchset-data > > > (package > > > -- > >=20 > > Doing it this way is actually dangerous, because changes in wine > > get > > propagated to wine-minimal even if they don't affect it (we had a > > similar error in emacs blowing up the size of emacs-minimal > > recently). > > There are two possible solutions: Bind the common phases to a > > variable > > and use that instead of %standard-phases, or make wine inherit > > wine- > > minimal. >=20 > I just sent a patch to this issue to make wine inherit from wine- > minimal instead of vice versa. If it seems fairly reasonable, I'll > rebase and reorder the patch series to include the change > (essentially to fold it into the commit that updates wine-minimal to > share phases with wine). Please do. Also, don't forget to bump the reroll count as well as adding me to CC. Thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:23:30 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:23:30 +0000 Received: from localhost ([127.0.0.1]:35991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3J-0003dV-UM for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:30 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:20933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3I-0003dD-9h for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:29 -0500 Date: Thu, 02 Feb 2023 21:23:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373002; x=1675632202; bh=jgqyvR3pmzvte1WfE4wJjw+uUkevYBXDlidtUFhZZHA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=auGxZSFjEtK2ognoJKHsxzZhv4tPAEp6Dk/PpYGzmVcZ2Y1qSMPyWLJnlsOsAB9wO wEVp/UbAFFquvn1R7eZk6sMueCSRzucV4vOi+x0+p8CcXeRP+1eRRY2dVx5K6UVmZH 5Yrf5JzARXNOaYm404pO9LkheIbwyv5PV/f3xKmGBhRNh7MTljzIdMAEHOEt0gaRZL G2yexW0w2SnusHtAqaYUb+V4FAcWZuaUthDH0LW3A3lzGU7uXsZoyONSg/y/gxQMkM 7iatSAkor0twbf67fqhSYSx7wHDHnbRCowrzc82UDquhBgnPiK09QPilc8tRYrJnsz JftT7ar1Qii9Q== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) New in v3: * Modified the patch for sharing phases between wine and wine-minimal to al= so invert the relationship between the two packages, with wine now inheritin= g from wine-minimal. Cheers, Kaelyn Kaelyn Takata (5): gnu: wine: Update to 8.0. gnu: wine-staging: Update to 8.0. gnu: wine-minimal: Make the parent of wine so phases can be shared. gnu: wine64: Share phases with parent wine package. gnu: wine-minimal: Build more reproducibly. gnu/packages/wine.scm | 320 +++++++++++++++++++----------------------- 1 file changed, 142 insertions(+), 178 deletions(-) base-commit: 74f15a002cf2979f3268afeed61aa1aef09ea4fa -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:23:48 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:23:48 +0000 Received: from localhost ([127.0.0.1]:35995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3c-0003eB-9Y for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:48 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:24205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3a-0003dr-Fh for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:47 -0500 Date: Thu, 02 Feb 2023 21:23:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373020; x=1675632220; bh=HHvNkOgjDdFQV6CrFK/7OIG4zfMa6Ip/MzmwjKM0t0Q=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=crsL+kDG8RKG01Qs0+JQEECAwzxutiHmogr1qiwQE5uZKFqoZwP03rbp2Qm17xxgR E1/afH3501e8tR+lZABY6rgWTiDNuOTyp/gu40H8ELX6ZdHdlKlBMzcBRG7l7dI0wp S4u6V7eIN3jggsw3ICrzJkdgxjc5R8/j3/U3AV0lONArKUwFz5WfL8j7SiPc1dhBXr jA6mXN2xLvMdHFzFPfa1HBFNo73GwlaxTzVuA27HRMxySYR/mHNpzEB26Bz+3b4ozM NgLXEsLor1REp8be8PromsazrKwIhjTkaTRuaS2OUSCS1y5Z1fNdTeSPi/wt/oAHpB 1KADsWqiMLFLA== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 1/5] gnu: wine: Update to 8.0. Message-ID: <3b141cbb5c1d77e218db28e505a5a14011370bfa.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0. [arguments]: Remove superfluous rpath setting in configure-flags. --- gnu/packages/wine.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e86add4e3..7ca2ac5bdf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2018=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Pierre Neidhardt ;;; Copyright =C2=A9 2022 Liliana Marie Prikler +;;; Copyright =C2=A9 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "7.19") + (version "8.0") (source (origin (method url-fetch) @@ -88,7 +89,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) (native-inputs (list bison flex gettext-minimal perl pkg-config)) @@ -142,9 +143,6 @@ (define-public wine ;; pass. #:tests? #f - #:configure-flags - #~(list (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/win= e32")) - #:make-flags #~(list "SHELL=3Dbash" (string-append "libdir=3D" #$output "/lib/wine32")) @@ -197,7 +195,7 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir )= ;")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -260,7 +258,7 @@ (define-public wine64 (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", so_dir );= "))))) + "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -293,8 +291,7 @@ (define-public wine64 (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))))))) #:configure-flags - #~(list "--enable-win64" - (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib/wine= 64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine)))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:23:58 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:23:58 +0000 Received: from localhost ([127.0.0.1]:35999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3l-0003ed-Oj for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:58 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:52971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3j-0003eO-Q6 for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:56 -0500 Date: Thu, 02 Feb 2023 21:23:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373030; x=1675632230; bh=NU+uBePYo9ejiZYdZ7WgvfMbcCLORwW/Gw3XNUMqtwA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=diSxcv8HED5z0She7IZElb190jY614q0w9PFc15x+3t4qNInyVugozSOVctD4mjAG O9xbSyctINr4WUWYkRH9IktssJvK352p1X9cUeRG+uhpGiK52A0PeuJUB4zuT0V6gg HoZiCxYY2sPdXPcWUWcdk29kMPmEzWc5ftIbLjq7VptMZjh27Wq9fXqXM/Qzm3NZ8D ElpnaXkaFCThDbgP+2393Ra3GuTlYEWGNzOPpRPd+rKA5l5CNPkt0Yxa8D98rqyxIL RqPKdkxBw5sBkWbrcnAwbb5dXk5VvfZQu/QhHblV0Au6P2Fhn/q7+zyGh6UNi3bWi7 cWF9kRAym0WHA== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 2/5] gnu: wine-staging: Update to 8.0. Message-ID: <4b798e6825dca60ea21fbc0bc25e0cbfb5b8a973.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine-staging,wine64-staging): Update to 8.0. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..6e43494c68 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -336,7 +336,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "7.8") + (version "8.0") (source (origin (method git-fetch) @@ -345,7 +345,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) + (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -395,7 +395,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))= ))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))= ))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:24:19 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:24:19 +0000 Received: from localhost ([127.0.0.1]:36008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh47-0003g3-3p for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:19 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:20303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh44-0003fh-C2 for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:17 -0500 Date: Thu, 02 Feb 2023 21:23:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373050; x=1675632250; bh=cMyu0mRMHFYK7ZJKXImCTRc6DGGUHg9KWLMfCmQw7hA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=FdrA41hMwzQgohC1cGBO32eYV22iE472naS195cQi0eCl7LS/cUlnIsCcbQG2M3Wk owwLGMGRJo7MxIg77t0T9cpPRLa3PJ4SZnuDfgZNnFKhItcr52KdogCiBKeXHkRAgb gOc98boDlij1a8A1pztVbJsZHiNRukcVh+431E9MzHWIwVhLYan9LacjEJpM7nZwHR tE8D1UVWu4d/VH6T75VObSF/MzUWTd65jqgjHNRD+PNTc57ldJI0gnmyhywtoCvkvL umiargiqGVCroC2nLHPSnZGOtp6YDSlrvkJwnNENJIqfd1OEoVf6gntB0XYTi576NA zPqhTddtQcdog== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 3/5] gnu: wine-minimal: Make the parent of wine so phases can be shared. Message-ID: <7a81358b182ba151977df25900e980c87488ee02.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine,wine-minimal): Have wine expand upon the package definition of wine-minimal instead of having wine-minimal trim down the package definition of wine, and share the phases between them. --- gnu/packages/wine.scm | 166 +++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 91 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e43494c68..ceef09ea5d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -74,9 +74,11 @@ (define-module (gnu packages wine) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -(define-public wine +;; This minimal build of Wine is needed to prevent a circular dependency w= ith +;; vkd3d. +(define-public wine-minimal (package - (name "wine") + (name "wine-minimal") (version "8.0") (source (origin @@ -91,8 +93,72 @@ (define-public wine (sha256 (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) + (native-inputs (list bison flex)) + (inputs `()) + (arguments + (list + ;; Force a 32-bit build targeting a similar architecture, i.e.: + ;; armhf for armhf/aarch64, i686 for i686/x86_64. + #:system (match (%current-system) + ((or "armhf-linux" "aarch64-linux") "armhf-linux") + (_ "i686-linux")) + + ;; XXX: There's a test suite, but it's unclear whether it's suppose= d to + ;; pass. + #:tests? #f + + #:make-flags + #~(list "SHELL=3Dbash" + (string-append "libdir=3D" #$output "/lib/wine32")) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-SHELL + (lambda _ + (substitute* "configure" + ;; configure first respects CONFIG_SHELL, clobbers SHELL = later. + (("/bin/sh") + (which "bash"))))) + (add-after 'configure 'patch-dlopen-paths + ;; Hardcode dlopened sonames to absolute paths. + (lambda _ + (let* ((library-path (search-path-as-string->list + (getenv "LIBRARY_PATH"))) + (find-so (lambda (soname) + (search-path library-path soname)))) + (substitute* "include/config.h" + (("(#define SONAME_.* )\"(.*)\"" _ defso soname) + (format #f "~a\"~a\"" defso (find-so soname))))))) + (add-after 'patch-generated-file-shebangs 'patch-makedep + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "tools/makedep.c" + (("output_filenames\\( unix_libs \\);" all) + (string-append all + "output ( \" -Wl,-rpath=3D%s \", arch_install_dirs[arch= ] );")))))) + #:configure-flags + #~(list "--without-freetype" + "--without-x"))) + (home-page "https://www.winehq.org/") + (synopsis "Implementation of the Windows API (32-bit only)") + (description + "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a +compatibility layer capable of running Windows applications. Instead of +simulating internal Windows logic like a virtual machine or emulator, Wine +translates Windows API calls into POSIX calls on-the-fly, eliminating the +performance and memory penalties of other methods and allowing you to clea= nly +integrate Windows applications into your desktop.") + ;; Any platform should be able to build wine, but based on '#:system' = these + ;; are the ones we currently support. + (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) + (license license:lgpl2.1+))) + +(define-public wine + (package + (inherit wine-minimal) + (name "wine") (native-inputs - (list bison flex gettext-minimal perl pkg-config)) + (modify-inputs (package-native-inputs wine-minimal) + (prepend gettext-minimal perl pkg-config))) (inputs ;; Some libraries like libjpeg are now compiled into native PE object= s. ;; The ELF objects provided by Guix packages are of no use. Whilst t= his @@ -100,6 +166,7 @@ (define-public wine ;; to build some of these from Guix PACKAGE-SOURCE but attempts were = not ;; fruitful so far. See . (list alsa-lib + bash-minimal cups dbus eudev @@ -132,23 +199,9 @@ (define-public wine vkd3d vulkan-loader)) (arguments - (list - ;; Force a 32-bit build targeting a similar architecture, i.e.: - ;; armhf for armhf/aarch64, i686 for i686/x86_64. - #:system (match (%current-system) - ((or "armhf-linux" "aarch64-linux") "armhf-linux") - (_ "i686-linux")) - - ;; XXX: There's a test suite, but it's unclear whether it's suppose= d to - ;; pass. - #:tests? #f - - #:make-flags - #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine32")) - - #:phases - #~(modify-phases %standard-phases + (substitute-keyword-arguments (package-arguments wine-minimal) + ((#:phases phases) + #~(modify-phases #$phases ;; Explicitly set the 32-bit version of vulkan-loader when inst= alling ;; to i686-linux or x86_64-linux. ;; TODO: Add more JSON files as they become available in Mesa. @@ -173,42 +226,8 @@ (define-public wine "/radeon_icd.i686.json" ":" icd "/intel_icd.i686.json"))= ))))))) (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL = later. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname))))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_dirs[arch] );")))))))) - (home-page "https://www.winehq.org/") - (synopsis "Implementation of the Windows API (32-bit only)") - (description - "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a -compatibility layer capable of running Windows applications. Instead of -simulating internal Windows logic like a virtual machine or emulator, Wine -translates Windows API calls into POSIX calls on-the-fly, eliminating the -performance and memory penalties of other methods and allowing you to clea= nly -integrate Windows applications into your desktop.") - ;; Any platform should be able to build wine, but based on '#:system' = these - ;; are thr ones we currently support. - (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) - (license license:lgpl2.1+))) + `())))) + ((#:configure-flags _ '()) #~'()))))) (define-public wine64 (package @@ -298,41 +317,6 @@ (define-public wine64 (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -;; This minimal build of Wine is needed to prevent a circular dependency w= ith -;; vkd3d. -(define-public wine-minimal - (package - (inherit wine) - (name "wine-minimal") - (native-inputs (modify-inputs (package-native-inputs wine) - (delete "gettext" "perl" "pkg-config"))) - (inputs `()) - (arguments - `(#:validate-runpath? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL la= ter. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - (list "--without-freetype" - "--without-x") - ,@(strip-keyword-arguments '(#:configure-flags #:phases) - (package-arguments wine)))))) - (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:24:20 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:24:20 +0000 Received: from localhost ([127.0.0.1]:36010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh47-0003g6-Ry for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:20 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:18713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh45-0003fj-Vq for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:18 -0500 Date: Thu, 02 Feb 2023 21:24:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373052; x=1675632252; bh=OaGkvkZ2PPaKs51UC/iUkUg/xxO81TWZATYK6E9qRmo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=y1u+w6biVUUEbLsWAiBw5KuQjPyieCi6aVbrKRcfn5D3XC9GivXnPxQxu6c0rJfzz ozjfZpALGvd4s7XYid/lvw5piWiK335N4wEIHHsBzHFF/7MO77e7cA1QqZ6LlS+Myn /j7wkGV+v/vxMOec1fvldErvMOwUW/MUVB5lNGoJHieOBT+Ein4IQR9KfZrAAm2Vbb iTbZawAyvwfIMSOgkHxgTHQoy1USQq7Hht3NTm1QUqOx6UP2AF8yQ/1GHLw/wzLHjy xW8ST1yJBILmhpP9bl2u+eAxagypHihETdVGTD6udm91YDv+e+NM9z5xKm29UJ+eYB cQs5N6p9+a9eA== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 4/5] gnu: wine64: Share phases with parent wine package. Message-ID: <221fdb108116f5e6c18b804a94a9b2f22ee2b14d.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine64): Share phases with parent wine package. --- gnu/packages/wine.scm | 134 ++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 78 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ceef09ea5d..3b637f76e5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -236,84 +236,62 @@ (define-public wine64 (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - (cons* - #:make-flags - #~(list "SHELL=3Dbash" - (string-append "libdir=3D" #$output "/lib/wine64")) - #:phases - #~(modify-phases %standard-phases - ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-= loader - ;; when installing to x86_64-linux so both are available. - ;; TODO: Add more JSON files as they become available in Mesa. - #$@(match (%current-system) - ((or "x86_64-linux") - `((add-after 'copy-wine32-binaries 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd-files (map - (lambda (basename) - (search-input-file - inputs - (string-append "/share/vulkan/= icd.d/" - basename))) - '("radeon_icd.x86_64.json" - "intel_icd.x86_64.json" - "radeon_icd.i686.json" - "intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine-preloa= der") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) - (wrap-program (string-append out "/bin/wine64-prel= oader") - `("VK_ICD_FILENAMES" ":" =3D ,icd-files))))))) - (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL l= ater. - (("/bin/sh") - (which "bash"))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_dirs[arch] );"))))) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (search-input-file inputs "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrap= ped - ;; version. - (copy-file (search-input-file inputs "/bin/.wine-preloader= -real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - (copy-recursively (search-input-directory inputs "/lib/win= e32") - (string-append out "/lib/wine32"))))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from wine= . - (copy-file (search-input-file inputs "/share/man/man1/wine= .1.gz") - (string-append out "/share/man/man1/wine.1.gz")= )))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - #~(list "--enable-win64") - (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (substitute-keyword-arguments + (strip-keyword-arguments '(#:system) (package-arguments wine)) + ((#:make-flags _) + #~(list "SHELL=3Dbash" + (string-append "libdir=3D" #$output "/lib/wine64")) + ) + ((#:phases phases) + #~(modify-phases #$phases + ;; Explicitly set both the 64-bit and 32-bit versions of vulka= n-loader + ;; when installing to x86_64-linux so both are available. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "x86_64-linux") + `((delete 'wrap-executable) + (add-after 'copy-wine32-binaries 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd-files (map + (lambda (basename) + (search-input-file + inputs + (string-append "/share/vulka= n/icd.d/" + basename))) + '("radeon_icd.x86_64.json" + "intel_icd.x86_64.json" + "radeon_icd.i686.json" + "intel_icd.i686.json")))) + (wrap-program (string-append out "/bin/wine-prel= oader") + `("VK_ICD_FILENAMES" ":" =3D ,icd-files)) + (wrap-program (string-append out "/bin/wine64-pr= eloader") + `("VK_ICD_FILENAMES" ":" =3D ,icd-files))))))) + (_ + `())) + (add-after 'install 'copy-wine32-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + ;; Copy the 32-bit binaries needed for WoW64. + (copy-file (search-input-file inputs "/bin/wine") + (string-append out "/bin/wine")) + ;; Copy the real 32-bit wine-preloader instead of the wr= apped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preload= er-real") + (string-append out "/bin/wine-preloader"))))) + (add-after 'install 'copy-wine32-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + (copy-recursively (search-input-directory inputs "/lib/w= ine32") + (string-append out "/lib/wine32"))))) + (add-after 'compress-documentation 'copy-wine32-manpage + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + ;; Copy the missing man file for the wine binary from wi= ne. + (copy-file (search-input-file inputs "/share/man/man1/wi= ne.1.gz") + (string-append out "/share/man/man1/wine.1.gz= "))))))) + ((#:configure-flags configure-flags '()) + #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 16:24:33 2023 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:24:33 +0000 Received: from localhost ([127.0.0.1]:36014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh4L-0003gi-GR for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:33 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:48603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh4K-0003gS-Hc for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:24:32 -0500 Date: Thu, 02 Feb 2023 21:24:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373066; x=1675632266; bh=ReqyjcXbtSiFDYiKYpqXgdALjo8vNONnNAm8LJ2TCRI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Jj0d4yOFzcZj4YCSeyJVof71CT4xPIlf7bS2lwHr6kVHCbS8Qy+9MKbNnlJrUf/dN dhIzeYeXVrJlTpZN1nTyt1JK+46RRCA+pxQkEwnbE6kz11xZRGr+iavKnRzScLrbcK qE8XAeeqbo902mwxOhF6pP/LZqXxqy9Ww6OCZryh+v+qyz9U1DCPuUJPGIoJ2dxFee uN8uHEcEQ1q+WEG9F0Zl0PkEjuglEDwSDmPxLc6yvC99QVP949z4QRj6ylFvpHmZxh fS3UtrX5Ru2BAYdDtCfavgb+MEusFHSGFjE9n4P18D0wmdGc3M8UJyn9PT6pYKQLaV mjMF1rCeVp3TA== To: 61067@debbugs.gnu.org From: Kaelyn Takata Subject: [PATCH v3 5/5] gnu: wine-minimal: Build more reproducibly. Message-ID: <9ff684d88b3c0f7a3dfde6ef86d07e11f2f9c38d.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61067 Cc: Kaelyn Takata , liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/wine.scm (wine-minimal)[phases]: Add a new 'set-widl-time-ov= erride phase. --- gnu/packages/wine.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 3b637f76e5..88f146b46b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -134,7 +134,12 @@ (define-public wine-minimal (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=3D%s \", arch_install_dirs[arch= ] );")))))) + "output ( \" -Wl,-rpath=3D%s \", arch_install_dirs[arch= ] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date= in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) #:configure-flags #~(list "--without-freetype" "--without-x"))) -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 01:13:52 2023 Received: (at 61067-done) by debbugs.gnu.org; 5 Feb 2023 06:13:52 +0000 Received: from localhost ([127.0.0.1]:43865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOYHf-0003KK-Q2 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 01:13:52 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOYHe-0003K6-BK for 61067-done@debbugs.gnu.org; Sun, 05 Feb 2023 01:13:50 -0500 Received: by mail-ed1-f65.google.com with SMTP id a10so1668325edu.9 for <61067-done@debbugs.gnu.org>; Sat, 04 Feb 2023 22:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=snlVWuHsK6LK6J5GUMX6YQFq1+Zba6uzvoqeqYIZ7Jo=; b=BlPq7/0hi2PKHCC+nPCni96oY5qmq20f5sVi9KjNzEZw5nrKCR37dwAtm5TlcYL2u4 eY2lUvqMAKRhD1EhtSDN6tdTzZpp4469OQmvn3NyQUx7gvISDjJD+RgNT9MiVnXHr0VJ iakv2aM9qEOCRSrqZIqqQEOpxwyPILVSfkQJZl8Vee6FnWKksjnXTinMogX3R3ynpUPY mFeMHioKMKfq1uQ8GKVCVhrHle3Beqcp8eSyTgIa3U7IcMCqAOKpZnbFw7gQWEqYqv78 BSH6p924gShPthxufWwNjaAb5+RQblpIHcucz1zOg7T4nAgbRuRLsBCSnPcwiFh8GIMG fL1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=snlVWuHsK6LK6J5GUMX6YQFq1+Zba6uzvoqeqYIZ7Jo=; b=eUFn+VNvpKeaTiheTC7CwWq3fcOGlAb/wXPAuVNuGntydI8a78L2PAiaaGto5Xh+by bu2Ift08kRuFvvxac93z7g8FztoUpHNTLMZpMua06O7H/9NsWGXscsCNvKWI8aJeP5z2 MkV/ANEX3dPrzVSapOecbLRQcLFavDUf+sYxkKrnMmO4/CS/oRYJ2G2+16DqXF+Ef016 ZlARIDPYPAtog2nYw8yRmIpv4BVLhVFowHjwGbnr4jfVQ/ZtpGvirJGBgRmUQizvd/v0 6qt+W5ek+D8VgYF2W4GEhezVFZyAIsLAQpSriwSGsClwbSukzmRpdfuP6jCl03OLARoF ANHg== X-Gm-Message-State: AO0yUKURx/Xsx49U+AGjDT6VGbUUtvHb1Pey8mlA4u5bblTyjsALCBD5 wrsk34mtOSzlBBcky/OW6Io= X-Google-Smtp-Source: AK7set+yeYJQvSpUFawltqwiTJ+hxpXjLy2oHeXRSRdrjUseYizMl7NkMotV9J9BqrisEBlMARKA4Q== X-Received: by 2002:aa7:db88:0:b0:472:1436:73ab with SMTP id u8-20020aa7db88000000b00472143673abmr14145581edt.28.1675577624554; Sat, 04 Feb 2023 22:13:44 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i26-20020a05640200da00b004a7e9ec2087sm3382073edu.76.2023.02.04.22.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 22:13:44 -0800 (PST) Message-ID: <4e9d1735bcab6c3590aa1600f35edf464ef3fd13.camel@gmail.com> Subject: Re: [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 From: Liliana Marie Prikler To: Kaelyn Takata , 61067-done@debbugs.gnu.org Date: Sun, 05 Feb 2023 07:13:43 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Donnerstag, dem 02.02.2023 um 21:23 +0000 schrieb Kaelyn Takata: > New in v3: > > * Modified the patch for sharing phases between wine and wine-minimal > to also >   invert the relationship betwee [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.208.65 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] X-Debbugs-Envelope-To: 61067-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Donnerstag, dem 02.02.2023 um 21:23 +0000 schrieb Kaelyn Takata: > New in v3: >=20 > * Modified the patch for sharing phases between wine and wine-minimal > to also > =C2=A0 invert the relationship between the two packages, with wine now > inheriting > =C2=A0 from wine-minimal. >=20 > Cheers, > Kaelyn Pushed. Thanks From unknown Fri Aug 15 14:48:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 05 Mar 2023 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator