[packages/wine] Version: 1.6

jajcus jajcus at pld-linux.org
Sun Oct 27 15:56:05 CET 2013


commit 47bd64d57946c280f1be93ff2bdb8325c404cf2e
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sun Oct 27 15:55:40 2013 +0100

    Version: 1.6

 desktop.patch        |  19 +--
 wine-bison3.patch    | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++
 wine-fontcache.patch |  22 ---
 wine-gnutls.patch    |  22 ---
 wine.spec            |  25 ++--
 5 files changed, 408 insertions(+), 65 deletions(-)
---
diff --git a/wine.spec b/wine.spec
index 73899fc..a5a7d34 100644
--- a/wine.spec
+++ b/wine.spec
@@ -25,32 +25,31 @@
 %define	libqual %{nil}
 %endif
 
-%define		gecko_ver	1.4
+%define		gecko_ver	2.21
 Summary:	Program that lets you launch Win applications
 Summary(es.UTF-8):	Ejecuta programas Windows en Linux
 Summary(pl.UTF-8):	Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):	Executa programas Windows no Linux
 Name:		wine
-Version:	1.4.1
-Release:	4
+Version:	1.6
+Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
 Source0:	http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
-# Source0-md5:	0c28702ed478df7a1c097f3a9c4cabd6
+# Source0-md5:	47cf1e121d395e9c8ca1a4ab88f1e658
 Source1:	http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86.msi
-# Source1-md5:	700aaa08724be1992cffed7b87e79a44
+# Source1-md5:	432eb3a2d05c3f07df67864f53c87c60
 Source2:	http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86_64.msi
-# Source2-md5:	7b4811f667fd01d300fdff68420a9c72
+# Source2-md5:	580bbabde1ec99ba9caa439c2dbca3f6
 Source3:	%{name}-uninstaller.desktop
-Patch0:		%{name}-fontcache.patch
+Patch0:		%{name}-bison3.patch
 Patch1:		%{name}-makedep.patch
 Patch2:		%{name}-ncurses.patch
 Patch4:		%{name}-disable-valgrind.patch
 Patch5:		%{name}-ca_certificates.patch
 Patch6:		%{name}-manpaths.patch
 Patch7:		desktop.patch
-Patch8:		wine-gnutls.patch
 URL:		http://www.winehq.org/
 BuildRequires:	OpenAL-devel >= 1.1
 BuildRequires:	OpenGL-GLU-devel
@@ -268,7 +267,6 @@ Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 icotool -x --width=32 --height=32 --bit-depth=32 -o . dlls/user32/resources/oic_winlogo.ico
@@ -325,7 +323,7 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
 
 findup -m $RPM_BUILD_ROOT%{_winedir}/fakedlls
 
-install -p tools/fnt2bdf $RPM_BUILD_ROOT%{_bindir}
+install -p tools/fnt2fon $RPM_BUILD_ROOT%{_bindir}
 cp -a aclocal.m4 $RPM_BUILD_ROOT%{_aclocaldir}/wine.m4
 
 install -d \
@@ -403,7 +401,7 @@ fi
 
 %files -f files.so
 %defattr(644,root,root,755)
-%doc README documentation/ChangeLog* AUTHORS ANNOUNCE
+%doc README AUTHORS ANNOUNCE
 %lang(de) %doc documentation/README.de
 %lang(es) %doc documentation/README.es
 %lang(fr) %doc documentation/README.fr
@@ -457,6 +455,9 @@ fi
 %{_libdir}/wine/fakedlls/*.vxd
 %endif
 %{_mandir}/man1/wine.1*
+%lang(de) %{_mandir}/de/man1/wine.1*
+%lang(fr) %{_mandir}/fr/man1/wine.1*
+%lang(pl) %{_mandir}/pl/man1/wine.1*
 %{_mandir}/man1/msiexec.1*
 %{_mandir}/man1/wineboot.1*
 %{_mandir}/man1/winecfg.1*
@@ -474,7 +475,7 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fnt2bdf
+%attr(755,root,root) %{_bindir}/fnt2fon
 %attr(755,root,root) %{_bindir}/function_grep.pl
 %attr(755,root,root) %{_bindir}/widl
 %attr(755,root,root) %{_bindir}/winebuild
diff --git a/desktop.patch b/desktop.patch
index d851861..8a1cb29 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,10 +1,11 @@
---- wine-1.2.2/tools/wine.desktop~	2010-12-03 20:37:15.000000000 +0200
-+++ wine-1.2.2/tools/wine.desktop	2010-12-22 02:29:30.206200511 +0200
-@@ -1,6 +1,7 @@
- [Desktop Entry]
- Type=Application
- Name=Wine Windows Program Loader
+diff -dur wine-1.6.orig/tools/wine.desktop wine-1.6/tools/wine.desktop
+--- wine-1.6.orig/tools/wine.desktop	2013-07-18 19:57:36.000000000 +0200
++++ wine-1.6/tools/wine.desktop	2013-10-26 17:34:16.255593785 +0200
+@@ -24,6 +24,7 @@
+ Name[hr]=Wine - dizač Windows programa
+ Name[he]=Wine — מריץ תכניות Windows
+ Name[ja]=Wine Windowsプログラムローダー
 +Comment=Launch Windows Program with Wine
- Name[cs]=Zavaděč programů pro Wine
- Name[de]=Wine Windows-Programmstarter
- Name[es]=Wine Cargador de programas de Windows
+ Exec=wine start /unix %f
+ MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;
+ Icon=wine
diff --git a/wine-bison3.patch b/wine-bison3.patch
new file mode 100644
index 0000000..abde1cb
--- /dev/null
+++ b/wine-bison3.patch
@@ -0,0 +1,385 @@
+
+patch from: http://bugs.winehq.org/show_bug.cgi?id=34329
+
+
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 09:59:12 +0000 (+0200)
+Subject: jscript: Use bison directives instead of defines to specify extra lexer parameters.
+X-Git-Tag: wine-1.7.0~38
+X-Git-Url: http://source.winehq.org/git
+
+jscript: Use bison directives instead of defines to specify extra lexer parameters.
+---
+
+diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
+index f5a2e72..327366a 100644
+--- a/dlls/jscript/parser.y
++++ b/dlls/jscript/parser.y
+@@ -25,10 +25,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(jscript);
+ 
+-#define YYLEX_PARAM ctx
+-#define YYPARSE_PARAM ctx
+-
+-static int parser_error(const char*);
++static int parser_error(parser_ctx_t*,const char*);
+ static void set_error(parser_ctx_t*,UINT);
+ static BOOL explicit_error(parser_ctx_t*,void*,WCHAR);
+ static BOOL allow_auto_semicolon(parser_ctx_t*);
+@@ -139,7 +136,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state
+ 
+ %}
+ 
+-%pure_parser
++%lex-param { parser_ctx_t *ctx }
++%parse-param { parser_ctx_t *ctx }
++%pure-parser
+ %start Program
+ 
+ %union {
+@@ -1386,7 +1385,7 @@ static expression_t *new_call_expression(parser_ctx_t *ctx, expression_t *expres
+     return &ret->expr;
+ }
+ 
+-static int parser_error(const char *str)
++static int parser_error(parser_ctx_t *ctx, const char *str)
+ {
+     return 0;
+ }
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 10:00:04 +0000 (+0200)
+Subject: msi: Use bison directives instead of defines to specify extra lexer parameters.
+X-Git-Tag: wine-1.7.0~37
+X-Git-Url: http://source.winehq.org/git
+
+msi: Use bison directives instead of defines to specify extra lexer parameters.
+---
+
+diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
+index 97bb002..fa55825 100644
+--- a/dlls/msi/cond.y
++++ b/dlls/msi/cond.y
+@@ -42,11 +42,6 @@
+ #include "wine/unicode.h"
+ #include "wine/list.h"
+ 
+-#define YYLEX_PARAM info
+-#define YYPARSE_PARAM info
+-
+-static int cond_error(const char *str);
+-
+ WINE_DEFAULT_DEBUG_CHANNEL(msi);
+ 
+ typedef struct tag_yyinput
+@@ -66,6 +61,7 @@ struct cond_str {
+ static LPWSTR COND_GetString( COND_input *info, const struct cond_str *str );
+ static LPWSTR COND_GetLiteral( COND_input *info, const struct cond_str *str );
+ static int cond_lex( void *COND_lval, COND_input *info);
++static int cond_error( COND_input *info, const char *str);
+ 
+ static void *cond_alloc( COND_input *cond, unsigned int sz );
+ static void *cond_track_mem( COND_input *cond, void *ptr, unsigned int sz );
+@@ -110,6 +106,8 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
+ 
+ %}
+ 
++%lex-param { COND_input *info }
++%parse-param { COND_input *info }
+ %pure-parser
+ 
+ %union
+@@ -798,7 +796,7 @@ static void cond_free( void *ptr )
+     }
+ }
+ 
+-static int cond_error(const char *str)
++static int cond_error( COND_input *info, const char *str )
+ {
+     TRACE("%s\n", str );
+     return 0;
+diff --git a/dlls/msi/query.h b/dlls/msi/query.h
+index ca34b4c..063fbb9 100644
+--- a/dlls/msi/query.h
++++ b/dlls/msi/query.h
+@@ -96,6 +96,19 @@ struct expr
+     } u;
+ };
+ 
++typedef struct
++{
++    MSIDATABASE *db;
++    LPCWSTR command;
++    DWORD n, len;
++    UINT r;
++    MSIVIEW **view;  /* View structure for the resulting query.  This value
++                      * tracks the view currently being created so we can free
++                      * this view on syntax error.
++                      */
++    struct list *mem;
++} SQL_input;
++
+ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview,
+                    struct list *mem ) DECLSPEC_HIDDEN;
+ 
+diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
+index ead7743..fa54741 100644
+--- a/dlls/msi/sql.y
++++ b/dlls/msi/sql.y
+@@ -34,29 +34,12 @@
+ #include "wine/debug.h"
+ #include "wine/unicode.h"
+ 
+-#define YYLEX_PARAM info
+-#define YYPARSE_PARAM info
+-
+-static int sql_error(const char *str);
+-
+ WINE_DEFAULT_DEBUG_CHANNEL(msi);
+ 
+-typedef struct tag_SQL_input
+-{
+-    MSIDATABASE *db;
+-    LPCWSTR command;
+-    DWORD n, len;
+-    UINT r;
+-    MSIVIEW **view;  /* View structure for the resulting query.  This value
+-                      * tracks the view currently being created so we can free
+-                      * this view on syntax error.
+-                      */
+-    struct list *mem;
+-} SQL_input;
+-
+ static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str );
+ static INT SQL_getint( void *info );
+ static int sql_lex( void *SQL_lval, SQL_input *info );
++static int sql_error( SQL_input *info, const char *str);
+ 
+ static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table );
+ static void *parser_alloc( void *info, unsigned int sz );
+@@ -77,6 +60,8 @@ static struct expr * EXPR_wildcard( void *info );
+ 
+ %}
+ 
++%lex-param { SQL_input *info }
++%parse-param { SQL_input *info }
+ %pure-parser
+ 
+ %union
+@@ -866,7 +851,7 @@ INT SQL_getint( void *info )
+     return r;
+ }
+ 
+-static int sql_error( const char *str )
++static int sql_error( SQL_input *info, const char *str )
+ {
+     return 0;
+ }
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 10:00:23 +0000 (+0200)
+Subject: vbscript: Use bison directives instead of defines to specify extra lexer parameters.
+X-Git-Tag: wine-1.7.0~36
+X-Git-Url: http://source.winehq.org/git
+
+vbscript: Use bison directives instead of defines to specify extra lexer parameters.
+---
+
+diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
+index 4b380ef..3c54fd8 100644
+--- a/dlls/vbscript/parser.y
++++ b/dlls/vbscript/parser.y
+@@ -25,10 +25,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(vbscript);
+ 
+-#define YYLEX_PARAM ctx
+-#define YYPARSE_PARAM ctx
+-
+-static int parser_error(const char*);
++static int parser_error(parser_ctx_t *,const char*);
+ 
+ static void parse_complete(parser_ctx_t*,BOOL);
+ 
+@@ -82,7 +79,9 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0};
+ 
+ %}
+ 
+-%pure_parser
++%lex-param { parser_ctx_t *ctx }
++%parse-param { parser_ctx_t *ctx }
++%pure-parser
+ %start Program
+ 
+ %union {
+@@ -426,7 +425,7 @@ Identifier
+     | tPROPERTY      { $$ = propertyW; }
+ %%
+ 
+-static int parser_error(const char *str)
++static int parser_error(parser_ctx_t *ctx, const char *str)
+ {
+     return 0;
+ }
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 10:00:44 +0000 (+0200)
+Subject: wbemprox: Use bison directives instead of defines to specify extra lexer parameters.
+X-Git-Tag: wine-1.7.0~35
+X-Git-Url: http://source.winehq.org/git
+
+wbemprox: Use bison directives instead of defines to specify extra lexer parameters.
+---
+
+diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y
+index 8e347c2..58663d0 100644
+--- a/dlls/wbemprox/wql.y
++++ b/dlls/wbemprox/wql.y
+@@ -30,11 +30,6 @@
+ #include "wine/debug.h"
+ #include "wine/unicode.h"
+ 
+-#define YYLEX_PARAM ctx
+-#define YYPARSE_PARAM ctx
+-#define YYERROR_DEBUG 1
+-#define YYERROR_VERBOSE 1
+-
+ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+ 
+ struct parser
+@@ -181,7 +176,7 @@ static struct expr *expr_propval( struct parser *parser, const struct property *
+     return e;
+ }
+ 
+-static int wql_error( const char *str );
++static int wql_error( struct parser *parser, const char *str );
+ static int wql_lex( void *val, struct parser *parser );
+ 
+ #define PARSER_BUBBLE_UP_VIEW( parser, result, current_view ) \
+@@ -190,6 +185,9 @@ static int wql_lex( void *val, struct parser *parser );
+ 
+ %}
+ 
++%lex-param { struct parser *ctx }
++%parse-param { struct parser *ctx }
++%error-verbose
+ %pure-parser
+ 
+ %union
+@@ -691,7 +689,7 @@ static int wql_lex( void *p, struct parser *parser )
+     return token;
+ }
+ 
+-static int wql_error( const char *str )
++static int wql_error( struct parser *parser, const char *str )
+ {
+     ERR("%s\n", str);
+     return 0;
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 10:04:24 +0000 (+0200)
+Subject: widl: Remove non-bison compatibility code.
+X-Git-Tag: wine-1.7.0~34
+X-Git-Url: http://source.winehq.org/git
+
+widl: Remove non-bison compatibility code.
+---
+
+diff --git a/tools/widl/parser.y b/tools/widl/parser.y
+index b7fa2f6..579cbc6 100644
+--- a/tools/widl/parser.y
++++ b/tools/widl/parser.y
+@@ -38,33 +38,6 @@
+ #include "expr.h"
+ #include "typetree.h"
+ 
+-#if defined(YYBYACC)
+-	/* Berkeley yacc (byacc) doesn't seem to know about these */
+-	/* Some *BSD supplied versions do define these though */
+-# ifndef YYEMPTY
+-#  define YYEMPTY	(-1)	/* Empty lookahead value of yychar */
+-# endif
+-# ifndef YYLEX
+-#  define YYLEX		yylex()
+-# endif
+-
+-#elif defined(YYBISON)
+-	/* Bison was used for original development */
+-	/* #define YYEMPTY -2 */
+-	/* #define YYLEX   yylex() */
+-
+-#else
+-	/* No yacc we know yet */
+-# if !defined(YYEMPTY) || !defined(YYLEX)
+-#  error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX.
+-# elif defined(__GNUC__)	/* gcc defines the #warning directive */
+-#  warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested
+-  /* #else we just take a chance that it works... */
+-# endif
+-#endif
+-
+-#define YYERROR_VERBOSE
+-
+ static unsigned char pointer_default = RPC_FC_UP;
+ 
+ typedef struct list typelist_t;
+@@ -323,6 +296,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s
+ %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF
+ %left '.' MEMBERPTR '[' ']'
+ 
++%error-verbose
++
+ %%
+ 
+ input:   gbl_statements				{ fix_incomplete();
+From: Alexandre Julliard <julliard at winehq.org>
+Date: Thu, 1 Aug 2013 10:04:29 +0000 (+0200)
+Subject: wrc: Remove non-bison compatibility code.
+X-Git-Tag: wine-1.7.0~33
+X-Git-Url: http://source.winehq.org/git
+
+wrc: Remove non-bison compatibility code.
+---
+
+diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
+index ad5fb98..ff59327 100644
+--- a/tools/wrc/parser.y
++++ b/tools/wrc/parser.y
+@@ -142,31 +142,6 @@
+ #include "wingdi.h"
+ #include "winuser.h"
+ 
+-#if defined(YYBYACC)
+-	/* Berkeley yacc (byacc) doesn't seem to know about these */
+-	/* Some *BSD supplied versions do define these though */
+-# ifndef YYEMPTY
+-#  define YYEMPTY	(-1)	/* Empty lookahead value of yychar */
+-# endif
+-# ifndef YYLEX
+-#  define YYLEX		yylex()
+-# endif
+-
+-#elif defined(YYBISON)
+-	/* Bison was used for original development */
+-	/* #define YYEMPTY -2 */
+-	/* #define YYLEX   yylex() */
+-
+-#else
+-	/* No yacc we know yet */
+-# if !defined(YYEMPTY) || !defined(YYLEX)
+-#  error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX.
+-# elif defined(__GNUC__)	/* gcc defines the #warning directive */
+-#  warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested
+-  /* #else we just take a chance that it works... */
+-# endif
+-#endif
+-
+ int want_nl = 0;	/* Signal flex that we need the next newline */
+ int want_id = 0;	/* Signal flex that we need the next identifier */
+ static stringtable_t *tagstt;	/* Stringtable tag.
+@@ -2837,7 +2812,7 @@ static int rsrcid_to_token(int lookahead)
+ 
+ 	/* Get a token if we don't have one yet */
+ 	if(lookahead == YYEMPTY)
+-		lookahead = YYLEX;
++		lookahead = yylex();
+ 
+ 	/* Only numbers are possibly interesting */
+ 	switch(lookahead)
diff --git a/wine-fontcache.patch b/wine-fontcache.patch
deleted file mode 100644
index 01d8c03..0000000
--- a/wine-fontcache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur wine-20011108.orig/graphics/x11drv/xfont.c wine-20011108/graphics/x11drv/xfont.c
---- wine-20011108.orig/dlls/winex11.drv/xfont.c	Tue Nov  6 01:46:36 2001
-+++ wine-20011108/dlls/winex11.drv/xfont.c	Fri Nov 16 11:29:37 2001
-@@ -2191,11 +2191,13 @@
- 			       goto fail;
- 			   }
- 
--			   if( pfi->df.dfPixHeight == 0 )
--			   {
--			       TRACE("error: dfPixHeight==0\n");
--			       goto fail;
--			   }
-+// To strict font checking - commented
-+// FIXME - adaptarized to 20011108 by pascalek at pld.org.pl
-+//			   if( pfi->df.dfPixHeight == 0 )
-+//			   {
-+//			       TRACE("error: dfPixHeight==0\n");
-+//			       goto fail;
-+//			   }
- 
- 			   pfi->df.dfFace = pfr->lfFaceName;
- 			   if( pfi->fi_flags & FI_SCALABLE )
diff --git a/wine-gnutls.patch b/wine-gnutls.patch
deleted file mode 100644
index cd09237..0000000
--- a/wine-gnutls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wine-1.4.1/configure.ac~	2013-06-13 12:53:42.143966172 +0200
-+++ wine-1.4.1/configure.ac	2013-06-13 12:57:28.566381773 +0200
-@@ -1267,7 +1267,8 @@
-         CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
-     fi
-     AC_CHECK_HEADER(gnutls/gnutls.h,
--        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
-+        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
-+#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
-             [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
-                 [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
-     CPPFLAGS="$ac_save_CPPFLAGS"
---- wine-1.4.1/dlls/secur32/schannel_gnutls.c~	2012-06-15 21:17:00.000000000 +0200
-+++ wine-1.4.1/dlls/secur32/schannel_gnutls.c	2013-06-13 13:11:32.414575193 +0200
-@@ -25,6 +25,7 @@
- #include <stdarg.h>
- #ifdef SONAME_LIBGNUTLS
- #include <gnutls/gnutls.h>
-+#include <gnutls/crypto.h>
- #endif
- 
- #include "windef.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/47bd64d57946c280f1be93ff2bdb8325c404cf2e



More information about the pld-cvs-commit mailing list