Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2015-10-28 17:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2015-10-22 12:58:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2015-10-28 17:16:33.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Oct 22 20:27:11 CEST 2015 - [email protected] + +- Fix crash of gitk with --all option in non-English locales + (bsc#951153): + 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch + 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch + 0003-gitk-Add-accelerators-to-Japanese-locale.patch + 0004-gitk-Add-accelerator-to-German-locale.patch + +------------------------------------------------------------------- New: ---- 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch 0003-gitk-Add-accelerators-to-Japanese-locale.patch 0004-gitk-Add-accelerator-to-German-locale.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.EWo091/_old 2015-10-28 17:16:34.000000000 +0100 +++ /var/tmp/diff_new_pack.EWo091/_new 2015-10-28 17:16:34.000000000 +0100 @@ -51,6 +51,11 @@ Patch6: git-tcsh-completion-fixes.diff # adapt paths in zsh completion (bnc#853183) Patch7: git-zsh-completion-fixes.diff +# PATCH-FIX-OPENSUSE fixes for gitk crash (bsc#951153) +Patch101: 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch +Patch102: 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch +Patch103: 0003-gitk-Add-accelerators-to-Japanese-locale.patch +Patch104: 0004-gitk-Add-accelerator-to-German-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2 BuildRequires: asciidoc @@ -236,6 +241,10 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 %build cat > .make <<'EOF' ++++++ 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch ++++++ >From dc5621adb09150be368d2a3d29f4312f79dfcbd3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Tue, 20 Oct 2015 13:40:13 +0200 Subject: [PATCH 1/4] gitk: Fix crash with --all in non-English locales When gitk is invoked with --all option in a non-English locale, it crashes like: $ LC_ALL="de_DE.UTF-8" gitk --all Error in startup script: bad menu entry index "Ansicht bearbeiten ..." while executing ".bar.view entryconf [mca "Edit view..."] -state normal" invoked from within "if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { # create a view for the files/dirs specified on the command line se..." (file "/usr/bin/gitk" line 12442) The reason is the leftover strings that don't match any longer with the new string containing accelerator mark (&). This patch corrects these strings. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=951153 Signed-off-by: Takashi Iwai <[email protected]> --- gitk-git/gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index 2028b554f487..fcc606eab735 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -12452,8 +12452,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { set viewchanged(1) 0 set vdatemode(1) 0 addviewmenu 1 - .bar.view entryconf [mca "Edit view..."] -state normal - .bar.view entryconf [mca "Delete view"] -state normal + .bar.view entryconf [mca "&Edit view..."] -state normal + .bar.view entryconf [mca "&Delete view"] -state normal } if {[info exists permviews]} { -- 2.6.1 ++++++ 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch ++++++ ++++ 1151 lines (skipped) ++++++ 0003-gitk-Add-accelerators-to-Japanese-locale.patch ++++++ >From def48190211772ca6b5a6b4f2603201be1768bb2 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Tue, 20 Oct 2015 14:09:36 +0200 Subject: [PATCH 3/4] gitk: Add accelerators to Japanese locale Just follow the English accelerator keys. Signed-off-by: Takashi Iwai <[email protected]> --- gitk-git/po/ja.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po index 9bbbadd3b427..59e42a89fd7e 100644 --- a/gitk-git/po/ja.po +++ b/gitk-git/po/ja.po @@ -91,71 +91,71 @@ msgstr "キャンセル" #: gitk:2069 msgid "&Update" -msgstr "更新" +msgstr "更新(&U)" #: gitk:2070 msgid "&Reload" -msgstr "リロード" +msgstr "リロード(&R)" #: gitk:2071 msgid "Reread re&ferences" -msgstr "リファレンスを再読み込み" +msgstr "リファレンスを再読み込み(&F)" #: gitk:2072 msgid "&List references" -msgstr "リファレンスリストを表示" +msgstr "リファレンスリストを表示(&L)" #: gitk:2074 msgid "Start git &gui" -msgstr "git gui の開始" +msgstr "git gui の開始(&G)" #: gitk:2076 msgid "&Quit" -msgstr "終了" +msgstr "終了(&Q)" #: gitk:2068 msgid "&File" -msgstr "ファイル" +msgstr "ファイル(&F)" #: gitk:2080 msgid "&Preferences" -msgstr "設定" +msgstr "設定(&P)" #: gitk:2079 msgid "&Edit" -msgstr "編集" +msgstr "編集(&E)" #: gitk:2084 msgid "&New view..." -msgstr "新規ビュー..." +msgstr "新規ビュー...(&N)" #: gitk:2085 msgid "&Edit view..." -msgstr "ビュー編集..." +msgstr "ビュー編集...(&E)" #: gitk:2086 msgid "&Delete view" -msgstr "ビュー削除" +msgstr "ビュー削除(&D)" #: gitk:2088 gitk:4043 msgid "&All files" -msgstr "全てのファイル" +msgstr "全てのファイル(&A)" #: gitk:2083 gitk:4067 msgid "&View" -msgstr "ビュー" +msgstr "ビュー(&V)" #: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" -msgstr "gitk について" +msgstr "gitk について(&A)" #: gitk:2094 gitk:2108 msgid "&Key bindings" -msgstr "キーバインディング" +msgstr "キーバインディング(&K)" #: gitk:2092 gitk:2107 msgid "&Help" -msgstr "ヘルプ" +msgstr "ヘルプ(&H)" #: gitk:2185 gitk:8652 msgid "SHA1 ID:" -- 2.6.1 ++++++ 0004-gitk-Add-accelerator-to-German-locale.patch ++++++ >From 1c4d07e5f86ae9507e973b50ed28fbaf8eebea67 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Tue, 20 Oct 2015 14:21:49 +0200 Subject: [PATCH 4/4] gitk: Add accelerator to German locale Assigned either to the first letter or some unique letter. At least there are no conflicts, as far as I see... Signed-off-by: Takashi Iwai <[email protected]> --- gitk-git/po/de.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index 56c053b98428..d9ba4052e20b 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2010-01-27 20:27+0100\n" +"PO-Revision-Date: 2015-10-20 14:20+0200\n" "Last-Translator: Christian Stimming <[email protected]>\n" "Language-Team: German\n" "Language: \n" @@ -90,71 +90,71 @@ msgstr "Abbrechen" #: gitk:2069 msgid "&Update" -msgstr "Aktualisieren" +msgstr "&Aktualisieren" #: gitk:2070 msgid "&Reload" -msgstr "Neu laden" +msgstr "&Neu laden" #: gitk:2071 msgid "Reread re&ferences" -msgstr "Zweige neu laden" +msgstr "&Zweige neu laden" #: gitk:2072 msgid "&List references" -msgstr "Zweige/Markierungen auflisten" +msgstr "Zweige/Markierungen auf&listen" #: gitk:2074 msgid "Start git &gui" -msgstr "»git gui« starten" +msgstr "»git &gui« starten" #: gitk:2076 msgid "&Quit" -msgstr "Beenden" +msgstr "&Beenden" #: gitk:2068 msgid "&File" -msgstr "Datei" +msgstr "&Datei" #: gitk:2080 msgid "&Preferences" -msgstr "Einstellungen" +msgstr "&Einstellungen" #: gitk:2079 msgid "&Edit" -msgstr "Bearbeiten" +msgstr "&Bearbeiten" #: gitk:2084 msgid "&New view..." -msgstr "Neue Ansicht ..." +msgstr "&Neue Ansicht ..." #: gitk:2085 msgid "&Edit view..." -msgstr "Ansicht bearbeiten ..." +msgstr "Ansicht &bearbeiten ..." #: gitk:2086 msgid "&Delete view" -msgstr "Ansicht entfernen" +msgstr "Ansicht &entfernen" #: gitk:2088 gitk:4043 msgid "&All files" -msgstr "Alle Dateien" +msgstr "&Alle Dateien" #: gitk:2083 gitk:4067 msgid "&View" -msgstr "Ansicht" +msgstr "&Ansicht" #: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" -msgstr "Über gitk" +msgstr "Über &gitk" #: gitk:2094 gitk:2108 msgid "&Key bindings" -msgstr "Tastenkürzel" +msgstr "&Tastenkürzel" #: gitk:2092 gitk:2107 msgid "&Help" -msgstr "Hilfe" +msgstr "&Hilfe" #: gitk:2185 gitk:8652 msgid "SHA1 ID:" -- 2.6.1
