Kouhei Sutou
null+****@clear*****
Tue Sep 8 22:35:46 JST 2015
Kouhei Sutou 2015-09-08 22:35:46 +0900 (Tue, 08 Sep 2015) New Revision: de59e93cabef2501ccf024a22c70227606a2cb76 https://github.com/mroonga/mroonga/commit/de59e93cabef2501ccf024a22c70227606a2cb76 Message: package source windows: remove needless patch Removed files: packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff Modified files: packages/source/Makefile.am Modified: packages/source/Makefile.am (+1 -2) =================================================================== --- packages/source/Makefile.am 2015-09-01 22:41:25 +0900 (0ee3e4c) +++ packages/source/Makefile.am 2015-09-08 22:35:46 +0900 (9863700) @@ -104,8 +104,7 @@ files/$(MARIADB_WITH_MROONGA_BASE).tar.gz: tmp/$(MARIADB_WITH_MROONGA_BASE).stam (cd tmp && tar czf ../$@ $(MARIADB_WITH_MROONGA_BASE)) PATCHES = \ - patches/mariadb-10.0.3-windows-build.diff \ - patches/groonga-5.0.7-windows-mariadb-bundled-build.diff + patches/mariadb-10.0.3-windows-build.diff tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE).stamp: tmp/$(MARIADB_WITH_MROONGA_BASE).stamp $(PATCHES) rm -rf tmp/$(MARIADB_WITH_MROONGA_FOR_WINDOWS_BASE) Deleted: packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff (+0 -14) 100644 =================================================================== --- packages/source/patches/groonga-5.0.7-windows-mariadb-bundled-build.diff 2015-09-01 22:41:25 +0900 (6e768b0) +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h ---- mariadb-10.0.21-with-mroonga-5.06.orig/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-13 18:15:38.000000000 +0900 -+++ mariadb-10.0.21-with-mroonga-5.06/storage/mroonga/vendor/groonga/lib/grn.h 2015-08-31 17:13:59.251028024 +0900 -@@ -47,6 +47,10 @@ - # undef NTDDI_VERSION - # endif /* NTDDI_VERSION */ - # define NTDDI_VERSION GRN_MINIMUM_WINDOWS_VERSION -+ -+# ifdef WIN32_LEAN_AND_MEAN -+# undef WIN32_LEAN_AND_MEAN -+# endif /* WIN32_LEAN_AND_MEAN */ - #endif /* WIN32 */ - - #ifdef __cplusplus -------------- next part -------------- HTML����������������������������...Download