← Back to branch summary

~ubuntu-branches/ubuntu/trusty/enigmail/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/build_system_dont_link_libxul.diff

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-06-07 14:35:53 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: package-import@ubuntu.com-20110607143553-fbgqhhvh8g8h6j1y
Tags: 2:1.2~a2~cvs20110606t2200-0ubuntu1
* Update to latest trunk snapshot for Thunderbird beta compat

* Remove build/pgo/profileserver.py from debian/clean. The new build
  system has a target depending on this
  - update debian/clean
* Drop debian/patches/autoconf.diff, just generate this at build time
* Refresh debian/patches/build_system_dont_link_libxul.diff
* libipc seems to be renamed to libipc-pipe. Fix genxpi and chrome.manifest
  to fix this 
  - add debian/patches/ipc-pipe_rename.diff
  - update debian/patches/series
* The makefiles in extensions/enigmail/ipc have an incorrect DEPTH
  attribute. Fix this so that they can find the rest of the build system
  - add debian/patches/makefile_depth.diff
  - update debian/patches/series
* Drop debian/patches/makefile-in-empty-xpcom-fix.diff - fixed in the
  current version
* Don't register a class ID multiple times, as this breaks enigmail entirely
  - add debian/patches/dont_register_cids_multiple_times.diff
  - update debian/patches/series
* Look for the Thunderbird 5 SDK
  - update debian/rules
  - update debian/control
* Run autoconf2.13 at build time
  - update debian/rules
  - update debian/control
* Add useless mesa-common-dev build-dep, just to satisfy the build system.
  We should just patch this out entirely really, but that's for another upload
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build_system_dont_link_libxul.diff
1
 
--- builds/enigmail-1.0.1/configure.in  2010-02-16 05:07:34.000000000 +0100
2
 
+++ hacked_working_tree/configure.in    2010-03-22 00:40:10.000000000 +0100
3
 
@@ -7503,7 +7504,7 @@
 
1
--- a/configure.in
 
2
+++ b/configure.in
 
3
@@ -8308,7 +8308,7 @@ if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$
 
4
 fi
 
5
 
4
6
 AC_SUBST(LIBXUL_LIBS)
 
7
-XPCOM_LIBS="$LIBXUL_LIBS"
 
8
+XPCOM_LIBS="$XPCOM_FROZEN_LDOPTS"
 
9
 AC_DEFINE(MOZ_ENABLE_LIBXUL)
5
10
 
6
 
 if test -n "$MOZ_ENABLE_LIBXUL"; then
7
 
-    XPCOM_LIBS="$LIBXUL_LIBS"
8
 
+    XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"
9
 
     AC_DEFINE(MOZ_ENABLE_LIBXUL)
10
 
 else
11
 
     if test -n "$BUILD_STATIC_LIBS"; then
 
11
 dnl ========================================================