remaining build fixes for dbus 0.94 update.

diff --git a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
index 8475bd275e2d9a3b73efcd7d02409252d7fe7dc7..e0c5ded70f11427b58f3132c1db1f219b344c9cd 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -40,6 +40,8 @@ CVSDATE_gomunicator = "20061108"
 CVSDATE_gconf-dbus ?= "20060719"
 CVSDATE_qemu-native ?= "20060723"
 
+PREFERRED_VERSION_autoconf-native = "2.59"
+
 #The CSL compiler is unusable because
 # 1) certain programs stop to compile
 # 2) more programs segfault

diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.59/autoconf-x.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.59/autoconf-x.patch
new file mode 100644 (file)
index 0000000..596535b
--- /dev/null
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.59/autoconf-x.patch
@@ -0,0 +1,36 @@
+Index: lib/autoconf/libs.m4
+===================================================================
+RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
+retrieving revision 1.13
+diff -p -u -r1.13 libs.m4
+--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000       1.13
++++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000
+@@ -265,13 +265,13 @@ ac_x_header_dirs='
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for Intrinsic.h.
++  # Guess where to find include files, by looking for Xlib.h.
+   # First, try using that file with no special directory specified.
+-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
++  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
+ [# We can compile using X headers with no special include directory.
+ ac_x_includes=],
+ [for ac_dir in $ac_x_header_dirs; do
+-  if test -r "$ac_dir/X11/Intrinsic.h"; then
++  if test -r "$ac_dir/X11/Xlib.h"; then
+     ac_x_includes=$ac_dir
+     break
+   fi
+@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+-  LIBS="-lXt $LIBS"
+-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
+-                                [XtMalloc (0)])],
++  LIBS="-lX11 $LIBS"
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
++                                [XrmInitialize ()])],
+                [LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=],

diff --git a/org.handhelds.familiar/packages/autoconf/autoconf-2.59/sizeof_types.patch b/org.handhelds.familiar/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 9a6e47453edfe3b2ef190f61b5c3b88f468bf90a..30fd5c1926d02f3c3c4bdeade4aa0712131dc220 100644 (file)
--- a/org.handhelds.familiar/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/org.handhelds.familiar/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch     2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4        2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4   2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4        2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
  # Generic checks.  #
  # ---------------- #
  
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
 +AC_DEFUN([AC_PROG_SIZE],
 +[
-+  AC_CHECK_TOOL(SIZE, size, :)
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
 +])
  
  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
 -                [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
 +[
 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+                 [static const $1 x[[256]];])],
-+                 [
-+                   AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+                 ],
-+                 [
-+                   AS_TR_SH([ac_cv_sizeof_$1])=0
-+                 ])
++      if test "$cross_compiling" = yes; then
++      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++                         [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++                         [
++                           AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++                         ],
++                         [
++                           AS_TR_SH([ac_cv_sizeof_$1])=0
++                         ])
++      else
++              # The cast to unsigned long works around a bug in the HP C Compiler
++              # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++              # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++              # This bug is HP SR number 8606223364.
++              _AC_COMPUTE_INT([(long) (sizeof ($1))],
++                      [AS_TR_SH([ac_cv_sizeof_$1])],
++                      [AC_INCLUDES_DEFAULT([$3])],
++                      [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++      fi
  else
    AS_TR_SH([ac_cv_sizeof_$1])=0
 -fi])dnl
@@ -51,9 +85,3 @@
  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
                   [The size of a `$1', as computed by sizeof.])
  ])# AC_CHECK_SIZEOF
- 
--
--
- # ---------------- #
- # Generic checks.  #
- # ---------------- #

diff --git a/org.handhelds.familiar/packages/autoconf/autoconf_2.59.bb b/org.handhelds.familiar/packages/autoconf/autoconf_2.59.bb
index 8636a77787219e5e30735f5aeb11cf1ff7bcfe3d..f1eb2759729cf047ba0c387046fb233604590ae9 100644 (file)
--- a/org.handhelds.familiar/packages/autoconf/autoconf_2.59.bb
+++ b/org.handhelds.familiar/packages/autoconf/autoconf_2.59.bb
@@ -17,5 +17,6 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
           file://autoconf259-update-configscripts.patch;patch=1 \
           file://autoheader-nonfatal-warnings.patch;patch=1 \
           file://sizeof_types.patch;patch=1 \
+          file://autoconf-x.patch;patch=1 \
           ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
 inherit autotools

diff --git a/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
index 97be2329b99b6977bbfc533bb1ef7a31b2421f54..2c1d5791a5131343d72de4159281992c2ab5707f 100644 (file)
--- a/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/org.handhelds.familiar/packages/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -5,20 +5,20 @@ PV = "2.0.0-cvs-mco1-${CVSDATE}"
 WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \
-       ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \
-       ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \
-       ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \
-       ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \
-       ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \
-       ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \
-       ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \
-       ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \
-       ${WEBCVSURL}/define-pda-mode.patch;patch=1 \
-       ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \
-       ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \
-       ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \
-       ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \
-       ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \
+       file://no-superimposed-version-on-logo.patch;patch=1 \
+       file://01-optional-icons-in-dialogs.patch;patch=1 \
+       file://02-request-field-dialogs.patch;patch=1 \
+       file://03-blist-dialogs.patch;patch=1 \
+       file://04-saved-status-dialogs.patch;patch=1 \
+       file://05-statusbox-icon-size.patch;patch=1 \
+       file://06-account-dialogs.patch;patch=1 \
+       file://07-roomlist-dialog.patch;patch=1 \
+       file://define-pda-mode.patch;patch=1 \
+       file://desktop-name-2.0.0.patch;patch=1 \
+       file://docklet-icon-size.patch;patch=1 \
+       file://08-prefs-dialog.patch;patch=1 \
+       file://09-filetransfer-dialog.patch;patch=1 \
+       file://10-pda-default-settings.patch;patch=1 \
        "
 
 include gaim.inc

diff --git a/org.handhelds.familiar/packages/gnutls/gnutls-1.4.4/onceonly.m4 b/org.handhelds.familiar/packages/gnutls/gnutls-1.4.4/onceonly.m4
new file mode 100644 (file)
index 0000000..f6fec37
--- /dev/null
+++ b/org.handhelds.familiar/packages/gnutls/gnutls-1.4.4/onceonly.m4
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  AC_FOREACH([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+                                                 [-./], [___])), [
+      AC_CHECK_HEADERS(gl_HEADER_NAME)
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [-./], [___])))
+  ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  AC_FOREACH([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+  ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  AC_FOREACH([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+  ])
+])

diff --git a/org.handhelds.familiar/packages/gnutls/gnutls_1.4.4.bb b/org.handhelds.familiar/packages/gnutls/gnutls_1.4.4.bb
index 0391f59c7c5a1a11238a1403fee02fd632c1b683..d5b2fb8a6eaad28326a088dc23de281396520edc 100644 (file)
--- a/org.handhelds.familiar/packages/gnutls/gnutls_1.4.4.bb
+++ b/org.handhelds.familiar/packages/gnutls/gnutls_1.4.4.bb
@@ -4,11 +4,16 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 LICENSE = "LGPL"
 
 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
+          file://onceonly.m4 \
            file://gnutls-openssl.patch;patch=1 \
            file://gnutls-texinfo-euro.patch;patch=1"
 
 inherit autotools binconfig pkgconfig
 
+do_configure_prepend() {
+        cp ${WORKDIR}/onceonly.m4 ${S}/m4/
+}
+
 PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"

diff --git a/org.handhelds.familiar/packages/librsvg/files/librsvg_sgml_jade13_fix.patch b/org.handhelds.familiar/packages/librsvg/files/librsvg_sgml_jade13_fix.patch
new file mode 100644 (file)
index 0000000..f11916e
--- /dev/null
+++ b/org.handhelds.familiar/packages/librsvg/files/librsvg_sgml_jade13_fix.patch
@@ -0,0 +1,78 @@
+diff -Naur librsvg-2.6.5_old/rsvg.c librsvg-2.6.5/rsvg.c
+--- librsvg-2.6.5_old/rsvg.c   2004-03-12 04:58:20.000000000 +0200
++++ librsvg-2.6.5/rsvg.c       2006-11-11 01:34:09.000000000 +0200
+@@ -1260,7 +1260,6 @@
+  *
+  * Returns: The SVG's title
+  *
+- * Since: 2.4
+  */
+ G_CONST_RETURN char *rsvg_handle_get_title (RsvgHandle *handle)
+ {
+@@ -1276,7 +1275,6 @@
+  *
+  * Returns: The SVG's description
+  *
+- * Since: 2.4
+  */
+ G_CONST_RETURN char *rsvg_handle_get_desc (RsvgHandle *handle)
+ {
+@@ -1336,7 +1334,6 @@
+  * 72, 90, and 300 DPI. Passing a number <= 0 to #dpi will 
+  * reset the DPI to whatever the default value happens to be.
+  *
+- * Since: 2.2
+  */
+ void
+ rsvg_set_default_dpi (double dpi)
+@@ -1356,7 +1353,6 @@
+  * 72, 90, and 300 DPI. Passing a number <= 0 to #dpi will 
+  * reset the DPI to whatever the default value happens to be.
+  *
+- * Since: 2.2
+  */
+ void
+ rsvg_handle_set_dpi (RsvgHandle * handle, double dpi)
+diff -Naur librsvg-2.6.5_old/rsvg-file-util.c librsvg-2.6.5/rsvg-file-util.c
+--- librsvg-2.6.5_old/rsvg-file-util.c 2003-09-19 18:59:07.000000000 +0300
++++ librsvg-2.6.5/rsvg-file-util.c     2006-11-11 01:34:30.000000000 +0200
+@@ -217,7 +217,6 @@
+  * 
+  * Return value: A newly allocated #GdkPixbuf, or %NULL
+  *
+- * Since: 2.4
+  */
+ GdkPixbuf  *
+ rsvg_pixbuf_from_file_at_size_ex (RsvgHandle * handle,
+@@ -248,7 +247,6 @@
+  * 
+  * Return value: A newly allocated #GdkPixbuf, or %NULL
+  *
+- * Since: 2.4
+  */
+ GdkPixbuf  *
+ rsvg_pixbuf_from_file_ex (RsvgHandle * handle,
+@@ -274,7 +272,6 @@
+  * 
+  * Return value: A newly allocated #GdkPixbuf, or %NULL
+  *
+- * Since: 2.4
+  */
+ GdkPixbuf  *
+ rsvg_pixbuf_from_file_at_zoom_ex (RsvgHandle * handle,
+@@ -311,7 +308,6 @@
+  * 
+  * Return value: A newly allocated #GdkPixbuf, or %NULL
+  *
+- * Since: 2.4
+  */
+ GdkPixbuf  *
+ rsvg_pixbuf_from_file_at_max_size_ex (RsvgHandle * handle,
+@@ -348,7 +344,6 @@
+  * 
+  * Return value: A newly allocated #GdkPixbuf, or %NULL
+  *
+- * Since: 2.4
+  */
+ GdkPixbuf  *
+ rsvg_pixbuf_from_file_at_zoom_with_max_ex (RsvgHandle * handle,

diff --git a/org.handhelds.familiar/packages/librsvg/librsvg/librsvg_sgml_jade13_fix.patch b/org.handhelds.familiar/packages/librsvg/librsvg/librsvg_sgml_jade13_fix.patch
deleted file mode 100644 (file)
index 04698e0..0000000
--- a/org.handhelds.familiar/packages/librsvg/librsvg/librsvg_sgml_jade13_fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Naur librsvg-2.6.5_old/doc/sgml/rsvg-file-util.sgml librsvg-2.6.5/doc/sgml/rsvg-file-util.sgml
---- librsvg-2.6.5_old/doc/sgml/rsvg-file-util.sgml     2006-11-10 17:30:02.000000000 +0200
-+++ librsvg-2.6.5/doc/sgml/rsvg-file-util.sgml 2006-11-09 19:16:35.000000000 +0200
-@@ -238,7 +238,7 @@
- </simpara></listitem></varlistentry>
- </variablelist></refsect2>
- <refsect2>
--<title><anchor id="rsvg-pixbuf-from-file-ex" role="function" condition="since:2.4">rsvg_pixbuf_from_file_ex ()</title>
-+<title><anchor id="rsvg-pixbuf-from-file-ex" role="function">rsvg_pixbuf_from_file_ex ()</title>
- <indexterm role="2.4"><primary>rsvg_pixbuf_from_file_ex</primary></indexterm><programlisting><link linkend="GdkPixbuf">GdkPixbuf</link>*  rsvg_pixbuf_from_file_ex        (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              const <link linkend="gchar">gchar</link> *file_name,
-                                              <link linkend="GError">GError</link> **error);</programlisting>
-@@ -265,7 +265,7 @@
- </variablelist><para>Since  2.4
- </para></refsect2>
- <refsect2>
--<title><anchor id="rsvg-pixbuf-from-file-at-zoom-ex" role="function" condition="since:2.4">rsvg_pixbuf_from_file_at_zoom_ex ()</title>
-+<title><anchor id="rsvg-pixbuf-from-file-at-zoom-ex" role="function">rsvg_pixbuf_from_file_at_zoom_ex ()</title>
- <indexterm role="2.4"><primary>rsvg_pixbuf_from_file_at_zoom_ex</primary></indexterm><programlisting><link linkend="GdkPixbuf">GdkPixbuf</link>*  rsvg_pixbuf_from_file_at_zoom_ex
-                                             (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              const <link linkend="gchar">gchar</link> *file_name,
-@@ -302,7 +302,7 @@
- </variablelist><para>Since  2.4
- </para></refsect2>
- <refsect2>
--<title><anchor id="rsvg-pixbuf-from-file-at-size-ex" role="function" condition="since:2.4">rsvg_pixbuf_from_file_at_size_ex ()</title>
-+<title><anchor id="rsvg-pixbuf-from-file-at-size-ex" role="function">rsvg_pixbuf_from_file_at_size_ex ()</title>
- <indexterm role="2.4"><primary>rsvg_pixbuf_from_file_at_size_ex</primary></indexterm><programlisting><link linkend="GdkPixbuf">GdkPixbuf</link>*  rsvg_pixbuf_from_file_at_size_ex
-                                             (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              const <link linkend="gchar">gchar</link> *file_name,
-@@ -340,7 +340,7 @@
- </variablelist><para>Since  2.4
- </para></refsect2>
- <refsect2>
--<title><anchor id="rsvg-pixbuf-from-file-at-max-size-ex" role="function" condition="since:2.4">rsvg_pixbuf_from_file_at_max_size_ex ()</title>
-+<title><anchor id="rsvg-pixbuf-from-file-at-max-size-ex" role="function">rsvg_pixbuf_from_file_at_max_size_ex ()</title>
- <indexterm role="2.4"><primary>rsvg_pixbuf_from_file_at_max_size_ex</primary></indexterm><programlisting><link linkend="GdkPixbuf">GdkPixbuf</link>*  rsvg_pixbuf_from_file_at_max_size_ex
-                                             (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              const <link linkend="gchar">gchar</link> *file_name,
-@@ -377,7 +377,7 @@
- </variablelist><para>Since  2.4
- </para></refsect2>
- <refsect2>
--<title><anchor id="rsvg-pixbuf-from-file-at-zoom-with-max-ex" role="function" condition="since:2.4">rsvg_pixbuf_from_file_at_zoom_with_max_ex ()</title>
-+<title><anchor id="rsvg-pixbuf-from-file-at-zoom-with-max-ex" role="function">rsvg_pixbuf_from_file_at_zoom_with_max_ex ()</title>
- <indexterm role="2.4"><primary>rsvg_pixbuf_from_file_at_zoom_with_max_ex</primary></indexterm><programlisting><link linkend="GdkPixbuf">GdkPixbuf</link>*  rsvg_pixbuf_from_file_at_zoom_with_max_ex
-                                             (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              const <link linkend="gchar">gchar</link> *file_name,
-diff -Naur librsvg-2.6.5_old/doc/sgml/rsvg.sgml librsvg-2.6.5/doc/sgml/rsvg.sgml
---- librsvg-2.6.5_old/doc/sgml/rsvg.sgml       2006-11-10 17:30:17.000000000 +0200
-+++ librsvg-2.6.5/doc/sgml/rsvg.sgml   2006-11-09 19:15:24.000000000 +0200
-@@ -95,7 +95,7 @@
- </simpara></listitem></varlistentry>
- </variablelist></refsect2>
- <refsect2>
--<title><anchor id="rsvg-set-default-dpi" role="function" condition="since:2.2">rsvg_set_default_dpi ()</title>
-+<title><anchor id="rsvg-set-default-dpi" role="function">rsvg_set_default_dpi ()</title>
- <indexterm role="2.2"><primary>rsvg_set_default_dpi</primary></indexterm><programlisting><link linkend="void">void</link>        rsvg_set_default_dpi            (<link linkend="double">double</link> dpi);</programlisting>
- <para>
- Sets the DPI for the all future outgoing pixbufs. Common values are
-@@ -124,7 +124,7 @@
- </simpara></listitem></varlistentry>
- </variablelist></refsect2>
- <refsect2>
--<title><anchor id="rsvg-handle-set-dpi" role="function" condition="since:2.2">rsvg_handle_set_dpi ()</title>
-+<title><anchor id="rsvg-handle-set-dpi" role="function">rsvg_handle_set_dpi ()</title>
- <indexterm role="2.2"><primary>rsvg_handle_set_dpi</primary></indexterm><programlisting><link linkend="void">void</link>        rsvg_handle_set_dpi             (<link linkend="RsvgHandle">RsvgHandle</link> *handle,
-                                              <link linkend="double">double</link> dpi);</programlisting>
- <para>
-@@ -240,7 +240,7 @@
- </simpara></listitem></varlistentry>
- </variablelist></refsect2>
- <refsect2>
--<title><anchor id="rsvg-handle-get-title" role="function" condition="since:2.4">rsvg_handle_get_title ()</title>
-+<title><anchor id="rsvg-handle-get-title" role="function">rsvg_handle_get_title ()</title>
- <indexterm role="2.4"><primary>rsvg_handle_get_title</primary></indexterm><programlisting>const <link linkend="char">char</link>* rsvg_handle_get_title           (<link linkend="RsvgHandle">RsvgHandle</link> *handle);</programlisting>
- <para>
- Returns the SVG's title in UTF-8 or <link linkend="NULL:CAPS"><literal>NULL</literal></link>. You must make a copy
-@@ -257,7 +257,7 @@
- </variablelist><para>Since  2.4
- </para></refsect2>
- <refsect2>
--<title><anchor id="rsvg-handle-get-desc" role="function" condition="since:2.4">rsvg_handle_get_desc ()</title>
-+<title><anchor id="rsvg-handle-get-desc" role="function">rsvg_handle_get_desc ()</title>
- <indexterm role="2.4"><primary>rsvg_handle_get_desc</primary></indexterm><programlisting>const <link linkend="char">char</link>* rsvg_handle_get_desc            (<link linkend="RsvgHandle">RsvgHandle</link> *handle);</programlisting>
- <para>
- Returns the SVG's description in UTF-8 or <link linkend="NULL:CAPS"><literal>NULL</literal></link>. You must make a copy

diff --git a/org.handhelds.familiar/packages/librsvg/librsvg_2.6.5.bb b/org.handhelds.familiar/packages/librsvg/librsvg_2.6.5.bb
index 59e8cecd285522be8dd80388edb23e6353b61028..2c646e23f30fa0eaec7c889ccc06d3d4b36e3def 100644 (file)
--- a/org.handhelds.familiar/packages/librsvg/librsvg_2.6.5.bb
+++ b/org.handhelds.familiar/packages/librsvg/librsvg_2.6.5.bb
@@ -13,6 +13,8 @@ FILES_rsvg = "${bindir}/rsvg"
 FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
 FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
 
+SRC_URI += "file://librsvg_sgml_jade13_fix.patch;patch=1"
+
 do_stage() {
        install -d ${STAGING_INCDIR}/librsvg-2/librsvg/
        install -m 0644 rsvg.h ${STAGING_INCDIR}/librsvg-2/librsvg/