From da16d7c8ed8cf2d8d3f289a94bad48da5eb5b7b6 Mon Sep 17 00:00:00 2001
From: melikamp <melikamp@melikamp.net>
Date: Thu, 15 Dec 2016 21:47:52 +0000
Subject: network/icecat: Updated for version 45.5.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 network/icecat/changeset280875.patch | 49 ------------------------------------
 network/icecat/icecat.SlackBuild     | 11 ++++----
 network/icecat/icecat.info           |  6 ++---
 3 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 network/icecat/changeset280875.patch

(limited to 'network')

diff --git a/network/icecat/changeset280875.patch b/network/icecat/changeset280875.patch
deleted file mode 100644
index 1e7fa1cd1e..0000000000
--- a/network/icecat/changeset280875.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4d0fe8f40364c170226f1ef3bc98975630463e87 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Tue, 19 Jan 2016 14:31:04 +0900
-Subject: [PATCH] Bug 1233963 - Work around recent GNU gold behavior with
- segments starting before the first section they contain
-
----
- build/unix/elfhack/elf.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp
-index 666b535..743afde 100644
---- a/build/unix/elfhack/elf.cpp
-+++ b/build/unix/elfhack/elf.cpp
-@@ -253,26 +253,29 @@ Elf::Elf(std::ifstream &file)
-         }
-         if (phdr.p_type == PT_PHDR)
-             segment->addSection(phdr_section);
-         for (int j = 1; j < ehdr->e_shnum; j++)
-             if (phdr.contains(sections[j]))
-                 segment->addSection(sections[j]);
-         // Make sure that our view of segments corresponds to the original
-         // ELF file.
--        assert(segment->getFileSize() == phdr.p_filesz);
-+        // GNU gold likes to start some segments before the first section
-+        // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392
-+        unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr;
-+        assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment);
-         // gold makes TLS segments end on an aligned virtual address, even
-         // when the underlying section ends before that, while bfd ld
-         // doesn't. It's fine if we don't keep that alignment.
-         unsigned int memsize = segment->getMemSize();
-         if (phdr.p_type == PT_TLS && memsize != phdr.p_memsz) {
-             unsigned int align = segment->getAlign();
-             memsize = (memsize + align - 1) & ~(align - 1);
-         }
--        assert(memsize == phdr.p_memsz);
-+        assert(memsize == phdr.p_memsz - gold_adjustment);
-         segments.push_back(segment);
-     }
- 
-     new (&eh_entry) ElfLocation(ehdr->e_entry, this);
- }
- 
- Elf::~Elf()
- {
--- 
-2.7.0
-
diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild
index d970fe3b59..9a08164551 100644
--- a/network/icecat/icecat.SlackBuild
+++ b/network/icecat/icecat.SlackBuild
@@ -25,10 +25,10 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM="icecat"
-VERSION=${VERSION:-38.8.0}
+VERSION=${VERSION:-45.5.1}
 RELEASEVER="$VERSION"
 RELEASEVERMAJ=$(echo $RELEASEVER | cut -f 1 -d .)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -86,7 +86,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}-$VERSION-gnu2.tar.bz2
+tar xvf $CWD/${PRGNAM}-$VERSION-gnu1.tar.bz2
 cd ${PRGNAM}-$VERSION
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
@@ -94,9 +94,6 @@ sed -e '/^ftglyph.h/i ftfntfmt.h' \
   -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \
   -i config/system-headers
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1233963
-patch -p1 < $CWD/changeset280875.patch
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -134,6 +131,8 @@ OPTIONS="\
   --disable-installer \
   --disable-mailnews \
   --disable-composer \
+  --enable-official-branding \
+  --disable-elf-hack \
   --disable-profilesharing"
 # Complains about missing APNG support in Slackware's libpng:
 # --with-system-png \
diff --git a/network/icecat/icecat.info b/network/icecat/icecat.info
index 7ac0b31ee2..28e8fb22e3 100644
--- a/network/icecat/icecat.info
+++ b/network/icecat/icecat.info
@@ -1,8 +1,8 @@
 PRGNAM="icecat"
-VERSION="38.8.0"
+VERSION="45.5.1"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/38.8.0-gnu2/icecat-38.8.0-gnu2.tar.bz2"
-MD5SUM="9d9481dea1bd4fb254d6387278566126"
+DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/45.5.1/icecat-45.5.1-gnu1.tar.bz2"
+MD5SUM="1a0d24551a72c60e82ded717455c21fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3