[maemo-commits] [maemo-commits] r10934 - in projects/haf/trunk/gtkhtml: . debian upstream/patches

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-04-03 15:35:39 +0300 (Tue, 03 Apr 2007)
New Revision: 10934

Added:
   projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_210_try_a11y.diff
Modified:
   projects/haf/trunk/gtkhtml/ChangeLog
   projects/haf/trunk/gtkhtml/debian/changelog
   projects/haf/trunk/gtkhtml/squeaky
Log:
Forgot to add soft-a11y-check


Modified: projects/haf/trunk/gtkhtml/ChangeLog
===================================================================
--- projects/haf/trunk/gtkhtml/ChangeLog	2007-04-03 12:12:19 UTC (rev 10933)
+++ projects/haf/trunk/gtkhtml/ChangeLog	2007-04-03 12:35:39 UTC (rev 10934)
@@ -1,5 +1,9 @@
 2007-04-03  Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
+	* Forgot to add soft-a11y-check patch
+
+2007-04-03  Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
 	* Added patch comments
 	* Removed empty debian/patches
 	* Added --enable-a11y, but with forgiving gail check

Modified: projects/haf/trunk/gtkhtml/debian/changelog
===================================================================
--- projects/haf/trunk/gtkhtml/debian/changelog	2007-04-03 12:12:19 UTC (rev 10933)
+++ projects/haf/trunk/gtkhtml/debian/changelog	2007-04-03 12:35:39 UTC (rev 10934)
@@ -1,3 +1,9 @@
+gtkhtml (3.9.1-3osso7) unstable; urgency=low
+
+  * Forgot to add soft-a11y-check patch
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue,  3 Apr 2007 15:32:47 +0300
+
 gtkhtml (3.9.1-3osso6) unstable; urgency=low
 
   * Added patch comments

Modified: projects/haf/trunk/gtkhtml/squeaky
===================================================================
--- projects/haf/trunk/gtkhtml/squeaky	2007-04-03 12:12:19 UTC (rev 10933)
+++ projects/haf/trunk/gtkhtml/squeaky	2007-04-03 12:35:39 UTC (rev 10934)
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 rm -rf \
-        gtkhtml* *stamp
+        gtkhtml* *stamp debian/{files,gtkhtml{0{,-dbg},-dev},tmp}

Added: projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_210_try_a11y.diff
===================================================================
--- projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_210_try_a11y.diff	2007-04-03 12:12:19 UTC (rev 10933)
+++ projects/haf/trunk/gtkhtml/upstream/patches/gtkhtml_210_try_a11y.diff	2007-04-03 12:35:39 UTC (rev 10934)
@@ -0,0 +1,33 @@
+diff -ru gtkhtml-3.13.91/configure.in gtkhtml-3.13.91-a11y/configure.in
+--- gtkhtml-3.13.91/configure.in	2007-04-03 13:43:10.000000000 +0300
++++ gtkhtml-3.13.91-a11y/configure.in	2007-04-03 15:20:59.000000000 +0300
+@@ -75,6 +75,29 @@
+              [ --enable-a11y   Enable Accessibility (requires gail) [default=no]],
+              [ac_cv_enable_a11y=$enableval],[ac_cv_enable_a11y=no])
+ AC_MSG_CHECKING([whether to enable a11y])
++echo '**********************************'
++if test -z "$PKG_CONFIG"; then
++       echo "Going to check for pkg-config ..."
++       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++       echo "Checked for pkg-config: $PKG_CONFIG"
++fi
++if test "$ac_cv_enable_a11y" = yes; then
++       echo "ac_cv_enable_a11y: Forced off."
++       ac_cv_enable_a11y=no
++       if test "x$PKG_CONFIG" != "xno"; then
++         echo "ac_cv_enable_a11y: Have pkg-config: $PKG_CONFIG"
++         if $PKG_CONFIG --exists gail; then
++           echo "ac_cv_enable_a11y: pkg-config says gail exists"
++           ac_cv_enable_a11y=yes ;
++           echo "ac_cv_enable_a11y: Turned on."
++         else
++           echo "ac_cv_enable_a11y: $PKG_CONFIG --exists gail failed"
++         fi
++       else
++         echo "ac_cv_enable_a11y: Do not have pkg-config: $PKG_CONFIG"
++       fi
++fi
++echo '**********************************'
+ if test "$ac_cv_enable_a11y" = yes; then
+        AC_MSG_RESULT(yes)
+        GAIL_MODULES="gail >= 1.1.0"