Version: 1.7.35

use git-apply to aply compholio patches, workaround for patchinstall.sh
'git bug workaround'.

diff --git a/wine-ca_certificates.patch b/wine-ca_certificates.patch
index d284ee18d6c8e8505a7e82d02f66ef134bbd2275..c2e647f3d7e4d08ddd59fb5cf6c649bea455af7b 100644 (file)
--- a/wine-ca_certificates.patch
+++ b/wine-ca_certificates.patch
@@ -1,10 +1,11 @@
---- wine-1.3.25/dlls/crypt32/rootstore.c~      2011-07-22 19:32:43.000000000 +0200
-+++ wine-1.3.25/dlls/crypt32/rootstore.c       2011-07-29 14:50:36.459205636 +0200
-@@ -487,6 +487,7 @@
+diff -dur -x '*~' -x '*.orig' -x '*.rej' wine-1.7.35.orig/dlls/crypt32/rootstore.c wine-1.7.35/dlls/crypt32/rootstore.c
+--- wine-1.7.35.orig/dlls/crypt32/rootstore.c  2015-01-23 21:06:27.000000000 +0100
++++ wine-1.7.35/dlls/crypt32/rootstore.c       2015-01-28 16:32:00.343994824 +0100
+@@ -488,6 +488,7 @@
   "/etc/pki/tls/certs/ca-bundle.crt",
+  "/usr/share/ca-certificates/ca-bundle.crt",
   "/usr/local/share/certs/",
-  "/etc/sfw/openssl/certs",
 + "/etc/certs/ca-certificates.crt",
+  "/etc/sfw/openssl/certs",
+  "/etc/security/cacerts",  /* Android */
  };
- 
- static const BYTE authenticode[] = {

diff --git a/wine-compholio-patchinstall.patch b/wine-compholio-patchinstall.patch
new file mode 100644 (file)
index 0000000..ab11e1a
--- /dev/null
+++ b/wine-compholio-patchinstall.patch
@@ -0,0 +1,13 @@
+diff -dur wine-1.7.35.orig/wine-staging-1.7.35/patches/patchinstall.sh wine-1.7.35/wine-staging-1.7.35/patches/patchinstall.sh
+--- wine-1.7.35.orig/wine-staging-1.7.35/patches/patchinstall.sh       2015-01-24 16:04:50.000000000 +0100
++++ wine-1.7.35/wine-staging-1.7.35/patches/patchinstall.sh    2015-01-28 16:56:06.046971532 +0100
+@@ -708,8 +708,7 @@
+ # are applied, but the exitcode is zero. To avoid broken builds we
+ # will workaround this issue or abort. For more information see
+ # https://github.com/wine-compholio/wine-staging/issues/7
+-test ! -d "$DESTDIR/.git" && (cd "$DESTDIR"; git rev-parse --git-dir) &> /dev/null
+-workaround_git_bug="$?"
++workaround_git_bug="1"
+ 
+ # Apply the patches using gitapply.sh, a small wrapper around 'patch'
+ if test "$backend" = "patch"; then

diff --git a/wine-ncurses.patch b/wine-ncurses.patch
deleted file mode 100644 (file)
index 44c55ad..0000000
--- a/wine-ncurses.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/configure.ac wine-1.7.18/configure.ac
---- wine-1.7.18.orig/configure.ac      2014-05-02 20:15:48.000000000 +0200
-+++ wine-1.7.18/configure.ac   2014-05-03 13:18:36.421083206 +0200
-@@ -443,6 +443,7 @@
-       machine/sysarch.h \
-       mntent.h \
-       ncurses.h \
-+      ncurses/ncurses.h \
-       netdb.h \
-       netinet/in.h \
-       netinet/in_systm.h \
-@@ -1354,9 +1355,12 @@
- 
- dnl **** Check which curses lib to use ***
- CURSES_LIBS=""
--if test "$ac_cv_header_ncurses_h" = "yes"
-+if test "$ac_cv_header_ncurses_h" = "yes" || test "$ac_cv_header_ncurses_ncurses_h" = "yes"
- then
-     WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"])
-+    if test "x$ac_cv_lib_soname_ncurses" = "x"; then
-+        WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
-+    fi
- elif test "$ac_cv_header_curses_h" = "yes"
- then
-     WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
-@@ -1365,8 +1369,8 @@
- LIBS="$LIBS $CURSES_LIBS"
- AC_CHECK_FUNCS(mousemask)
- LIBS="$ac_save_LIBS"
--WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
--                 [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
-+WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
-+                 [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
- 
- dnl **** Check for SANE ****
- if test "x$with_sane" != "xno"
-diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/dlls/kernel32/term.c wine-1.7.18/dlls/kernel32/term.c
---- wine-1.7.18.orig/dlls/kernel32/term.c      2014-05-02 20:15:48.000000000 +0200
-+++ wine-1.7.18/dlls/kernel32/term.c   2014-05-03 13:16:18.597752974 +0200
-@@ -27,6 +27,8 @@
- # include <ncurses.h>
- #elif defined(HAVE_CURSES_H)
- # include <curses.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+# include <ncurses/ncurses.h>
- #endif
- /* avoid redefinition warnings */
- #undef KEY_EVENT
-@@ -34,6 +36,8 @@
- 
- #if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H)
- #include <term.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+#include <ncurses/term.h>
- #endif
- 
- #include <windef.h>
-@@ -148,7 +152,7 @@
- 
- #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
- 
--#ifdef HAVE_NCURSES_H
-+#ifdef HAVE_NCURSES_H || defined(HAVE_NCURSES_NCURSES_H)
- # define CURSES_NAME "ncurses"
- #else
- # define CURSES_NAME "curses"
-diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/programs/wineconsole/curses.c wine-1.7.18/programs/wineconsole/curses.c
---- wine-1.7.18.orig/programs/wineconsole/curses.c     2014-05-02 20:15:48.000000000 +0200
-+++ wine-1.7.18/programs/wineconsole/curses.c  2014-05-03 13:16:18.597752974 +0200
-@@ -40,6 +40,8 @@
- # include <ncurses.h>
- #elif defined(HAVE_CURSES_H)
- # include <curses.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+# include <ncurses/ncurses.h>
- #endif
- /* avoid redefinition warnings */
- #undef KEY_EVENT
-@@ -64,7 +66,7 @@
- 
- #if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
- 
--#ifdef HAVE_NCURSES_H
-+#if defined(HAVE_NCURSES_H) || defined(HAVE_NCURSES_NCURSES_H)
- # define CURSES_NAME "ncurses"
- #else
- # define CURSES_NAME "curses"

diff --git a/wine.spec b/wine.spec
index 1c3a8327cde97136af94f6b3a39200aa2e896f3c..57f8130fed364d01d843f4dd72de1e7fea96c7bc 100644 (file)
--- a/wine.spec
+++ b/wine.spec
@@ -36,27 +36,27 @@ Summary(pt_BR.UTF-8):       Executa programas Windows no Linux
 Name:          wine
 # 1.6.x – stable
 # 1.7.x – development (DEVEL branch)
-Version:       1.7.18
+Version:       1.7.35
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         Applications/Emulators
 Source0:       http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
-# Source0-md5: b13c19ef69a99f2aa6c0b3fd08ae8d90
+# Source0-md5: c33d5f3187218ef53e233da3b5cccc80
 Source1:       http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86.msi
 # Source1-md5: 766bb034172f7f0a97443951a02a0df8
 Source2:       http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86_64.msi
 # Source2-md5: 1912fd191872c72d5f562283e44e8ab4
 Source3:       %{name}-uninstaller.desktop
-Source4:       https://github.com/compholio/wine-compholio-daily/archive/v%{compholio_ver}/wine-compholio-%{compholio_ver}.tar.gz
-# Source4-md5: 7e5b25b732415112f6d4b9418a2e5945
+Source4:       https://github.com/wine-compholio/wine-staging/archive/v%{compholio_ver}/wine-staging-%{compholio_ver}.tar.gz
+# Source4-md5: 41bc21247e5a4f4f3c68667fd9d489fa
 Patch0:                %{name}-gphoto2_bool.patch
 Patch1:                %{name}-makedep.patch
-Patch2:                %{name}-ncurses.patch
-Patch4:                %{name}-disable-valgrind.patch
-Patch5:                %{name}-ca_certificates.patch
-Patch6:                desktop.patch
-Patch7:                %{name}-wine64_man.patch
+Patch2:                %{name}-disable-valgrind.patch
+Patch3:                %{name}-ca_certificates.patch
+Patch4:                desktop.patch
+Patch5:                %{name}-wine64_man.patch
+Patch6:                %{name}-compholio-patchinstall.patch
 URL:           http://www.winehq.org/
 BuildRequires: OpenAL-devel >= 1.1
 BuildRequires: ocl-icd-libOpenCL-devel
@@ -80,6 +80,7 @@ BuildRequires:        freetype-devel >= 2.0.5
 BuildRequires: fslint
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
+%{?with_compholio:BuildRequires:       git-core}
 BuildRequires: gnutls-devel
 %{?with_gstreamer:BuildRequires:       gstreamer0.10-plugins-base-devel}
 BuildRequires: icoutils
@@ -282,22 +283,15 @@ Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 %ifarch %{x8664}
-%patch7 -p1
+%patch5 -p1
 %endif
 
 %if %{with compholio}
-# binary patch that doesn't apply
-# and real Arial may be installed through fonts-TTF-microsoft
-rm -r wine-compholio-*/patches/10-Missing_Fonts
-
-for patch in wine-compholio-*/patches/*/*.patch ; do
-       patch -N -p0 --strip=1 < "${patch}"
-#      wine-compholio-*/debian/tools/gitapply.sh < "${patch}"
-done
+%patch6 -p1
+./wine-staging-*/patches/patchinstall.sh DESTDIR=$PWD --all --backend=git-apply
 %endif
 
 %build