Merge pull request #2042 from poyraz76/master

wine 1.9.14 version bump

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.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")
+    #pisitools.flags.add("-fno-omit-frame-pointer")
+    
+    
+    shelltools.system("sed -i 's|OpenCL/opencl.h|CL/opencl.h|g'  configure*")
+    
     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") 

hardware/emulator/wine/pspec.xml

@@ -8,12 +8,11 @@
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
-        <ExcludeArch>i686</ExcludeArch>
         <License>LGPLv2.1</License>
         <IsA>app:console</IsA>
         <Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="157efa125c047ac5a2f64f5ef2d26e9592645f82" type="tarbz2">https://dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2</Archive>
+        <Archive sha1sum="d09bca2a32d80857f97847795bc82749200ef12c" type="tarbz2">https://dl.winehq.org/wine/source/1.9/wine-1.9.14.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>lcms2-devel</Dependency>
             <Dependency>libao-devel</Dependency>
@@ -69,10 +68,6 @@
             <Patch level="1">wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch</Patch>
             <Patch level="1">gcc_erorr.patch</Patch>
             <!-- Use XDG_DOCUMENTS_DIR for "My Documents" -->
-            <!--Patch level="1">documents-path.patch</Patch>
-            <Patch level="1">application-pdf.patch</Patch>
-            <Patch level="1">desktop-file-translation.patch</Patch>
-            <Patch level="1">fix_rm.patch</Patch-->
         </Patches>
         
     </Source>
@@ -263,6 +258,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2016-07-11</Date>
+            <Version>1.9.14</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2016-07-09</Date>
             <Version>1.9.13</Version>