[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                  |    3 +++
 patches/dev300/buildfix-extensions-npwrap-no-gtk.diff |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit b87ca979633b8448d204a32834b2bce608afb6f7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 13 10:53:23 2010 +0200

    Fix npwrap.cxx build without GTK (i#110833, gentoo#306181)
    
    * patches/dev300/buildfix-extensions-npwrap-no-gtk.diff:
    * patches/dev300/apply: add missing #ifdef ENABLE_GTK

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a6011bb..4755292 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1195,6 +1195,9 @@ ucb-neon-0.24.diff, pmladek
 # it builds fine with boost-1,36 here
 build-enable-boost-1.36.diff, i#105772, pmladek
 
+# fix npwrap.cxx build without gtk
+buildfix-extensions-npwrap-no-gtk.diff, i#110833, gentoo#306181, pmladek
+
 # don't break dmake with environment variables containing space in the name
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
diff --git a/patches/dev300/buildfix-extensions-npwrap-no-gtk.diff b/patches/dev300/buildfix-extensions-npwrap-no-gtk.diff
new file mode 100644
index 0000000..8ce8071
--- /dev/null
+++ b/patches/dev300/buildfix-extensions-npwrap-no-gtk.diff
@@ -0,0 +1,12 @@
+--- extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:31:31.000000000 +0300
++++ extensions/source/plugin/unx/npwrap.cxx	2010-02-22 02:32:04.000000000 +0300
+@@ -485,7 +485,9 @@
+ 
+     medDebug( 1, "left plugin app main loop\n" );
+ 
++    #ifdef ENABLE_GTK
+     g_source_remove(xt_polling_timer_id);
++    #endif
+     
+     pNP_Shutdown();
+     medDebug( 1, "NP_Shutdown done\n" );