Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

git: Update to 2.6.3

Browse Source
This commit is contained in:
Alexey Pavlov
2015-11-12 13:32:24 +03:00
parent 3bc5161379
commit 1dfb8b5e19
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git/PKGBUILD
View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=git
pkgver=2.6.2
pkgver=2.6.3
pkgrel=1
pkgdesc="The fast distributed version control system"
arch=('i686' 'x86_64')
@@ -47,9 +47,9 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
git-1.9.0-manifest-msys2.patch
git-1.8.4-msys2.patch
git-2.3.5-mingw-pwd.patch)
md5sums=('dbe60b314bdbb72b02118bca36b2d9c8'
md5sums=('65f659fb55ba49f17de03d1d9a859a83'
'c33c9dfa2944a0de9151a7af7a63a27b'
'f5975b367aa0979006bb07b297ef081b'
'b45a125ce8690fbba4097ee082c7d5b7'
'9f9170a30dfb7643df4948cdae5bb864'
'18381075d8c134d8c4b03c9a566f40f0')

8
git/git-1.9.0-manifest-msys2.patch
View File

@@ -147,11 +147,11 @@ Signed-off-by: Cesar Eduardo Barros <ces...@cesarb.net>
-git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
+git-http-fetch$X: http.o http-walker.o http-fetch.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL)
$(CURL_LIBCURL) $(LIBS)
-git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
+git-http-push$X: http.o http-push.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
-git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
+git-remote-testsvn$X: remote-testsvn.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
@@ -165,7 +165,7 @@ Signed-off-by: Cesar Eduardo Barros <ces...@cesarb.net>
-$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
+$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+%.o: %.rc
+ $(QUIET_WINDRES)$(WINDRES) $< $@
@@ -173,7 +173,7 @@ Signed-off-by: Cesar Eduardo Barros <ces...@cesarb.net>
+
+
$(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
@@ -2260,7 +2273,7 @@