diff options
| -rw-r--r-- | net-libs/xulrunner/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/xulrunner/files/301-xulrunner-xpctools.diff | 25 | ||||
| -rw-r--r-- | net-libs/xulrunner/files/xulrunner-1.9.2-fix-pkgconfig-file.patch | 9 |
3 files changed, 39 insertions, 1 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index 55c280d0becf..ebf68817f3c6 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/xulrunner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.287 2010/01/22 02:24:53 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.288 2010/01/22 03:59:01 anarchy Exp $ + + 22 Jan 2010; <anarchy@gentoo.org> +files/301-xulrunner-xpctools.diff, + +files/xulrunner-1.9.2-fix-pkgconfig-file.patch: + Add patches that were missed on initial commit *xulrunner-1.9.2 (22 Jan 2010) diff --git a/net-libs/xulrunner/files/301-xulrunner-xpctools.diff b/net-libs/xulrunner/files/301-xulrunner-xpctools.diff new file mode 100644 index 000000000000..2ff82a5803bf --- /dev/null +++ b/net-libs/xulrunner/files/301-xulrunner-xpctools.diff @@ -0,0 +1,25 @@ +--- js/src/xpconnect/src/Makefile.in~ 2009-09-20 13:13:15.508713367 -0500 ++++ js/src/xpconnect/src/Makefile.in 2009-09-20 13:14:30.994713367 -0500 +@@ -77,6 +77,10 @@ + widget \ + $(NULL) + ++ifdef MOZ_XPCTOOLS ++DEFINES += -DXPC_TOOLS_SUPPORT ++REQUIRES += xpctools ++endif + + CPPSRCS = \ + nsScriptError.cpp \ +@@ -174,11 +178,6 @@ + + endif # ENABLE_JIT + +-ifdef MOZ_XPCTOOLS +-DEFINES += -DXPC_TOOLS_SUPPORT +-REQUIRES += xpctools +-endif +- + ifdef XPC_IDISPATCH_SUPPORT + DEFINES += -DXPC_IDISPATCH_SUPPORT + ifdef XPC_COMOBJECT diff --git a/net-libs/xulrunner/files/xulrunner-1.9.2-fix-pkgconfig-file.patch b/net-libs/xulrunner/files/xulrunner-1.9.2-fix-pkgconfig-file.patch new file mode 100644 index 000000000000..540f9d0e01fd --- /dev/null +++ b/net-libs/xulrunner/files/xulrunner-1.9.2-fix-pkgconfig-file.patch @@ -0,0 +1,9 @@ +--- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in-orig 2010-01-18 22:07:22.609207920 -0600 ++++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2010-01-18 22:07:31.665185152 -0600 +@@ -5,5 +5,5 @@ + Name: Mozilla Plug-In API + Description: Mozilla Plug-In API + Version: %MOZILLA_VERSION% +-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% ++Cflags: -I${includedir} -DXP_UNIX %ojidef% + |