tag 624923 + patch
thanks

On Mon, 02 May 2011 14:33:19 +0200, Lucas Nussbaum wrote:

> Source: kompozer
> Version: 1:0.8~b3.dfsg.1-0.1
> Severity: serious
> Tags: wheezy sid
> User: [email protected]
> Usertags: qa-ftbfs-20110502 qa-ftbfs
> Justification: FTBFS on amd64
> 
> During a rebuild of all packages in sid, your package failed to build on
> amd64.

Here's a debdiff including the patches from Ubuntu (refreshed to
reduced the noise).

I'm not uploading the package now because it would get auto-rejected:

E: kompozer: embedded-library usr/lib/kompozer/components/libimglib2.so: libjpeg
E: kompozer: embedded-library usr/lib/kompozer/components/libstoragecomps.so: 
sqlite


Cheers,
gregor
 
-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: Kurt Ostbahn & Die Kombo: Ois wann nix gwesen waa
diff -u kompozer-0.8~b3.dfsg.1/debian/changelog kompozer-0.8~b3.dfsg.1/debian/changelog
--- kompozer-0.8~b3.dfsg.1/debian/changelog
+++ kompozer-0.8~b3.dfsg.1/debian/changelog
@@ -1,3 +1,14 @@
+kompozer (1:0.8~b3.dfsg.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: nsCSSStyleSheet.cpp:2897:43: error: uninitialized const
+    'ciComparator' [-fpermissive]": add patch from Ubuntu / Daniel T Chen:
+     - Add 25_uninitialized_const.patch to fix FTBFS.
+       (LP: #770836) (Closes: #624923)
+     - Refresh 99_configure.patch to handle new multiarch lib path.
+
+ -- gregor herrmann <[email protected]>  Sun, 23 Oct 2011 17:48:15 +0200
+
 kompozer (1:0.8~b3.dfsg.1-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u kompozer-0.8~b3.dfsg.1/debian/patches/series kompozer-0.8~b3.dfsg.1/debian/patches/series
--- kompozer-0.8~b3.dfsg.1/debian/patches/series
+++ kompozer-0.8~b3.dfsg.1/debian/patches/series
@@ -13,2 +13,3 @@
 23_x11-session.patch
+25_uninitialized_const.patch
 99_configure.patch
diff -u kompozer-0.8~b3.dfsg.1/debian/patches/99_configure.patch kompozer-0.8~b3.dfsg.1/debian/patches/99_configure.patch
--- kompozer-0.8~b3.dfsg.1/debian/patches/99_configure.patch
+++ kompozer-0.8~b3.dfsg.1/debian/patches/99_configure.patch
@@ -29,7 +29,7 @@
 +        wince*)       OS_ARCH=WINCE ;;
 +        darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
 +    esac
-+fi
+ fi
 +
 +if test -n "$FORCE_USE_HOST_OS"; then
 +	OS_TARGET="${host_os}"
@@ -43,7 +43,7 @@
 +	    wince*)       OS_ARCH=WINCE ;;
 +	    darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
 +	esac
- fi
++fi
 +
  _COMPILER_PREFIX=
  
@@ -2659,7 +2659,7 @@
  
  if test -n "$MOZ_NATIVE_NSS"; then
 -   NSS_LIBS="$NSS_LIBS -lcrmf"
-+   NSS_LIBS=`echo $NSS_LIBS | sed 's/-l/-lcrmf &/'`
++   NSS_LIBS="-lcrmf $NSS_LIBS"
  else
     NSS_CFLAGS='-I$(DIST)/public/nss'
     NSS_DEP_LIBS='\\\
@@ -4167,15 +4167,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -19241,14 +19263,14 @@ echo "configure:19212: checking CAIRO_LI
- 
-       if test "$MOZ_X11"; then
-           if test "$MOZ_SVG_RENDERER_CAIRO"; then
--
-+
-   succeeded=no
- 
-   if test -z "$PKG_CONFIG"; then
+@@ -19248,7 +19270,7 @@ echo "configure:19212: checking CAIRO_LI
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4184,22 +4176,6 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19256,13 +19278,13 @@ else
-   /*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-   ;;
--  ?:/*)
-+  ?:/*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
 @@ -19292,19 +19314,19 @@ fi
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -4223,34 +4199,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`"
-@@ -19312,14 +19334,14 @@ echo "configure:19308: checking CAIRO_XL
-         else
-             CAIRO_XLIB_CFLAGS=""
-             CAIRO_XLIB_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
-+            ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
-             CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"`
--
-+
-         fi
- 
--
--
-+
-+
-      else
-         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-         echo "*** See http://www.freedesktop.org/software/pkgconfig";
-@@ -19336,14 +19358,14 @@ echo "configure:19308: checking CAIRO_XL
-               MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
-           fi
-           if test "$MOZ_ENABLE_CANVAS"; then
--
-+
-   succeeded=no
- 
-   if test -z "$PKG_CONFIG"; then
+@@ -19343,7 +19365,7 @@ echo "configure:19308: checking CAIRO_XL
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4259,22 +4208,6 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19351,13 +19373,13 @@ else
-   /*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-   ;;
--  ?:/*)
-+  ?:/*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
 @@ -19387,19 +19409,19 @@ fi
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -4298,25 +4231,6 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`"
-@@ -19407,14 +19429,14 @@ echo "configure:19403: checking CAIRO_XR
-         else
-             CAIRO_XRENDER_CFLAGS=""
-             CAIRO_XRENDER_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
-+            ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
-             CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"`
--
-+
-         fi
- 
--
--
-+
-+
-      else
-         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-         echo "*** See http://www.freedesktop.org/software/pkgconfig";
 @@ -19470,7 +19492,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
only in patch2:
unchanged:
--- kompozer-0.8~b3.dfsg.1.orig/debian/patches/25_uninitialized_const.patch
+++ kompozer-0.8~b3.dfsg.1/debian/patches/25_uninitialized_const.patch
@@ -0,0 +1,23 @@
+--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
++++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
+@@ -2894,7 +2894,8 @@ static PRBool AttrMatchesValue(const nsA
+ {
+   NS_PRECONDITION(aAttrSelector, "Must have an attribute selector");
+   const nsDefaultStringComparator defaultComparator;
+-  const nsCaseInsensitiveStringComparator ciComparator;
++  const nsCaseInsensitiveStringComparator ciComparator =
++    nsCaseInsensitiveStringComparator();
+   const nsStringComparator& comparator = aAttrSelector->mCaseSensitive
+                 ? NS_STATIC_CAST(const nsStringComparator&, defaultComparator)
+                 : NS_STATIC_CAST(const nsStringComparator&, ciComparator);
+--- a/mozilla/toolkit/xre/nsAppRunner.cpp
++++ b/mozilla/toolkit/xre/nsAppRunner.cpp
+@@ -703,7 +703,7 @@ nsXULAppInfo::PostUpdate(nsILocalFile *a
+ }
+ #endif
+ 
+-static const nsXULAppInfo kAppInfo;
++static const nsXULAppInfo kAppInfo = nsXULAppInfo();
+ static NS_METHOD AppInfoConstructor(nsISupports* aOuter,
+                                     REFNSIID aIID, void **aResult)
+ {

Attachment: signature.asc
Description: Digital signature

Reply via email to