From 47a512dee1237f696686c888ee1b32610e53c828 Mon Sep 17 00:00:00 2001 From: kwm Date: Mon, 27 Aug 2012 17:49:26 +0000 Subject: Add -fno-omit-frame-pointer to CPPFLAGS. This makes gnome-shell and friends a lot stabler. Add a patch to clutter, to first try to lock a mutex before unlocking. FreeBSD doesn't allow unlock to silently fail. Submitted by: Gustau P'erez i Querol git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17056 df743ca5-7f9a-e211-a948-0013205c9059 --- graphics/clutter/Makefile | 5 +++-- graphics/clutter/files/patch-clutter_clutter-main.c | 10 ++++++++++ x11-toolkits/gtk30/Makefile | 6 +++--- x11-wm/mutter/Makefile | 4 ++-- x11/gnome-shell/Makefile | 6 +----- 5 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 graphics/clutter/files/patch-clutter_clutter-main.c diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 303865c71..40352db78 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -3,11 +3,12 @@ # Whom: Martin Wilke # # $FreeBSD$ -# $MCom: ports/graphics/clutter/Makefile,v 1.57 2012/05/29 18:00:51 kwm Exp $ +# $MCom: ports/graphics/clutter/Makefile,v 1.58 2012/06/21 18:28:20 kwm Exp $ # PORTNAME= clutter PORTVERSION= 1.10.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GNOME @@ -31,7 +32,7 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --with-x --enable-conformance=no \ --disable-gdk-backend -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include diff --git a/graphics/clutter/files/patch-clutter_clutter-main.c b/graphics/clutter/files/patch-clutter_clutter-main.c new file mode 100644 index 000000000..a607b3f80 --- /dev/null +++ b/graphics/clutter/files/patch-clutter_clutter-main.c @@ -0,0 +1,10 @@ +--- clutter/clutter-main.c.orig 2012-06-19 09:56:35.000000000 +0200 ++++ clutter/clutter-main.c 2012-07-15 13:09:09.000000000 +0200 +@@ -227,6 +227,7 @@ + static void + clutter_threads_impl_unlock (void) + { ++ g_mutex_trylock (&clutter_threads_mutex); + g_mutex_unlock (&clutter_threads_mutex); + } + diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 012b9982d..e53d796f4 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.46 2012/05/15 15:20:42 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.47 2012/07/15 21:54:22 kwm Exp $ # PORTNAME= gtk @@ -39,9 +39,9 @@ USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --enable-xinput=yes +CONFIGURE_ARGS= --enable-static CONFIGURE_ARGS+=--enable-gtk2-dependency --disable-packagekit -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index 598ea9ad2..fcd81b3fc 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -3,7 +3,7 @@ # Whom: Pawel Worach # # $FreeBSD$ -# $MCom: ports/x11-wm/mutter/Makefile,v 1.34 2012/05/27 07:38:18 kwm Exp $ +# $MCom: ports/x11-wm/mutter/Makefile,v 1.35 2012/06/30 22:13:09 kwm Exp $ # PORTNAME= mutter @@ -35,7 +35,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gtk30 ltverhack USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= LIBS="-lexecinfo" CONFIGURE_ARGS= --enable-compile-warnings=maximum diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 842959abf..1e3b03330 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -3,7 +3,7 @@ # Whom: Pawel Worach # # $FreeBSD$ -# $MCom: ports/x11/gnome-shell/Makefile,v 1.53 2012/05/26 19:05:29 kwm Exp $ +# $MCom: ports/x11/gnome-shell/Makefile,v 1.54 2012/07/24 10:02:05 kwm Exp $ # PORTNAME= gnome-shell @@ -52,10 +52,6 @@ CONFIGURE_ARGS+=--enable-compile-warnings=no \ CPPFLAGS+= -I${LOCALASE}/include LDFLAGS+= -L${LOCALBASE}/lib -# don't use -O2 in CFLAGS it makes gnome-shell unhappy (aka crashing) -# but only for me on amd64, report that it works on i386 .. -CFLAGS+= -O0 -pipe -fno-strict-aliasing - post-patch: @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \ ${WRKSRC}/src/shell-app-system.c -- cgit v1.2.3