[thunderbird] Added objdir patch

Martin Stransky stransky at fedoraproject.org
Wed Jul 30 08:59:21 UTC 2014


commit 067bb242d36ec90bb8c15e28d317cee68d726973
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Jul 30 10:59:16 2014 +0200

    Added objdir patch

 thunderbird-objdir.patch |   13 +++++++++++++
 thunderbird.spec         |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/thunderbird-objdir.patch b/thunderbird-objdir.patch
new file mode 100644
index 0000000..f6dcde7
--- /dev/null
+++ b/thunderbird-objdir.patch
@@ -0,0 +1,13 @@
+diff -up thunderbird-31.0/comm-esr31/client.mk.old thunderbird-31.0/comm-esr31/client.mk
+--- thunderbird-31.0/comm-esr31/client.mk.old	2014-07-18 02:04:05.000000000 +0200
++++ thunderbird-31.0/comm-esr31/client.mk	2014-07-30 10:57:01.177453550 +0200
+@@ -131,7 +131,7 @@ endif
+ 
+ 
+ ifndef MOZ_OBJDIR
+-  MOZ_OBJDIR = obj-$(CONFIG_GUESS)
++  MOZ_OBJDIR = objdir
+ else
+ # On Windows Pymake builds check MOZ_OBJDIR doesn't start with "/"
+   ifneq (,$(findstring mingw,$(CONFIG_GUESS)))
+diff -up thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile.old thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile
diff --git a/thunderbird.spec b/thunderbird.spec
index 2163b1a..1316039 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -75,6 +75,7 @@ Patch0:         thunderbird-install-dir.patch
 Patch9:         mozilla-build-arm.patch
 
 # Build patches
+Patch100:       thunderbird-objdir.patch
 
 # Linux specific
 Patch200:       thunderbird-enable-addons.patch
@@ -158,7 +159,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %setup -q -c
 cd %{tarballdir}
 
-%patch0  -p2 -b .dir
+%patch0   -p2 -b .dir
+%patch100 -p2 -b .objdir
+
 # Mozilla (XULRunner) patches
 cd mozilla
 %patch9   -p2 -b .arm


More information about the scm-commits mailing list