Comment 43 for bug 203413

Revision history for this message
Alexander Sack (asac) wrote :

here the debdiff that will go up for liferea:

diff -u liferea-1.4.14/debian/patches/xul1.9.dpatch liferea-1.4.14/debian/patches/xul1.9.dpatch
--- liferea-1.4.14/debian/patches/xul1.9.dpatch
+++ liferea-1.4.14/debian/patches/xul1.9.dpatch
@@ -5,10 +5,10 @@
 ## DP: implement configure option to choose --with-gecko=xulrunner-1.9

 @DPATCH@
-diff -urNad liferea-1.4.9~/configure liferea-1.4.9/configure
---- liferea-1.4.9~/configure 2007-12-12 20:32:43.000000000 +0100
-+++ liferea-1.4.9/configure 2007-12-12 20:37:30.000000000 +0100
-@@ -1616,7 +1616,7 @@
+diff -urNad liferea-1.4.14~/configure liferea-1.4.14/configure
+--- liferea-1.4.14~/configure 2008-03-12 00:43:44.000000000 +0100
++++ liferea-1.4.14/configure 2008-03-31 17:42:29.000000000 +0200
+@@ -1619,7 +1619,7 @@
    --disable-xulrunner don't compile the xulrunner backend
    --disable-gecko don't compile the Gecko backend
    --enable-gecko=ARG specify which Gecko provider to use ("mozilla",
@@ -17,7 +17,7 @@
    --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes]
    --disable-libnotify don't compile the libnotify plugin
    --disable-lua don't compile with LUA scripting support
-@@ -24604,158 +24604,22 @@
+@@ -25119,158 +25119,22 @@

  if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then
     gecko_provider=mozilla
@@ -185,7 +185,7 @@

  pkg_failed=no
  { echo "$as_me:$LINENO: checking for MOZILLA" >&5
-@@ -24766,12 +24630,12 @@
+@@ -25281,12 +25145,12 @@
          pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -201,7 +201,7 @@
  else
    pkg_failed=yes
  fi
-@@ -24784,12 +24648,12 @@
+@@ -25299,12 +25163,12 @@
          pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -217,7 +217,7 @@
  else
    pkg_failed=yes
  fi
-@@ -24808,9 +24672,9 @@
+@@ -25323,9 +25187,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -229,7 +229,7 @@
          fi
   # Put the nasty error message in config.log where it belongs
   echo "$MOZILLA_PKG_ERRORS" >&5
-@@ -24827,7 +24691,7 @@
+@@ -25342,7 +25206,7 @@
  echo "${ECHO_T}yes" >&6; }
   enable_mozilla=yes
  fi
@@ -238,7 +238,7 @@
  echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; }
  fi

-@@ -25313,9 +25177,9 @@
+@@ -25828,9 +25692,9 @@

@@ -250,9 +250,9 @@

        MOZILLA_CFLAGS="$MOZILLA_CFLAGS \
  -I$MOZILLA_INCLUDE_ROOT \
-diff -urNad liferea-1.4.9~/configure.ac liferea-1.4.9/configure.ac
---- liferea-1.4.9~/configure.ac 2007-12-12 20:32:43.000000000 +0100
-+++ liferea-1.4.9/configure.ac 2007-12-12 20:37:25.000000000 +0100
+diff -urNad liferea-1.4.14~/configure.ac liferea-1.4.14/configure.ac
+--- liferea-1.4.14~/configure.ac 2008-02-29 00:45:05.000000000 +0100
++++ liferea-1.4.14/configure.ac 2008-03-31 17:42:29.000000000 +0200
 @@ -36,7 +36,7 @@
  AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes)
  AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes)
@@ -307,0 +308,38 @@
+diff -urNad liferea-1.4.14~/src/liferea liferea-1.4.14/src/liferea
+--- liferea-1.4.14~/src/liferea 2008-03-12 00:44:08.000000000 +0100
++++ liferea-1.4.14/src/liferea 2008-03-31 17:43:04.000000000 +0200
+@@ -18,11 +18,12 @@
+ # If we run with Gecko or XulRunner we need to set
+ # LD_LIBRARY_PATH (WebKit and GtkHTML do not need this).
+ #
+-if [ "/usr/lib/xulrunner" != "" ]; then
++if [ "ls /usr/lib/xulrunner-1.9*/libsqlite3.so.0" != "" ]; then
++ mozdir=`dirname \`ls /usr/lib/xulrunner-1.9*/libsqlite3.so.0\``
+ if [ "$LD_LIBRARY_PATH" = "" ]; then
+- LD_LIBRARY_PATH=/usr/lib/xulrunner
++ LD_LIBRARY_PATH=$mozdir
+ else
+- LD_LIBRARY_PATH=/usr/lib/xulrunner:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=$mozdir:$LD_LIBRARY_PATH
+ fi
+ export LD_LIBRARY_PATH
+ fi
+diff -urNad liferea-1.4.14~/src/liferea.in liferea-1.4.14/src/liferea.in
+--- liferea-1.4.14~/src/liferea.in 2007-11-21 23:37:39.000000000 +0100
++++ liferea-1.4.14/src/liferea.in 2008-03-31 17:43:23.000000000 +0200
+@@ -18,11 +18,12 @@
+ # If we run with Gecko or XulRunner we need to set
+ # LD_LIBRARY_PATH (WebKit and GtkHTML do not need this).
+ #
+-if [ "@MOZILLA_LIB_ROOT@" != "" ]; then
++if [ "ls /usr/lib/xulrunner-1.9*/libsqlite3.so.0" != "" ]; then
++ mozdir=`dirname \`ls /usr/lib/xulrunner-1.9*/libsqlite3.so.0\``
+ if [ "$LD_LIBRARY_PATH" = "" ]; then
+- LD_LIBRARY_PATH=@MOZILLA_LIB_ROOT@
++ LD_LIBRARY_PATH=$mozdir
+ else
+- LD_LIBRARY_PATH=@MOZILLA_LIB_ROOT@:$LD_LIBRARY_PATH
++ LD_LIBRARY_PATH=$mozdir:$LD_LIBRARY_PATH
+ fi
+ export LD_LIBRARY_PATH
+ fi
diff -u liferea-1.4.14/debian/changelog liferea-1.4.14/debian/changelog
--- liferea-1.4.14/debian/changelog
+++ liferea-1.4.14/debian/changelog
@@ -1,3 +1,11 @@
+liferea (1.4.14-0ubuntu3) hardy; urgency=low
+
+ * fix generation of corrupted places by setting up
+ LD_LIBRARY_PATH properly (LP: #203413)
+ - update debian/patches/xul1.9.dpatch
+
+ -- Alexander Sack <email address hidden> Mon, 31 Mar 2008 17:41:42 +0200
+
 liferea (1.4.14-0ubuntu2) hardy; urgency=low

   * fix glue startup code to also load the internal symbols through