← Back to branch summary

~ubuntu-branches/ubuntu/hardy/firefox-3.0/hardy

« back to all changes in this revision

Viewing changes to debian/patches/no-have-stdint-h-ftbfs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack
  • Date: 2007-10-05 02:38:08 UTC
  • Revision ID: james.westby@ubuntu.com-20071005023808-51una9yzsey8fl0r
Tags: 3.0~alpha8-0ubuntu1
RELEASE: 3.0~alpha8-0ubuntu1 to gutsy/universe.

[ Alexander Sack ]
* drop libnspr4-dev and libnss3-dev build-depends for gutsy upload.
* don't build with system-nspr/-nss for gutsy universe upload.
* add nspr_flags_by_pkg_config_hack.patch to use pkg-config to get
  nspr libs and cflags from xulrunner-1.9-dev package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/no-have-stdint-h-ftbfs.patch
 
1
---
 
2
 configure.in |   12 ++++++------
 
3
 1 file changed, 6 insertions(+), 6 deletions(-)
 
4
 
 
5
Index: mozilla/configure.in
 
6
===================================================================
 
7
--- mozilla.orig/configure.in   2007-08-18 15:05:44.000000000 +0000
 
8
+++ mozilla/configure.in        2007-08-18 15:16:14.000000000 +0000
 
9
@@ -6927,24 +6927,24 @@
 
10
    MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo'
 
11
 
 
12
    MOZ_TREE_CAIRO=1
 
13
    MOZ_ARG_ENABLE_BOOL(system-cairo,
 
14
    [ --enable-system-cairo Use system cairo (located with pkgconfig)],
 
15
    MOZ_TREE_CAIRO=,
 
16
    MOZ_TREE_CAIRO=1 )
 
17
 
 
18
-   if test "$MOZ_TREE_CAIRO"; then
 
19
-       # Check for headers defining standard int types.
 
20
-       AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
 
21
+   # Check for headers defining standard int types.
 
22
+   AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
 
23
 
 
24
-       # For now we assume that we will have a uint64_t available through
 
25
-       # one of the above headers or mozstdint.h.
 
26
-       AC_DEFINE(HAVE_UINT64_T)
 
27
+   # For now we assume that we will have a uint64_t available through
 
28
+   # one of the above headers or mozstdint.h.
 
29
+   AC_DEFINE(HAVE_UINT64_T)
 
30
 
 
31
+   if test "$MOZ_TREE_CAIRO"; then
 
32
        # Define macros for cairo-features.h
 
33
        if test "$MOZ_X11"; then
 
34
            XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
 
35
            XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
 
36
            PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
 
37
            PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
 
38
            FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
 
39
            MOZ_ENABLE_CAIRO_FT=1