From 7887c684adab042fed1bfcba2e91589ecd17c4a8 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Fri, 8 Mar 2013 10:51:34 +0000 Subject: * Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which are the latest stable releases. * Update vala to the newest stable release 0.18.1, also update a few ports in the gtk/gnome stack. * The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles. * Remove pkg-config run depends from glib20 and freetype2. This doesn't eliminate pkg-config run dependency completely, a second phase is needed and is planned. * Support for .:run. and .:build. for USE_GNOME components was added. Currently only libxml2 and libxslt support this mechanism. * Updates of the telepathy stack and empathy. * Trim makefile headers, convert ports to new options, trim off library versions for some ports. * Fix other ports so they build with the new glib version. Thanks to miwi and crees for helping out with some exp-runs. Approved by: portmgr (miwi & bapt) Obtained from: gnome team repo --- devel/gobject-introspection/files/patch-configure | 32 ++++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'devel/gobject-introspection/files/patch-configure') diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure index 7fbbcde68d78..d2838d890f5e 100644 --- a/devel/gobject-introspection/files/patch-configure +++ b/devel/gobject-introspection/files/patch-configure @@ -1,11 +1,29 @@ ---- configure.orig 2011-05-02 17:19:45.000000000 -0500 -+++ configure 2011-05-02 17:19:58.000000000 -0500 -@@ -15983,7 +15983,7 @@ +--- configure.orig 2011-09-23 11:49:54.000000000 +0200 ++++ configure 2011-09-23 11:50:31.000000000 +0200 +@@ -14400,10 +14400,10 @@ $as_echo_n "checking for headers required to compile python extensions... " >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-if test "x$PYTHON_INCLUDES" == x; then +- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++if test "x$PYTHON_INCLUDES" = x; then ++ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` + if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags` + fi fi + +@@ -14429,10 +14429,10 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5 + $as_echo_n "checking for libraries required to link against libpython... " >&6; } +-if test "x$PYTHON_LIBS" == x; then ++if test "x$PYTHON_LIBS" = x; then + PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + fi +-if test "x$PYTHON_LIB_LOC" == x; then ++if test "x$PYTHON_LIB_LOC" = x; then + PYTHON_LIB_LOC="${py_prefix}/lib" + fi + -- cgit v1.2.3