Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 http/firefox-esr/HISTORY                            |    5 +++++
 http/firefox-esr/PRE_BUILD                          |    2 +-
 http/firefox-esr/patches/rust-fuchsia-targets.patch |   12 ++++++++++++
 x11-libs/cairo/DETAILS                              |   10 +++-------
 x11-libs/cairo/HISTORY                              |    3 +++
 5 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit d5c25ecb00db92f97c9821b61a26887f74daf7ff
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    firefox-esr: port over patch to fix build with rust 1.29

commit ef352f81be3138aaec60eeed318f4a6f06ea5bfd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    cairo: use 1.15.x also as stable
    
    Other spells require 1.15.x and break unless user opts for
    devel cairo.  Nobody uses 1.14.x anymore. The cairo
    project intends to release 1.15 as stable soon, anyway.

diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 57c831d..d09dd8e 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,5 +1,10 @@
+2018-09-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD, patches/rust-fuchsia-targets.patch: fix build
+         with modern rust that has two-component triplets
+
 2018-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: SECURITY_PATCH++ for 60.2.0esr
+
 2018-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 60.2.0esr
 
diff --git a/http/firefox-esr/PRE_BUILD b/http/firefox-esr/PRE_BUILD
index 36f6bf4..853848b 100755
--- a/http/firefox-esr/PRE_BUILD
+++ b/http/firefox-esr/PRE_BUILD
@@ -1,7 +1,7 @@
 default_pre_build  &&
 cd  $SOURCE_DIRECTORY &&
 
-#apply_patch_dir patches &&
+apply_patch_dir patches &&
 
 
 # To remove version suffix from some directories
diff --git a/http/firefox-esr/patches/rust-fuchsia-targets.patch 
b/http/firefox-esr/patches/rust-fuchsia-targets.patch
new file mode 100644
index 0000000..55c1e16
--- /dev/null
+++ b/http/firefox-esr/patches/rust-fuchsia-targets.patch
@@ -0,0 +1,12 @@
+diff --git a/build/moz.configure/rust.configure 
b/build/moz.configure/rust.configure
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -119,6 +119,8 @@
+     ambiguous = set()
+     per_raw_os = {}
+     for t in out:
++        if t.endswith("fuchsia"):
++            t = t + "-fuchsia"
+         t = split_triplet(t, allow_unknown=True)
+         key = (t.cpu, t.endianness, t.os)
+         if key in per_os:
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index eabb2b7..f373302 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -9,19 +9,15 @@ case "$CAIRO_BRANCH" in
   FORCE_DOWNLOAD=1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" ;;
 
- devel)
+ # There is 1.14.x stable, but it does not work anymore for the OSS
+ # infrastructure. 1.15 is de facto stable.
+ devel|stable)
          VERSION=1.15.12
      SOURCE_HASH=sha1:4e64c6a48789edb4c60bc3fa95bd3992cc388b88:UPSTREAM_HASH
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=http://cairographics.org/snapshots/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
 
-  stable)
-         VERSION=1.14.12
-     SOURCE_HASH=sha1:490025a0ba0622a853010f49fb6343f29fb70b9b:UPSTREAM_HASH
-          SOURCE=$SPELL-$VERSION.tar.xz
-   SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" ;;
 esac
         WEB_SITE=http://cairographics.org/
       LICENSE[0]=MIT
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 9328c51..d439715 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2018-09-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: stable==devel, as 1.15.x is required by others
+
 2018-04-12 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: versions 1.14.12 and 1.15.12