Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manual merge from firefox16 changes
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 09 Oct 2012 13:43:09 +0200
changeset 556 a30fcfcd2e53
parent 554 d19c7ee78903
child 562 9069817b5cac
child 563 8349c239bff9
manual merge from firefox16 changes
mozilla-idldir.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
xulrunner/mozilla-gstreamer.patch file | annotate | diff | comparison | revisions
xulrunner/mozilla-idldir.patch file | annotate | diff | comparison | revisions
xulrunner/xulrunner.spec file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-idldir.patch	Tue Oct 09 13:43:09 2012 +0200
@@ -0,0 +1,22 @@
+# HG changeset patch
+# Parent 2b6d21723804b8b5a73a2fe675ee9ce25f788229
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+Install IDL files to includedir instead of /usr/share/idl
+
+diff --git a/config/baseconfig.mk b/config/baseconfig.mk
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,12 +1,12 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(includedir)
+ installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+ # manually use it before config.mk inclusion
+ _OBJ_SUFFIX := $(OBJ_SUFFIX)
+ OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
--- a/series	Mon Oct 08 23:00:15 2012 +0200
+++ b/series	Tue Oct 09 13:43:09 2012 +0200
@@ -17,6 +17,7 @@
 mozilla-gstreamer.patch
 mozilla-gstreamer-760140.patch
 mozilla-ppc.patch
+mozilla-idldir.patch
 #mozilla-disable-neon-option.patch
 
 # Firefox patches
--- a/xulrunner/mozilla-gstreamer.patch	Mon Oct 08 23:00:15 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-gstreamer.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-idldir.patch	Tue Oct 09 13:43:09 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-idldir.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.spec	Mon Oct 08 23:00:15 2012 +0200
+++ b/xulrunner/xulrunner.spec	Tue Oct 09 13:43:09 2012 +0200
@@ -70,6 +70,7 @@
 Source9:        compare-locales.tar.bz2
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-pkgconfig.patch
+Patch3:         mozilla-idldir.patch
 Patch4:         mozilla-nongnome-proxies.patch
 Patch5:         mozilla-prefer_plugin_pref.patch
 Patch6:         mozilla-language.patch
@@ -181,6 +182,7 @@
 %setup -n mozilla -q -b 1 -b 9
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
mozilla