Package: firegpg
Severity: important
Tags: patch
Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so firegpg should be able to build against it.
As a matter of being future-proof, the attached patch implements the
necessary changes to avoid hard coding paths for the SDK.
This should work for any version of xulrunner, so please upload these
changes ASAP.
Cheers,
Mike
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ruN firegpg-0.7.8/debian/ipc-build/public/Makefile firegpg-0.7.8.new/debian/ipc-build/public/Makefile
--- firegpg-0.7.8/debian/ipc-build/public/Makefile 2009-09-17 15:27:49.000000000 +0200
+++ firegpg-0.7.8.new/debian/ipc-build/public/Makefile 2009-09-17 15:37:33.433270261 +0200
@@ -9,7 +9,8 @@
MODULE = ipc
XPIDL_MODULE = ipc
-XULRUNNERPATH = /usr/lib/xulrunner-1.9
+SDKDIR := $(shell pkg-config --variable=sdkdir libxul-embedding-unstable)
+IDLDIR := $(shell pkg-config --variable=idldir libxul-embedding-unstable)
IDL_HEADERS = \
nsIProcessInfo.h \
@@ -34,12 +35,12 @@
all: $(IDL_HEADERS) ipc.xpt
ipc.xpt: $(IDL_XPTS)
- $(XULRUNNERPATH)/xpt_link $@ $(IDL_XPTS)
+ $(SDKDIR)/bin/xpt_link $@ $(IDL_XPTS)
%.h: %.idl
- $(XULRUNNERPATH)/xpidl -m header -I /usr/share/idl/xulrunner-1.9/unstable -w $<
+ $(SDKDIR)/bin/xpidl -m header -I $(IDLDIR)/unstable -w $<
%.xpt: %.idl
- $(XULRUNNERPATH)/xpidl -m typelib -I /usr/share/idl/xulrunner-1.9/unstable -w $<
+ $(SDKDIR)/bin/xpidl -m typelib -I $(IDLDIR)/unstable -w $<
clean:
rm -f $(IDL_HEADERS) $(IDL_XPTS) ipc.xpt
diff -ruN firegpg-0.7.8/debian/rules firegpg-0.7.8.new/debian/rules
--- firegpg-0.7.8/debian/rules 2009-09-17 15:27:49.000000000 +0200
+++ firegpg-0.7.8.new/debian/rules 2009-09-17 15:41:14.335470305 +0200
@@ -20,5 +20,5 @@
tar xzf components/ipc-latest.tar.gz -C debian
(cd $(IPC_BUILDDIR) && make)
dh binary-arch --after dh_auto_build --before dh_shlibdeps
- dh_shlibdeps -a -l/usr/lib/xulrunner-1.9
+ dh_shlibdeps -a -l$(shell pkg-config --variable=sdkdir libxul-embedding-unstable)/lib
dh binary-arch --after dh_shlibdeps
