summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Karlsson2022-09-20 01:41:29 +0200
committerRasmus Karlsson2022-09-20 01:48:24 +0200
commit103468dc5f255e7f3616ee7976feb4164165c7d0 (patch)
tree47d6c9d0cb446882dc52c49c5f812e9b84495467
parente985af640266ff8a9af5e38d97df893d75234b8f (diff)
downloadaur-git-run-command-patch-git.tar.gz
Bump PKGBUILD from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=git-git
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD32
2 files changed, 23 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cfcfa62574c..5ab16630e852 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = git-run-command-patch-git
pkgdesc = A fast distributed version control system with patch applied for customizing git add --patch behaviour
- pkgver = 2.35.0.rc2.r2.g297ca895a2
+ pkgver = 2.38.0.rc0.r52.gdda7228a83
pkgrel = 1
- url = http://git-scm.com/
+ url = https://git-scm.com/
install = git-git.install
arch = i686
arch = x86_64
@@ -21,22 +21,23 @@ pkgbase = git-run-command-patch-git
depends = pcre2
depends = grep
depends = shadow
+ depends = zlib
optdepends = tk: gitk and git gui
optdepends = perl-libwww: git svn
- optdepends = perl-term-readkey: git svn
- optdepends = perl-mime-tools: git send-email
- optdepends = perl-net-smtp-ssl: git send-email TLS support
+ optdepends = perl-term-readkey: git svn and interactive.singlekey setting
+ optdepends = perl-io-socket-ssl: git send-email TLS support
optdepends = perl-authen-sasl: git send-email TLS support
optdepends = perl-mediawiki-api: git mediawiki support
optdepends = perl-datetime-format-iso8601: git mediawiki support
optdepends = perl-lwp-protocol-https: git mediawiki https support
optdepends = perl-cgi: gitweb (web interface) support
- optdepends = python: various helper scripts
+ optdepends = python: git svn & git p4
optdepends = subversion: git svn
optdepends = org.freedesktop.secrets: keyring credential helper
optdepends = libsecret: libsecret credential helper
provides = git
conflicts = git
+ options = debug
source = git+https://github.com/git/git.git
source = git-daemon@.service
source = git-daemon.socket
diff --git a/PKGBUILD b/PKGBUILD
index 61aabac6f788..bddd47a8aa1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,31 @@
_name=git
pkgname=$_name-run-command-patch-git
-pkgver=2.35.0.rc2.r2.g297ca895a2
+pkgver=2.38.0.rc0.r52.gdda7228a83
pkgrel=1
pkgdesc='A fast distributed version control system with patch applied for customizing git add --patch behaviour'
arch=('i686' 'x86_64')
-url='http://git-scm.com/'
+url='https://git-scm.com/'
license=('GPL2')
depends=('curl' 'expat' 'perl-error' 'perl' 'openssl'
- 'perl-mailtools' 'pcre2' 'grep' 'shadow')
+ 'perl-mailtools' 'pcre2' 'grep' 'shadow' 'zlib')
makedepends=('python' 'xmlto' 'asciidoc' 'libgnome-keyring' 'git')
optdepends=('tk: gitk and git gui'
'perl-libwww: git svn'
- 'perl-term-readkey: git svn'
- 'perl-mime-tools: git send-email'
- 'perl-net-smtp-ssl: git send-email TLS support'
+ 'perl-term-readkey: git svn and interactive.singlekey setting'
+ 'perl-io-socket-ssl: git send-email TLS support'
'perl-authen-sasl: git send-email TLS support'
'perl-mediawiki-api: git mediawiki support'
'perl-datetime-format-iso8601: git mediawiki support'
'perl-lwp-protocol-https: git mediawiki https support'
'perl-cgi: gitweb (web interface) support'
- 'python: various helper scripts'
+ 'python: git svn & git p4'
'subversion: git svn'
'org.freedesktop.secrets: keyring credential helper'
'libsecret: libsecret credential helper')
conflicts=('git')
provides=('git')
+options=('debug')
install=git-git.install
source=('git+https://github.com/git/git.git'
'git-daemon@.service'
@@ -39,12 +39,6 @@ sha512sums=('SKIP'
'4d4b434c2c317388ed6d3bdd87b1e8acb6c845b58be7bd1466e73a210cc824d53185fad302c5fffc1328f0c25300050843f343f37d36700a981e3c11322ea0cc'
'8772d6647a58f87afee336c2bdbf69e67cde8372449b015af7fd49ee41684f9dbb8fe37a11680eb82c1ef1e3fd5beb3c9e9453ed0ce8cd8c3e64d3bedc7407b7')
-pkgver() {
- cd "$srcdir/$_name"
- git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-
_make_paths=(
prefix='/usr'
gitexecdir='/usr/lib/git-core'
@@ -54,12 +48,17 @@ _make_paths=(
_make_options=(
CFLAGS="$CFLAGS"
LDFLAGS="$LDFLAGS"
- USE_LIBPCRE2=1
- NO_PERL_CPAN_FALLBACKS=1
- MAN_BOLD_LITERAL=1
INSTALL_SYMLINKS=1
+ MAN_BOLD_LITERAL=1
+ NO_PERL_CPAN_FALLBACKS=1
+ USE_LIBPCRE2=1
)
+pkgver() {
+ cd "$srcdir/$_name"
+ git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
prepare() {
patch --directory="$srcdir/$_name" --input="${srcdir}/add-patch-interactive-run-commands.patch"
}
@@ -101,6 +100,7 @@ check() {
package() {
cd "$srcdir/$_name"
+
make \
"${_make_paths[@]}" \
"${_make_options[@]}" \