Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:thomas-schraitle
xmlroff
xmlroff_0.6.2-1.2.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xmlroff_0.6.2-1.2.diff of Package xmlroff
--- xmlroff-0.6.2.orig/xmlroff/xmlroff.c +++ xmlroff-0.6.2/xmlroff/xmlroff.c @@ -302,7 +302,7 @@ if (compat_stylesheet == TRUE) { - printf (libfo_compat_get_stylesheet ()); + printf ("%s", libfo_compat_get_stylesheet ()); exit (0); } @@ -325,6 +325,7 @@ g_set_error(&error, XMLROFF_ERROR, XMLROFF_ERROR_NO_FILE, + "%s", xmlroff_error_messages [XMLROFF_ERROR_NO_FILE]); goto option_error; --- xmlroff-0.6.2.orig/debian/rules +++ xmlroff-0.6.2/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +DB2MAN = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" +DEB_CONFIGURE_EXTRA_FLAGS := --enable-cunit --disable-gtk-doc --enable-man --disable-gp +DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_MAKE_INSTALL_TARGET += xmldir="\$$(datadir)/xml/libfo" + +binary-install/xmlroff:: + dh_installxmlcatalogs + +# remove libfo and doc stuff - ATM no other package needs it +install/xmlroff:: + rm -rf debian/xmlroff/usr/include/ \ + debian/xmlroff/usr/lib/ \ + debian/xmlroff/usr/share/gtk-doc/ \ + debian/xmlroff/usr/share/xml/libfo/xmlroff.* --- xmlroff-0.6.2.orig/debian/xmlroff.docs +++ xmlroff-0.6.2/debian/xmlroff.docs @@ -0,0 +1,3 @@ +docs/html/users.html +docs/html/xmlroff.1.html +docs/html/style.css --- xmlroff-0.6.2.orig/debian/control +++ xmlroff-0.6.2/debian/control @@ -0,0 +1,22 @@ +Source: xmlroff +Section: text +Priority: optional +Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> +Uploaders: W. Martin Borgert <debacle@debian.org>, + Daniel Leidert (dale) <daniel.leidert@wgdd.de> +Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 5), autotools-dev, cdbs, docbook-xsl, + libcairo2-dev, libcunit1-dev, libpango1.0-dev, + libgtk2.0-dev, libxslt1-dev, xml-core, xsltproc +Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/ +Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xmlroff/trunk/ +Homepage: http://xmlroff.org +DM-Upload-Allowed: yes + +Package: xmlroff +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: XSL formatter mainly for DocBook + xmlroff is a fast, free, high-quality, multi-platform XSL formatter + that aims to excel at DocBook formatting and that integrates easily + with other programs and with scripting languages. --- xmlroff-0.6.2.orig/debian/xmlroff.xmlcatalogs +++ xmlroff-0.6.2/debian/xmlroff.xmlcatalogs @@ -0,0 +1 @@ +root-and-package;uri;http://xmlroff.org/release/libfo/;/usr/share/xml/libfo/catalog.xml --- xmlroff-0.6.2.orig/debian/changelog +++ xmlroff-0.6.2/debian/changelog @@ -0,0 +1,129 @@ +xmlroff (0.6.2-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Including individual glib headers no longer supported": + apply patch from Michael Biebl: only include <glib.h> + (Closes: #665628) + * Fix "uses libgnomeprint which is scheduled for removal": + - drop build dependency on libgnomeprint2.2-dev + - add --disable-gp to ./configure call in debian/rules. + (Closes: #542564) + + -- gregor herrmann <gregoa@debian.org> Sat, 18 May 2013 19:37:06 +0200 + +xmlroff (0.6.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: fo-area-page.c:907:12: error: format not a string + literal and no format arguments [-Werror=format-security]": + apply patch from Ubuntu / Daniel T Chen: + - Fix format-security FTBFS with gcc-4.6. (Closes: #646503) + + -- gregor herrmann <gregoa@debian.org> Wed, 23 Nov 2011 17:20:06 +0100 + +xmlroff (0.6.2-1) unstable; urgency=low + + * New upstream release 0.6.2. + + * debian/control (Standards-Version): Bumped to 3.8.1 (no other changes). + (Vcs-Browser): Fixed. + * debian/copyright: Minor update. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sat, 14 Mar 2009 16:15:21 +0100 + +xmlroff (0.6.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Mon, 16 Feb 2009 00:11:18 +0100 + +xmlroff (0.6.1-1) experimental; urgency=low + + * New upstream release 0.6.1. + + * debian/control (Standards-Version): Bumped to 3.8.0. + * debian/copyright: Updated and fixed. + * debian/rules: Removed manual page related stuff (creatd by source). + (DEB_CONFIGURE_EXTRA_FLAGS): Disable gtk-doc and enable manual page + building. + (install): Remove the library documentation (closes: #492221). + * debian/xmlroff.docs: Added to install the users guide and the HTML version + of the manual page. + * debian/README.Debian: Added to inform about the fix for #492221. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Mon, 01 Dec 2008 01:35:18 +0100 + +xmlroff (0.6.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Eliminate segfault in fo-area-table-row.c + fo_area_table_row_split_before_height. + Closes: #494227 + + -- Thomas Viehmann <tv@beamnet.de> Sun, 24 Aug 2008 21:45:53 +0200 + +xmlroff (0.6.0-1) unstable; urgency=low + + * New upstream release 0.6.0. + - Fixes a segmentation fault if no stylesheet is given and input is not + XML-FO (closes: #471268). + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Tue, 08 Jul 2008 10:25:49 +0200 + +xmlroff (0.5.5-2) unstable; urgency=low + + * debian/compat: Added. + * debian/control (Build-Depends): Increased to debhelper v5. Added xml-core + for catalog registration. + * Depends: Added ${misc:Depends} for xml-core. + * debian/rules: Call dh_installxmlcatalogs. + (DEB_INSTALL_MANPAGES_xmlroff, common-build-arch, clean): Rewrote manpage + (creation) related parts, to avoid running the target twice. Remove the + manpage in the clean target. + (DEB_MAKE_INSTALL_TARGET): Don't append version to catalog path. + (install): Also remove the examples from /usr/share/xml/libfo. + * debian/xmlroff.xmlcatalogs: Added for catalog registration. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Mon, 17 Mar 2008 02:41:35 +0100 + +xmlroff (0.5.5-1) unstable; urgency=low + + * New upstream release 0.5.5. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Fri, 14 Mar 2008 22:27:46 +0100 + +xmlroff (0.5.4-1) unstable; urgency=low + + * New upstream release 0.5.4. + + * debian/control: Added Vcs fields. Set DM-Upload-Allowed for DM status. + (Uploaders): Added myself. + * debian/rules: Install the NEWS file as upstream changelog. + * debian/watch: Added. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Thu, 06 Mar 2008 14:40:13 +0100 + +xmlroff (0.5.3-1) unstable; urgency=low + + * New upstream release. + * New policy version. Added Homepage field to debian/control. + * Enabled unit tests in debian/rules, added build dependency on + libcunit1-dev to debian/control. + * Added --as-needed in debian/rules to reduce lib dependencies. + * Remove most libfo files in debian/rules, not needed. + + -- W. Martin Borgert <debacle@debacle.org> Sat, 22 Dec 2007 23:24:23 +0000 + +xmlroff (0.5.1-1) unstable; urgency=low + + * New upstream release. + * Build-Depends fixed, thanks to Bastian Blank (Closes: #432406). + Verified using pbuilder. + + -- W. Borgert <debacle@debacle.org> Wed, 11 Jul 2007 10:52:27 +0000 + +xmlroff (0.5.0-1) unstable; urgency=low + + * Initial upload closes: #182445 after 1572 days. + + -- W. Borgert <debacle@debacle.org> Sat, 16 Jun 2007 21:03:12 +0000 --- xmlroff-0.6.2.orig/debian/compat +++ xmlroff-0.6.2/debian/compat @@ -0,0 +1 @@ +5 --- xmlroff-0.6.2.orig/debian/README.Debian +++ xmlroff-0.6.2/debian/README.Debian @@ -0,0 +1,8 @@ +xmlroff for Debian +------------------ + +The package currently only ships the binary and a few HTML manual pages. +Please send a report, if you need the library, headers or the full +documentation. + + -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>, 2008 --- xmlroff-0.6.2.orig/debian/copyright +++ xmlroff-0.6.2/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by W. Martin Borgert +<debacle@debian.org> on Sat, 16 Jun 2007 21:03:12 +0000. + +It was downloaded from: + + http://xmlroff.org/ + +Upstream Author: + + Tony Graham <tkg@menteith.com> + +Copyright: + + Copyright (C) 2001-2006 Sun Microsystems. All Rights Reserved. + Copyright (C) 2007-2009 Menteith Consulting Ltd. + +License: (BSD-3) + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + + - Neither the name of Sun Microsystems or the names of contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + + This software is provided "AS IS," without a warranty of any kind. ALL + EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE OR NON INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + MICROSYSTEMS AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES + SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING + THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS OR + ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN + MICROSYSTEMS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + You acknowledge that this Software is not designed, licensed or + intended for use in the design, construction, operation or maintenance + of any nuclear facility. + + +Copyright: libfo/expr/* + + Copyright (C) 1998-2002 Daniel Veillard. + Copyright (C) 2001-2002 Sun Microsystems. + +License: libfo/expr/* (MIT) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is fur- + nished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- + NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- + NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of the authors shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from them. + --- xmlroff-0.6.2.orig/debian/watch +++ xmlroff-0.6.2/debian/watch @@ -0,0 +1,4 @@ +# see uscan(1) for format + +version=3 +http://xmlroff.org/download/ xmlroff-([\d.]+)\.tar\.gz --- xmlroff-0.6.2.orig/libfo/fo-doc-cairo.c +++ xmlroff-0.6.2/libfo/fo-doc-cairo.c @@ -362,6 +362,7 @@ g_set_error (error, FO_DOC_ERROR, FO_DOC_ERROR_UNSUPPORTED_FORMAT, + "%s", N_(fo_doc_error_messages[FO_DOC_ERROR_UNSUPPORTED_FORMAT])); } break; @@ -378,6 +379,7 @@ g_set_error (error, FO_DOC_ERROR, FO_DOC_ERROR_UNSUPPORTED_FORMAT, + "%s", N_(fo_doc_error_messages[FO_DOC_ERROR_UNSUPPORTED_FORMAT])); } @@ -424,6 +426,7 @@ g_set_error (error, FO_DOC_ERROR, FO_DOC_ERROR_FAILED, + "%s", N_(fo_doc_error_messages[FO_DOC_ERROR_FAILED])); return; } @@ -441,6 +444,7 @@ g_set_error (error, FO_DOC_ERROR, FO_DOC_ERROR_FAILED, + "%s", N_(fo_doc_error_messages[FO_DOC_ERROR_FAILED])); return; } --- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.c +++ xmlroff-0.6.2/libfo/fo-libfo-basic.c @@ -142,6 +142,7 @@ g_set_error (dest, new_domain, new_code, + "%s", error_string); g_free (error_string); --- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h +++ xmlroff-0.6.2/libfo/fo-libfo-basic.h @@ -11,8 +11,7 @@ #define __FO_LIBFO_BASIC_H__ #include <stdio.h> -#include <glib/gtypes.h> -#include <glib/gerror.h> +#include <glib.h> G_BEGIN_DECLS --- xmlroff-0.6.2.orig/libfo/fo-xsl-formatter.c +++ xmlroff-0.6.2/libfo/fo-xsl-formatter.c @@ -984,6 +984,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE])); return FALSE; } @@ -998,6 +999,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_RESULT_TREE_NOT_FO, + "%s\n%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_RESULT_TREE_NOT_FO]), root_element->ns == NULL ? NULL : root_element->ns->href, root_element->name); @@ -1009,6 +1011,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_FO_DOC, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_FO_DOC])); return FALSE; } @@ -1018,6 +1021,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_FO_DOC, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NOT_FO_DOC])); return FALSE; } @@ -1088,6 +1092,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_RESULT_TREE])); return FALSE; } @@ -1097,6 +1102,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_FO_DOC, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_FO_DOC])); return FALSE; } @@ -1106,6 +1112,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_FO_DOC, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NOT_FO_DOC])); return FALSE; } @@ -1115,6 +1122,7 @@ g_set_error (error, FO_XSL_FORMATTER_ERROR, FO_XSL_FORMATTER_ERROR_NO_AREA_TREE, + "%s", _(fo_xsl_formatter_error_messages[FO_XSL_FORMATTER_ERROR_NO_AREA_TREE])); return FALSE; } --- xmlroff-0.6.2.orig/libfo/fo-xslt-transformer.c +++ xmlroff-0.6.2/libfo/fo-xslt-transformer.c @@ -97,6 +97,7 @@ g_set_error (error, FO_XSLT_TRANSFORMER_ERROR, FO_XSLT_TRANSFORMER_ERROR_NO_STYLESHEET_DOC, + "%s", _(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_NO_STYLESHEET_DOC])); return NULL; } @@ -107,6 +108,7 @@ g_set_error (error, FO_XSLT_TRANSFORMER_ERROR, FO_XSLT_TRANSFORMER_ERROR_NO_XML_DOC, + "%s", _(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_NO_XML_DOC])); return NULL; } @@ -119,6 +121,7 @@ g_set_error (error, FO_XSLT_TRANSFORMER_ERROR, FO_XSLT_TRANSFORMER_ERROR_PARSE_FAILED, + "%s", _(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_PARSE_FAILED])); return NULL; @@ -135,6 +138,7 @@ g_set_error (error, FO_XSLT_TRANSFORMER_ERROR, FO_XSLT_TRANSFORMER_ERROR_TRANSFORM_FAILED, + "%s", _(fo_xslt_transformer_error_messages[FO_XSLT_TRANSFORMER_ERROR_TRANSFORM_FAILED])); return NULL; --- xmlroff-0.6.2.orig/libfo/fo-xml-doc.c +++ xmlroff-0.6.2/libfo/fo-xml-doc.c @@ -203,6 +203,7 @@ g_set_error (error, FO_XML_DOC_ERROR, FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED, + "%s", _(fo_xml_doc_error_messages[FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED])); } @@ -246,6 +247,7 @@ g_set_error (error, FO_XML_DOC_ERROR, FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED, + "%s", _(fo_xml_doc_error_messages[FO_XML_DOC_ERROR_MEMORY_PARSE_FAILED])); } --- xmlroff-0.6.2.orig/libfo/fo-node.c +++ xmlroff-0.6.2/libfo/fo-node.c @@ -1311,6 +1311,7 @@ new_error = g_error_new (src->domain, src->code, + "%s", new_message->str); g_string_free (new_message, TRUE); @@ -1367,6 +1368,7 @@ new_error = g_error_new (src->domain, src->code, + "%s", new_message->str); g_string_free (new_message, TRUE); --- xmlroff-0.6.2.orig/libfo/fo/fo-table.c +++ xmlroff-0.6.2/libfo/fo/fo-table.c @@ -1812,6 +1812,7 @@ g_set_error (error, FO_TABLE_ERROR, FO_TABLE_ERROR_LAYOUT_METHOD_UNKNOWN, + "%s", fo_table_error_messages[FO_TABLE_ERROR_LAYOUT_METHOD_UNKNOWN]); return; } @@ -1829,6 +1830,7 @@ g_set_error (error, FO_TABLE_ERROR, FO_TABLE_ERROR_FIXED_NO_COLUMN, + "%s", fo_table_error_messages[FO_TABLE_ERROR_FIXED_NO_COLUMN]); return; } @@ -1923,6 +1925,7 @@ g_set_error (error, FO_TABLE_ERROR, FO_TABLE_ERROR_NO_AREA, + "%s", fo_table_error_messages[FO_TABLE_ERROR_NO_AREA]); return; } @@ -2625,6 +2628,7 @@ GError *local_error = g_error_new (FO_TABLE_ERROR, FO_TABLE_ERROR_FIXED_BUT_AUTO, + "%s", fo_table_error_messages[FO_TABLE_ERROR_FIXED_BUT_AUTO]); fo_object_log_warning (FO_OBJECT (fo), @@ -2705,6 +2709,7 @@ GError *local_error = g_error_new (FO_TABLE_ERROR, FO_TABLE_ERROR_FALLBACK_TO_FIXED, + "%s", fo_table_error_messages[FO_TABLE_ERROR_FALLBACK_TO_FIXED]); fo_object_log_warning (FO_OBJECT (fo), --- xmlroff-0.6.2.orig/libfo/fo/fo-table-column.c +++ xmlroff-0.6.2/libfo/fo/fo-table-column.c @@ -1139,6 +1139,7 @@ g_set_error (error, FO_TABLE_COLUMN_ERROR, FO_FO_ERROR_DATATYPE, + "%s", _(fo_table_column_error_messages[FO_TABLE_COLUMN_ERROR_FIXED_NO_WIDTH])); fo_object_log_warning (FO_OBJECT (fo), --- xmlroff-0.6.2.orig/libfo/expr/fo-expr-eval.c +++ xmlroff-0.6.2/libfo/expr/fo-expr-eval.c @@ -168,6 +168,7 @@ error = g_error_new (FO_EXPR_EVAL_ERROR, error_type, + "%s", error_string); return fo_error_new_with_value (error); @@ -220,6 +221,7 @@ new_error = g_error_new (FO_EXPR_EVAL_ERROR, error_type, + "%s", error_string); return fo_error_new_with_value (new_error); @@ -1338,6 +1340,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_NULL_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_NULL_RESULT])); } else if (FO_IS_ERROR (result_datatype)) @@ -1345,6 +1348,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_ERROR_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_ERROR_RESULT])); } else if (!fo_expr_context_stack_is_empty (context)) @@ -1685,6 +1689,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_NULL_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_NULL_RESULT])); } else if (FO_IS_ERROR (result_datatype)) @@ -1692,6 +1697,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_ERROR_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_ERROR_RESULT])); } else if (!fo_expr_context_stack_is_empty (context)) @@ -1838,6 +1844,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_NULL_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_NULL_RESULT])); } else if (FO_IS_ERROR (result_datatype)) @@ -1845,6 +1852,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_ERROR_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_ERROR_RESULT])); } else if (!fo_expr_context_stack_is_empty (context)) @@ -1854,6 +1862,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_EXTRA_STACK, + "%s\n%s", _(fo_expr_error_messages[FO_EXPR_ERROR_EXTRA_STACK]), string); @@ -1864,6 +1873,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_EXTRA_EXPR, + "%s\n%p", _(fo_expr_error_messages[FO_EXPR_ERROR_EXTRA_EXPR]), fo_expr_context_cur_ptr (context)); } @@ -1978,6 +1988,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_NULL_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_NULL_RESULT])); } else if (FO_IS_ERROR (result_datatype)) @@ -1985,6 +1996,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_ERROR_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_ERROR_RESULT])); } else if (!fo_expr_context_stack_is_empty (context)) @@ -2306,6 +2318,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_NULL_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_NULL_RESULT])); } else if (FO_IS_ERROR (result_datatype)) @@ -2313,6 +2326,7 @@ g_set_error (error, FO_EXPR_ERROR, FO_EXPR_ERROR_ERROR_RESULT, + "%s", _(fo_expr_error_messages[FO_EXPR_ERROR_ERROR_RESULT])); } else if (!fo_expr_context_stack_is_empty (context)) --- xmlroff-0.6.2.orig/libfo/expr/fo-expr-func.c +++ xmlroff-0.6.2/libfo/expr/fo-expr-func.c @@ -259,6 +259,7 @@ g_set_error (error, FO_EXPR_EVAL_ERROR, FO_EXPR_EVAL_ERROR_INVALID_TYPE, + "%s", fo_expr_eval_error_messages[FO_EXPR_EVAL_ERROR_INVALID_TYPE]); } @@ -269,6 +270,7 @@ g_set_error (error, FO_EXPR_EVAL_ERROR, FO_EXPR_EVAL_ERROR_INVALID_ARITY, + "%s", fo_expr_eval_error_messages[FO_EXPR_EVAL_ERROR_INVALID_ARITY]); } @@ -1206,6 +1208,7 @@ g_set_error (error, FO_EXPR_EVAL_ERROR, FO_EXPR_EVAL_ERROR_INVALID_TYPE, + "%s", fo_expr_eval_error_messages[FO_EXPR_EVAL_ERROR_INVALID_TYPE]); } --- xmlroff-0.6.2.orig/libfo/area/fo-area-page.c +++ xmlroff-0.6.2/libfo/area/fo-area-page.c @@ -904,6 +904,7 @@ { GError *error = g_error_new (FO_AREA_PAGE_ERROR, FO_AREA_PAGE_ERROR_OVERFLOW, + "%s", fo_area_page_error_messages[FO_AREA_PAGE_ERROR_OVERFLOW]); fo_object_log_warning (FO_OBJECT (child), --- xmlroff-0.6.2.orig/libfo/area/fo-area-table-row.c +++ xmlroff-0.6.2/libfo/area/fo-area-table-row.c @@ -2,7 +2,7 @@ * fo-area-table-row.c: Area object for table-row formatting objects * * Copyright (C) 2001 Sun Microsystems - * Copyright (C) 2007-2008 Menteith Consulting Ltd + * Copyright (C) 2007 Menteith Consulting Ltd * * See COPYING for the status of this software. */ @@ -400,22 +400,20 @@ split_child = fo_area_split_before_height (use_child_area, max_height); - if (split_child != NULL) + if (split_child != NULL) { - fo_area_unlink (split_child); - fo_area_append (clone, split_child); + fo_area_unlink (split_child); + fo_area_append (clone, split_child); - max_remaining_child_height = - MAX (max_remaining_child_height, - fo_area_area_get_height (use_child_area)); - max_split_child_height = - MAX (max_split_child_height, - fo_area_area_get_height (split_child)); + max_remaining_child_height = + MAX (max_remaining_child_height, + fo_area_area_get_height (use_child_area)); + max_split_child_height = + MAX (max_split_child_height, + fo_area_area_get_height (split_child)); } else - { - g_warning ("Did not split cell."); - } + g_warning ("Need better fix."); use_child_area = fo_area_next_sibling (use_child_area); } --- xmlroff-0.6.2.orig/libfo/property/fo-property-font-family.c +++ xmlroff-0.6.2/libfo/property/fo-property-font-family.c @@ -414,7 +414,7 @@ if (tmp_error != NULL) { - g_message (tmp_error->message); + g_message ("%s", tmp_error->message); g_propagate_error (error, tmp_error); return NULL; --- xmlroff-0.6.2.orig/libfo/property/fo-property.c +++ xmlroff-0.6.2/libfo/property/fo-property.c @@ -386,6 +386,7 @@ g_set_error (error, FO_PROPERTY_ERROR, FO_PROPERTY_ERROR_NO_ENUMERATION, + "%s", fo_property_error_messages[FO_PROPERTY_ERROR_NO_ENUMERATION]); return NULL; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
