[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.4.4-1

[Guido Günther]

The following commit has been merged in the master branch:
commit d97cb98a6530fd6c45a44d908bb23c5fc0591d1a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 17 21:06:56 2011 +0100

    Fix build with xulrunner-8.0

diff --git a/debian/control b/debian/control
index 8ffa877..d93c149 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  python-dev,
  libgnutls-dev (>= 1.4.0),
  libcairo2-dev,
- xulrunner-dev,
+ xulrunner-dev (>= 8.0),
  autotools-dev,
  libffi-dev,
  libsasl2-dev,
diff --git a/debian/patches/Fix-build-with-xulrunner-8.0.patch b/debian/patches/Fix-build-with-xulrunner-8.0.patch
new file mode 100644
index 0000000..01e7981
--- /dev/null
+++ b/debian/patches/Fix-build-with-xulrunner-8.0.patch
@@ -0,0 +1,40 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 17 Nov 2011 21:04:30 +0100
+Subject: Fix build with xulrunner-8.0
+
+---
+ plugin/npshell.c |    4 ++--
+ plugin/npunix.c  |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugin/npshell.c b/plugin/npshell.c
+index abdc338..b017fe7 100644
+--- a/plugin/npshell.c
++++ b/plugin/npshell.c
+@@ -91,10 +91,10 @@ Contributor(s): Adobe Systems Incorporated.
+  *
+  ***********************************************************************/
+ 
+-char *
++const char *
+ NPP_GetMIMEDescription(void)
+ {
+-  return (char *) MIME_TYPES_HANDLED;
++  return (const char *) MIME_TYPES_HANDLED;
+ }
+ 
+ NPError
+diff --git a/plugin/npunix.c b/plugin/npunix.c
+index 703d020..a7c6e68 100644
+--- a/plugin/npunix.c
++++ b/plugin/npunix.c
+@@ -537,7 +537,7 @@ Private_HandleEvent(NPP instance, void* event)
+  *  - Netscape uses the return value to identify when an object instance
+  *    of this plugin should be created.
+  */
+-char *
++const char *
+ NP_GetMIMEDescription(void)
+ {
+     return NPP_GetMIMEDescription();
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 86e2af6..1676d8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-build-with-xulrunner-1.9.1.patch
 Look-for-generated-enums-in-srcdir.patch
 Use-C99-int-types-instead-of-NSPR-ones.patch
+Fix-build-with-xulrunner-8.0.patch

-- 
libgtk-vnc Debian packaging