mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ticket #4052: reimplement SIGWINCH handling. 

Bump minimum GLib requirenment to 2.30.0.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-02-02 10:15:54 +03:00
parent 8c243309cc
commit 91688ab76e
6 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-glib2.sh
View File

@ -25,13 +25,13 @@
: ${MC_TOPDIR=`pwd`}
: ${WORK_TOPDIR=$MC_TOPDIR/build_glib2}
: ${TMP_INSTDIR=$WORK_TOPDIR/tmp-inst}
: ${GLIB_VERSION=2.21.0}
: ${GLIB_VERSION=2.30.0}
: ${PKGC_VERSION=0.23}
: ${GETTEXT_VERSION=0.17}
GLIB_DIR="glib-$GLIB_VERSION"
GLIB_TARBALL="glib-$GLIB_VERSION.tar.gz"
GLIB_URL="ftp://ftp.gtk.org/pub/glib/2.21/$GLIB_TARBALL"
GLIB_URL="ftp://ftp.gnome.org/pub/gnome/sources/glib/2.30/$GLIB_TARBALL"
PKGC_DIR="pkg-config-$PKGC_VERSION"
PKGC_TARBALL="pkg-config-$PKGC_VERSION.tar.gz"

2
doc/HACKING
View File

@ -19,7 +19,7 @@ required:
Autoconf 2.52 and above (latest is recommended)
Automake 1.5 and above (latest is recommended)
Gettext 0.11.5 and above
Glib 2.26 and above
Glib 2.30 and above
Full list of requirements you can see at:
http://www.midnight-commander.org/wiki/doc/buildAndInstall/req

6
doc/INSTALL
View File

@ -15,7 +15,7 @@ Build requirements for GNU Midnight Commander
- autoconf
- automake
- libtool
- glib2 >= 2.26
- glib2 >= 2.30
- slang2 or ncurses
- gettext >= 0.18.1
- libssh2 >= 1.2.5 is required only for sftp vfs (1.2.7 if you need ssh-agent support)
@ -383,8 +383,8 @@ get glib from
ftp://ftp.gnome.org/pub/gnome/sources/glib/
Minimal version of glib: 2.26.x
Recommended version: 2.26.x and higher.
Minimal version of glib: 2.30.0
Recommended version: 2.30.x and higher.
Newer versions may work, but haven't been tested.

41
lib/glibcompat.c
View File

@ -50,47 +50,6 @@
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
#if ! GLIB_CHECK_VERSION (2, 28, 0)
/**
* g_slist_free_full:
* @list: a pointer to a #GSList
* @free_func: the function to be called to free each element's data
*
* Convenience method, which frees all the memory used by a #GSList, and
* calls the specified destroy function on every element's data.
*
* Since: 2.28
**/
void
g_slist_free_full (GSList * list, GDestroyNotify free_func)
{
g_slist_foreach (list, (GFunc) free_func, NULL);
g_slist_free (list);
}
/* --------------------------------------------------------------------------------------------- */
/**
* g_list_free_full:
* @list: a pointer to a #GList
* @free_func: the function to be called to free each element's data
*
* Convenience method, which frees all the memory used by a #GList, and
* calls the specified destroy function on every element's data.
*
* Since: 2.28
*/
void
g_list_free_full (GList * list, GDestroyNotify free_func)
{
g_list_foreach (list, (GFunc) free_func, NULL);
g_list_free (list);
}
/* --------------------------------------------------------------------------------------------- */
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
#if ! GLIB_CHECK_VERSION (2, 63, 3)
/**
* g_clear_slist: (skip)

5
lib/glibcompat.h
View File

@ -11,11 +11,6 @@
/*** declarations of public functions ************************************************************/
#if ! GLIB_CHECK_VERSION (2, 28, 0)
void g_slist_free_full (GSList * list, GDestroyNotify free_func);
void g_list_free_full (GList * list, GDestroyNotify free_func);
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
#if ! GLIB_CHECK_VERSION (2, 63, 3)
void g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy);
void g_clear_list (GList ** list_ptr, GDestroyNotify destroy);

8
m4.include/mc-glib.m4
View File

@ -8,12 +8,12 @@ AC_DEFUN([mc_G_MODULE_SUPPORTED], [
g_module_supported=""
found_gmodule=no
PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.26], [found_gmodule=yes], [:])
PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.30], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-no-export-2.0"
else
dnl try fallback to the generic gmodule
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.26], [found_gmodule=yes], [:])
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.30], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-2.0"
fi
@ -78,9 +78,9 @@ AC_DEFUN([mc_CHECK_GLIB], [
AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@]))
glib_found=no
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26], [glib_found=yes], [:])
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30], [glib_found=yes], [:])
if test x"$glib_found" = xno; then
AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.26)])
AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.30)])
fi
])