diff options
| author | bland <bland@FreeBSD.org> | 2004-03-24 07:05:48 +0000 |
|---|---|---|
| committer | bland <bland@FreeBSD.org> | 2004-03-24 07:05:48 +0000 |
| commit | 63e2cf4869c997a0e6aeb562d1e3309847211d68 (patch) | |
| tree | b0f47ace12581eef249579777939b6026d076de8 /x11-toolkits/gtkmm24 | |
| parent | 2fab84d2c8e3db0dd777a9a5b5ec1cd234476748 (diff) | |
| download | FreeBSD-ports-63e2cf4869c997a0e6aeb562d1e3309847211d68.zip FreeBSD-ports-63e2cf4869c997a0e6aeb562d1e3309847211d68.tar.gz | |
Fix detection of ambiguous const template specialization.
This triggered build breakage in gnome-vfsmm port.
Diffstat (limited to 'x11-toolkits/gtkmm24')
| -rw-r--r-- | x11-toolkits/gtkmm24/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gtkmm24/files/patch-configure | 28 |
2 files changed, 22 insertions, 9 deletions
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index 6b20db2..ad2bb84 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtkmm PORTVERSION= 2.2.10 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_SOURCEFORGE} @@ -27,7 +28,7 @@ USE_GMAKE= yes USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes USE_REINPLACE= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack lthack gtk20 CONFIGURE_ARGS= --enable-static=yes \ --with-sigc-prefix=${LOCALBASE} diff --git a/x11-toolkits/gtkmm24/files/patch-configure b/x11-toolkits/gtkmm24/files/patch-configure index c14c5d9..166267a 100644 --- a/x11-toolkits/gtkmm24/files/patch-configure +++ b/x11-toolkits/gtkmm24/files/patch-configure @@ -1,10 +1,22 @@ ---- configure.orig Sat Oct 12 00:36:53 2002 -+++ configure Sat Oct 12 00:37:15 2002 -@@ -6823,6 +6823,7 @@ +--- configure.orig Wed Mar 24 14:29:14 2004 ++++ configure Wed Mar 24 14:37:06 2004 +@@ -21358,10 +21358,6 @@ + std::cout << "Traits<Foo<const int >> --> " + << cfit.whoami() << std::endl; - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS +- return 0; +- } +- +- ; + return 0; + } + _ACEOF +@@ -21404,7 +21400,7 @@ + if test "x${gtkmm_cv_cxx_can_disambiguate_const_template_specializations}" = "xyes"; then + { + cat >>confdefs.h <<\_ACEOF +-#define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1, Defined if the compiler does not find it ambiguous to have both const and non-const template specializations ++#define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 + _ACEOF - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' + } |
