aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1390

Browse Source 
Problem:    When building with GTK and glib-compile-resources cannot be found
            building Vim fails. (Michael Gehring)
Solution:   Make GLIB_COMPILE_RESOURCES empty instead of leaving it at "no".
            (nuko8, closes #655)
This commit is contained in:
Bram Moolenaar
2016-02-22 21:07:06 +01:00
parent b2bd6a087d
commit 33c31d5abf
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/auto/configure vendored
View File

@@ -9052,7 +9052,7 @@ $as_echo_n "checking version of Gdk-Pixbuf... " >&6; }
gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'` sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`
if test "x$gdk_pixbuf_version_minor" != x -a \ if test "x$gdk_pixbuf_version_minor" != x -a \
$gdk_pixbuf_version_minor -ge 31 ; then $gdk_pixbuf_version_minor -ge 31 ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5
$as_echo "OK." >&6; } $as_echo "OK." >&6; }
# Extract the first word of "glib-compile-resources", so it can be a program name with args. # Extract the first word of "glib-compile-resources", so it can be a program name with args.
@@ -9099,15 +9099,16 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5
$as_echo_n "checking glib-compile-resources... " >&6; } $as_echo_n "checking glib-compile-resources... " >&6; }
if test "x$GLIB_COMPILE_RESOURCES" = xno ; then if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 GLIB_COMPILE_RESOURCES=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
$as_echo "cannot be found in PATH." >&6; } $as_echo "cannot be found in PATH." >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5
$as_echo "usable." >&6; } $as_echo "usable." >&6; }
$as_echo "#define USE_GRESOURCE 1" >>confdefs.h $as_echo "#define USE_GRESOURCE 1" >>confdefs.h
GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o" GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5

11
src/configure.in
View File

@@ -2610,17 +2610,18 @@ if test "x$GUITYPE" = "xGTK"; then
gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'` sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'`
if test "x$gdk_pixbuf_version_minor" != x -a \ if test "x$gdk_pixbuf_version_minor" != x -a \
$gdk_pixbuf_version_minor -ge 31 ; then $gdk_pixbuf_version_minor -ge 31 ; then
AC_MSG_RESULT([OK.]) AC_MSG_RESULT([OK.])
AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no) AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
AC_MSG_CHECKING([glib-compile-resources]) AC_MSG_CHECKING([glib-compile-resources])
if test "x$GLIB_COMPILE_RESOURCES" = xno ; then if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
AC_MSG_RESULT([cannot be found in PATH.]) GLIB_COMPILE_RESOURCES=""
AC_MSG_RESULT([cannot be found in PATH.])
else else
AC_MSG_RESULT([usable.]) AC_MSG_RESULT([usable.])
AC_DEFINE(USE_GRESOURCE) AC_DEFINE(USE_GRESOURCE)
GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o" GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi fi
else else
AC_MSG_RESULT([not usable.]) AC_MSG_RESULT([not usable.])

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1390,
/**/ /**/
1389, 1389,
/**/ /**/