diff --git a/mingw-w64-git-git/0001-Don-t-redefine-_ReadWriteBarrier-in-malloc.c.h.patch b/mingw-w64-git-git/0001-Don-t-redefine-_ReadWriteBarrier-in-malloc.c.h.patch index c9bb211949..ec47531e5b 100644 --- a/mingw-w64-git-git/0001-Don-t-redefine-_ReadWriteBarrier-in-malloc.c.h.patch +++ b/mingw-w64-git-git/0001-Don-t-redefine-_ReadWriteBarrier-in-malloc.c.h.patch @@ -1,4 +1,4 @@ -From 3dd7eee7588b65e5fbea60469f4eee9eb771109c Mon Sep 17 00:00:00 2001 +From d77f782b65fd76b37e5882ddcdec9d07f2d172d1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 22 Jul 2014 00:58:19 +0100 Subject: [PATCH 01/15] Don't redefine _ReadWriteBarrier in malloc.c.h @@ -23,5 +23,5 @@ index f216a2a..6aeac26 100644 static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value) { -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0002-Undefine-FORCEINLINE-on-MinGW-w64-in-malloc.c.h.patch b/mingw-w64-git-git/0002-Undefine-FORCEINLINE-on-MinGW-w64-in-malloc.c.h.patch index 6c3fc6e20f..c82e055638 100644 --- a/mingw-w64-git-git/0002-Undefine-FORCEINLINE-on-MinGW-w64-in-malloc.c.h.patch +++ b/mingw-w64-git-git/0002-Undefine-FORCEINLINE-on-MinGW-w64-in-malloc.c.h.patch @@ -1,4 +1,4 @@ -From 26ff7ec8dec78317563afa69f368820e8e5fefd0 Mon Sep 17 00:00:00 2001 +From 1b58c3c6354871d792c5097f650b0f0a8d4daaca Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 22 Jul 2014 00:56:51 +0100 Subject: [PATCH 02/15] Undefine FORCEINLINE on MinGW-w64 in malloc.c.h @@ -28,5 +28,5 @@ index 6aeac26..22f3496 100644 #if defined(__GNUC__) #define FORCEINLINE __inline __attribute__ ((always_inline)) -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0003-Fix-BASIC_LDFLAGS-and-COMPAT_CFLAGS-for-64bit-MinGW-.patch b/mingw-w64-git-git/0003-Fix-BASIC_LDFLAGS-and-COMPAT_CFLAGS-for-64bit-MinGW-.patch index dcd51780ec..d94205ff3f 100644 --- a/mingw-w64-git-git/0003-Fix-BASIC_LDFLAGS-and-COMPAT_CFLAGS-for-64bit-MinGW-.patch +++ b/mingw-w64-git-git/0003-Fix-BASIC_LDFLAGS-and-COMPAT_CFLAGS-for-64bit-MinGW-.patch @@ -1,4 +1,4 @@ -From 48e52671ed63a1897b52e060334dc911d256050d Mon Sep 17 00:00:00 2001 +From 733566921b5b8ed395bd0f5afd4875d5b9ba4e8d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 22 Jul 2014 00:20:01 +0100 Subject: [PATCH 03/15] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64 @@ -8,7 +8,7 @@ Subject: [PATCH 03/15] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index bb4ddab..d5132bb 100644 +index d804cb3..c311eb3 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -6,6 +6,7 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') @@ -19,7 +19,7 @@ index bb4ddab..d5132bb 100644 ifdef MSVC # avoid the MingW and Cygwin configuration sections -@@ -497,12 +498,15 @@ ifneq (,$(findstring MINGW,$(uname_S))) +@@ -504,12 +505,15 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_POSIX_GOODIES = UnfortunatelyYes DEFAULT_HELP_FORMAT = html NO_D_INO_IN_DIRENT = YesPlease @@ -38,5 +38,5 @@ index bb4ddab..d5132bb 100644 GITLIBS += git.res PTHREAD_LIBS = -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0004-Also-look-in-winsock2.h-for-sockaddr_storage-and-loo.patch b/mingw-w64-git-git/0004-Also-look-in-winsock2.h-for-sockaddr_storage-and-loo.patch index 344a0765e7..2cd0a2e13e 100644 --- a/mingw-w64-git-git/0004-Also-look-in-winsock2.h-for-sockaddr_storage-and-loo.patch +++ b/mingw-w64-git-git/0004-Also-look-in-winsock2.h-for-sockaddr_storage-and-loo.patch @@ -1,4 +1,4 @@ -From 5d667f96df35b16a217d901384d238aaca540165 Mon Sep 17 00:00:00 2001 +From bb6634fc573cdb08bc86e339d518df3426b77d4e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 21 Jul 2014 21:33:08 +0100 Subject: [PATCH 04/15] Also look in winsock2.h for sockaddr_storage and look @@ -26,10 +26,10 @@ index f11bc7e..91322f1 100644 + #endif]) ]) diff --git a/configure.ac b/configure.ac -index 5a3d531..752db3d 100644 +index 890ef61..ee9efb8 100644 --- a/configure.ac +++ b/configure.ac -@@ -382,6 +382,11 @@ AS_HELP_STRING([],[Tcl/Tk interpreter will be found in a system.]), +@@ -390,6 +390,11 @@ AS_HELP_STRING([],[Tcl/Tk interpreter will be found in a system.]), GIT_PARSE_WITH(tcltk)) # @@ -41,7 +41,7 @@ index 5a3d531..752db3d 100644 ## Checks for programs. AC_MSG_NOTICE([CHECKS for programs]) -@@ -778,7 +783,12 @@ AC_CHECK_TYPE(struct sockaddr_storage, +@@ -786,7 +791,12 @@ AC_CHECK_TYPE(struct sockaddr_storage, [NO_SOCKADDR_STORAGE=], [NO_SOCKADDR_STORAGE=YesPlease],[ #include @@ -54,7 +54,7 @@ index 5a3d531..752db3d 100644 ]) GIT_CONF_SUBST([NO_SOCKADDR_STORAGE]) # -@@ -789,7 +799,12 @@ AC_CHECK_TYPE([struct addrinfo],[ +@@ -797,7 +807,12 @@ AC_CHECK_TYPE([struct addrinfo],[ [NO_IPV6=YesPlease]) ],[NO_IPV6=YesPlease],[ #include @@ -68,5 +68,5 @@ index 5a3d531..752db3d 100644 ]) GIT_CONF_SUBST([NO_IPV6]) -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0005-Don-t-redefine-some-things-MinGW-w64-provides.patch b/mingw-w64-git-git/0005-Don-t-redefine-some-things-MinGW-w64-provides.patch index 3a6c4fa2c2..9161302f24 100644 --- a/mingw-w64-git-git/0005-Don-t-redefine-some-things-MinGW-w64-provides.patch +++ b/mingw-w64-git-git/0005-Don-t-redefine-some-things-MinGW-w64-provides.patch @@ -1,6 +1,6 @@ -From 9dba7d3853bd8e273fcf58e0c6047931785d75a9 Mon Sep 17 00:00:00 2001 +From 05ef32b283e6e7b564157740a77174dc9eda6c86 Mon Sep 17 00:00:00 2001 From: Ray Donnelly -Date: Mon, 21 Jul 2014 23:39:44 +0100 +Date: Thu, 9 Oct 2014 23:59:15 +0100 Subject: [PATCH 05/15] Don't redefine some things MinGW-w64 provides off64_t, _lseeki64, _CONSOLE_FONT_INFOEX @@ -11,7 +11,7 @@ and (probably incorrectly, unsetenv) 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compat/mingw.h b/compat/mingw.h -index 9dbba85..2dd1279 100644 +index 5adc91c..1f1b665 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -212,7 +212,9 @@ char *mingw_getenv(const char *name); @@ -36,11 +36,11 @@ index 9dbba85..2dd1279 100644 /* use struct stat with 64 bit st_size */ #ifdef stat diff --git a/compat/winansi.c b/compat/winansi.c -index 13bc28d..5682af1 100644 +index efc5bb3..0ac3297 100644 --- a/compat/winansi.c +++ b/compat/winansi.c -@@ -23,7 +23,7 @@ static HANDLE hthread, hread, hwrite; - static HANDLE hwrite1 = INVALID_HANDLE_VALUE, hwrite2 = INVALID_HANDLE_VALUE; +@@ -22,7 +22,7 @@ static int non_ascii_used = 0; + static HANDLE hthread, hread, hwrite; static HANDLE hconsole1, hconsole2; -#ifdef __MINGW32__ @@ -49,5 +49,5 @@ index 13bc28d..5682af1 100644 ULONG cbSize; DWORD nFont; -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0006-Include-ntdef.h-on-MinGW-w64-for-REPARSE_DATA_BUFFER.patch b/mingw-w64-git-git/0006-Include-ntdef.h-on-MinGW-w64-for-REPARSE_DATA_BUFFER.patch index e0b0c00b61..b39af881ad 100644 --- a/mingw-w64-git-git/0006-Include-ntdef.h-on-MinGW-w64-for-REPARSE_DATA_BUFFER.patch +++ b/mingw-w64-git-git/0006-Include-ntdef.h-on-MinGW-w64-for-REPARSE_DATA_BUFFER.patch @@ -1,4 +1,4 @@ -From a7ba6c2d6478c30dc89d2bbb8e5afd9fdc0b5d5a Mon Sep 17 00:00:00 2001 +From f497f9ba1efc25967f75232bcd11239edcb58027 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 21 Jul 2014 23:52:34 +0100 Subject: [PATCH 06/15] Include ntdef.h on MinGW-w64 for REPARSE_DATA_BUFFER @@ -8,10 +8,10 @@ Subject: [PATCH 06/15] Include ntdef.h on MinGW-w64 for REPARSE_DATA_BUFFER 1 file changed, 4 insertions(+) diff --git a/compat/mingw.c b/compat/mingw.c -index 69f3c39..69ea532 100644 +index 013c938..0604c62 100644 --- a/compat/mingw.c +++ b/compat/mingw.c -@@ -7,6 +7,10 @@ +@@ -6,6 +6,10 @@ #include "../run-command.h" #include "../cache.h" @@ -23,5 +23,5 @@ index 69f3c39..69ea532 100644 unsigned int _CRT_fmode = _O_BINARY; -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0007-Include-winsock2.h-and-not-netdb.h-on-MinGW-w64.patch b/mingw-w64-git-git/0007-Include-winsock2.h-and-not-netdb.h-on-MinGW-w64.patch index b0226e2cf8..525275d94d 100644 --- a/mingw-w64-git-git/0007-Include-winsock2.h-and-not-netdb.h-on-MinGW-w64.patch +++ b/mingw-w64-git-git/0007-Include-winsock2.h-and-not-netdb.h-on-MinGW-w64.patch @@ -1,4 +1,4 @@ -From aa45dfb88ff50ac8117060e5a27037eba3cbb58b Mon Sep 17 00:00:00 2001 +From d63187a3745e31afd804ddc3653b5a761adf0b92 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 22 Jul 2014 00:29:15 +0100 Subject: [PATCH 07/15] Include winsock2.h and not netdb.h on MinGW-w64 @@ -23,5 +23,5 @@ index 069c555..d37ad25 100644 const char *githstrerror(int err) { -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0008-fix-mingw64-compat-wide-char.patch b/mingw-w64-git-git/0008-fix-mingw64-compat-wide-char.patch index b29b91e8b1..2d2596b0c1 100644 --- a/mingw-w64-git-git/0008-fix-mingw64-compat-wide-char.patch +++ b/mingw-w64-git-git/0008-fix-mingw64-compat-wide-char.patch @@ -1,4 +1,4 @@ -From 0ff43214bcc835dc089a866685852ae0e4faf37f Mon Sep 17 00:00:00 2001 +From d0212b6db7ed3f507255c5773ef93951469d4357 Mon Sep 17 00:00:00 2001 From: martell Date: Mon, 21 Jul 2014 21:10:25 +0100 Subject: [PATCH 08/15] fix mingw64 compat wide char @@ -8,7 +8,7 @@ Subject: [PATCH 08/15] fix mingw64 compat wide char 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h -index 2dd1279..1b07f17 100644 +index 1f1b665..310f51c 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -1,14 +1,13 @@ @@ -29,5 +29,5 @@ index 2dd1279..1b07f17 100644 #define S_IFLNK 0120000 /* Symbolic link */ #define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK) -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0009-fix-fork-for-mingw64.patch b/mingw-w64-git-git/0009-fix-fork-for-mingw64.patch index e178834ccc..472a9eb0a8 100644 --- a/mingw-w64-git-git/0009-fix-fork-for-mingw64.patch +++ b/mingw-w64-git-git/0009-fix-fork-for-mingw64.patch @@ -1,4 +1,4 @@ -From c1fd988200845617cabbdcdfbc99ef3e0db57bca Mon Sep 17 00:00:00 2001 +From a85e100c34e52dfd79e5a2e5544cae8ef4091c9b Mon Sep 17 00:00:00 2001 From: martell Date: Mon, 21 Jul 2014 21:11:03 +0100 Subject: [PATCH 09/15] fix fork for mingw64 @@ -8,11 +8,11 @@ Subject: [PATCH 09/15] fix fork for mingw64 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h -index 1b07f17..1f9b4ef 100644 +index 310f51c..2a626c6 100644 --- a/compat/mingw.h +++ b/compat/mingw.h -@@ -85,8 +85,8 @@ struct itimerval { - +@@ -92,8 +92,8 @@ static inline int symlink(const char *oldpath, const char *newpath) + { errno = ENOSYS; return -1; } static inline int fchmod(int fildes, mode_t mode) { errno = ENOSYS; return -1; } -static inline pid_t fork(void) @@ -23,5 +23,5 @@ index 1b07f17..1f9b4ef 100644 { return 0; } static inline int fsync(int fd) -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch b/mingw-w64-git-git/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch index 71b003b9ad..1385765bdc 100644 --- a/mingw-w64-git-git/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch +++ b/mingw-w64-git-git/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch @@ -1,20 +1,20 @@ -From 9be43f639705a55cd82b893e96d323d4690e4395 Mon Sep 17 00:00:00 2001 +From b7bef1c29b4ad7a374fdee90c9af1f482f43e78f Mon Sep 17 00:00:00 2001 From: Ray Donnelly -Date: Wed, 23 Jul 2014 20:31:15 +0100 +Date: Fri, 10 Oct 2014 00:05:28 +0100 Subject: [PATCH 10/15] Use GIT_CHECK_FUNC for socket and basename .. and look in c, socket, ws2_32 and c, gen respectively. --- Makefile | 13 ++++++------- - config.mak.uname | 19 ++++++++++--------- + config.mak.uname | 16 ++++++++-------- configure.ac | 20 ++++++++------------ - 3 files changed, 24 insertions(+), 28 deletions(-) + 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile -index 203945d..bf2e8ea 100644 +index b4d3c06..d3666c6 100644 --- a/Makefile +++ b/Makefile -@@ -106,7 +106,7 @@ all:: +@@ -108,7 +108,7 @@ all:: # # Define NO_LIBGEN_H if you don't have libgen.h. # @@ -23,7 +23,7 @@ index 203945d..bf2e8ea 100644 # # Define NO_SYS_SELECT_H if you don't have sys/select.h. # -@@ -155,8 +155,7 @@ all:: +@@ -157,8 +157,7 @@ all:: # # Define NO_UINTMAX_T if you don't have uintmax_t. # @@ -33,7 +33,7 @@ index 203945d..bf2e8ea 100644 # # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. # Notably on Solaris hstrerror resides in libresolv and on Solaris 7 -@@ -1202,16 +1201,16 @@ ifdef NEEDS_LIBICONV +@@ -1211,16 +1210,16 @@ ifdef NEEDS_LIBICONV endif EXTLIBS += $(ICONV_LINK) -liconv endif @@ -55,10 +55,10 @@ index 203945d..bf2e8ea 100644 ifdef NEEDS_NSL EXTLIBS += -lnsl diff --git a/config.mak.uname b/config.mak.uname -index d5132bb..76f3ca5 100644 +index c311eb3..95a092e 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -44,7 +44,7 @@ +@@ -47,7 +47,7 @@ ifeq ($(uname_S),GNU/kFreeBSD) endif ifeq ($(uname_S),UnixWare) CC = cc @@ -67,7 +67,7 @@ index d5132bb..76f3ca5 100644 NEEDS_NSL = YesPlease NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease -@@ -68,7 +68,7 @@ +@@ -71,7 +71,7 @@ ifeq ($(uname_S),SCO_SV) CC = cc BASIC_CFLAGS += -Kthread endif @@ -76,7 +76,7 @@ index d5132bb..76f3ca5 100644 NEEDS_NSL = YesPlease NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease -@@ -100,7 +100,7 @@ +@@ -103,7 +103,7 @@ ifeq ($(uname_S),Darwin) BASIC_CFLAGS += -DPRECOMPOSE_UNICODE endif ifeq ($(uname_S),SunOS) @@ -85,8 +85,8 @@ index d5132bb..76f3ca5 100644 NEEDS_NSL = YesPlease SHELL_PATH = /bin/bash SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin -@@ -264,7 +264,7 @@ - NO_FNMATCH_CASEFOLD = YesPlease +@@ -267,7 +267,7 @@ ifeq ($(uname_S),IRIX) + NO_REGEX = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease SHELL_PATH = /usr/gnu/bin/bash - NEEDS_LIBGEN = YesPlease @@ -94,8 +94,8 @@ index d5132bb..76f3ca5 100644 endif ifeq ($(uname_S),IRIX64) NO_SETENV = YesPlease -@@ -284,7 +284,7 @@ - NO_FNMATCH_CASEFOLD = YesPlease +@@ -286,7 +286,7 @@ ifeq ($(uname_S),IRIX64) + NO_REGEX = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease SHELL_PATH = /usr/gnu/bin/bash - NEEDS_LIBGEN = YesPlease @@ -103,7 +103,7 @@ index d5132bb..76f3ca5 100644 endif ifeq ($(uname_S),HP-UX) INLINE = __inline -@@ -404,7 +404,7 @@ +@@ -401,7 +401,7 @@ ifeq ($(uname_S),Minix) NO_IPV6 = YesPlease NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease NO_NSEC = YesPlease @@ -112,7 +112,7 @@ index d5132bb..76f3ca5 100644 NEEDS_CRYPTO_WITH_SSL = YesPlease NEEDS_IDN_WITH_CURL = YesPlease NEEDS_SSL_WITH_CURL = YesPlease -@@ -518,7 +518,7 @@ +@@ -514,7 +514,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_OBJS += compat/mingw.o compat/winansi.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o compat/win32/fscache.o @@ -121,29 +121,20 @@ index d5132bb..76f3ca5 100644 GITLIBS += git.res PTHREAD_LIBS = RC = windres -O coff -@@ -535,14 +535,15 @@ - HAVE_LIBCHARSET_H = YesPlease - NO_GETTEXT = YesPlease - else -- NO_CURL = YesPlease -+ # MinGW-w64 then? -+ EXTLIBS += -lz -lcurl - endif - endif - ifeq ($(uname_S),QNX) +@@ -538,7 +538,7 @@ ifeq ($(uname_S),QNX) COMPAT_CFLAGS += -DSA_RESTART=0 EXPAT_NEEDS_XMLPARSE_H = YesPlease HAVE_STRINGS_H = YesPlease - NEEDS_SOCKET = YesPlease + SOCKET_LIB = -lsocket - NO_FNMATCH_CASEFOLD = YesPlease NO_GETPAGESIZE = YesPlease NO_ICONV = YesPlease + NO_MEMMEM = YesPlease diff --git a/configure.ac b/configure.ac -index 752db3d..9c75131 100644 +index ee9efb8..f1c1dfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -622,13 +622,11 @@ GIT_UNSTASH_FLAGS($ZLIB_PATH) +@@ -630,13 +630,11 @@ GIT_UNSTASH_FLAGS($ZLIB_PATH) GIT_CONF_SUBST([NO_DEFLATE_BOUND]) # @@ -162,7 +153,7 @@ index 752db3d..9c75131 100644 # # The next few tests will define NEEDS_RESOLV if linking with -@@ -677,11 +675,9 @@ GIT_CONF_SUBST([NEEDS_RESOLV]) +@@ -685,11 +683,9 @@ GIT_CONF_SUBST([NEEDS_RESOLV]) # build-time, also set it here for remaining configure-time checks. test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" @@ -178,5 +169,5 @@ index 752db3d..9c75131 100644 AC_CHECK_LIB([c], [gettext], [LIBC_CONTAINS_LIBINTL=YesPlease], -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0011-Use-GIT_CHECK_FUNC-for-regcomp-regex.patch b/mingw-w64-git-git/0011-Use-GIT_CHECK_FUNC-for-regcomp-regex.patch index 57e998dc1f..792e0fbbce 100644 --- a/mingw-w64-git-git/0011-Use-GIT_CHECK_FUNC-for-regcomp-regex.patch +++ b/mingw-w64-git-git/0011-Use-GIT_CHECK_FUNC-for-regcomp-regex.patch @@ -1,19 +1,18 @@ -From 5148c72c231ae0a2c96c6dc0ee591abaad3c0d90 Mon Sep 17 00:00:00 2001 +From a389228cfd0c8981de4e8f362b5ac834b7d2d998 Mon Sep 17 00:00:00 2001 From: Ray Donnelly -Date: Wed, 23 Jul 2014 22:06:44 +0100 +Date: Fri, 10 Oct 2014 00:08:31 +0100 Subject: [PATCH 11/15] Use GIT_CHECK_FUNC for regcomp (regex) --- - Makefile | 3 +++ - config.mak.uname | 3 --- - configure.ac | 12 +++++++----- - 3 files changed, 10 insertions(+), 8 deletions(-) + Makefile | 3 +++ + configure.ac | 12 +++++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index bf2e8ea..1c5d360 100644 +index d3666c6..2eb1b46 100644 --- a/Makefile +++ b/Makefile -@@ -1471,6 +1471,9 @@ ifdef NO_REGEX +@@ -1476,6 +1476,9 @@ ifdef NO_REGEX COMPAT_CFLAGS += -Icompat/regex COMPAT_OBJS += compat/regex/regex.o endif @@ -23,25 +22,11 @@ index bf2e8ea..1c5d360 100644 ifdef NATIVE_CRLF BASIC_CFLAGS += -DNATIVE_CRLF endif -diff --git a/config.mak.uname b/config.mak.uname -index 76f3ca5..cef8974 100644 ---- a/config.mak.uname -+++ b/config.mak.uname -@@ -523,9 +523,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) - INTERNAL_QSORT = YesPlease - HAVE_LIBCHARSET_H = YesPlease - NO_GETTEXT = YesPlease --else -- # MinGW-w64 then? -- EXTLIBS += -lz -lcurl - endif - endif - ifeq ($(uname_S),QNX) diff --git a/configure.ac b/configure.ac -index 9c75131..2c88c92 100644 +index f1c1dfc..fedbe41 100644 --- a/configure.ac +++ b/configure.ac -@@ -819,11 +819,13 @@ yippeeyeswehaveit +@@ -827,11 +827,13 @@ yippeeyeswehaveit [ac_cv_c_excellent_regex=yes], [ac_cv_c_excellent_regex=no]) ]) @@ -61,5 +46,5 @@ index 9c75131..2c88c92 100644 # # Define FREAD_READS_DIRECTORIES if your are on a system which succeeds -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0012-Use-system-dirent.h-on-MinGW-w64.patch b/mingw-w64-git-git/0012-Use-system-dirent.h-on-MinGW-w64.patch index 593e84545b..a47d99e848 100644 --- a/mingw-w64-git-git/0012-Use-system-dirent.h-on-MinGW-w64.patch +++ b/mingw-w64-git-git/0012-Use-system-dirent.h-on-MinGW-w64.patch @@ -1,4 +1,4 @@ -From d6ec653a8e04e9303458d3c8021b665090a9334e Mon Sep 17 00:00:00 2001 +From e2fc0252bb5fd9ffb64cd54b23afd763b2ec0562 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 23 Jul 2014 22:46:32 +0100 Subject: [PATCH 12/15] Use system dirent.h on MinGW-w64 @@ -89,10 +89,10 @@ index 6b3ddee..0000000 - -#endif /* DIRENT_H */ diff --git a/git-compat-util.h b/git-compat-util.h -index e0f258c..7a238fe 100644 +index 150242d..cf6ca54 100644 --- a/git-compat-util.h +++ b/git-compat-util.h -@@ -122,7 +122,11 @@ enum git_target_type { +@@ -112,7 +112,11 @@ #include #endif #include @@ -105,5 +105,5 @@ index e0f258c..7a238fe 100644 #include #include -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0013-Remove-custom-pthread-layer.patch b/mingw-w64-git-git/0013-Remove-custom-pthread-layer.patch index 5579ae17e4..52b9370a88 100644 --- a/mingw-w64-git-git/0013-Remove-custom-pthread-layer.patch +++ b/mingw-w64-git-git/0013-Remove-custom-pthread-layer.patch @@ -1,4 +1,4 @@ -From b551d6199014c99982e121f4948bf1db7147ca1d Mon Sep 17 00:00:00 2001 +From 5680be1e782505c7f7fb8119ec0772d2b1c377dd Mon Sep 17 00:00:00 2001 From: martell Date: Thu, 24 Jul 2014 01:29:13 +0100 Subject: [PATCH 13/15] Remove custom pthread layer @@ -13,10 +13,10 @@ Subject: [PATCH 13/15] Remove custom pthread layer delete mode 100644 compat/win32/pthread.h diff --git a/compat/mingw.c b/compat/mingw.c -index 69ea532..d21fc56 100644 +index 0604c62..34e20d9 100644 --- a/compat/mingw.c +++ b/compat/mingw.c -@@ -1074,6 +1074,11 @@ int pipe(int filedes[2]) +@@ -745,6 +745,11 @@ int pipe(int filedes[2]) return 0; } @@ -249,10 +249,10 @@ index 8ad1873..0000000 - -#endif /* PTHREAD_H */ diff --git a/config.mak.uname b/config.mak.uname -index cef8974..acd4f19 100644 +index 95a092e..8646382 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -505,7 +505,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) +@@ -512,7 +512,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) endif COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/winansi.o \ @@ -262,5 +262,5 @@ index cef8974..acd4f19 100644 SOCKET_LIB = -lws2_32 GITLIBS += git.res -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0014-Do-not-compile-dirent-on-mingw64.patch b/mingw-w64-git-git/0014-Do-not-compile-dirent-on-mingw64.patch index c74f69c16d..3855d8e49c 100644 --- a/mingw-w64-git-git/0014-Do-not-compile-dirent-on-mingw64.patch +++ b/mingw-w64-git-git/0014-Do-not-compile-dirent-on-mingw64.patch @@ -1,4 +1,4 @@ -From 1d95b331707b4dc1b1353fd889b5b8f35159d262 Mon Sep 17 00:00:00 2001 +From 62390ce8cc068b4d13abf8908a0a3bf1b1e9eb37 Mon Sep 17 00:00:00 2001 From: martell Date: Thu, 24 Jul 2014 00:15:28 +0100 Subject: [PATCH 14/15] Do not compile dirent on mingw64 @@ -8,10 +8,10 @@ Subject: [PATCH 14/15] Do not compile dirent on mingw64 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index acd4f19..34e7797 100644 +index 8646382..7b870a2 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -505,8 +505,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) +@@ -512,8 +512,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) endif COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/winansi.o \ @@ -22,5 +22,5 @@ index acd4f19..34e7797 100644 GITLIBS += git.res PTHREAD_LIBS = -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/0015-Alter-fscache-for-mingw64.patch b/mingw-w64-git-git/0015-Alter-fscache-for-mingw64.patch index 0a893c6219..2c555b38dd 100644 --- a/mingw-w64-git-git/0015-Alter-fscache-for-mingw64.patch +++ b/mingw-w64-git-git/0015-Alter-fscache-for-mingw64.patch @@ -1,4 +1,4 @@ -From 78b17b48cf4e4767c45cc1ce8728b9880dcb1349 Mon Sep 17 00:00:00 2001 +From b58f5721f4405e798a3dd781ab06787675e2b89a Mon Sep 17 00:00:00 2001 From: martell Date: Thu, 24 Jul 2014 01:04:02 +0100 Subject: [PATCH 15/15] Alter fscache for mingw64 @@ -8,10 +8,10 @@ Subject: [PATCH 15/15] Alter fscache for mingw64 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/compat/win32/fscache.c b/compat/win32/fscache.c -index da3bb2c..8a00bc2 100644 +index 9e7e36e..bc5d9b8 100644 --- a/compat/win32/fscache.c +++ b/compat/win32/fscache.c -@@ -317,6 +317,10 @@ static struct fsentry *fscache_get(struct fsentry *key) +@@ -364,6 +364,10 @@ static struct fsentry *fscache_get(struct fsentry *key) */ int fscache_enable(int enable) { @@ -22,7 +22,7 @@ index da3bb2c..8a00bc2 100644 int result; if (!initialized) { -@@ -345,6 +349,7 @@ int fscache_enable(int enable) +@@ -392,6 +396,7 @@ int fscache_enable(int enable) LeaveCriticalSection(&mutex); } return result; @@ -30,7 +30,7 @@ index da3bb2c..8a00bc2 100644 } /* -@@ -393,17 +398,22 @@ int fscache_lstat(const char *filename, struct stat *st) +@@ -440,17 +445,22 @@ int fscache_lstat(const char *filename, struct stat *st) return 0; } @@ -55,7 +55,7 @@ index da3bb2c..8a00bc2 100644 fscache_DIR *dir = (fscache_DIR*) base_dir; struct fsentry *next = dir->pfsentry->next; if (!next) -@@ -412,6 +422,7 @@ static struct dirent *fscache_readdir(DIR *base_dir) +@@ -459,6 +469,7 @@ static struct dirent *fscache_readdir(DIR *base_dir) dir->dirent.d_type = S_ISDIR(next->st_mode) ? DT_DIR : DT_REG; dir->dirent.d_name = (char*) next->name; return &(dir->dirent); @@ -63,7 +63,7 @@ index da3bb2c..8a00bc2 100644 } /* -@@ -419,10 +430,14 @@ static struct dirent *fscache_readdir(DIR *base_dir) +@@ -466,10 +477,14 @@ static struct dirent *fscache_readdir(DIR *base_dir) */ static int fscache_closedir(DIR *base_dir) { @@ -78,7 +78,7 @@ index da3bb2c..8a00bc2 100644 } /* -@@ -431,12 +446,16 @@ static int fscache_closedir(DIR *base_dir) +@@ -478,12 +493,16 @@ static int fscache_closedir(DIR *base_dir) */ DIR *fscache_opendir(const char *dirname) { @@ -96,12 +96,12 @@ index da3bb2c..8a00bc2 100644 /* prepare name (strip trailing '/', replace '.') */ len = strlen(dirname); -@@ -456,4 +475,5 @@ DIR *fscache_opendir(const char *dirname) +@@ -503,4 +522,5 @@ DIR *fscache_opendir(const char *dirname) dir->base_dir.pclosedir = fscache_closedir; dir->pfsentry = list; return (DIR*) dir; +#endif } -- -2.0.1 +2.1.2 diff --git a/mingw-w64-git-git/PKGBUILD b/mingw-w64-git-git/PKGBUILD index 82a9a8f766..fdd3134a4f 100644 --- a/mingw-w64-git-git/PKGBUILD +++ b/mingw-w64-git-git/PKGBUILD @@ -18,7 +18,7 @@ fi pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" _ver_base=2.0.0 -pkgver=2.0.0.47132.e31124d +pkgver=2.0.0.47118.8768113 pkgrel=1 pkgdesc="The fast distributed version control system (mingw-w64)" arch=('any') @@ -49,23 +49,23 @@ source=(${GIT_URL} "0015-Alter-fscache-for-mingw64.patch") md5sums=('SKIP' - 'cd1574d3529aac3f0c9f4194939ac23f' - '2383167c26c29fe7af9b3c73758a8b55' - '04f800e290884b8d4659f5ebdc9456ca' - '3e986d42aa12f0b54c59d02638aa4068' - '14ff828b1d7c771d2da2977dbb018f09' - 'b2a58b49e186aa43758584b77a8b47e1' - '970e1ee0021779dd646a81536d42bcef' - '62b8a45fa280082bb73be75a82aa44c7' - 'fd874a1c65f2e2040d486054e46d252c' - '43d160e878841cb5642683a060c39c1f' + '22ae5e3bba7f890a20e2b4c184e17ed3' + '0ca95ce894d8e661ac63724e209db2cb' + '4624af1c8767197df1cc2e473f44211f' + '323c001481df08bdb9ed2f7fb7bfec3b' + '3deeea3dc5354eea7e9b7ab7e1004163' + '6e5dd2f9d9355fb5d56d237f854c1172' + 'b3f4c22c95c045a8806079aea905fac3' + '9497b948574e46b550a00831788d30fc' + '0f991fa30b724b5c7425b4f119221e3f' + 'c75048e9ffb360a10abfa0a40440a13b' '69af98595eeabd892289de06d0cd009f' - '157fb4de7db3b3b53025c103780da2f2' + 'ccb8e99ddac758eef78b40efd0ee5cf7' '6e59f1619c2a9d8575c53ca8a8ab7f6b' - '1aacf732e02da4cb6604b4496ba24ff9' - 'c6a4066fb670e95ed102b543e7d67c01' - 'c594da89c1d029abdc2d85eb61fc6bea' - '185c2096bf376b056445d57d92dbe3a0') + 'fc8ce8937df8aa20bef28d5324a418ca' + 'e666d6966b3e88aee7109f7f90282f24' + '8ece3647996ecf963ab7a138ddbd5ef2' + '5d1c975adc7e66b72a7b1a134e33032b') pkgver() { cd "${srcdir}"/${SRC_DIR} @@ -90,7 +90,6 @@ prepare() { if [ "${_based_on_dscho_w64_msysgit}" = "no" ]; then git am "${srcdir}"/0008-fix-mingw64-compat-wide-char.patch git am "${srcdir}"/0009-fix-fork-for-mingw64.patch - git am "${srcdir}"/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch fi if [ "${_based_on_dscho_w64_msysgit}" = "no" ]; then git am "${srcdir}"/0010-Use-GIT_CHECK_FUNC-for-socket-and-basename.patch