Hi, The attached NMU has been uploaded to delayed/3.
Cheers, Emilio
diff -u mlview-0.9.0/debian/changelog mlview-0.9.0/debian/changelog
--- mlview-0.9.0/debian/changelog
+++ mlview-0.9.0/debian/changelog
@@ -1,3 +1,15 @@
+mlview (0.9.0-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/10_port_to_gtksourceview2.patch, debian/control:
+ switch to gtksourceview2. Closes: #532938.
+ * debian/patches/99_autoconf.patch: run autoconf on top of the
+ previous patch.
+ * Stop build-depending on libeel2-dev, which no longer exists and was
+ unused anyway. Closes: #525544.
+
+ -- Emilio Pozuelo Monfort <po...@ubuntu.com> Tue, 18 Aug 2009 01:50:42 +0200
+
mlview (0.9.0-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u mlview-0.9.0/debian/control mlview-0.9.0/debian/control
--- mlview-0.9.0/debian/control
+++ mlview-0.9.0/debian/control
@@ -2,7 +2,7 @@
Section: editors
Priority: optional
Maintainer: Sebastien Bacher <seb...@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.0.0), libgnomeui-dev (>= 2.6.1.1-4), libxml2-dev (>= 2.6.11), libgtk2.0-dev (>= 2.6), libglib2.0-dev (>= 2.6), libgconf2-dev (>= 2.6.2), libglade2-dev (>= 2.0), libxslt1-dev (>= 1.1.8), libeel2-dev (>= 2.6.2), libxml-parser-perl, libxext-dev, libgtksourceview-dev (>= 1.0), libvte-dev (>= 0.11.12), libgnomevfs2-dev (>= 2.6.0), libglademm-2.4-dev, libgtkmm-2.4-dev
+Build-Depends: cdbs, debhelper (>> 4.0.0), libgnomeui-dev (>= 2.6.1.1-4), libxml2-dev (>= 2.6.11), libgtk2.0-dev (>= 2.6), libglib2.0-dev (>= 2.6), libgconf2-dev (>= 2.6.2), libglade2-dev (>= 2.0), libxslt1-dev (>= 1.1.8), libxml-parser-perl, libxext-dev, libgtksourceview2.0-dev (>= 1.0), libvte-dev (>= 0.11.12), libgnomevfs2-dev (>= 2.6.0), libglademm-2.4-dev, libgtkmm-2.4-dev
Standards-Version: 3.7.3
Package: mlview
only in patch2:
unchanged:
--- mlview-0.9.0.orig/debian/patches/99_autoconf.patch
+++ mlview-0.9.0/debian/patches/99_autoconf.patch
@@ -0,0 +1,951 @@
+diff -Nur -x '*.orig' -x '*~' mlview-0.9.0/configure mlview-0.9.0.new/configure
+--- mlview-0.9.0/configure 2009-08-18 02:46:09.000000000 +0200
++++ mlview-0.9.0.new/configure 2009-08-18 02:46:10.000000000 +0200
+@@ -1345,7 +1345,7 @@
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+
+@@ -2230,7 +2230,7 @@
+ LIBGNOME2_VERSION=2.4.1
+ GCONF2_VERSION=2.6.2
+ SEWFOX_VERSION=0.0.1
+-GTKSOURCEVIEW_VERSION=1.0
++GTKSOURCEVIEW_VERSION=2.0
+ VTE_VERSION=0.11.12
+ DBUS_VERSION=0.22
+ GTKMM2_VERSION=2.4.0
+@@ -2272,7 +2272,7 @@
+ \* 10000 + $MLVIEW_MINOR_VERSION \
+ \* 100 + $MLVIEW_MICRO_VERSION`
+
+-MLVIEW_EXE=$prefix/bin/mlview
++MLVIEW_EXE=$prefix/bin/mlv
+
+
+
+@@ -2628,7 +2628,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2686,7 +2687,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2757,7 +2759,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2801,7 +2804,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3527,7 +3531,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3585,7 +3590,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3701,7 +3707,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3755,7 +3762,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3800,7 +3808,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3844,7 +3853,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4458,7 +4468,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 4461 "configure"' > conftest.$ac_ext
++ echo '#line 4471 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -4578,7 +4588,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4887,7 +4898,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5057,7 +5069,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5124,7 +5137,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5562,7 +5576,7 @@
+
+
+ # Provide some information about the compiler.
+-echo "$as_me:5565:" \
++echo "$as_me:5579:" \
+ "checking for Fortran 77 compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+@@ -5608,7 +5622,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5657,7 +5672,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6594,11 +6610,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6597: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6613: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6601: \$? = $ac_status" >&5
++ echo "$as_me:6617: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -6827,11 +6843,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6830: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:6834: \$? = $ac_status" >&5
++ echo "$as_me:6850: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -6887,11 +6903,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:6890: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:6906: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:6894: \$? = $ac_status" >&5
++ echo "$as_me:6910: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -7279,7 +7295,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7339,7 +7356,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8542,7 +8560,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8645,7 +8664,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8710,7 +8730,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8803,7 +8824,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8868,7 +8890,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8934,7 +8957,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9000,7 +9024,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9075,7 +9100,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9078 "configure"
++#line 9103 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -9173,7 +9198,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 9176 "configure"
++#line 9201 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10245,7 +10270,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10306,7 +10332,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11350,11 +11377,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11353: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11380: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:11357: \$? = $ac_status" >&5
++ echo "$as_me:11384: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -11410,11 +11437,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:11413: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11440: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:11417: \$? = $ac_status" >&5
++ echo "$as_me:11444: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12246,7 +12273,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12349,7 +12377,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12414,7 +12443,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12507,7 +12537,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12572,7 +12603,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12638,7 +12670,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12704,7 +12737,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12779,7 +12813,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12782 "configure"
++#line 12816 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12877,7 +12911,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12880 "configure"
++#line 12914 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13704,11 +13738,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13707: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13741: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13711: \$? = $ac_status" >&5
++ echo "$as_me:13745: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -13764,11 +13798,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13767: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13801: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13771: \$? = $ac_status" >&5
++ echo "$as_me:13805: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14146,7 +14180,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14196,7 +14231,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15809,11 +15845,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15812: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15848: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15816: \$? = $ac_status" >&5
++ echo "$as_me:15852: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -16042,11 +16078,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16045: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16081: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16049: \$? = $ac_status" >&5
++ echo "$as_me:16085: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -16102,11 +16138,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16105: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16141: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16109: \$? = $ac_status" >&5
++ echo "$as_me:16145: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16494,7 +16530,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16554,7 +16591,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17757,7 +17795,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17860,7 +17899,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17925,7 +17965,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18018,7 +18059,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18083,7 +18125,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18149,7 +18192,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18215,7 +18259,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18290,7 +18335,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 18293 "configure"
++#line 18338 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -18388,7 +18433,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 18391 "configure"
++#line 18436 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -19449,7 +19494,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -19594,7 +19640,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -19665,7 +19712,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -19809,7 +19857,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -19867,7 +19916,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -19964,7 +20014,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20043,7 +20094,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20107,7 +20159,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20171,7 +20224,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20248,7 +20302,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20312,7 +20367,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20428,7 +20484,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20595,7 +20652,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20728,7 +20786,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20813,7 +20872,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -21449,7 +21509,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -21616,7 +21677,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -21765,7 +21827,8 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -22980,12 +23043,12 @@
+
+ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-1.0 >= \$GTKSOURCEVIEW_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-2.0 >= \$GTKSOURCEVIEW_VERSION\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GTKSOURCEVIEW_CFLAGS=`$PKG_CONFIG --cflags "gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION" 2>/dev/null`
++ pkg_cv_GTKSOURCEVIEW_CFLAGS=`$PKG_CONFIG --cflags "gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22994,12 +23057,12 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-1.0 >= \$GTKSOURCEVIEW_VERSION\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtksourceview-2.0 >= \$GTKSOURCEVIEW_VERSION\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_GTKSOURCEVIEW_LIBS=`$PKG_CONFIG --libs "gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION" 2>/dev/null`
++ pkg_cv_GTKSOURCEVIEW_LIBS=`$PKG_CONFIG --libs "gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23008,18 +23071,18 @@
+ fi
+
+ if test $pkg_failed = yes; then
+- GTKSOURCEVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION"`
++ GTKSOURCEVIEW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION"`
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKSOURCEVIEW_PKG_ERRORS" 1>&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION) were not met.
++ { { echo "$as_me:$LINENO: error: Package requirements (gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+ Alternatively you may set the GTKSOURCEVIEW_CFLAGS and GTKSOURCEVIEW_LIBS environment variables
+ to avoid the need to call pkg-config. See the pkg-config man page for
+ more details." >&5
+-echo "$as_me: error: Package requirements (gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION) were not met.
++echo "$as_me: error: Package requirements (gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+@@ -24400,6 +24463,11 @@
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -24438,12 +24506,6 @@
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
only in patch2:
unchanged:
--- mlview-0.9.0.orig/debian/patches/10_port_to_gtksourceview2.patch
+++ mlview-0.9.0/debian/patches/10_port_to_gtksourceview2.patch
@@ -0,0 +1,216 @@
+diff -Nur -x '*.orig' -x '*~' mlview-0.9.0/configure.in mlview-0.9.0.new/configure.in
+--- mlview-0.9.0/configure.in 2005-08-07 09:42:07.000000000 +0200
++++ mlview-0.9.0.new/configure.in 2009-08-18 02:45:29.000000000 +0200
+@@ -29,7 +29,7 @@
+ LIBGNOME2_VERSION=2.4.1
+ GCONF2_VERSION=2.6.2
+ SEWFOX_VERSION=0.0.1
+-GTKSOURCEVIEW_VERSION=1.0
++GTKSOURCEVIEW_VERSION=2.0
+ VTE_VERSION=0.11.12
+ DBUS_VERSION=0.22
+ GTKMM2_VERSION=2.4.0
+@@ -306,7 +306,7 @@
+ dnl **********************
+ dnl libgtksourceview
+ dnl **********************
+-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-1.0 >= $GTKSOURCEVIEW_VERSION)
++PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0 >= $GTKSOURCEVIEW_VERSION)
+
+ dnl **********************
+ dnl vte
+diff -Nur -x '*.orig' -x '*~' mlview-0.9.0/src/mlview-source-view.cc mlview-0.9.0.new/src/mlview-source-view.cc
+--- mlview-0.9.0/src/mlview-source-view.cc 2005-08-07 09:42:28.000000000 +0200
++++ mlview-0.9.0.new/src/mlview-source-view.cc 2009-08-18 02:44:12.000000000 +0200
+@@ -25,9 +25,10 @@
+
+ #include <string.h>
+ #include <gtk/gtk.h>
++#include "config.h"
+ #include <gtksourceview/gtksourceview.h>
+ #include <gtksourceview/gtksourcelanguage.h>
+-#include <gtksourceview/gtksourcelanguagesmanager.h>
++#include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourcebuffer.h>
+ #include "mlview-safe-ptr-utils.h"
+ #include "mlview-source-view.h"
+@@ -36,6 +37,7 @@
+ #include "mlview-prefs.h"
+ #include "mlview-prefs-category-sourceview.h"
+
++
+ namespace mlview
+ {
+ struct SourceViewPriv
+@@ -48,7 +50,7 @@
+ SafePtr<GtkSourceView, GtkSourceViewRef, GtkSourceViewUnref> native_sv_ptr ;
+ SafePtr<Gtk::Widget, GtkWidgetMMRef, GtkWidgetMMUnref> native_sv_wrapper_ptr ;
+ /* The language manager, used by native_sv */
+- GtkSourceLanguagesManager *languages_manager ;
++ GtkSourceLanguageManager *languages_manager ;
+
+ GtkUIManager *ui_manager ;
+
+@@ -165,8 +167,8 @@
+ gtk_source_view_set_show_line_numbers (source_view,
+ m_prefs->show_line_numbers ());
+
+- gtk_source_view_set_tabs_width (source_view,
+- m_prefs->get_tabs_width ());
++ gtk_source_view_set_tab_width (source_view,
++ m_prefs->get_tabs_width ());
+
+ gtk_source_view_set_auto_indent (source_view,
+ m_prefs->auto_indent ());
+@@ -175,11 +177,11 @@
+ (source_view,
+ m_prefs->replace_tabs_with_spaces ());
+
+- gtk_source_view_set_show_margin (source_view,
+- m_prefs->show_margin ());
++ gtk_source_view_set_show_right_margin (source_view,
++ m_prefs->show_margin ());
+
+- gtk_source_view_set_margin (source_view,
+- m_prefs->get_margin_position ());
++ gtk_source_view_set_right_margin_position (source_view,
++ m_prefs->get_margin_position ());
+
+ const char* fontname = const_cast<char*> (
+ m_prefs->get_font_name ().c_str ());
+@@ -240,8 +242,8 @@
+ {
+ GtkSourceView *source_view = (GtkSourceView*)native_sv_ptr;
+
+- gtk_source_view_set_tabs_width (source_view,
+- m_prefs->get_tabs_width ());
++ gtk_source_view_set_tab_width (source_view,
++ m_prefs->get_tabs_width ());
+ }
+
+ void
+@@ -268,8 +270,8 @@
+ {
+ GtkSourceView *source_view = (GtkSourceView*)native_sv_ptr;
+
+- gtk_source_view_set_show_margin (source_view,
+- m_prefs->show_margin ());
++ gtk_source_view_set_show_right_margin (source_view,
++ m_prefs->show_margin ());
+ }
+
+ void
+@@ -277,8 +279,8 @@
+ {
+ GtkSourceView *source_view = (GtkSourceView*)native_sv_ptr;
+
+- gtk_source_view_set_margin (source_view,
+- m_prefs->get_margin_position ());
++ gtk_source_view_set_right_margin_position (source_view,
++ m_prefs->get_margin_position ());
+ }
+
+ void
+@@ -469,14 +471,13 @@
+ return false;
+ }
+
+-GtkSourceLanguagesManager *
++GtkSourceLanguageManager *
+ SourceView::get_languages_manager ()
+ {
+ THROW_IF_FAIL (m_priv) ;
+
+ if (!m_priv->languages_manager) {
+- m_priv->languages_manager =
+- gtk_source_languages_manager_new () ;
++ m_priv->languages_manager = gtk_source_language_manager_new () ;
+ THROW_IF_FAIL (m_priv->languages_manager) ;
+ }
+ return m_priv->languages_manager ;
+@@ -492,7 +493,7 @@
+ (gtk_text_view_get_buffer (GTK_TEXT_VIEW (m_priv->native_sv_ptr.get ()))) ;
+ THROW_IF_FAIL (source_buffer) ;
+
+- gtk_source_buffer_set_highlight (source_buffer, TRUE) ;
++ gtk_source_buffer_set_highlight_syntax (source_buffer, TRUE) ;
+ gtk_source_buffer_set_language (source_buffer, a_language) ;
+
+ return MLVIEW_OK ;
+@@ -501,22 +502,22 @@
+ enum MlViewStatus
+ SourceView::set_language_from_mime_type (const UString &a_mime_type)
+ {
+- GtkSourceLanguagesManager *lm = NULL ;
++ GtkSourceLanguageManager *lm = NULL ;
+ GtkSourceLanguage *language = NULL ;
+
+ THROW_IF_FAIL (m_priv) ;
+ lm = get_languages_manager () ;
+ THROW_IF_FAIL (lm) ;
+- language = gtk_source_languages_manager_get_language_from_mime_type
+- (lm, a_mime_type.c_str ()) ;
++ language = gtk_source_language_manager_guess_language
++ (lm, NULL, a_mime_type.c_str ()) ;
+ LOG_TO_ERROR_STREAM ("language associated to '"
+ << a_mime_type
+ <<"'mime type: "
+ << language) ;
+ if (!language) {
+ language =
+- gtk_source_languages_manager_get_language_from_mime_type
+- (lm,"text/xml") ;
++ gtk_source_language_manager_guess_language
++ (lm, NULL, "text/xml") ;
+ THROW_IF_FAIL (language) ;
+ LOG_TO_ERROR_STREAM ("falling back to the language associated to"
+ "mime type 'text/xml'") ;
+@@ -1305,7 +1306,7 @@
+ m_priv->show_line_numbers) ;
+
+ m_priv->tabs_width = 4 ;
+- gtk_source_view_set_tabs_width
++ gtk_source_view_set_tab_width
+ (m_priv->native_sv_ptr,
+ m_priv->tabs_width) ;
+
+@@ -1314,11 +1315,11 @@
+ m_priv->set_autoindent) ;
+
+ m_priv->set_show_margin = FALSE ;
+- gtk_source_view_set_show_margin (m_priv->native_sv_ptr,
+- m_priv->set_show_margin) ;
++ gtk_source_view_set_show_right_margin (m_priv->native_sv_ptr,
++ m_priv->set_show_margin) ;
+ m_priv->margin = 2 ;
+- gtk_source_view_set_margin (m_priv->native_sv_ptr,
+- m_priv->margin) ;
++ gtk_source_view_set_right_margin_position (m_priv->native_sv_ptr,
++ m_priv->margin) ;
+
+ set_default_language () ;
+
+diff -Nur -x '*.orig' -x '*~' mlview-0.9.0/src/mlview-source-view.h mlview-0.9.0.new/src/mlview-source-view.h
+--- mlview-0.9.0/src/mlview-source-view.h 2005-08-07 09:42:28.000000000 +0200
++++ mlview-0.9.0.new/src/mlview-source-view.h 2009-08-18 02:39:22.000000000 +0200
+@@ -25,9 +25,10 @@
+ #ifndef __MLVIEW_SOURCE_VIEW_H
+ #define __MLVIEW_SOURCE_VIEW_H
+
++#include "config.h"
+ #include <gtksourceview/gtksourceview.h>
+ #include <gtksourceview/gtksourcelanguage.h>
+-#include <gtksourceview/gtksourcelanguagesmanager.h>
++#include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourcebuffer.h>
+ #include "mlview-view-adapter.h"
+ #include "mlview-xml-document.h"
+@@ -112,7 +113,7 @@
+
+ enum MlViewStatus build_edit_menu_body (const UString &a_menu_root_path) ;
+
+- GtkSourceLanguagesManager * get_languages_manager () ;
++ GtkSourceLanguageManager * get_languages_manager () ;
+
+ enum MlViewStatus set_language (GtkSourceLanguage *a_language) ;
+
signature.asc
Description: OpenPGP digital signature
