Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
| Navigation: |
|
Lists:
gentoo-commits:
< Prev
By Thread
Next >
< Prev
By Date
Next >
|
| Headers: |
|
To:
|
gentoo-commits@g.o
|
|
From:
|
"Gilles Dartiguelongue (eva)" <eva@g.o>
|
|
Subject:
|
gentoo-x86 commit in app-accessibility/dasher/files: dasher-4.7.3-no-gnome.patch dasher-4.7.3-cairo.patch
|
|
Date:
|
Mon, 11 Aug 2008 13:44:19 +0000
|
|
eva 08/08/11 13:44:19
Added: dasher-4.7.3-no-gnome.patch
dasher-4.7.3-cairo.patch
Log:
fix compilation with -cairo, bug #216050. fix compilation with -gnome, bug #218011. direct to stable because the patches are trivial enough and already upstream.
(Portage version: 2.2_rc6/cvs/Linux 2.6.24-gentoo-r8 i686)
Revision Changes Path
1.1 app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/files/dasher-4.7.3-no-gnome.patch?rev=1.1&content-type=text/plain
Index: dasher-4.7.3-no-gnome.patch
===================================================================
Index: configure.in
===================================================================
--- configure.in (revision 3450)
+++ configure.in (working copy)
@@ -412,13 +412,16 @@
AC_SUBST(GTK2BUILD_CFLAGS)
AC_SUBST(GTK2BUILD_LIBS)
-if [[ x"$WITHGNOME" = xtrue ]]; then
- GNOME_DOC_INIT
-else
- # Allows compilation if --without-gnome is passed
- AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
+AC_MSG_CHECKING([for gnome-doc-utils])
+GNOME_DOC_INIT([0.9.0],[have_gdu=yes],[have_gdu=no])
+AC_MSG_RESULT($have_gdu)
+
+if [[ x"$WITHGNOME" = xtrue ]] && [[ "$have_gdu" = xno ]]; then
+ AC_MSG_ERROR([gnome-doc-utils not found!])
fi
+AM_CONDITIONAL(ENABLE_SK, test x"$WITHGNOME" = xfalse -a "x$enable_scrollkeeper" = "xyes")
+
AC_CONFIG_FILES([Data/dasher.desktop.in
Data/Makefile
Data/training/Makefile
1.1 app-accessibility/dasher/files/dasher-4.7.3-cairo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/files/dasher-4.7.3-cairo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/dasher/files/dasher-4.7.3-cairo.patch?rev=1.1&content-type=text/plain
Index: dasher-4.7.3-cairo.patch
===================================================================
--- a/Src/Gtk2/Canvas.cpp
+++ b/Src/Gtk2/Canvas.cpp
@@ -88,7 +88,9 @@
g_object_unref(m_pOnscreenBuffer);
#endif
+#if WITH_CAIRO
delete[] cairo_colours;
+#endif
delete m_pPangoInk;
}
|
|
