icecat: update to 45.5.1

srcpkgs/icecat-devel

@@ -1 +0,0 @@
-icecat

srcpkgs/icecat/files/icecat-safe.desktop

@@ -0,0 +1,116 @@
+[Desktop Entry]
+Name=GNU-IceCat
+GenericName=GNU Web Browser - Safe Mode
+GenericName[af]=GNU Web Blaaier
+GenericName[ar]=GNU متصفح ويب
+GenericName[az]=GNU Veb Səyyahı
+GenericName[bg]=GNU Браузър
+GenericName[bn]=GNU ওয়েব ব্রাউজার
+GenericName[br]=GNU Furcher ar Gwiad
+GenericName[bs]=GNU WWW Preglednik
+GenericName[ca]=GNU Fullejador web
+GenericName[cs]=GNU WWW prohlížeč
+GenericName[cy]=GNU Porydd Gwe
+GenericName[da]=GNU Browser
+GenericName[de]=GNU Web-Browser
+GenericName[el]=GNU Περιηγητής Ιστού
+GenericName[eo]=GNU TTT-legilo
+GenericName[es]=GNU Navegador web
+GenericName[et]=GNU Veebilehitseja
+GenericName[eu]=GNU Web arakatzailea
+GenericName[fa]=GNU مرورگر وب
+GenericName[fi]=GNU WWW-selain
+GenericName[fo]=GNU Alnótsfar
+GenericName[fr]=GNU Navigateur web
+GenericName[gl]=GNU Navegador Web
+GenericName[he]=GNU דפדפן אינטרנט
+GenericName[hi]=GNU वेब ब्राउज़र
+GenericName[hr]=GNU Web preglednik
+GenericName[hu]=GNU Webböngésző
+GenericName[is]=GNU Vafri
+GenericName[it]=GNU Browser Web
+GenericName[ja]=GNU ウェブブラウザ
+GenericName[ko]=GNU 웹 브라우저
+GenericName[lo]=GNU ເວັບບຣາວເຊີ
+GenericName[lt]=GNU Žiniatinklio naršyklė
+GenericName[lv]=GNU Web Pārlūks
+GenericName[mk]=GNU Прелистувач на Интернет 
+GenericName[mn]=GNU Веб-Хөтөч
+GenericName[nb]=GNU Nettleser
+GenericName[nds]=GNU Nettkieker
+GenericName[nl]=GNU Webbrowser
+GenericName[nn]=GNU Nettlesar
+GenericName[nso]=GNU Seinyakisi sa Web
+GenericName[pa]=GNU ਵੈਬ ਝਲਕਾਰਾ
+GenericName[pl]=GNU Przeglądarka WWW
+GenericName[pt]=GNU Navegador Web
+GenericName[pt_BR]=GNU Navegador Web
+GenericName[ro]=GNU Navigator de web
+GenericName[ru]=GNU Веб-браузер
+GenericName[se]=GNU Fierpmádatlogan
+GenericName[sk]=GNU Webový prehliadač
+GenericName[sl]=GNU Spletni brskalnik
+GenericName[sr]=GNU Веб претраживач
+GenericName[sr@Latn]=GNU Veb pretraživač
+GenericName[ss]=GNU Ibrawuza yeWeb 
+GenericName[sv]=GNU Webbläsare
+GenericName[ta]=GNU வலை உலாவி
+GenericName[tg]=GNU Тафсиргари вэб
+GenericName[th]=GNU เว็บบราวเซอร์
+GenericName[tr]=GNU Web Tarayıcı
+GenericName[uk]=GNU Навігатор Тенет
+GenericName[uz]=GNU Веб-браузер
+GenericName[ven]=GNU Buronza ya Webu
+GenericName[vi]=GNU Trình duyệt Web
+GenericName[wa]=GNU Betchteu waibe
+GenericName[xh]=GNU Umkhangeli zincwadi we Web
+GenericName[zh_CN]=GNU 网页浏览器
+GenericName[zh_TW]=GNU 網頁瀏覽器
+GenericName[zu]=GNU Umcingi we-Web
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
+Exec=icecat -safe-mode %u
+Icon=icecat
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Categories=Network;WebBrowser;

srcpkgs/icecat/patches/firefox-install-dir.patch

@@ -1,5 +1,5 @@
---- config/baseconfig.mk.orig	2014-04-28 23:05:04.491525412 +0200
-+++ config/baseconfig.mk	2014-04-28 23:05:39.922751247 +0200
+--- config/baseconfig.mk	2016-12-01 23:48:34.000000000 +0100
++++ config/baseconfig.mk	2016-12-05 12:07:21.227637374 +0100
 @@ -2,10 +2,10 @@
  # directly in python/mozbuild/mozbuild/base.py for gmake validation.
  # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
@@ -12,6 +12,6 @@
 +idldir = $(datadir)/idl/$(MOZ_APP_NAME)
 +installdir = $(libdir)/$(MOZ_APP_NAME)
 +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- ifndef TOP_DIST
- TOP_DIST = dist
- endif
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else

srcpkgs/icecat/patches/fix-ipc.patch

@@ -1,55 +0,0 @@
---- ipc/chromium/src/base/file_util.h
-+++ ipc/chromium/src/base/file_util.h
-@@ -14,10 +14,15 @@
- #include <windows.h>
- #elif defined(ANDROID)
- #include <sys/stat.h>
-+#define NO_FTS
- #elif defined(OS_POSIX) 
- #include <sys/types.h>
--#include <fts.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
-+#include <fts.h>
-+#else
-+#define NO_FTS
-+#endif
- #endif
- 
- #include <stdio.h>
---- ipc/chromium/src/base/file_util_posix.cc
-+++ ipc/chromium/src/base/file_util_posix.cc
-@@ -8,13 +8,13 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fnmatch.h>
--#ifndef ANDROID
-+#ifndef NO_FTS
- #include <fts.h>
- #endif
- #include <libgen.h>
- #include <stdio.h>
- #include <string.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/mman.h>
- #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
- #include <sys/stat.h>
-@@ -67,7 +67,7 @@
-   if (!recursive)
-     return (rmdir(path_str) == 0);
- 
--#ifdef ANDROID
-+#ifdef NO_FTS
-   // XXX Need ftsless impl for bionic
-   return false;
- #else
-@@ -140,7 +140,7 @@
-     return false;
-   }
- 
--#ifdef ANDROID
-+#ifdef NO_FTS
-   // XXX Need ftsless impl for bionic
-   return false;
- #else

srcpkgs/icecat/patches/fix-linux-include.patch

@@ -1,10 +0,0 @@
---- xpcom/io/nsLocalFileUnix.cpp.orig
-+++ xpcom/io/nsLocalFileUnix.cpp
-@@ -28,6 +28,7 @@
- #define USE_LINUX_QUOTACTL
- #include <sys/mount.h>
- #include <sys/quota.h>
-+#include <linux/fs.h>
- #endif
- 
- #include "xpcom-private.h"

srcpkgs/icecat/patches/fix-media.patch

@@ -1,10 +0,0 @@
---- media.orig/mtransport/third_party/nICEr/src/stun/addrs.c
-+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -45,7 +45,6 @@
- #include <sys/param.h>
- #include <sys/socket.h>
- #ifndef ANDROID
--#include <sys/sysctl.h>
- #include <sys/syslog.h>
- #else
- #include <syslog.h>

srcpkgs/icecat/patches/fix-netwerk.patch

@@ -1,37 +0,0 @@
---- netwerk.orig/sctp/src/netinet/sctp_os_userspace.h
-+++ netwerk/sctp/src/netinet/sctp_os_userspace.h
-@@ -400,11 +400,8 @@
- };
- 
- #else /* !defined(Userspace_os_Windows) */
--#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
- #include <sys/socket.h>
--#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
- #include <pthread.h>
--#endif
- typedef pthread_mutex_t userland_mutex_t;
- typedef pthread_cond_t userland_cond_t;
- typedef pthread_t userland_thread_t;
---- netwerk.orig/sctp/src/netinet/sctp_pcb.c
-+++ netwerk/sctp/src/netinet/sctp_pcb.c
-@@ -30,6 +30,9 @@
-  * THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#define _BSD_SOURCE /* for IPPORT_RESERVED */
-+#include <netdb.h>
-+
- #ifdef __FreeBSD__
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $");
---- netwerk.orig/sctp/src/user_queue.h
-+++ netwerk/sctp/src/user_queue.h
-@@ -31,7 +31,7 @@
- #ifndef _USER_QUEUE_H_
- #define	_USER_QUEUE_H_
- 
--#if !defined (__Userspace_os_Windows)
-+#if defined(__Userspace_os_FreeBSD)
- #include <sys/cdefs.h>
- #endif
- /*

srcpkgs/icecat/patches/fix-seccomp-bpf.patch

@@ -0,0 +1,14 @@
+--- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
++++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
+@@ -23,6 +23,11 @@
+ #include "sandbox/linux/services/android_ucontext.h"
+ #endif
+ 
++// musl libc defines siginfo_t __si_fields instead of _sifields
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#define _sifields __si_fields
++#endif
++
+ namespace {
+ 
+ struct arch_sigsys {

srcpkgs/icecat/patches/fix-toolkit.patch

@@ -75,70 +75,3 @@
  
    return rv;
  }
---- toolkit.orig/xre/nsSigHandlers.cpp	2014-03-15 05:19:38.000000000 +0000
-+++ toolkit/xre/nsSigHandlers.cpp	2014-04-17 10:24:33.796765327 +0000
-@@ -15,6 +15,7 @@
- #include <signal.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include "prthread.h"
- #include "plstr.h"
- #include "prenv.h"
-@@ -152,7 +153,7 @@
-   status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl =
-     status->__precis = status->__stkflt = status->__errsumm = 0;
- 
--  __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
-@@ -172,13 +173,13 @@
-   *sw &= ~FPU_STATUS_FLAGS;
- #endif
- #if defined(__amd64__)
--  __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd;
-+  u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd;
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  __uint16_t *sw = &uc->uc_mcontext.fpregs->swd;
-+  u_int16_t *sw = &uc->uc_mcontext.fpregs->swd;
-   *sw &= ~FPU_STATUS_FLAGS;
- 
--  __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
-@@ -187,24 +188,24 @@
-   ucontext_t *uc = (ucontext_t *)context;
- 
- #if defined(__i386)
--  uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0];
-+  u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0];
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1];
-+  u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1];
-   *sw &= ~FPU_STATUS_FLAGS;
- 
-   /* address of the instruction that caused the exception */
--  uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3];
-+  u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3];
-   uc->uc_mcontext.gregs[REG_PC] = *ip;
- #endif
- #if defined(__amd64__)
--  uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw;
-+  u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw;
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw;
-+  u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw;
-   *sw &= ~FPU_STATUS_FLAGS;
- 
--  uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif

srcpkgs/icecat/patches/fix-tools.patch

@@ -1,5 +1,5 @@
---- tools/profiler/local_debug_info_symbolizer.cc
-+++ tools/profiler/local_debug_info_symbolizer.cc
+--- tools/profiler/gecko/local_debug_info_symbolizer.cc
++++ tools/profiler/gecko/local_debug_info_symbolizer.cc
 @@ -3,6 +3,7 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,19 +8,8 @@
  #include "PlatformMacros.h"
  #include "nsAutoPtr.h"
  
---- tools/profiler/platform-linux.cc
-+++ tools/profiler/platform-linux.cc
-@@ -84,7 +84,7 @@
- 
- #define SIGNAL_SAVE_PROFILE SIGUSR2
- 
--#if defined(__GLIBC__)
-+#if 1
- // glibc doesn't implement gettid(2).
- #include <sys/syscall.h>
- pid_t gettid()
---- tools/profiler/platform.h
-+++ tools/profiler/platform.h
+--- tools/profiler/core/platform.h
++++ tools/profiler/core/platform.h
 @@ -29,6 +29,8 @@
  #ifndef TOOLS_PLATFORM_H_
  #define TOOLS_PLATFORM_H_
@@ -30,8 +19,8 @@
  #ifdef ANDROID
  #include <android/log.h>
  #else
---- tools/profiler/LulElf.cpp
-+++ tools/profiler/LulElf.cpp
+--- tools/profiler/lul/LulElf.cpp
++++ tools/profiler/lul/LulElf.cpp
 @@ -579,10 +579,10 @@
  // Return the non-directory portion of FILENAME: the portion after the
  // last slash, or the whole filename if there are no slashes.
@@ -47,8 +36,8 @@
    return base;
  }
  
---- tools/profiler/platform-linux.cc.orig	2015-06-11 18:39:35.689739054 +0200
-+++ tools/profiler/platform-linux.cc	2015-06-11 18:40:04.479706749 +0200
+--- tools/profiler/core/platform-linux.cc.orig	2015-06-11 18:39:35.689739054 +0200
++++ tools/profiler/core/platform-linux.cc	2015-06-11 18:40:04.479706749 +0200
 @@ -651,11 +651,13 @@ void OS::Startup() {
  void TickSample::PopulateContext(void* aContext)
  {
@@ -63,3 +52,31 @@
  }
  
  void OS::SleepMicro(int microseconds)
+--- tools/profiler/core/platform.h.orig	2015-11-04 18:27:58.170732586 +0100
++++ tools/profiler/core/platform.h	2015-11-04 18:29:11.898478051 +0100
+@@ -60,9 +60,9 @@
+ #include "v8-support.h"
+ #include <vector>
+ 
+-// We need a definition of gettid(), but glibc doesn't provide a
++// We need a definition of gettid(), but glibc nor musl don't provide a
+ // wrapper for it.
+-#if defined(__GLIBC__)
++#if defined(__linux__)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+ static inline pid_t gettid()
+--- media/libav/config_unix.h.orig	2015-11-04 18:38:46.660289503 +0100
++++ media/libav/config_unix.h	2015-11-04 18:39:38.620814879 +0100
+@@ -223,7 +223,11 @@
+ #define HAVE_STRERROR_R 1
+ #define HAVE_STRPTIME 1
+ #define HAVE_SYSCONF 1
++#if !defined(__linux__) || defined(__GLIBC__)
+ #define HAVE_SYSCTL 1
++#else
++#define HAVE_SYSCTL 0
++#endif
+ #define HAVE_USLEEP 1
+ #define HAVE_VIRTUALALLOC 0
+ #define HAVE_PTHREADS 0

srcpkgs/icecat/patches/fix-xpcom.patch

@@ -0,0 +1,11 @@
+--- xpcom/base/nsMemoryReporterManager.cpp.orig	2015-12-16 11:53:14.211144456 +0100
++++ xpcom/base/nsMemoryReporterManager.cpp	2015-12-16 11:55:26.859476381 +0100
+@@ -46,7 +46,7 @@ using namespace mozilla;
+ #  include "mozmemory.h"
+ #endif  // MOZ_MEMORY
+ 
+-#if defined(XP_LINUX)
++#if defined(XP_LINUX) && defined(__GLIBC__)
+ 
+ #include <malloc.h>
+ #include <string.h>

srcpkgs/icecat/patches/stat.patch

@@ -6,7 +6,7 @@
  
 +  // glibc's stat/lstat/fstat are macros while uclibc's are not
 +#if defined(__GLIBC__) && !defined(__UCLIBC__)
-+   { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) },
++   { "OSFILE_STAT_MACROS", JS::Int32Value(1) },
 +#endif // defined(stat)
 +
    PROP_END

srcpkgs/icecat/template

@@ -1,13 +1,13 @@
 # Template build file for 'icecat'.
 pkgname=icecat
-version=38.8.0
-revision=5
+version=45.5.1
+revision=1
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.gnu.org/software/${pkgname}/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
-distfiles="${GNU_SITE}/${pkgname}/${version}-gnu2/${pkgname}-${version}-gnu2.tar.bz2"
-checksum="0b0a323c7e167c3d23df9c1d33d2ca2d8c5deaca3f43841f4b2a5fac7f5067f9"
+distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
+checksum="8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9"
 
 nopie=yes
 lib32disabled=yes
@@ -38,6 +38,11 @@ if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
 	CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) CXXFLAGS+=" -DNO_STABS_SUPPORT=1"
+		;;
+esac
+
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -155,6 +160,7 @@ do_install() {
 
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/icecat/defaults/pref
 	vinstall ${FILESDIR}/icecat.desktop 644 usr/share/applications
+	vinstall ${FILESDIR}/icecat-safe.desktop 644 usr/share/applications
 
 	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
 		vinstall ${wrksrc}/browser/branding/official/default${i%x*}.png 644 \
@@ -170,14 +176,7 @@ do_install() {
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf icecat ${DESTDIR}/usr/lib/icecat/icecat-bin
-}
 
-icecat-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/icecat-devel
-		vmove usr/share/idl
-	}
+	# Remove the development files - noone uses them and the subpkg was broken
+	rm -rf ${DESTDIR}/usr/{include,lib/icecat-devel,share/idl}
 }