diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-12-07 15:08:45 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-12-07 15:55:05 (GMT) |
| commit | a21d675e0eab7f51d3f0f45a98aebbe236e5ad63 (patch) | |
| tree | ce8456ae648408587a757435488f30b50baf3c25 | |
| parent | 2fbf9e1610c03d8e1c9f9be75670c91db03147d7 (diff) | |
Add patches 1001 and 2001 to fix hardcoded libxul path. Closes: bug#507850.
| -rw-r--r-- | debian/patches/1001_hardcode_LIBXUL_DIR.patch | 12 | ||||
| -rw-r--r-- | debian/patches/2001_hardcode_LIBXUL_DIR_automade.patch | 12 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/1001_hardcode_LIBXUL_DIR.patch b/debian/patches/1001_hardcode_LIBXUL_DIR.patch new file mode 100644 index 0000000..77e7205 --- /dev/null +++ b/debian/patches/1001_hardcode_LIBXUL_DIR.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ PKG_CHECK_MODULES([LIBXUL],[libxul]) + # FIXME To be able to use pyxpcom we currently need + # to link to xpcom at build time. Which involves various hacks. + LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul` +-LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`" ++LIBXUL_DIR="/usr/lib/xulrunner-1.9" + LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom" + + LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul` diff --git a/debian/patches/2001_hardcode_LIBXUL_DIR_automade.patch b/debian/patches/2001_hardcode_LIBXUL_DIR_automade.patch new file mode 100644 index 0000000..5acb918 --- /dev/null +++ b/debian/patches/2001_hardcode_LIBXUL_DIR_automade.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -20531,7 +20531,7 @@ fi + # FIXME To be able to use pyxpcom we currently need + # to link to xpcom at build time. Which involves various hacks. + LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul` +-LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`" ++LIBXUL_DIR="/usr/lib/xulrunner-1.9" + LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom" + + LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul` diff --git a/debian/patches/series b/debian/patches/series index c05035e..be240dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001_fix_pointer_conversion.patch +1001_hardcode_LIBXUL_DIR.patch +2001_hardcode_LIBXUL_DIR_automade.patch |