[packages/wine: 5/5] Version: 1.8
jajcus
jajcus at pld-linux.org
Sat Jan 9 19:43:57 CET 2016
commit c54d2750c4b2da1956f2c5da33d074724ce6694c
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Jan 9 19:43:24 2016 +0100
Version: 1.8
desktop.patch | 6 +++---
wine-ca_certificates.patch | 9 +++++----
wine-ncurses.patch | 26 +++++++++++++-------------
wine.spec | 20 +++++++++++++++-----
4 files changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/wine.spec b/wine.spec
index b079ea5..1e0da65 100644
--- a/wine.spec
+++ b/wine.spec
@@ -45,13 +45,13 @@ 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.8
Release: 0.1
Epoch: 1
License: LGPL
Group: Applications/Emulators
Source0: http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2
-# Source0-md5: b13c19ef69a99f2aa6c0b3fd08ae8d90
+# Source0-md5: 96b51a2f2ae727802d71095354e69fef
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
@@ -103,6 +103,7 @@ BuildRequires: libgphoto2-devel
BuildRequires: libgsm-devel
BuildRequires: libjpeg-devel
BuildRequires: libmpg123-devel >= 1.5.0
+BuildRequires: libcap-devel
BuildRequires: libpng-devel >= 1.5
BuildRequires: libtiff-devel
BuildRequires: libtool
@@ -333,11 +334,12 @@ mv -f oic_winlogo_*.png %{name}.png
--with-openal \
--with-opencl \
--with-opengl \
- --with-openssl \
--with-osmesa \
--with-oss \
+ --with-pcap \
--with-png \
--with-pthread \
+ --with-pulse \
--with%{!?with_sane:out}-sane \
--with-tiff \
--with-v4l \
@@ -419,8 +421,16 @@ for dir in $RPM_BUILD_ROOT%{_mandir}/*.UTF-8 ; do
done
%ifarch %{x8664}
-for langdir in "" de/ fr/ pl/ ; do
-mv $RPM_BUILD_ROOT%{_mandir}/${langdir}man1/{wine,wine64}.1
+install loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine64.1
+for lang in de fr pl ; do
+install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1
+install loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine64.1
+done
+%else
+install loader/wine.man $RPM_BUILD_ROOT%{_mandir}/man1/wine.1
+for lang in de fr pl ; do
+install -d $RPM_BUILD_ROOT%{_mandir}/${lang}/man1
+install loader/wine.${lang}.UTF-8.man $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/wine.1
done
%endif
diff --git a/desktop.patch b/desktop.patch
index 8a1cb29..a0655e3 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,6 +1,6 @@
-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
+diff -dur wine-1.8.orig/loader/wine.desktop wine-1.8/loader/wine.desktop
+--- wine-1.8.orig/loader/wine.desktop 2015-12-19 16:57:44.000000000 +0100
++++ wine-1.8/loader/wine.desktop 2016-01-09 18:22:26.828643807 +0100
@@ -24,6 +24,7 @@
Name[hr]=Wine - dizač Windows programa
Name[he]=Wine — מריץ תכניות Windows
diff --git a/wine-ca_certificates.patch b/wine-ca_certificates.patch
index d284ee1..19b70c9 100644
--- a/wine-ca_certificates.patch
+++ b/wine-ca_certificates.patch
@@ -1,9 +1,10 @@
---- 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 @@
- "/etc/pki/tls/certs/ca-bundle.crt",
+diff -dur wine-1.8.orig/dlls/crypt32/rootstore.c wine-1.8/dlls/crypt32/rootstore.c
+--- wine-1.8.orig/dlls/crypt32/rootstore.c 2015-12-19 16:57:44.000000000 +0100
++++ wine-1.8/dlls/crypt32/rootstore.c 2016-01-09 18:19:17.673921302 +0100
+@@ -490,6 +490,7 @@
"/usr/local/share/certs/",
"/etc/sfw/openssl/certs",
+ "/etc/security/cacerts", /* Android */
+ "/etc/certs/ca-certificates.crt",
};
diff --git a/wine-ncurses.patch b/wine-ncurses.patch
index 44c55ad..37a52e6 100644
--- a/wine-ncurses.patch
+++ b/wine-ncurses.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -dur wine-1.8.orig/configure.ac wine-1.8/configure.ac
+--- wine-1.8.orig/configure.ac 2015-12-19 16:57:44.000000000 +0100
++++ wine-1.8/configure.ac 2016-01-09 18:16:41.889401226 +0100
+@@ -450,6 +450,7 @@
machine/sysarch.h \
mntent.h \
ncurses.h \
@@ -9,21 +9,21 @@ diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/configure.ac wine-1.7.18/configu
netdb.h \
netinet/in.h \
netinet/in_systm.h \
-@@ -1354,9 +1355,12 @@
+@@ -1274,9 +1275,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"])
+ WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]])
+ 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 @@
+@@ -1285,8 +1289,8 @@
LIBS="$LIBS $CURSES_LIBS"
AC_CHECK_FUNCS(mousemask)
LIBS="$ac_save_LIBS"
@@ -34,9 +34,9 @@ diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/configure.ac wine-1.7.18/configu
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
+diff -dur wine-1.8.orig/dlls/kernel32/term.c wine-1.8/dlls/kernel32/term.c
+--- wine-1.8.orig/dlls/kernel32/term.c 2015-12-19 16:57:44.000000000 +0100
++++ wine-1.8/dlls/kernel32/term.c 2016-01-09 18:15:39.868921555 +0100
@@ -27,6 +27,8 @@
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
@@ -64,9 +64,9 @@ diff -durN -x '*~' -x '*.orig' wine-1.7.18.orig/dlls/kernel32/term.c wine-1.7.18
# 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
+diff -dur wine-1.8.orig/programs/wineconsole/curses.c wine-1.8/programs/wineconsole/curses.c
+--- wine-1.8.orig/programs/wineconsole/curses.c 2015-12-19 16:57:44.000000000 +0100
++++ wine-1.8/programs/wineconsole/curses.c 2016-01-09 18:15:39.872254915 +0100
@@ -40,6 +40,8 @@
# include <ncurses.h>
#elif defined(HAVE_CURSES_H)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/c54d2750c4b2da1956f2c5da33d074724ce6694c
More information about the pld-cvs-commit
mailing list