[gimp] build/win: Upgrade libmng to 2.0.2

[Michael Henning <mhenning src gnome org>]

commit 5d675005a63c48a1542a484437690cb9aab5af23
Author: Michael Henning <drawoc darkrefraction com>
Date:   Wed Nov 6 18:57:16 2013 -0500

    build/win: Upgrade libmng to 2.0.2

 build/windows/jhbuild/build.jhbuildrc              |    4 +-
 build/windows/jhbuild/imglibs.moduleset            |   13 +++---
 .../jhbuild/patches/libmng-1.0.10-mingw.patch      |   44 --------------------
 .../libmng-1.0.9-dont-leak-zlib-streams.patch      |   14 ------
 .../jhbuild/patches/libmng-change-locations.patch  |   19 --------
 .../jhbuild/patches/libmng-no-undefined.diff       |   11 +++++
 6 files changed, 18 insertions(+), 87 deletions(-)
---
diff --git a/build/windows/jhbuild/build.jhbuildrc b/build/windows/jhbuild/build.jhbuildrc
index ca3788e..66c5192 100644
--- a/build/windows/jhbuild/build.jhbuildrc
+++ b/build/windows/jhbuild/build.jhbuildrc
@@ -220,15 +220,13 @@ module_autogenargs['gimp-gtk3']  = autogenargs + """ --disable-python \
 module_autogenargs['gdb']        = autogenargs.replace ("--disable-static", "")
 
 module_makeargs['mingw32-pthreads']= " CROSS=" + mingw_tool_prefix
-module_makeargs['libmng'] = " CC=" + mingw_tool_prefix + "gcc"
+
 module_extra_env.update (
 {'mingw32-pthreads': 
        {'PREFIX': prefix, 'INSTALL': 'install'},
  'webkitgtk':
        {'CFLAGS': os.environ['CFLAGS'].replace ("-g", ""),
         'CXXFLAGS': os.environ['CXXFLAGS'].replace ("-g", "") + ' -I' + checkoutroot + 
'pthreads-w32-2-9-1-release -w'},
- 'libmng': 
-       {'PREFIX': prefix, 'CFLAGS': os.environ['CFLAGS'] + os.environ['LDFLAGS']},
  'ghostscript':
        {'CFLAGS': os.environ['CFLAGS'].replace ("-O0", "").replace ("-mms-bitfields", ""), 
'ac_cv_lib_pthread_pthread_create': 'no', 'CC': os.environ['CC'] + " -mms-bitfields"},
  'icu-native': {},
diff --git a/build/windows/jhbuild/imglibs.moduleset b/build/windows/jhbuild/imglibs.moduleset
index 531f3b8..a900855 100644
--- a/build/windows/jhbuild/imglibs.moduleset
+++ b/build/windows/jhbuild/imglibs.moduleset
@@ -61,17 +61,16 @@
        </dependencies>
 </metamodule>
 
-<autotools id="libmng"  autogen-sh=" || true" makeargs="-f makefiles/makefile.mingwdll" makeinstallargs="-f 
makefiles/makefile.mingwdll install">
-       <branch version="1.0.10" repo="sf.net"
-                       module="libmng/libmng-devel/1.0.10/libmng-1.0.10.tar.gz"
-                       hash="sha1:78ad516a1de79d00de720bf2a7c9afea2c896b09">
-               <patch file="libmng-1.0.10-mingw.patch" strip="1"/>
-               <patch file="libmng-1.0.9-dont-leak-zlib-streams.patch" strip="0"/>
-               <patch file="libmng-change-locations.patch" strip="1"/>
+<autotools id="libmng" autogen-sh="bootstrap.sh; ./configure">
+       <branch version="2.0.2" repo="sf.net"
+                       module="libmng/libmng-devel/2.0.2/libmng-2.0.2.tar.xz"
+                       hash="sha1:7dd35369ff5916e1823cbacef984ab1b87714b69">
+               <patch file="libmng-no-undefined.diff" strip="1"/>
        </branch>
        <dependencies>
                <dep package="zlib"/>
                <dep package="libjpeg-turbo"/>
+               <dep package="lcms2"/>
        </dependencies>
 </autotools>
 
diff --git a/build/windows/jhbuild/patches/libmng-no-undefined.diff 
b/build/windows/jhbuild/patches/libmng-no-undefined.diff
new file mode 100644
index 0000000..dceadf1
--- /dev/null
+++ b/build/windows/jhbuild/patches/libmng-no-undefined.diff
@@ -0,0 +1,11 @@
+--- a/Makefile.am      2013-03-05 06:59:27.000000000 -0500
++++ b/Makefile.am      2013-11-06 19:11:28.139007712 -0500
+@@ -9,7 +9,7 @@
+ 
+ # libmng release @VERSION@
+ libmng_la_LDFLAGS = \
+-      -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@
++      -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ -no-undefined
+ 
+ lib_LTLIBRARIES = libmng.la
+