macvim: snapshot-157 -> snapshot-161
This commit is contained in:
parent
846f86ee67
commit
647ee3c2f0
@ -27,13 +27,13 @@ in
|
|||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "macvim";
|
pname = "macvim";
|
||||||
|
|
||||||
version = "8.1.1722";
|
version = "8.1.2234";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "macvim-dev";
|
owner = "macvim-dev";
|
||||||
repo = "macvim";
|
repo = "macvim";
|
||||||
rev = "snapshot-157";
|
rev = "snapshot-161";
|
||||||
sha256 = "1gmgc4pwaqy78gj4p7iib94n7j52ir0aa03ks595h3vy1hkcwwky";
|
sha256 = "1hp3y85pj1icz053g627a1wp5pnwgxhk07pyd4arwcxs2103agw4";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
@ -106,9 +106,6 @@ stdenv.mkDerivation {
|
|||||||
substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include"
|
substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include"
|
||||||
|
|
||||||
substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope
|
substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope
|
||||||
|
|
||||||
# Work around weird code-signing issue
|
|
||||||
substituteInPlace src/auto/config.mk --replace "XCODEFLAGS''\t=" "XCODEFLAGS''\t= CODE_SIGN_IDENTITY="
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
@ -151,5 +148,6 @@ stdenv.mkDerivation {
|
|||||||
license = licenses.vim;
|
license = licenses.vim;
|
||||||
maintainers = with maintainers; [ cstrahan lilyball ];
|
maintainers = with maintainers; [ cstrahan lilyball ];
|
||||||
platforms = platforms.darwin;
|
platforms = platforms.darwin;
|
||||||
|
hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,21 +18,6 @@ index e519018de..556a4127d 100644
|
|||||||
PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
|
PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim;
|
||||||
PRODUCT_NAME = MacVim;
|
PRODUCT_NAME = MacVim;
|
||||||
VERSIONING_SYSTEM = "apple-generic";
|
VERSIONING_SYSTEM = "apple-generic";
|
||||||
diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
|
|
||||||
index 6f1a06e46..a12e2cea4 100644
|
|
||||||
--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
|
|
||||||
+++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
|
|
||||||
@@ -13,7 +13,9 @@
|
|
||||||
#import "PSMTabDragAssistant.h"
|
|
||||||
|
|
||||||
|
|
||||||
-@implementation PSMTabBarCell
|
|
||||||
+@implementation PSMTabBarCell {
|
|
||||||
+ id _controlView;
|
|
||||||
+}
|
|
||||||
|
|
||||||
#pragma mark -
|
|
||||||
#pragma mark Creation/Destruction
|
|
||||||
diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc
|
diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc
|
||||||
index 23a06bf37..dfb10fe94 100644
|
index 23a06bf37..dfb10fe94 100644
|
||||||
--- a/src/MacVim/vimrc
|
--- a/src/MacVim/vimrc
|
||||||
@ -92,18 +77,6 @@ diff --git a/src/auto/configure b/src/auto/configure
|
|||||||
index 9e6a82f4a..3c6d1a89b 100755
|
index 9e6a82f4a..3c6d1a89b 100755
|
||||||
--- a/src/auto/configure
|
--- a/src/auto/configure
|
||||||
+++ b/src/auto/configure
|
+++ b/src/auto/configure
|
||||||
@@ -4705,10 +4705,8 @@ fi
|
|
||||||
rm -f core conftest.err conftest.$ac_objext \
|
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
|
||||||
else
|
|
||||||
- if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
|
|
||||||
- macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
|
|
||||||
+ macosx_deployment_target=${MACOSX_DEPLOYMENT_TARGET:-10.12}
|
|
||||||
XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target"
|
|
||||||
- fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; }
|
@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; }
|
||||||
|
|
||||||
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
|
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
|
||||||
@ -214,23 +187,22 @@ index 9e6a82f4a..3c6d1a89b 100755
|
|||||||
|
|
||||||
if test "X$librubyarg" != "X"; then
|
if test "X$librubyarg" != "X"; then
|
||||||
diff --git a/src/vim.h b/src/vim.h
|
diff --git a/src/vim.h b/src/vim.h
|
||||||
index cb5be6c97..b703b31cd 100644
|
index f158aab..a714da9 100644
|
||||||
--- a/src/vim.h
|
--- a/src/vim.h
|
||||||
+++ b/src/vim.h
|
+++ b/src/vim.h
|
||||||
@@ -241,18 +241,6 @@
|
@@ -243,17 +243,6 @@
|
||||||
# define SUN_SYSTEM
|
# define SUN_SYSTEM
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
-/* If we're compiling in C++ (currently only KVim), the system
|
-// If we're compiling in C++ (currently only KVim), the system
|
||||||
- * headers must have the correct prototypes or nothing will build.
|
-// headers must have the correct prototypes or nothing will build.
|
||||||
- * Conversely, our prototypes might clash due to throw() specifiers and
|
-// Conversely, our prototypes might clash due to throw() specifiers and
|
||||||
- * cause compilation failures even though the headers are correct. For
|
-// cause compilation failures even though the headers are correct. For
|
||||||
- * a concrete example, gcc-3.2 enforces exception specifications, and
|
-// a concrete example, gcc-3.2 enforces exception specifications, and
|
||||||
- * glibc-2.2.5 has them in their system headers.
|
-// glibc-2.2.5 has them in their system headers.
|
||||||
- */
|
|
||||||
-#if !defined(__cplusplus) && defined(UNIX) \
|
-#if !defined(__cplusplus) && defined(UNIX) \
|
||||||
- && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */
|
- && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
|
||||||
-# include "auto/osdef.h" /* bring missing declarations in */
|
-# include "auto/osdef.h" // bring missing declarations in
|
||||||
-#endif
|
-#endif
|
||||||
-
|
-
|
||||||
#ifdef AMIGA
|
#ifdef AMIGA
|
||||||
|
Loading…
Reference in New Issue
Block a user