From 68255af4e9f42ede6de84e8398b2f36b5729aa57 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 3 Aug 2017 10:52:08 +0200 Subject: [PATCH 1/2] git: Update version from 2.13.3 to 2.13.4 > Git v2.13.4 Release Notes > ========================= > > Fixes since v2.13.3 > ------------------- > > * Update the character width tables. > > * A recent update broke an alias that contained an uppercase letter, > which has been fixed. > > * On Cygwin, similar to Windows, "git push //server/share/repository" > ought to mean a repository on a network share that can be accessed > locally, but this did not work correctly due to stripping the double > slashes at the beginning. > > * The progress meter did not give a useful output when we haven't had > 0.5 seconds to measure the throughput during the interval. Instead > show the overall throughput rate at the end, which is a much more > useful number. > > * We run an early part of "git gc" that deals with refs before > daemonising (and not under lock) even when running a background > auto-gc, which caused multiple gc processes attempting to run the > early part at the same time. This is now prevented by running the > early part also under the GC lock. > > Also contains a handful of small code and documentation clean-ups. [1] https://git.kernel.org/pub/scm/git/git.git/tree/Documentation/RelNotes/2.13.4.txt --- git.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.be0 b/git.be0 index 476bc5a05..a5a92baae 100755 --- a/git.be0 +++ b/git.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION git-2.13.3-0 +# BEE_VERSION git-2.13.4-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 4b72781e00ec8381c08dc7963cff95e0d2f9cab8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 3 Aug 2017 10:53:22 +0200 Subject: [PATCH 2/2] git: Add patch for git-gui and our Tcl/Tk version Copy the commit description. ``` [PATCH] git-gui: Correctly detect Tkk feature Since git 2.12.2, running `git gui` in a git checkout fails with the error below [1]. > Error in startup script: wrong # args: should be "ttk::style theme use theme" > while executing > "ttk::style theme use" > (procedure "ttext" line 4) > invoked from within > "ttext $ui_workdir -background white -foreground black \ > -borderwidth 0 \ > -width 20 -height 10 \ > -wrap none \ > -takefocus 1 -highlightthickness 1\ > ..." > (file "/usr/libexec/git-core/git-gui" line 3190) Konstantin Khomoutov explains the issue and the fix [2]. > The git-gui relies on the [ttk::style theme use] command -- > that is, the two-argument invocation of [ttk::style] -- to return > the theme being currently in use, and this feature was implemented > on 2008-05-27 [1] by Pat Thoyts. > > Judging from the output of > > fossil descendants e83b7dd29ddae998f96538584afb518849ac1e2c > > the first Tk release to have this change was 8.6b2. > > So the proper fix appears to be more involved: > > set default_config(gui.usettk) \ > [expr {[package vcompare [info patchlevel] 8.6b2] >= 0}] > > (The slash+newline sequence is not needed -- it's here mostly > for pretty-printing.) > > 1. http://core.tcl.tk/tk/info/e83b7dd29ddae998 [1] https://public-inbox.org/git/1490906641.2546.1.camel@kaarsemaker.net/T/ [2] https://public-inbox.org/git/20170331173435.c822389c9fc7ebe15c20ed00@domain007.com/ ``` Fixes: #444 (git: `git gui` does not start anymore) --- git.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.be0 b/git.be0 index a5a92baae..90ef4992d 100755 --- a/git.be0 +++ b/git.be0 @@ -15,7 +15,7 @@ SRCURL[0]="https://www.kernel.org/pub/software/scm/git/git-${PKGVERSION}.tar.xz" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +PATCHURL+=(/src/mariux/patches/0001-git-gui-Correctly-detect-Tkk-feature.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not