This commit was manufactured by cvs2git to create branch 'AC-branch'.

Cherrypick from master 2008-07-25 18:12:01 UTC Adam Gołębiowski <adamg@pld-linux.org> '- updated to 1.1.2':
    wine-bug9177_workaround.patch -> 1.1
    wine-disable-valgrind.patch -> 1.2
    wine-ncurses.patch -> 1.10
    wine-uninstaller.desktop -> 1.2

diff --git a/wine-bug9177_workaround.patch b/wine-bug9177_workaround.patch
new file mode 100644 (file)
index 0000000..f26b710
--- /dev/null
+++ b/wine-bug9177_workaround.patch
@@ -0,0 +1,11 @@
+--- ./dlls/advapi32/security.c.org     2007-07-27 17:11:43.000000000 +0200
++++ ./dlls/advapi32/security.c 2007-08-11 21:38:43.000000000 +0200
+@@ -3470,7 +3470,7 @@
+  
+ lend:
+     TRACE(" ret=%d\n", bret);
+-    return bret;
++    return 1; //bret;
+ }
+ 
+ /******************************************************************************

diff --git a/wine-disable-valgrind.patch b/wine-disable-valgrind.patch
new file mode 100644 (file)
index 0000000..684c515
--- /dev/null
+++ b/wine-disable-valgrind.patch
@@ -0,0 +1,14 @@
+diff -ruN wine-0.9.51./configure.ac wine-0.9.51/configure.ac
+--- wine-0.9.51./configure.ac  2007-12-16 20:15:52.000000000 +0100
++++ wine-0.9.51/configure.ac   2007-12-16 20:31:42.099007759 +0100
+@@ -265,9 +265,7 @@
+       syscall.h \
+       termios.h \
+       unistd.h \
+-      utime.h \
+-      valgrind/memcheck.h \
+-      valgrind/valgrind.h
++      utime.h
+ )
+ AC_HEADER_STAT()
+ 

diff --git a/wine-ncurses.patch b/wine-ncurses.patch
new file mode 100644 (file)
index 0000000..96fb545
--- /dev/null
+++ b/wine-ncurses.patch
@@ -0,0 +1,39 @@
+--- wine-0.9.28/configure.ac.orig      2006-12-22 17:17:47.000000000 +0100
++++ wine-0.9.28/configure.ac   2006-12-24 03:10:15.504363300 +0100
+@@ -194,6 +194,7 @@
+       machine/soundcard.h \
+       mntent.h \
+       ncurses.h \
++      ncurses/ncurses.h \
+       netdb.h \
+       netinet/in.h \
+       netinet/in_systm.h \
+@@ -519,7 +520,7 @@
+ 
+ dnl **** Check which curses lib to use ***
+ CURSESLIBS=""
+-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
+     AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"])
+ elif test "$ac_cv_header_curses_h" = "yes"
+--- wine-0.9.41/programs/wineconsole/curses.c.old      2007-07-14 22:00:49.124363079 +0200
++++ wine-0.9.41/programs/wineconsole/curses.c  2007-07-14 22:07:46.714791368 +0200
+@@ -39,6 +39,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
+@@ -62,7 +64,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-uninstaller.desktop b/wine-uninstaller.desktop
new file mode 100644 (file)
index 0000000..4d9018b
--- /dev/null
+++ b/wine-uninstaller.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Wine Application Uninstaller
+Name[pl]=Narzędzie usuwania aplikacji Wine
+Comment=Remove installed Wine applications
+Comment[pl]=Usuwanie zainstalowanych aplikacji Wine
+Exec=uninstaller %f
+Icon=wine
+Categories=System;