← Back to branch summary

~ubuntu-branches/ubuntu/natty/libreoffice-l10n/natty

« back to all changes in this revision

Viewing changes to sources/libreoffice-libs-extern-sys-3.3.0.4/libxml2/libxml2-gnome599717.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-01-21 01:37:08 UTC
  • mfrom: (0.6.1) (0.5.1) (0.4.1) (0.1.2)
  • Revision ID: package-import@ubuntu.com-20110121013708-d4rj1blksdgno023
Tags: 1:3.3.0~rc4-1ubuntu1
https://launchpad.net/bugs/705343
https://launchpad.net/bugs/696549
* Merge 3.3.0~rc4 changes.
* Merged Debian packaging up to r2336.
* libreoffice-writer: Make the java stuff a suggestion instead of a
  recommendation.
* Fix libreoffice-base upgrade, overwriting doc file. LP: #705343.
* Add initial desktop menu translations. LP: #696549. Still needs
  rosetta integration. Use the file lo-desktop.pot.
* Relax dependencies of libreoffice-l10n-xx on libreoffice-common.
* Move the icons zip files back into the libreoffice-style-* packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sources/libreoffice-libs-extern-sys-3.3.0.4/libxml2/libxml2-gnome599717.patch
 
1
--- misc/libxml2-2.7.6/relaxng.c        2009-12-17 11:53:12.000000000 +0000
 
2
+++ misc/build/libxml2-2.7.6/relaxng.c  2009-12-17 16:30:43.000000000 +0000
 
3
@@ -5369,7 +5369,7 @@
 
4
     } else {
 
5
         xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
 
6
                    "expecting name, anyName, nsName or choice : got %s\n",
 
7
-                   (node == NULL ? "nothing" : node->name), NULL);
 
8
+                   (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
 
9
         return (NULL);
 
10
     }
 
11
     if (ret != def) {
 
12
@@ -9459,7 +9459,7 @@
 
13
             ctxt->states = NULL;
 
14
             if (found == 0) {
 
15
                 if (cur == NULL) {
 
16
-                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
 
17
+                    VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
 
18
                 } else {
 
19
                     VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
 
20
                 }