* [bug#29603] [PATCH] Two patches for wine/wine64.
@ 2017-12-07 9:23 Rutger Helling
2017-12-08 20:45 ` bug#29603: " Danny Milosavljevic
0 siblings, 1 reply; 3+ messages in thread
From: Rutger Helling @ 2017-12-07 9:23 UTC (permalink / raw)
To: 29603
[-- Attachment #1.1: Type: text/plain, Size: 208 bytes --]
Hey Guix,
here are two patches for wine and wine64.
The first patch adds a few more inputs to wine (and thus wine64). The
second patch makes sure wine64 installs its libraries into /lib instead
of /lib64.
[-- Attachment #1.2: Type: text/html, Size: 405 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-wine-Add-more-inputs.patch --]
[-- Type: text/x-diff; name=0001-gnu-wine-Add-more-inputs.patch, Size: 2173 bytes --]
From 9687611bf04787b6164384d8eb26fc06caafcebc Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 7 Dec 2017 10:05:31 +0100
Subject: [PATCH] gnu: wine: Add more inputs.
* gnu/packages/wine.scm (wine)[inputs]: Add eudev, gst-plugins-base, libpcap and
v4l-utils.
---
gnu/packages/wine.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index b4c3c194f..059839275 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -26,6 +26,7 @@
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages admin)
#:use-module (gnu packages audio)
#:use-module (gnu packages bison)
#:use-module (gnu packages compression)
@@ -38,6 +39,7 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gstreamer)
#:use-module (gnu packages linux)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
@@ -49,6 +51,7 @@
#:use-module (gnu packages samba)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages video)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg))
@@ -73,10 +76,12 @@
`(("alsa-lib" ,alsa-lib)
("dbus" ,dbus)
("cups" ,cups)
+ ("eudev" ,eudev)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glu" ,glu)
("gnutls" ,gnutls)
+ ("gst-plugins-base" ,gst-plugins-base)
("lcms" ,lcms)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
@@ -85,6 +90,7 @@
("libldap" ,openldap)
("libnetapi" ,samba)
("libsane" ,sane-backends)
+ ("libpcap" ,libpcap)
("libpng" ,libpng)
("libjpeg" ,libjpeg)
("libtiff" ,libtiff)
@@ -102,6 +108,7 @@
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("unixodbc" ,unixodbc)
+ ("v4l-utils" ,v4l-utils)
("zlib" ,zlib)))
(arguments
`(;; Force a 32-bit build (under the assumption that this package is
--
2.15.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-wine64-Install-libraries-to-lib.patch --]
[-- Type: text/x-diff; name=0002-gnu-wine64-Install-libraries-to-lib.patch, Size: 1419 bytes --]
From 1b6fbf0607c7a6d555aa1c20c0c57ed9c3aee319 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 7 Dec 2017 10:06:38 +0100
Subject: [PATCH] gnu: wine64: Install libraries to /lib.
* gnu/packages/wine.scm (wine64)[arguments]: Remove inherited #:make-flags and
add new #:make-flags argument. #:configure-flags: Change LDFLAGS from /lib64
to /lib.
---
gnu/packages/wine.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 059839275..b4f6573cf 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -158,10 +158,13 @@ integrate Windows applications into your desktop.")
(inherit wine)
(name "wine64")
(arguments
- `(#:configure-flags
+ `(#:make-flags
+ (list "SHELL=bash"
+ (string-append "libdir=" %output "/lib"))
+ #:configure-flags
(list "--enable-win64"
- (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib64"))
- ,@(strip-keyword-arguments '(#:configure-flags #:system)
+ (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+ ,@(strip-keyword-arguments '(#:configure-flags #:make-flags #:system)
(package-arguments wine))))
(synopsis "Implementation of the Windows API (64-bit version)")
(supported-systems '("x86_64-linux" "aarch64-linux"))))
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#29603: [PATCH] Two patches for wine/wine64.
2017-12-07 9:23 [bug#29603] [PATCH] Two patches for wine/wine64 Rutger Helling
@ 2017-12-08 20:45 ` Danny Milosavljevic
2017-12-15 11:10 ` [bug#29603] " Rutger Helling
0 siblings, 1 reply; 3+ messages in thread
From: Danny Milosavljevic @ 2017-12-08 20:45 UTC (permalink / raw)
To: Rutger Helling; +Cc: 29603-done
Hi,
thanks! I've pushed those to master as 1aa6582ee9ffb57724ed15db7c87cd1ff868a4ef and e02693a3cb210653ce547918b5fbf3c2b5d560c1.
Note that wine is not reproducible - I don't think that your patches caused that, though.
Details:
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml3.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml3.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml4.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml4.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml6.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml6.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/oleacc.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/oleacc.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/oledb32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/oledb32.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/olepro32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/olepro32.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/pstorec.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/pstorec.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/quartz.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/quartz.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/riched20.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/riched20.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/scrrun.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/scrrun.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/shdocvw.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/shdocvw.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/shell32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/shell32.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/stdole2.tlb.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/stdole2.tlb.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/stdole32.tlb.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/stdole32.tlb.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/taskschd.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/taskschd.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/vbscript.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/vbscript.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wbemdisp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wbemdisp.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/winhttp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/winhttp.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wmp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wmp.dll.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wscript.exe.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wscript.exe.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wshom.ocx.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wshom.ocx.so differ
Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wuapi.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wuapi.dll.so differ
...
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#29603] [PATCH] Two patches for wine/wine64.
2017-12-08 20:45 ` bug#29603: " Danny Milosavljevic
@ 2017-12-15 11:10 ` Rutger Helling
0 siblings, 0 replies; 3+ messages in thread
From: Rutger Helling @ 2017-12-15 11:10 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 29603-done
[-- Attachment #1: Type: text/plain, Size: 4803 bytes --]
Thanks for pushing! Shame about the reproducibility. Like you said, it's
unlikely due to these patches.
Maybe I'll look into it at a later time.
On 2017-12-08 21:45, Danny Milosavljevic wrote:
> Hi,
>
> thanks! I've pushed those to master as 1aa6582ee9ffb57724ed15db7c87cd1ff868a4ef and e02693a3cb210653ce547918b5fbf3c2b5d560c1.
>
> Note that wine is not reproducible - I don't think that your patches caused that, though.
>
> Details:
>
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml3.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml3.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml4.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml4.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml6.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml6.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/msxml.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/msxml.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/oleacc.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/oleacc.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/oledb32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/oledb32.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/olepro32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/olepro32.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/pstorec.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/pstorec.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/quartz.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/quartz.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/riched20.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/riched20.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/scrrun.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/scrrun.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/shdocvw.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/shdocvw.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/shell32.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/shell32.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/stdole2.tlb.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/stdole2.tlb.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/stdole32.tlb.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/stdole32.tlb.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/taskschd.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/taskschd.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/vbscript.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/vbscript.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wbemdisp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wbemdisp.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/winhttp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/winhttp.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wmp.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wmp.dll.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wscript.exe.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wscript.exe.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wshom.ocx.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wshom.ocx.so differ
> Binary files /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3/lib/wine/wuapi.dll.so and /gnu/store/pl1zpsh827mc313p712z87g80ipzqp5h-wine-2.0.3-check/lib/wine/wuapi.dll.so differ
> ...
[-- Attachment #2: Type: text/html, Size: 5393 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-15 11:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-07 9:23 [bug#29603] [PATCH] Two patches for wine/wine64 Rutger Helling
2017-12-08 20:45 ` bug#29603: " Danny Milosavljevic
2017-12-15 11:10 ` [bug#29603] " Rutger Helling
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.