+Date: Wed Jun 20 10:29:11 2012 -0400
+
+ Bug 678479 - Leading spaces in first line of are ignored
+
+ (cherry picked from commit 4fae4725243fe1d83d15c84a1e652217369d4d0d)
+
+ gtkhtml/htmlengine.c | 2 +-
+ gtkhtml/tests/test12.html | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+commit adb4408d44e39917012bacd33a524d8f482dc631
+Author: Matthew Barnes
+Date: Sun Jun 17 18:46:53 2012 -0400
+
+ Post-release version bump.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 92d616ab47a128670e16a207791a101d1c283165
Author: Matthew Barnes
Date: Sun Jun 17 18:18:06 2012 -0400
diff -Nru gtkhtml4.0-4.4.3/components/editor/gtkhtml-editor-4.0.pc gtkhtml4.0-4.4.4/components/editor/gtkhtml-editor-4.0.pc
--- gtkhtml4.0-4.4.3/components/editor/gtkhtml-editor-4.0.pc 2012-06-18 00:15:02.000000000 +0200
+++ gtkhtml4.0-4.4.4/components/editor/gtkhtml-editor-4.0.pc 2012-08-12 23:35:37.000000000 +0200
@@ -1,4 +1,4 @@
-prefix=/home/mfb/local/stable
+prefix=/home/mfb/local/common
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
@@ -8,6 +8,6 @@
Name: gtkhtml-editor
Description: HTML editor widget
Requires: libgtkhtml-4.0
-Version: 4.4.3
+Version: 4.4.4
Libs: -L${libdir} -lgtkhtml-editor-4.0
Cflags: -I${includedir}/libgtkhtml-4.0/editor
diff -Nru gtkhtml4.0-4.4.3/components/editor/Makefile.in gtkhtml4.0-4.4.4/components/editor/Makefile.in
--- gtkhtml4.0-4.4.3/components/editor/Makefile.in 2012-06-18 00:10:37.000000000 +0200
+++ gtkhtml4.0-4.4.4/components/editor/Makefile.in 2012-08-12 23:31:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru gtkhtml4.0-4.4.3/components/Makefile.in gtkhtml4.0-4.4.4/components/Makefile.in
--- gtkhtml4.0-4.4.3/components/Makefile.in 2012-06-18 00:10:37.000000000 +0200
+++ gtkhtml4.0-4.4.4/components/Makefile.in 2012-08-12 23:31:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru gtkhtml4.0-4.4.3/configure gtkhtml4.0-4.4.4/configure
--- gtkhtml4.0-4.4.3/configure 2012-06-18 00:10:32.000000000 +0200
+++ gtkhtml4.0-4.4.4/configure 2012-08-12 23:31:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtkhtml 4.4.3.
+# Generated by GNU Autoconf 2.69 for gtkhtml 4.4.4.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='gtkhtml'
PACKAGE_TARNAME='gtkhtml'
-PACKAGE_VERSION='4.4.3'
-PACKAGE_STRING='gtkhtml 4.4.3'
+PACKAGE_VERSION='4.4.4'
+PACKAGE_STRING='gtkhtml 4.4.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml'
PACKAGE_URL=''
@@ -1432,7 +1432,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtkhtml 4.4.3 to adapt to many kinds of systems.
+\`configure' configures gtkhtml 4.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtkhtml 4.4.3:";;
+ short | recursive ) echo "Configuration of gtkhtml 4.4.4:";;
esac
cat <<\_ACEOF
@@ -1633,7 +1633,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtkhtml configure 4.4.3
+gtkhtml configure 4.4.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2177,7 +2177,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtkhtml $as_me 4.4.3, which was
+It was created by gtkhtml $as_me 4.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2992,7 +2992,7 @@
# Define the identity of the package.
PACKAGE='gtkhtml'
- VERSION='4.4.3'
+ VERSION='4.4.4'
cat >>confdefs.h <<_ACEOF
@@ -8422,10 +8422,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -8464,7 +8460,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11428,7 +11424,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -13598,17 +13594,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -13725,7 +13710,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -15548,9 +15533,6 @@
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
@@ -15712,7 +15694,7 @@
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -16572,7 +16554,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -17444,17 +17426,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -17571,7 +17542,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -19640,7 +19611,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtkhtml $as_me 4.4.3, which was
+This file was extended by gtkhtml $as_me 4.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19706,7 +19677,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtkhtml config.status 4.4.3
+gtkhtml config.status 4.4.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru gtkhtml4.0-4.4.3/configure.ac gtkhtml4.0-4.4.4/configure.ac
--- gtkhtml4.0-4.4.3/configure.ac 2012-06-18 00:09:32.000000000 +0200
+++ gtkhtml4.0-4.4.4/configure.ac 2012-08-12 23:27:58.000000000 +0200
@@ -1,6 +1,6 @@
dnl Initialization
AC_PREREQ(2.58)
-AC_INIT([gtkhtml], [4.4.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
+AC_INIT([gtkhtml], [4.4.4], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
AM_INIT_AUTOMAKE([gnu 1.9 dist-xz no-dist-gzip])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
diff -Nru gtkhtml4.0-4.4.3/debian/changelog gtkhtml4.0-4.4.4/debian/changelog
--- gtkhtml4.0-4.4.3/debian/changelog 2012-06-19 16:40:56.000000000 +0200
+++ gtkhtml4.0-4.4.4/debian/changelog 2012-10-20 21:55:46.000000000 +0200
@@ -1,3 +1,9 @@
+gtkhtml4.0 (4.4.4-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Jordi Mallach Sat, 20 Oct 2012 18:54:57 +0200
+
gtkhtml4.0 (4.4.3-1) unstable; urgency=low
* Team upload.
diff -Nru gtkhtml4.0-4.4.3/gtkhtml/htmlengine.c gtkhtml4.0-4.4.4/gtkhtml/htmlengine.c
--- gtkhtml4.0-4.4.3/gtkhtml/htmlengine.c 2012-06-18 00:07:58.000000000 +0200
+++ gtkhtml4.0-4.4.4/gtkhtml/htmlengine.c 2012-08-12 23:29:51.000000000 +0200
@@ -970,7 +970,7 @@
text++;
text--;
}
- } else if ((e->flow == NULL && !e->editable) || ((prev == NULL || prev_text_ends_in_space) && !e->inPre)) {
+ } else if (!e->inPre && ((e->flow == NULL && !e->editable) || ((prev == NULL || prev_text_ends_in_space) && !e->inPre))) {
while (*text == ' ')
text++;
if (*text == 0)
diff -Nru gtkhtml4.0-4.4.3/gtkhtml/Makefile.in gtkhtml4.0-4.4.4/gtkhtml/Makefile.in
--- gtkhtml4.0-4.4.3/gtkhtml/Makefile.in 2012-06-18 00:10:37.000000000 +0200
+++ gtkhtml4.0-4.4.4/gtkhtml/Makefile.in 2012-08-12 23:31:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru gtkhtml4.0-4.4.3/gtkhtml/tests/test12.html gtkhtml4.0-4.4.4/gtkhtml/tests/test12.html
--- gtkhtml4.0-4.4.3/gtkhtml/tests/test12.html 1970-01-01 01:00:00.000000000 +0100
+++ gtkhtml4.0-4.4.4/gtkhtml/tests/test12.html 2012-08-13 01:06:11.000000000 +0200
@@ -0,0 +1,6 @@
+
+
+ Leading spaces at the first line in pre.
+ Leading spaces at the second line in pre.
+
+
diff -Nru gtkhtml4.0-4.4.3/ltmain.sh gtkhtml4.0-4.4.4/ltmain.sh
--- gtkhtml4.0-4.4.3/ltmain.sh 2012-06-18 00:10:19.000000000 +0200
+++ gtkhtml4.0-4.4.4/ltmain.sh 2012-08-12 23:31:26.000000000 +0200
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1"
+VERSION="2.4.2 Debian-2.4.2-1.1"
TIMESTAMP=""
package_revision=1.3337
diff -Nru gtkhtml4.0-4.4.3/m4/libtool.m4 gtkhtml4.0-4.4.4/m4/libtool.m4
--- gtkhtml4.0-4.4.3/m4/libtool.m4 2012-06-18 00:10:19.000000000 +0200
+++ gtkhtml4.0-4.4.4/m4/libtool.m4 2012-08-12 23:31:26.000000000 +0200
@@ -2512,17 +2512,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2639,7 +2628,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -3255,10 +3244,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3297,7 +3282,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4049,7 +4034,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4348,7 +4333,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -6241,9 +6226,6 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6405,7 +6387,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Nru gtkhtml4.0-4.4.3/Makefile.in gtkhtml4.0-4.4.4/Makefile.in
--- gtkhtml4.0-4.4.3/Makefile.in 2012-06-18 00:10:38.000000000 +0200
+++ gtkhtml4.0-4.4.4/Makefile.in 2012-08-12 23:31:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -685,7 +685,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -Nru gtkhtml4.0-4.4.3/NEWS gtkhtml4.0-4.4.4/NEWS
--- gtkhtml4.0-4.4.3/NEWS 2012-06-18 00:18:00.000000000 +0200
+++ gtkhtml4.0-4.4.4/NEWS 2012-08-13 01:03:57.000000000 +0200
@@ -1,3 +1,11 @@
+GtkHTML-4.4.4 2012-08-13
+------------------------
+
+Bug Fixes:
+ Bug 678479 - Leading spaces in first line of are ignored
+ (Kouhei Sutou)
+
+
GtkHTML-4.4.3 2012-06-18
------------------------