m4_define([gtk_major_version], [3])
m4_define([gtk_minor_version], [3])
-m4_define([gtk_micro_version], [9])
+m4_define([gtk_micro_version], [19])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
-m4_define([glib_required_version], [2.31.10])
+m4_define([glib_required_version], [2.31.20])
m4_define([pango_required_version], [1.29.0])
m4_define([atk_required_version], [2.1.5])
m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.23.5])
+m4_define([gdk_pixbuf_required_version], [2.25.2])
m4_define([introspection_required_version], [0.10.1])
GLIB_REQUIRED_VERSION=glib_required_version
PANGO_REQUIRED_VERSION=pango_required_version
[AS_HELP_STRING([--enable-xinerama],
[support Xinerama extension [default=maybe]])],,
[enable_xinerama="maybe"])
-AC_ARG_ENABLE(xinput,
- [AS_HELP_STRING([--enable-xinput],
- [support XInput extension [default=yes]])],,
- [enable_xinput="maybe"])
AC_ARG_ENABLE(xrandr,
[AS_HELP_STRING([--enable-xrandr],
[support XRandR extension [default=maybe]])],,
have_base_x_pc=true
X_PACKAGES="$X_PACKAGES x11 xext"
x_libs="`$PKG_CONFIG --libs x11 xext`"
- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext` -DXINPUT2_1_USE_UNSTABLE_PROTOCOL -DXINPUT2_2_USE_UNSTABLE_PROTOCOL"
# Strip out any .la files that pkg-config might give us (this happens
# with -uninstalled.pc files)
AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
# set up things for XInput
- if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
- have_xinput=yes
-
- AC_DEFINE(XINPUT_XFREE, 1,
- [Define to 1 if XFree XInput should be used])
+ if $PKG_CONFIG --exists "xi" ; then
X_PACKAGES="$X_PACKAGES xi"
GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
AC_CHECK_HEADER(X11/extensions/XInput2.h,
have_xinput2=yes
X_EXTENSIONS="$X_EXTENSIONS XI2"
- AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
- X_EXTENSIONS="$X_EXTENSIONS XInput")
+ AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
- else
- AC_DEFINE(XINPUT_NONE, 1,
- [Define to 1 if no XInput should be used])
+ gtk_save_LIBS="$LIBS"
+ LIBS="$LIBS -lXi"
+ AC_CHECK_FUNC(XIAllowTouchEvents, AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]))
+ LIBS="$gtk_save_LIBS"
fi
- AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes")
- if test "x$enable_xinput" = "xyes" ; then
- if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
- AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
- fi
- fi
+ AS_IF([test "x$have_xinput2" != "xyes"],
+ [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
# Check for the RANDR extension
if test x"$enable_xrandr" != xno; then
else
XPACKAGES=
- AM_CONDITIONAL(XINPUT_XFREE, false)
AM_CONDITIONAL(XINPUT_2, false)
AM_CONDITIONAL(USE_X11, false)
AM_CONDITIONAL(HAVE_X11R6, false)
G_BEGIN_DECLS
-/* These macros are used to mark deprecated functions in GDK and
- * GTK+ headers, and thus have to be exposed in installed headers.
- * But please do *not* use them in other projects. Instead, use
- * G_DEPRECATED or define your own wrappers around it.
- */
-
-#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-#define GDK_DEPRECATED
-#define GDK_DEPRECATED_FOR(f)
-#else
-#define GDK_DEPRECATED G_DEPRECATED
-#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#endif
-
_______EOF
cat >>$outfile <<_______EOF
demos/gtk-demo/Makefile
demos/gtk-demo/geninclude.pl
demos/pixbuf-demo/Makefile
+demos/widget-factory/Makefile
examples/Makefile
tests/Makefile
tests/a11y/Makefile
gdk/quartz/Makefile
gdk/wayland/Makefile
gdk/tests/Makefile
+gdk/gdkversionmacros.h
gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h