[arch-commits] Commit in kicad/trunk (PKGBUILD fix-version-string.patch)

[George Rawlinson]

    Date: Monday, January 17, 2022 @ 07:02:35
  Author: grawlinson
Revision: 1107355

upgpkg: kicad 6.0.1-2; fix version string

Version string includes 'makepkg' as branch, this is due to
how makepkg interacts with a git source. Fixed this particular
issue.

Added:
  kicad/trunk/fix-version-string.patch
Modified:
  kicad/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   33 +++++++++++++++++++++++++++------
 fix-version-string.patch |   15 +++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-17 07:01:24 UTC (rev 1107354)
+++ PKGBUILD	2022-01-17 07:02:35 UTC (rev 1107355)
@@ -7,25 +7,45 @@
 
 pkgname=kicad
 pkgver=6.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Electronic schematic and printed circuit board (PCB) design tools'
 arch=('x86_64')
 url='http://kicad.org/'
 license=('GPL')
-depends=('wxgtk3' 'python' 'boost-libs' 'glew' 'curl' 'glm' 'ngspice' 'opencascade' 'python-wxpython')
-makedepends=('git' 'cmake' 'mesa' 'boost' 'swig')
+depends=(
+  'boost-libs'
+  'curl'
+  'glew'
+  'glm'
+  'ngspice'
+  'opencascade'
+  'python'
+  'python-wxpython'
+  'wxgtk3'
+)
+makedepends=(
+  'git'
+  'cmake'
+  'mesa'
+  'boost'
+  'swig'
+)
 optdepends=(
   'kicad-library: for footprints, symbols and templates'
   'kicad-library-3d: for 3D models of components'
 )
+_commit='0a9271f98e154202d3f4d1ddfbbea6e57abef955'
 source=(
-  "$pkgname::git+https://gitlab.com/kicad/code/kicad.git#commit=0a9271f98e154202d3f4d1ddfbbea6e57abef955"
+  "$pkgname::git+https://gitlab.com/kicad/code/kicad.git#commit=$_commit"
   'fix-archive-permissions.patch'
+  'fix-version-string.patch'
 )
 sha512sums=('SKIP'
-            'e655d37f743e131e60ea8143b78c195ea5233b1336a0cd73c3388bf27848240622843e31c895467fcb8af5d74e351676b353c524c835b9dde49e1e6bc85e0dce')
+            'e655d37f743e131e60ea8143b78c195ea5233b1336a0cd73c3388bf27848240622843e31c895467fcb8af5d74e351676b353c524c835b9dde49e1e6bc85e0dce'
+            '229559222b96f7ff4334e69142934b1ac74cfdb01b76dd16f1d56fcf70dfe06fa928de4bb9ffb46e023f4a3918bceb04fa39758e2673f51354304ebd2ef6d8b0')
 b2sums=('SKIP'
-        'fd1312d6adc0a9d00734a95a76fd0ed82824cfae0e626bfa2e0a24a710dd7a9f30d8d9d8b80a278d94aab8dd6d06bfe5edb41f03bb3bb8d4c3b5e9f066d49a84')
+        'fd1312d6adc0a9d00734a95a76fd0ed82824cfae0e626bfa2e0a24a710dd7a9f30d8d9d8b80a278d94aab8dd6d06bfe5edb41f03bb3bb8d4c3b5e9f066d49a84'
+        'bad6ad3b0278e24717cf8b1c5a30989cb9a329aa7e0fd36c9b2197c2031783c4873b1e0fb5ad9827c15cf93271fb910afddac2c853153e9f7f98bd703725732b')
 
 pkgver() {
   cd "$pkgname"
@@ -35,6 +55,7 @@
 prepare() {
   cd "$pkgname"
   patch -p1 -i ../fix-archive-permissions.patch
+  patch -p1 -i ../fix-version-string.patch
 }
 
 build() {

Added: fix-version-string.patch
===================================================================
--- fix-version-string.patch	                        (rev 0)
+++ fix-version-string.patch	2022-01-17 07:02:35 UTC (rev 1107355)
@@ -0,0 +1,15 @@
+--- a/CMakeModules/CreateGitVersionHeader.cmake
++++ b/CMakeModules/CreateGitVersionHeader.cmake
+@@ -32,10 +32,10 @@ macro( create_git_version_header _git_src_path )
+         set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" )
+         set( ENV{LC_ALL} C )
+ 
+-        # Use `git describe --dirty` to create the KiCad version string.
++        # Use `git describe` to create the KiCad version string.
+         execute_process(
+             COMMAND
+-            ${GIT_EXECUTABLE} describe --dirty
++            ${GIT_EXECUTABLE} describe
+             WORKING_DIRECTORY ${_git_src_path}
+             OUTPUT_VARIABLE _git_DESCRIBE
+             ERROR_VARIABLE _git_log_error