Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (80c45629fd74ffdadb3acfda727b94ef1c16014b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (80c45629fd74ffdadb3acfda727b94ef1c16014b)
  • Date: Fri, 13 Dec 2013 01:37:04 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:


mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
| 64 ++++++++++
mail/thunderbird/HISTORY
| 2
mail/thunderbird/PRE_BUILD
| 2
3 files changed, 68 insertions(+)

New commits:
commit 80c45629fd74ffdadb3acfda727b94ef1c16014b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

mail/thunderbird: remove version number from thunberbird's installation
path

diff --git
a/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch

b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
new file mode 100644
index 0000000..5b1b2ae
--- /dev/null
+++
b/mail/thunderbird/0001-remove-version-number-from-thunderbird-s-installatio.patch
@@ -0,0 +1,64 @@
+From 3509f66d1881194da6dacfba7bb592ee7d13b5f0 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Thu, 12 Dec 2013 23:27:13 +0100
+Subject: [PATCH] remove version number from thunderbird's installation path
+
+---
+ config/baseconfig.mk | 8 ++++----
+ mozilla/config/baseconfig.mk | 8 ++++----
+ mozilla/js/src/config/baseconfig.mk | 4 ++--
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/config/baseconfig.mk b/config/baseconfig.mk
+index 636b9aa..fe36c48 100644
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
+diff --git a/mozilla/config/baseconfig.mk b/mozilla/config/baseconfig.mk
+index ae69bae..c452e84 100644
+--- a/mozilla/config/baseconfig.mk
++++ b/mozilla/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff --git a/mozilla/js/src/config/baseconfig.mk
b/mozilla/js/src/config/baseconfig.mk
+index 6ca9f60..9262ac1 100644
+--- a/mozilla/js/src/config/baseconfig.mk
++++ b/mozilla/js/src/config/baseconfig.mk
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
+--
+1.8.5.1
+
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 010227d..8b5b484 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,5 +1,7 @@
2013-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 24.2.0, SECURITY_PATCH++
+ * 0001-remove-version-number-from-thunderbird-s-installatio.patch,
+ PRE_BUILD: remove version number from thunderbird's installation
path

2013-09-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 24.0
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index a01ab0f..130bf54 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -3,6 +3,8 @@ cd "${SOURCE_DIRECTORY}" &&
unpack_file '' &&
cd comm-* &&

+patch -p1 <
$SPELL_DIRECTORY/0001-remove-version-number-from-thunderbird-s-installatio.patch
&&
+
cp -v "${SPELL_DIRECTORY}"/mozconfig .mozconfig &&

if [[ "$THUNDERBIRD_STRIP" == "y" ]]; then



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (80c45629fd74ffdadb3acfda727b94ef1c16014b), Florian Franzmann, 12/13/2013

Archive powered by MHonArc 2.6.24.

Top of Page