Web lists-archives.com

[PATCH-v2] fix build error related bug:750892




This is proper one than previous and obsoleted it.
Changes from commit a74a3da745e6923b0d5f04073f40446a310aec40

From 78d598993ef506781d7ac2f1973a4f56630cf557 Mon Sep 17 00:00:00 2001
From: canatan <unixman@xxxxxxxxxxxxxx>
Date: Wed, 8 Jul 2015 13:34:25 +0000
Subject: [PATCH-v2] fix build error related bug:750892

---
 configure.ac | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index f14abea..1163dbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1309,12 +1309,19 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"

-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" -GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version"
+PANGOFT2_PACKAGE=""
+
 if test "x$enable_x11_backend" = xyes; then
-  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
+  PANGOFT2_PACKAGE=pangoft2
 fi

+if test "x$enable_wayland_backend" = xyes; then
+  PANGOFT2_PACKAGE=pangoft2
+fi
+
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" +GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $PANGOFT2_PACKAGE $cairo_backends epoxy >= epoxy_required_version"
+
 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
 GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS"
@@ -1347,10 +1354,8 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" -GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
-if test "x$enable_x11_backend" = xyes; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
-fi
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $PANGOFT2_PACKAGE epoxy >= epoxy_required_version"
+
 if test "$have_gio_unix" = "yes"; then
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
 fi
--
2.4.5

_______________________________________________
gtk-devel-list mailing list
gtk-devel-list@xxxxxxxxx
https://mail.gnome.org/mailman/listinfo/gtk-devel-list