April 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : make_announce: Update version number parsing for the new versioning scheme.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 4cd22c2cba1118a9b9fbd84d855e02be0e5342e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd22c2cba1118a9b9fbd84d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:56:07 2017 +0100 make_announce: Update version number parsing for the new versioning scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9629bb6ad2136593ac6c5026a57614640be41453) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index c65f900..83d869a 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -109,7 +109,7 @@ my $old = get_current_version(); my $new = $ARGV[0]; unless ($new) { - if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1.$2.1"; } + if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1." . ($2 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) { $new = "$1.$2." . ($3 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)-rc([0-9]+)$/) { $new = "$1.$2-rc" . ($3 + 1); } else { die "unknown version format $old"; } @@ -117,8 +117,12 @@ unless ($new) print "Updating files for release $new\n"; -(my $reldir = $new) =~ s/^([0-9]+\.[0-9]+).*/$1/; -my $is_stable = ($new =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) && !($2 % 2); # stable releases have an even minor number +my $reldir = $new; +if ($reldir =~ /^([0-9]+\.0)/) { $reldir = $1; } +elsif ($reldir =~ /^([0-9]+)\./) { $reldir = "$1.x"; } +else { die "unknown version format $reldir"; } + +my $is_stable = ($new =~ /^([0-9]+)\.0\.([0-9]+)$/); # stable releases have a 0 minor number my $filter = "product=Wine&resolution=FIXED&" . ($is_stable ? "target_milestone=$reldir.x" : "bug_status=RESOLVED"); my %bugs = get_bugs( $filter ); @@ -128,11 +132,16 @@ my %authors = get_authors(); open ANNOUNCE, "<ANNOUNCE" or die "cannot open ANNOUNCE"; open NEW, ">ANNOUNCE.new" or die "cannot create ANNOUNCE.new"; + +# replace version number in first line +$_ = <ANNOUNCE>; +s/(([0-9]+)\.)+[0-9]+(-rc[0-9]+)?/$new/; +print NEW $_; + while (<ANNOUNCE>) { last if /^------------------/; - s!http://mirrors.ibiblio.org/wine/source/.*!http://mirrors.ibiblio.org/wine…!; - s!http://dl.winehq.org/wine/source/.*!http://dl.winehq.org/wine/source/$rel…!; + s!(https?://.*/wine/source/).*\.tar!$1$reldir/wine-$new.tar!; print NEW $_; }

1 0

Gerald Pfeifer : winedump: Increase buffer size and potential string length inoutput_spec_symbol.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 2ad97820b77ff25cb4967a8ece93176865de5335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad97820b77ff25cb4967a8ec… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 17:26:42 2017 +0100 winedump: Increase buffer size and potential string length inoutput_spec_symbol. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d258b0fd7df2744c35a9b7ee5d8653fb6653aa2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 6c2bfae..bbbb1ac 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -62,13 +62,13 @@ void output_spec_preamble (void) */ void output_spec_symbol (const parsed_symbol *sym) { - char ord_spec[16]; + char ord_spec[20]; assert (specfile); assert (sym && sym->symbol); if (sym->ordinal >= 0) - snprintf(ord_spec, 8, "%d", sym->ordinal); + snprintf(ord_spec, 12, "%d", sym->ordinal); else { ord_spec[0] = '@';

1 0

Francois Gouget : readme: Note that Wine may also use Mac APIs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 595ec50f5e696fb3db96b04d4939da4ac669f312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595ec50f5e696fb3db96b04d4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:27 2017 +0100 readme: Note that Wine may also use Mac APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa2a90c4189c250ef168da033ca20cb7167aba5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b1ca54f..5cd2151 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x, Win32, and Win64 executables) on Unix. It consists of a program loader which loads and executes a Microsoft Windows binary, and a library (called Winelib) that implements Windows -API calls using their Unix or X11 equivalents. The library may also +API calls using their Unix, X11 or Mac equivalents. The library may also be used for porting Windows code into native Unix executables. Wine is free software, released under the GNU LGPL; see the file

1 0

Francois Gouget : readme: Adjust a couple of section separators.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 20b6d64276134bac4dad5ce3e44c730334778f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b6d64276134bac4dad5ce3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:38 2017 +0100 readme: Adjust a couple of section separators. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a924b9e1f74cc84b1fc12201b9999ab5044dad0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 5cd2151..5423e7b 100644 --- a/README +++ b/README @@ -82,6 +82,7 @@ Optional support libraries: 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see http://wiki.winehq.org/Wine64 for details. + 4. COMPILATION To build Wine, do: @@ -98,6 +99,7 @@ To see compile configuration options, do ./configure --help. For more information, see https://wiki.winehq.org/Building_Wine + 5. SETUP Once Wine has been built correctly, you can do "make install"; this

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 81540196bf1bcd2d2f26a85c2b14fa96feed7cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81540196bf1bcd2d2f26a85c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 24 09:08:25 2017 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 159d3642e147694c3596d96a0646249e2146a2c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ru | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index c228fc6..616737e 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -13,11 +13,10 @@ GNU LGPL, файл LICENSE содержит информацию по лицен 2. БЫСТРЫЙ СТАРТ -Каждый раз, когда вы компилируете исходный код, рекомендуется использовать -Wine Installer для компоновки и установки Wine. В каталоге, содержащем -исходный код Wine (в нём находится этот файл), введите: +В каталоге, содержащем исходный код Wine, выполните: -./tools/wineinstall +./configure +make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с @@ -47,7 +46,7 @@ Solaris: Лучше всего компоновать Wine инструментами GNU (gcc, gas, и т.д.). Внимание: установка gas *НЕ* гарантирует что gcc будет его использовать. Необходимо перекомпилировать gcc после - установки gas или создать ссылку на cc, как и на ld в инструментах gnu. (?) + установки gas или создать ссылку на cc, как и на ld в инструментах gnu. NetBSD: Убедитесь что, параметры USER_LDT, SYSVSHM, SYSVSEM и SYSVMSG @@ -70,7 +69,7 @@ Mac OS X: Разумеется, вам необходим «make» (лучше всего использовать GNU make). - Вам также понадобятся flex (версии 2.5 или старше) и bison. + Вам также понадобятся flex версии 2.5.33 или более новой и bison. Поддержка дополнительных библиотек: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были @@ -86,30 +85,20 @@ Mac OS X: 4. КОМПИЛЯЦИЯ -Если вы не хотите использовать wineinstall, введите следующие команды -для компоновки Wine: +Для компиляции, выполните: ./configure -make depend make -Это скомпонует программу «wine», библиотеки и бинарные файлы, +В результате вы получите программу «wine», библиотеки и бинарные файлы, необходимые для работы Wine. -Программа «wine» будет загружать и выполнять программы Windows. +Программа «wine» нужна для загрузки и выполнения программ Windows. Библиотека «libwine» («Winelib») может быть использована для компилирования и компоновки исходного кода Windows под Unix. Для вывода конфигурационных настроек введите ./configure --help. -Для обновления до нового релиза используя патч, сначала перейдите в -корневой каталог релиза (он содержит README файл). -Затем введите «make clean» и пропачьте релиз: - - bunzip2 -c patch-file | patch -p1 - -где «patch-file» - имя файла с патчем (что-то вроде -wine-1.0.x.diff.bz2). Затем введите «./configure», и после этого -«make depend && make». +За дополнительной информацией обратитесь к https://wiki.winehq.org/Building_Wine 5. УСТАНОВКА @@ -169,8 +158,9 @@ IRC: Онлайн помощь доступна на канале #WineHQ на Git: Текущие разработки Wine доступны через Git. Смотрите http://www.winehq.org/site/git для дополнительной информации. -Если вы что-то добавили или исправили ошибку, пришлите патч (в формате 'diff -u') -на wine-patches(a)winehq.org для его включения в следующий релиз. +Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч +(предпочтительно сгенерированный с помощью git-format-patch) на wine-patches(a)winehq.org +для его включения в следующий релиз. -- Alexandre Julliard

1 0

Francois Gouget : readme: Update and rewrap the French translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 211e2584d412c13ebb3a4389a9d66a4cdc698c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211e2584d412c13ebb3a4389a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:37 2017 +0100 readme: Update and rewrap the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c392176096ba9401093e362eaa20b0f288e6d5f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.fr | 165 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=211e2584d412c13ebb3a4…

1 0

Can Taşan : wine.desktop: Add Turkish translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 484117da657d9db4fb8698f2d6de122c2a81b361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484117da657d9db4fb8698f2d… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:14:20 2017 +0100 wine.desktop: Add Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5c2d6211f6590d3856dc9188593b3d3597c8b441) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.desktop b/loader/wine.desktop index 04f7da8..36dd921 100644 --- a/loader/wine.desktop +++ b/loader/wine.desktop @@ -21,6 +21,7 @@ Name[nb]=Wine - for kjøring av Windows-programmer Name[nn]=Wine - for køyring av Windows-program Name[sr]=Wine - дизач Windows програма Name[sr(a)latin]=Wine - dizač Windows programa +Name[tr]=Wine - Windows programı yükleyicisi Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Name[ja]=Wine Windowsプログラムローダー

1 0

Can Taşan : kernel32: Add Unicode character for Turkish lira.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 45479166ac1e0687b5abea679fa6d7a47f660d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45479166ac1e0687b5abea679… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Mar 24 21:17:23 2017 +0100 kernel32: Add Unicode character for Turkish lira. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42ed54b5d8e67aeb647d5a4fc8af7c8962285c7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/trk.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 3c50fe5..fad46a3 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Ara" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Turkey" - LOCALE_SCURRENCY "TL" + LOCALE_SCURRENCY "₺" LOCALE_SDATE "." LOCALE_SDAYNAME1 "Pazartesi" LOCALE_SDAYNAME2 "Salı"

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: cf910aa4d24489d5f60543ef53d2a32ce481467e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf910aa4d24489d5f60543ef5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869a..9e44a13 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . "..stable" or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Can Taşan : documentation: Update Turkish translation.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: b313e70dcab78f88092497eba758b182ae241706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b313e70dcab78f88092497eba… Author: Can Taşan <betax34(a)hotmail.com> Date: Mon Feb 6 17:55:03 2017 +0100 documentation: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd9e7d0f8c3de265ab7a64545418a67d28e0766b) Conflicts: po/tr.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.tr | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/documentation/README.tr b/documentation/README.tr index aa11353..1ddce37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -124,7 +124,7 @@ bir dosya adı belirtebilirsiniz. Örneğin: Not Defteri'ni çalıştırmak için: wine notepad (dosyaları konumlandırmak için config - wine notepad.exe (dosyasındaki Path arama yolunu kullanarak) + wine notepad.exe dosyasındaki Path arama yolunu kullanarak) wine c:\\windows\\notepad.exe (DOS dosya adı sözdizimi ile) @@ -145,17 +145,18 @@ WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: + http://www.winehq.org/FAQ Hatalar: - Hatalarınızı http://bugs.winehq.org adresinden Wine Bugzilla - ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce - hatanın önceden girilip girilmediğini öğrenmek için bugzilla'da + Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce + hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. -Git: Geçerli Wine geliştirme ağacına Git üzerinden erişilebilir. +Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. E-posta listeleri: @@ -163,8 +164,8 @@ E-posta listeleri: Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki -sürümde içerilmesi için wine-patches(a)winehq.org e-posta listesine bir yama -('diff -u' biçiminde) gönderiniz. +sürümde yer alabilmesii için wine-patches(a)winehq.org e-posta listesine bir +yama ('diff -u' biçiminde) gönderiniz. -- Alexandre Julliard

1 0