From 090751389f71e803cd170e9fcbdb28f816ab5fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Salman?= Date: Mon, 11 Jul 2016 16:10:19 +0300 Subject: [PATCH 1/3] wine 1.9.14 version bump --- hardware/emulator/wine/actions.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py index 9ed4ab22fc..789a01d686 100644 --- a/hardware/emulator/wine/actions.py +++ b/hardware/emulator/wine/actions.py @@ -8,6 +8,8 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import get +WorkDir = "wine-%s" % get.srcVERSION() + def setup(): shelltools.system("install=wine.keyring") # For 32bit machines: @@ -22,10 +24,14 @@ def setup(): # to the 64bit files that was compiled in the first step (files in the work) # # More info can be obtained here: http://wiki.winehq.org/Wine64 - # shelltools.export("CPPFLAGS", "-D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=0") + #shelltools.system("make -C ./wine-staging-%s/patches DESTDIR=$(pwd) install" %get.srcVERSION()) - pisitools.flags.add("-fno-omit-frame-pointer") + #pisitools.flags.add("-fno-omit-frame-pointer") + + + shelltools.system("sed -i 's|OpenCL/opencl.h|CL/opencl.h|g' configure*") + shelltools.export("CPPFLAGS", "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0") autotools.autoreconf("-vif") options = "--without-capi \ --with-curses \ @@ -35,8 +41,7 @@ def setup(): --with-opengl \ --with-alsa \ --with-x \ - --with-xattr \ - --prefix=/usr" + " if get.buildTYPE() == "emul32": shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") From c69e1e25f83c264b4044d14c73cead55931e746a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Salman?= Date: Mon, 11 Jul 2016 16:10:58 +0300 Subject: [PATCH 2/3] wine 1.9.14 version bump --- hardware/emulator/wine/pspec.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hardware/emulator/wine/pspec.xml b/hardware/emulator/wine/pspec.xml index 4696b38cf0..4140471c1f 100644 --- a/hardware/emulator/wine/pspec.xml +++ b/hardware/emulator/wine/pspec.xml @@ -8,12 +8,11 @@ PisiLinux Community admins@pisilinux.org - i686 LGPLv2.1 app:console WINE Is Not An Emulator, which lets you run Microsoft Windows applications Wine allows running Windows 3.*, Windows 95/98 and Windows NT programs on a i386 (or compatible) machine running X11. It is still alpha level code; don't expect everything to work. - https://dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2 + https://dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2 lcms2-devel libao-devel @@ -69,10 +68,6 @@ wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch gcc_erorr.patch - @@ -263,6 +258,13 @@ + + 2016-07-11 + 1.9.14 + Version bump + Ergün Salman + poyraz76@pisilinux.org + 2016-07-09 1.9.13 From 53c594441c8094bb7567984fe8ba4647cca4fa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Salman?= Date: Mon, 11 Jul 2016 16:25:28 +0300 Subject: [PATCH 3/3] wine 1.9.14 version bump --- hardware/emulator/wine/actions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py index 789a01d686..f1c7aa3c54 100644 --- a/hardware/emulator/wine/actions.py +++ b/hardware/emulator/wine/actions.py @@ -25,13 +25,13 @@ def setup(): # # More info can be obtained here: http://wiki.winehq.org/Wine64 - + #shelltools.export("CPPFLAGS", "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0") #shelltools.system("make -C ./wine-staging-%s/patches DESTDIR=$(pwd) install" %get.srcVERSION()) #pisitools.flags.add("-fno-omit-frame-pointer") shelltools.system("sed -i 's|OpenCL/opencl.h|CL/opencl.h|g' configure*") - shelltools.export("CPPFLAGS", "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0") + autotools.autoreconf("-vif") options = "--without-capi \ --with-curses \