smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-17 19:06:01 +01:00
Code Issues Projects Releases Wiki Activity

move the post-install hacks to the gtk script and conditionalize the one that is for OS X only

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11686 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-03-14 20:04:56 +00:00
parent d48df13af6
commit 626abd1ea1
2 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tools/build-ardour-stack
View file

@ -249,36 +249,3 @@ svn co http://svn.drobilla.net/lad/trunk/lilv && \
svn co http://svn.drobilla.net/lad/trunk/suil && \
(set -e && cd suil && CFLAGS="-I$PREFIX/include" ./waf configure --prefix=$PREFIX && ./waf && ./waf install) || die "suil build failed"
# two post-install hacks
cat <<EOFA | (cd $PREFIX && patch -p0)
--- include/sigc++-2.0/sigc++/functors/functor_trait.h~2012-03-14 14:22:09.000000000 -0400
+++ include/sigc++-2.0/sigc++/functors/functor_trait.h2012-03-14 14:53:32.000000000 -0400
@@ -24,6 +24,9 @@
#define _SIGC_FUNCTORS_MACROS_FUNCTOR_TRAITHM4_
#include <sigc++/type_traits.h>
+#ifdef nil
+#undef nil
+#endif
namespace sigc {
EOFA
cat <<EOFB | (cd $PREFIX && patch -p0)
--- lib/pkgconfig/libgnomecanvas-2.0.pc~2012-03-14 14:35:34.000000000 -0400
+++ lib/pkgconfig/libgnomecanvas-2.0.pc2012-03-14 14:53:06.000000000 -0400
@@ -5,8 +5,8 @@
Name: libgnomecanvas-2.0
Description: libgnomecanvas
-Requires: libart-2.0 gtk+-2.0
-Requires.private: pango pangoft2 gail
+Requires: libart-2.0 gtk+-2.0 pangoft2
+Requires.private: pango gail
Version: 2.30.3
Libs: -L${libdir} -lgnomecanvas-2
Cflags: -I${includedir}/libgnomecanvas-2.0
EOFB

43
tools/build-gtk-stack
View file

@ -319,3 +319,46 @@ sudo rm /usr/include/libintl.h
#
#
(cd gtk+ && CFLAGS="$GLOBAL_CFLAGS" LDFLAGS="$GLOBAL_LDFLAGS" sh autogen.sh --enable-maintainer-mode --prefix=$PREFIX --libdir=$PREFIX/lib --disable-cups --disable-papi --disable-introspection --with-gdktarget=quartz && make && make install) || die "GTK build failed"
# two post-install hacks
if uname -a | grep --silent arwin ; then
#
# this is only needed on OS X where some Carbon headers define nil
#
cat <<EOFA | (cd $PREFIX && patch -p0)
--- include/sigc++-2.0/sigc++/functors/functor_trait.h~2012-03-14 14:22:09.000000000 -0400
+++ include/sigc++-2.0/sigc++/functors/functor_trait.h2012-03-14 14:53:32.000000000 -0400
@@ -24,6 +24,9 @@
#define _SIGC_FUNCTORS_MACROS_FUNCTOR_TRAITHM4_
#include <sigc++/type_traits.h>
+#ifdef nil
+#undef nil
+#endif
namespace sigc {
EOFA
fi
#
# libgnomecanvas has an incorrect pkg-config file. it has an implicit dependency on pangoft2.
#
cat <<EOFB | (cd $PREFIX && patch -p0)
--- lib/pkgconfig/libgnomecanvas-2.0.pc~2012-03-14 14:35:34.000000000 -0400
+++ lib/pkgconfig/libgnomecanvas-2.0.pc2012-03-14 14:53:06.000000000 -0400
@@ -5,8 +5,8 @@
Name: libgnomecanvas-2.0
Description: libgnomecanvas
-Requires: libart-2.0 gtk+-2.0
-Requires.private: pango pangoft2 gail
+Requires: libart-2.0 gtk+-2.0 pangoft2
+Requires.private: pango gail
Version: 2.30.3
Libs: -L${libdir} -lgnomecanvas-2
Cflags: -I${includedir}/libgnomecanvas-2.0
EOFB