[gegl: 12/12] don't leak "root" symbol (#642992)

[Nils Philippsen]

commit 76c69687481c744652d0c59d0a09b5d740b0cc1e
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Oct 19 17:09:36 2010 +0200

    don't leak "root" symbol (#642992)
    
    This clashes with the (equally broken, 3rd party) xvnkb input method.

 gegl-0.1.2-leaked-symbol.patch |   25 +++++++++++++++++++++++++
 gegl.spec                      |   12 +++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/gegl-0.1.2-leaked-symbol.patch b/gegl-0.1.2-leaked-symbol.patch
new file mode 100644
index 0000000..4ccf9fe
--- /dev/null
+++ b/gegl-0.1.2-leaked-symbol.patch
@@ -0,0 +1,25 @@
+From 75a5c4a5042aa3c531977637e5f0b5e62d14978c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Tue, 19 Oct 2010 16:32:41 +0200
+Subject: [PATCH] gegl: make "root" a have file, not global scope
+
+---
+ gegl/gegl-instrument.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gegl/gegl-instrument.c b/gegl/gegl-instrument.c
+index c43b268..a46b3ca 100644
+--- a/gegl/gegl-instrument.c
++++ b/gegl/gegl-instrument.c
+@@ -38,7 +38,7 @@ struct _Timing
+   Timing *next;
+ };
+ 
+-Timing *root = NULL;
++static Timing *root = NULL;
+ 
+ static Timing *iter_next (Timing *iter)
+ {
+-- 
+1.7.3.1
+
diff --git a/gegl.spec b/gegl.spec
index afcb2a5..7e90ca1 100644
--- a/gegl.spec
+++ b/gegl.spec
@@ -3,7 +3,7 @@
 Summary:	A graph based image processing framework
 Name:		gegl
 Version:	0.1.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
@@ -12,8 +12,13 @@ Source0:	ftp://ftp.gtk.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
 # backported git commit fc207f85521c3939600bd3e5a337c6ed2dfaa950
 # "process: don't leak each node set on a GeglProcessor"
 Patch0:		gegl-0.1.2-processor-leak.patch
+# git commit 6ed206a3f38a1bc5af315b2794d26392d45ba434
 # avoid buffer overflow in gegl_buffer_header_init()
 Patch1:		gegl-0.1.2-buffer-save-overflow.patch
+# git commit 75a5c4a5042aa3c531977637e5f0b5e62d14978c
+# don't leak "root" symbol which clashes with equally broken 3rd party input
+# methods (xvnkb)
+Patch2:     gegl-0.1.2-leaked-symbol.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc
 BuildRequires:	babl-devel >= 0.1.0
@@ -63,6 +68,7 @@ chmod -x docs/devhelp.css operations/external/ff-load.c operations/workshop/exte
 
 %patch0 -p1 -b .processor-leak
 %patch1 -p1 -b .buffer-save-overflow
+%patch2 -p1 -b .leaked-symbol
 
 %build
 # use PIC/PIE because gegl is likely to deal with data coming from untrusted
@@ -147,6 +153,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Oct 19 2010 Nils Philippsen <nils at redhat.com> - 0.1.2-4
+- don't leak "root" symbol which clashes with (equally broken) xvnkb input
+  method (#642992)
+
 * Wed Jun 23 2010 Nils Philippsen <nils at redhat.com> - 0.1.2-3
 - build with -fno-strict-aliasing
 - use PIC/PIE because gegl is likely to deal with data coming from untrusted