summaryrefslogtreecommitdiff
path: root/devel/glib20/files/patch-ae
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-03-08 10:51:34 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-03-08 10:51:34 +0000
commit7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree961839899dce7f75292a08c079f548973bdbd40d /devel/glib20/files/patch-ae
parent- Update to 0.27 (diff)
* 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
Notes
Notes: svn path=/head/; revision=313633
Diffstat (limited to 'devel/glib20/files/patch-ae')
-rw-r--r--devel/glib20/files/patch-ae36
1 files changed, 20 insertions, 16 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index c3e6c139b0e8..9c9caf0ab20c 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2011-06-06 01:24:53.000000000 +0200
-+++ configure 2012-12-12 11:23:28.000000000 +0100
-@@ -583,6 +583,9 @@
+--- configure.orig 2013-02-14 19:12:15.000000000 +0000
++++ configure 2013-02-14 19:13:51.000000000 +0000
+@@ -603,6 +603,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -10,7 +10,7 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -5194,7 +5197,7 @@
+@@ -5602,7 +5605,7 @@
fi
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,21 +19,25 @@
if test "x$with_runtime_libdir" != "x"; then
-@@ -23077,7 +23080,7 @@
+@@ -23647,7 +23650,7 @@
fi
done
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -28271,7 +28274,7 @@
- fi
-
-
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
- GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
-
+@@ -27108,10 +27111,10 @@
+ # b) FreeBSD doesn't do this either.
+ #
+ case $host in
+- *-*-freebsd*|*-*-linux*)
++ *-*-linux*)
+ G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+ ;;
+- *-*-openbsd*)
++ *-*-freebsd*|*-*-openbsd*)
+ LDFLAGS="$LDFLAGS -pthread"
+ ;;
+ *)