diff --git a/git/PKGBUILD b/git/PKGBUILD index e37bdc10..9c208148 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov 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') diff --git a/git/git-1.9.0-manifest-msys2.patch b/git/git-1.9.0-manifest-msys2.patch index 31bb0b0d..a1b060ab 100644 --- a/git/git-1.9.0-manifest-msys2.patch +++ b/git/git-1.9.0-manifest-msys2.patch @@ -147,11 +147,11 @@ Signed-off-by: Cesar Eduardo Barros -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 -$(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 + + $(LIB_FILE): $(LIB_OBJS) - $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS) + $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^ @@ -2260,7 +2273,7 @@