From b5ebb62139a5d36e8ce0287c9542379afae3f985 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Mon, 24 Jan 2011 18:11:46 +0100 Subject: [PATCH] - 1.3.12-1 - version upgrade --- .gitignore | 2 + sources | 2 +- wine.spec | 15 +- winepulse-0.38-winecfg.patch | 313 --------------------------------- winepulse-winecfg-1.3.11.patch | 49 ++++++ 5 files changed, 64 insertions(+), 317 deletions(-) delete mode 100644 winepulse-0.38-winecfg.patch create mode 100644 winepulse-winecfg-1.3.11.patch diff --git a/.gitignore b/.gitignore index bf9b492..bf7b922 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /wine-1.3.8.tar.bz2 /wine-1.3.9.tar.bz2 /wine-1.3.10.tar.bz2 +/wine-1.3.11.tar.bz2 +/wine-1.3.12.tar.bz2 diff --git a/sources b/sources index 1f5892b..fb0cf67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9f616cdcfb07a832c25623d3a971c3c wine-1.3.10.tar.bz2 +a36a5e9ec4b72dc4fa8e0a10a23e8dee wine-1.3.12.tar.bz2 diff --git a/wine.spec b/wine.spec index ec7985e..2da744a 100644 --- a/wine.spec +++ b/wine.spec @@ -1,6 +1,6 @@ %define no64bit 0 Name: wine -Version: 1.3.10 +Version: 1.3.12 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -45,7 +45,7 @@ Patch200: wine-imagemagick-6.5.patch # and http://art.ified.ca/?page_id=40 Patch400: http://art.ified.ca/downloads/winepulse/winepulse-configure.ac-1.3.10.patch Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.39.patch -Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch +Patch402: http://art.ified.ca/downloads/winepulse/winepulse-winecfg-1.3.11.patch Source402: README-FEDORA-PULSEAUDIO # enhancements @@ -459,7 +459,7 @@ export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno --enable-maintainer-mode \ --disable-tests -%{__make} TARGETFLAGS="" %{?_smp_mflags} +%{__make} TARGETFLAGS="" #%{?_smp_mflags} %install rm -rf %{buildroot} @@ -964,6 +964,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/netapi32.dll.so %{_libdir}/wine/netsh.exe.so %{_libdir}/wine/newdev.dll.so +%{_libdir}/wine/normaliz.dll.so %{_libdir}/wine/npmshtml.dll.so %{_libdir}/wine/ntdll.dll.so %{_libdir}/wine/ntdsapi.dll.so @@ -1340,6 +1341,14 @@ update-desktop-database &>/dev/null || : %endif %changelog +* Mon Jan 24 2011 Andreas Bierfert +- 1.3.12-1 +- version upgrade + +* Sun Jan 09 2011 Andreas Bierfert +- 1.3.11-1 +- version upgrade + * Tue Dec 28 2010 Andreas Bierfert - 1.3.10-1 - version upgrade diff --git a/winepulse-0.38-winecfg.patch b/winepulse-0.38-winecfg.patch deleted file mode 100644 index 30d17ed..0000000 --- a/winepulse-0.38-winecfg.patch +++ /dev/null @@ -1,313 +0,0 @@ -diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc -index d1ad34d..a95503c 100644 ---- a/programs/winecfg/Bg.rc -+++ b/programs/winecfg/Bg.rc -@@ -272,6 +272,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" -+ IDS_DRIVER_PULSE "PulseAudio Driver" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" -diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc -index a3f42d8..4758313 100644 ---- a/programs/winecfg/Cs.rc -+++ b/programs/winecfg/Cs.rc -@@ -272,6 +272,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standardn" - IDS_ACCEL_BASIC "Zkladn" - IDS_ACCEL_EMULATION "Emulace" -+ IDS_DRIVER_PULSE "Ovlada PulseAudio" - IDS_DRIVER_ALSA "Ovlada ALSA" - IDS_DRIVER_ESOUND "Ovlada EsounD" - IDS_DRIVER_OSS "Ovlada OSS" -diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc -index 6e594cc..4d1778c 100644 ---- a/programs/winecfg/Da.rc -+++ b/programs/winecfg/Da.rc -@@ -279,6 +279,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Grundlæggende" - IDS_ACCEL_EMULATION "Emuléring" -+ IDS_DRIVER_PULSE "PulseAudio-driver" - IDS_DRIVER_ALSA "ALSA-driver" - IDS_DRIVER_ESOUND "EsounD-driver" - IDS_DRIVER_OSS "OSS-driver" -diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc -index 885f986..265f006 100644 ---- a/programs/winecfg/De.rc -+++ b/programs/winecfg/De.rc -@@ -278,6 +278,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Einfach" - IDS_ACCEL_EMULATION "Emulation" -+ IDS_DRIVER_PULSE "PulseAudio-Treiber" - IDS_DRIVER_ALSA "ALSA-Treiber" - IDS_DRIVER_ESOUND "EsounD-Treiber" - IDS_DRIVER_OSS "OSS-Treiber" -diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc -index 9fc42ea..5bd66f9 100644 ---- a/programs/winecfg/En.rc -+++ b/programs/winecfg/En.rc -@@ -278,6 +278,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" -+ IDS_DRIVER_PULSE "PulseAudio Driver" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" -diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc -index dcf8e37..d46f32e 100644 ---- a/programs/winecfg/Es.rc -+++ b/programs/winecfg/Es.rc -@@ -277,6 +277,7 @@ BEGIN - IDS_ACCEL_STANDARD "Estndar" - IDS_ACCEL_BASIC "Bsica" - IDS_ACCEL_EMULATION "Emulacin" -+ IDS_DRIVER_PULSE "Controlador PulseAudio" - IDS_DRIVER_ALSA "Controlador ALSA" - IDS_DRIVER_ESOUND "Controlador EsounD" - IDS_DRIVER_OSS "Controlador OSS" -diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc -index 93c1e24..6beb0cb 100644 ---- a/programs/winecfg/Fi.rc -+++ b/programs/winecfg/Fi.rc -@@ -266,6 +266,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" -+ IDS_DRIVER_PULSE "PulseAudio Driver" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" -diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc -index ebbcfdd..638025f 100644 ---- a/programs/winecfg/Fr.rc -+++ b/programs/winecfg/Fr.rc -@@ -280,6 +280,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basique" - IDS_ACCEL_EMULATION "Émulation" -+ IDS_DRIVER_PULSE "Pilote PulseAudio" - IDS_DRIVER_ALSA "Pilote ALSA" - IDS_DRIVER_ESOUND "Pilote EsounD" - IDS_DRIVER_OSS "Pilote OSS" -diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc -index 0fb4982..d7df634 100644 ---- a/programs/winecfg/Hu.rc -+++ b/programs/winecfg/Hu.rc -@@ -266,6 +266,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" -+ IDS_DRIVER_PULSE "PulseAudio Driver" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" -diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc -index e738d22..cd64710 100644 ---- a/programs/winecfg/It.rc -+++ b/programs/winecfg/It.rc -@@ -280,6 +280,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Base" - IDS_ACCEL_EMULATION "Emulazione" -+ IDS_DRIVER_PULSE "Driver PulseAudio" - IDS_DRIVER_ALSA "Driver ALSA" - IDS_DRIVER_ESOUND "Driver Esound" - IDS_DRIVER_OSS "Driver OSS" -diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc -index a082856..e5a889b 100644 ---- a/programs/winecfg/Ja.rc -+++ b/programs/winecfg/Ja.rc -@@ -281,6 +281,7 @@ BEGIN - IDS_ACCEL_STANDARD "標準" - IDS_ACCEL_BASIC "基本" - IDS_ACCEL_EMULATION "エミュレーション" -+ IDS_DRIVER_PULSE "PulseAudio ドライバ" - IDS_DRIVER_ALSA "ALSA ドライバ" - IDS_DRIVER_ESOUND "EsounD ドライバ" - IDS_DRIVER_OSS "OSS ドライバ" -diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc -index 6321fe8..279a99d 100644 ---- a/programs/winecfg/Ko.rc -+++ b/programs/winecfg/Ko.rc -@@ -282,6 +282,7 @@ BEGIN - IDS_ACCEL_STANDARD "표준" - IDS_ACCEL_BASIC "기본" - IDS_ACCEL_EMULATION "애뮬레이션" -+ IDS_DRIVER_PULSE "PulseAudio 드라이버" - IDS_DRIVER_ALSA "ALSA 드라이버" - IDS_DRIVER_ESOUND "EsounD 드라이버" - IDS_DRIVER_OSS "OSS 드라이버" -diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc -index 7a979f0..e4f7ff4 100644 ---- a/programs/winecfg/Lt.rc -+++ b/programs/winecfg/Lt.rc -@@ -279,6 +279,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standartinis" - IDS_ACCEL_BASIC "Bazinis" - IDS_ACCEL_EMULATION "Emuliacija" -+ IDS_DRIVER_PULSE "PulseAudio tvarkyklė" - IDS_DRIVER_ALSA "ALSA tvarkyklė" - IDS_DRIVER_ESOUND "EsounD tvarkyklė" - IDS_DRIVER_OSS "OSS tvarkyklė" -diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc -index 62ab796..8bb207e 100644 ---- a/programs/winecfg/Nl.rc -+++ b/programs/winecfg/Nl.rc -@@ -279,6 +279,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standaard" - IDS_ACCEL_BASIC "Eenvoudig" - IDS_ACCEL_EMULATION "Emulatie" -+ IDS_DRIVER_PULSE "PulseAudio Stuurprogramma" - IDS_DRIVER_ALSA "ALSA Stuurprogramma" - IDS_DRIVER_ESOUND "EsounD Stuurprogramma" - IDS_DRIVER_OSS "OSS Stuurprogramma" -diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc -index 338a291..b54bd8e 100644 ---- a/programs/winecfg/No.rc -+++ b/programs/winecfg/No.rc -@@ -279,6 +279,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Grunnleggende" - IDS_ACCEL_EMULATION "Emulering" -+ IDS_DRIVER_PULSE "PulseAudio-driver" - IDS_DRIVER_ALSA "ALSA-driver" - IDS_DRIVER_ESOUND "EsounD-driver" - IDS_DRIVER_OSS "OSS-driver" -diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc -index 4cc4e85..9440ebc 100644 ---- a/programs/winecfg/Pl.rc -+++ b/programs/winecfg/Pl.rc -@@ -280,6 +280,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standardowe" - IDS_ACCEL_BASIC "Podstawowe" - IDS_ACCEL_EMULATION "Emulacja" -+ IDS_DRIVER_PULSE "Sterownik PulseAudio" - IDS_DRIVER_ALSA "Sterownik ALSA" - IDS_DRIVER_ESOUND "Sterownik EsounD" - IDS_DRIVER_OSS "Sterownik OSS" -diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc -index f96b9ad..4d8a05b 100644 ---- a/programs/winecfg/Pt.rc -+++ b/programs/winecfg/Pt.rc -@@ -611,6 +611,7 @@ BEGIN - IDS_ACCEL_STANDARD "Padrão" - IDS_ACCEL_BASIC "Básico" - IDS_ACCEL_EMULATION "Emulação" -+ IDS_DRIVER_PULSE "Controlador PulseAudio" - IDS_DRIVER_ALSA "Controlador ALSA" - IDS_DRIVER_ESOUND "Controlador EsounD" - IDS_DRIVER_OSS "Controlador OSS" -diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc -index f6fe5a0..cf96300 100644 ---- a/programs/winecfg/Ro.rc -+++ b/programs/winecfg/Ro.rc -@@ -278,6 +278,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "De bază" - IDS_ACCEL_EMULATION "Emulare" -+ IDS_DRIVER_PULSE "Driver PulseAudio" - IDS_DRIVER_ALSA "Driver ALSA" - IDS_DRIVER_ESOUND "Driver Esound" - IDS_DRIVER_OSS "Driver OSS" -diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc -index b391edc..70d79f7 100644 ---- a/programs/winecfg/Ru.rc -+++ b/programs/winecfg/Ru.rc -@@ -283,6 +283,7 @@ BEGIN - IDS_ACCEL_STANDARD "Стандартное" - IDS_ACCEL_BASIC "Минимальное" - IDS_ACCEL_EMULATION "Эмуляция" -+ IDS_DRIVER_PULSE "PulseAudio драйвер" - IDS_DRIVER_ALSA "ALSA драйвер" - IDS_DRIVER_ESOUND "EsounD драйвер" - IDS_DRIVER_OSS "OSS драйвер" -diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc -index 50322b6..bf85f4d 100644 ---- a/programs/winecfg/Si.rc -+++ b/programs/winecfg/Si.rc -@@ -278,6 +278,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standardno" - IDS_ACCEL_BASIC "Osnovno" - IDS_ACCEL_EMULATION "Emulacija" -+ IDS_DRIVER_PULSE "PulseAudio gonilnik" - IDS_DRIVER_ALSA "ALSA gonilnik" - IDS_DRIVER_ESOUND "EsounD gonilnik" - IDS_DRIVER_OSS "OSS gonilnik" -diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc -index 7e7f981..4d11a8c 100644 ---- a/programs/winecfg/Sv.rc -+++ b/programs/winecfg/Sv.rc -@@ -266,6 +266,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Grundlggande" - IDS_ACCEL_EMULATION "Emulering" -+ IDS_DRIVER_PULSE "PulseAudio-drivrutin" - IDS_DRIVER_ALSA "ALSA-drivrutin" - IDS_DRIVER_ESOUND "EsounD-drivrutin" - IDS_DRIVER_OSS "OSS-drivrutin" -diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc -index c124900..09a0b27 100644 ---- a/programs/winecfg/Tr.rc -+++ b/programs/winecfg/Tr.rc -@@ -266,6 +266,7 @@ BEGIN - IDS_ACCEL_STANDARD "Standart" - IDS_ACCEL_BASIC "Temel" - IDS_ACCEL_EMULATION "Taklit" -+ IDS_DRIVER_PULSE "PulseAudio Srcs" - IDS_DRIVER_ALSA "ALSA Srcs" - IDS_DRIVER_ESOUND "EsounD Srcs" - IDS_DRIVER_OSS "OSS Srcs" -diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc -index 93f6416..84bc6a0 100644 ---- a/programs/winecfg/Zh.rc -+++ b/programs/winecfg/Zh.rc -@@ -271,6 +271,7 @@ BEGIN - IDS_ACCEL_STANDARD "标准" - IDS_ACCEL_BASIC "基本" - IDS_ACCEL_EMULATION "软件模拟" -+ IDS_DRIVER_PULSE "PulseAudio 驱动" - IDS_DRIVER_ALSA "ALSA 驱动" - IDS_DRIVER_ESOUND "EsounD 驱动" - IDS_DRIVER_OSS "OSS 驱动" -diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c -index 134296d..1d70c03 100644 ---- a/programs/winecfg/audio.c -+++ b/programs/winecfg/audio.c -@@ -90,6 +90,7 @@ typedef struct - } AUDIO_DRIVER; - - static AUDIO_DRIVER sAudioDrivers[] = { -+ {IDS_DRIVER_PULSE, "pulse"}, - {IDS_DRIVER_ALSA, "alsa"}, - {IDS_DRIVER_OSS, "oss"}, - {IDS_DRIVER_COREAUDIO, "coreaudio"}, -diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c -index e402b4e..f0264ca 100644 ---- a/programs/winecfg/libraries.c -+++ b/programs/winecfg/libraries.c -@@ -73,6 +73,7 @@ static const char * const builtin_only[] = - "winedos", - "winemp3.acm", - "wineps", -+ "winepulse.drv", - "winmm", - "wintab32", - "wnaspi32", -diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 43651d8..160e01e 100644 ---- a/programs/winecfg/resource.h -+++ b/programs/winecfg/resource.h -@@ -186,7 +186,7 @@ - #define IDS_ACCEL_BASIC 8302 - #define IDS_ACCEL_EMULATION 8303 - #define IDS_DRIVER_ALSA 8304 -- -+#define IDS_DRIVER_PULSE 8305 - #define IDS_DRIVER_ESOUND 8306 - #define IDS_DRIVER_OSS 8307 - #define IDS_DRIVER_JACK 8308 diff --git a/winepulse-winecfg-1.3.11.patch b/winepulse-winecfg-1.3.11.patch new file mode 100644 index 0000000..3c5c3f8 --- /dev/null +++ b/winepulse-winecfg-1.3.11.patch @@ -0,0 +1,49 @@ +diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c +index 4c90282..fcf3236 100644 +--- a/programs/winecfg/audio.c ++++ b/programs/winecfg/audio.c +@@ -90,6 +90,7 @@ typedef struct + } AUDIO_DRIVER; + + static AUDIO_DRIVER sAudioDrivers[] = { ++ {IDS_DRIVER_PULSE, "pulse"}, + {IDS_DRIVER_ALSA, "alsa"}, + {IDS_DRIVER_OSS, "oss"}, + {IDS_DRIVER_COREAUDIO, "coreaudio"}, +diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c +index e402b4e..f0264ca 100644 +--- a/programs/winecfg/libraries.c ++++ b/programs/winecfg/libraries.c +@@ -73,6 +73,7 @@ static const char * const builtin_only[] = + "winedos", + "winemp3.acm", + "wineps", ++ "winepulse.drv", + "winmm", + "wintab32", + "wnaspi32", +diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h +index 3bed6aa..2f347d9 100644 +--- a/programs/winecfg/resource.h ++++ b/programs/winecfg/resource.h +@@ -186,7 +186,7 @@ + #define IDS_ACCEL_BASIC 8302 + #define IDS_ACCEL_EMULATION 8303 + #define IDS_DRIVER_ALSA 8304 +- ++#define IDS_DRIVER_PULSE 8305 + #define IDS_DRIVER_ESOUND 8306 + #define IDS_DRIVER_OSS 8307 + #define IDS_DRIVER_JACK 8308 +diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc +index f98a14d..314bd65 100644 +--- a/programs/winecfg/winecfg.rc ++++ b/programs/winecfg/winecfg.rc +@@ -97,6 +97,7 @@ BEGIN + IDS_ACCEL_STANDARD "Standard" + IDS_ACCEL_BASIC "Basic" + IDS_ACCEL_EMULATION "Emulation" ++ IDS_DRIVER_PULSE "PulseAudio Driver" + IDS_DRIVER_ALSA "ALSA Driver" + IDS_DRIVER_ESOUND "EsounD Driver" + IDS_DRIVER_OSS "OSS Driver"