[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.0.1-4-2877-g8fe555b

[Mike Hommey]

The following commit has been merged in the debian/experimental branch:
commit 8fe555beece9cd66e9cf2e70ee0c45cce7a3d395
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Oct 25 12:57:55 2008 +0200

    Properly check and link against libpangoft2
    
    https://bugs.webkit.org/show_bug.cgi?id=21885

diff --git a/configure b/configure
index 1e4dd82..e2f6647 100755
--- a/configure
+++ b/configure
@@ -24924,15 +24924,18 @@ if test -n "$PKG_CONFIG"; then
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
+                     pangoft2
                      fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
   ($PKG_CONFIG --exists --print-errors "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>/dev/null`
 else
@@ -24948,15 +24951,18 @@ if test -n "$PKG_CONFIG"; then
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo-ft
+                     pangoft2
                      fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= \$FREETYPE2_REQUIRED_VERSION\"") >&5
   ($PKG_CONFIG --exists --print-errors "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>/dev/null`
 else
@@ -24978,10 +24984,12 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
         else
 	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
         fi
@@ -24989,6 +24997,7 @@ fi
 	echo "$FREETYPE_PKG_ERRORS" >&5
 
 	{ { echo "$as_me:$LINENO: error: Package requirements (cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
 
@@ -25002,6 +25011,7 @@ and FREETYPE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
 echo "$as_me: error: Package requirements (cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION) were not met:
 
diff --git a/configure.ac b/configure.ac
index 212b4f4..8407966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,6 +596,7 @@ if test "$with_font_backend" = "freetype"; then
    else
    PKG_CHECK_MODULES([FREETYPE],
                      [cairo-ft
+                     pangoft2
                      fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                      freetype2 >= $FREETYPE2_REQUIRED_VERSION])
    fi
diff --git a/debian/changelog b/debian/changelog
index 3372f86..72b4bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ webkit (1.0.2~pre.svn37878-1) UNRELEASED; urgency=low
     we don't need to #include <stdio.h> anymore.
   * configure.ac, configure, GNUmakefile.am, GNUmakefile.in: Properly check
     and link against libpng. bz#21884.
+  * configure.ac, configure: Properly check and link against libpangoft2.
+    bz#21885.
 
  -- Mike Hommey <glandium at debian.org>  Sat, 25 Oct 2008 09:08:57 +0200
 

-- 
WebKit Debian packaging