From 5b8a6068f9e634bacea5ce99e7c71bcf796a6ab6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Oct 2019 18:06:47 +0200 Subject: remove superold firefox --- package/firefox/Makefile | 142 --------------------- package/firefox/files/firefox | 2 - package/firefox/files/firefox.init | 31 ----- package/firefox/files/firefox.postinst | 6 - package/firefox/files/mozconfig | 37 ------ package/firefox/files/xinitrc | 1 - .../patch-gfx_angle_src_common_angleutils_cpp | 10 -- package/firefox/patches/patch-old-configure_in | 10 -- ...oogle-breakpad_src_common_linux_dump_symbols_cc | 11 -- ...rter_google-breakpad_src_common_stabs_reader_cc | 34 ----- .../patch-tools_profiler_core_platform-linux_cc | 11 -- .../patches/patch-tools_profiler_lul_LulElf_cpp | 12 -- .../patch-xpcom_base_nsMemoryReporterManager_cpp | 18 --- .../firefox/patches/patch-xpcom_ds_nsMathUtils_h | 21 --- tasks/005-firefox | 31 ----- 15 files changed, 377 deletions(-) delete mode 100644 package/firefox/Makefile delete mode 100755 package/firefox/files/firefox delete mode 100755 package/firefox/files/firefox.init delete mode 100644 package/firefox/files/firefox.postinst delete mode 100644 package/firefox/files/mozconfig delete mode 100644 package/firefox/files/xinitrc delete mode 100644 package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp delete mode 100644 package/firefox/patches/patch-old-configure_in delete mode 100644 package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc delete mode 100644 package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc delete mode 100644 package/firefox/patches/patch-tools_profiler_core_platform-linux_cc delete mode 100644 package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp delete mode 100644 package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp delete mode 100644 package/firefox/patches/patch-xpcom_ds_nsMathUtils_h delete mode 100644 tasks/005-firefox diff --git a/package/firefox/Makefile b/package/firefox/Makefile deleted file mode 100644 index 1d2bf3077..000000000 --- a/package/firefox/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= firefox -PKG_VERSION:= 50.1.0 -PKG_RELEASE:= 1 -PKG_HASH:= 54bb9bccbf9eed0c7715ae7f45330bf41ce24b756f5fdecb380e06709a6ac5a4 -PKG_DESCR:= graphical webbrowser -PKG_SECTION:= x11/apps -PKG_DEPENDS:= alsa-lib glib libgtk2 libgtk3 libpng libtiff libxcursor libffi -PKG_DEPENDS+= nspr nss libjpeg-turbo libatk pango cairo libxt libx11 hicolor-icon-theme -PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libdbus -PKG_DEPENDS+= harfbuzz mesa libvpx libbz2 ca-certificates libevent at-spi2-atk at-spi2-core -PKG_BUILDDEP:= alsa-lib glib libgtk2 libgtk3 libIDL libX11 mesa libtiff gdk-pixbuf -PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme -PKG_BUILDDEP+= libvpx pango bzip2 libevent bzip2-host python2-host yasm-host -PKG_BUILDDEP+= zip-host autoconf-old-host -PKG_NEEDS:= threads c++ intl -PKG_URL:= http://www.mozilla.org/ -PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/ - -PKG_CFLINE_FIREFOX:= select ADK_PACKAGE_CAIRO_WITH_TEE@ -PKG_CFLINE_FIREFOX+= select ADK_PACKAGE_CAIRO_WITH_XRENDER - -PKG_ARCH_DEPENDS:= arm mips mips64 x86 x86_64 -PKG_SYSTEM_DEPENDS:= solidrun-imx6 lemote-yeelong qemu-i686 qemu-x86_64 raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).source.tar.xz -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj - -include $(ADK_TOPDIR)/mk/package.mk -include $(ADK_TOPDIR)/mk/python.mk - -$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= minimal -ifeq ($(ADK_DEBUG),y) -CONFIGURE_ARGS+= --enable-debug -else -CONFIGURE_ARGS+= --disable-debug -endif - -CONFIGURE_ENV+= CROSS_COMPILE=1 \ - OS_ARCH=Linux \ - OS_TARGET=Linux \ - OS_TEST="$(ADK_TARGET_ARCH)" \ - OS_CXXFLAGS="$(TARGET_CXXFLAGS)" \ - PYTHON="$(PYTHON)" \ - HOST_CC="$(HOST_CC)" \ - HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \ - HOST_CFLAGS="$(HOST_CFLAGS)" \ - HOST_LDFLAGS="$(HOST_LDLAGS)" \ - HOST_CXX="$(HOST_CXX)" \ - HOST_CXXFLAGS="$(HOST_CXXFLAGS)" \ - HOST_RANLIB="ranlib" \ - HOST_AR="ar" \ - ac_cv_sqlite_secure_delete=yes \ - ac_cv_sqlite_threadsafe=yes \ - ac_cv_sqlite_enable_fts3=yes \ - ac_cv_sqlite_enable_unlock_notify=yes \ - ac_cv_sqlite_dbstat_vtab=yes -CONFIGURE_ARGS+= --prefix=/usr \ - --target=$(GNU_TARGET_NAME) \ - --with-toolchain-prefix=$(GNU_TARGET_NAME)- \ - --enable-application=browser \ - --enable-official-branding \ - --with-system-zlib \ - --with-system-bz2 \ - --with-system-png \ - --with-system-cairo \ - --with-system-pixman \ - --with-system-jpeg \ - --with-system-nss \ - --with-system-nspr \ - --with-system-libvpx \ - --with-system-libevent=$(STAGING_TARGET_DIR)/usr \ - --disable-tree-freetype \ - --enable-system-ffi \ - --enable-system-sqlite \ - --enable-chrome-format=jar \ - --enable-necko-protocols=all \ - --enable-alsa \ - --disable-profiling \ - --disable-jprof \ - --disable-systrace \ - --disable-pulseaudio \ - --disable-gio \ - --disable-gold \ - --disable-gconf \ - --disable-accessibility \ - --disable-dbus \ - --disable-gamepad \ - --disable-strip \ - --disable-install-strip \ - --disable-tests \ - --disable-gnomeui \ - --disable-optimize \ - --disable-necko-wifi \ - --disable-jemalloc \ - --disable-crashreporter \ - --disable-printing \ - --disable-pie \ - --disable-updater \ - --disable-url-classifier \ - --disable-safe-browsing \ - --disable-elf-hack - -ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -CONFIGURE_ARGS+= --disable-ion \ - --disable-webrtc -TARGET_CFLAGS:= $(subst Os,g3,$(TARGET_CFLAGS)) -else -CONFIGURE_ARGS+= --enable-webrtc -endif - -XAKE_FLAGS+= CROSS_COMPILE=1 OS_ARCH="Linux" OS_TEST="$(ADK_TARGET_ARCH)" OS_RELEASE="2.6" -XAKE_FLAGS+= HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS) -XAKE_FLAGS+= ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC" - -pre-configure: - $(SED) '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' $(WRKSRC)/config/system-headers - -post-configure: - touch $(WRKSRC)/configure - touch $(WRKBUILD)/config.status - -firefox-install: - $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin - $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib - $(CP) $(WRKINST)/usr/lib/firefox-$(PKG_VERSION) \ - $(IDIR_FIREFOX)/usr/lib - $(INSTALL_BIN) ./files/firefox \ - $(IDIR_FIREFOX)/usr/bin -ifeq ($(ADK_APPLIANCE_FIREFOX),y) - $(INSTALL_DIR) $(IDIR_FIREFOX)/etc - $(CP) ./files/xinitrc \ - $(IDIR_FIREFOX)/etc -endif - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox deleted file mode 100755 index 4b93d8e8d..000000000 --- a/package/firefox/files/firefox +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -env LD_LIBRARY_PATH=/usr/lib/firefox-50.1.0 /usr/lib/firefox-50.1.0/firefox diff --git a/package/firefox/files/firefox.init b/package/firefox/files/firefox.init deleted file mode 100755 index fe6104721..000000000 --- a/package/firefox/files/firefox.init +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -#PKG firefox -#INIT 98 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${firefox:-NO}" = x"NO" && exit 0 - test x"$firefox" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - if [ ! -d /data/firefox ];then - mkdir -p /data/firefox - chown firefox /data/firefox - fi - su - firefox -c startx - ;; -stop) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/firefox/files/firefox.postinst b/package/firefox/files/firefox.postinst deleted file mode 100644 index a9be54701..000000000 --- a/package/firefox/files/firefox.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf firefox NO -gid=$(get_next_gid) -add_group firefox $gid -add_user firefox $(get_next_uid) $gid /data/firefox /bin/sh diff --git a/package/firefox/files/mozconfig b/package/firefox/files/mozconfig deleted file mode 100644 index 0b9caf6ca..000000000 --- a/package/firefox/files/mozconfig +++ /dev/null @@ -1,37 +0,0 @@ -ac_add_options --disable-dbus -ac_add_options --disable-necko-wifi -ac_add_options --disable-pulseaudio -ac_add_options --disable-gconf -ac_add_options --enable-system-sqlite -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-icu -# Stripping is now enabled by default. -# Uncomment these lines if you need to run a debugger -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-optimize - -ac_add_options --enable-gio -ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing -ac_add_options --enable-url-classifier - -# From firefox-40, using system cairo causes firefox to crash -# frequently when it is doing background rendering in a tab. -#ac_add_options --enable-system-cairo -ac_add_options --enable-system-ffi -ac_add_options --enable-system-pixman - -ac_add_options --with-pthreads - -ac_add_options --with-system-bz2 -ac_add_options --with-system-jpeg -ac_add_options --with-system-png -ac_add_options --with-system-zlib - diff --git a/package/firefox/files/xinitrc b/package/firefox/files/xinitrc deleted file mode 100644 index cdc71236c..000000000 --- a/package/firefox/files/xinitrc +++ /dev/null @@ -1 +0,0 @@ -exec firefox diff --git a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp b/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp deleted file mode 100644 index 77b0ac628..000000000 --- a/package/firefox/patches/patch-gfx_angle_src_common_angleutils_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- firefox-49.0.1.orig/gfx/angle/src/common/angleutils.cpp 2016-07-25 22:22:05.000000000 +0200 -+++ firefox-49.0.1/gfx/angle/src/common/angleutils.cpp 2016-10-01 23:24:47.412037504 +0200 -@@ -11,6 +11,7 @@ - - #include - #include -+#include - - namespace angle - { diff --git a/package/firefox/patches/patch-old-configure_in b/package/firefox/patches/patch-old-configure_in deleted file mode 100644 index 2d4d13b9c..000000000 --- a/package/firefox/patches/patch-old-configure_in +++ /dev/null @@ -1,10 +0,0 @@ ---- firefox-49.0.1.orig/old-configure.in 2016-09-05 22:12:50.000000000 +0200 -+++ firefox-49.0.1/old-configure.in 2016-10-01 23:25:33.657828298 +0200 -@@ -6,7 +6,6 @@ dnl file, You can obtain one at http://m - - dnl Process this file with autoconf to produce a configure script. - dnl ======================================================== --AC_PREREQ(2.13) - AC_INIT(config/config.mk) - AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) - AC_CANONICAL_SYSTEM diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc deleted file mode 100644 index 3cc0045eb..000000000 --- a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_linux_dump_symbols_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2013-09-11 01:15:25.000000000 +0200 -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2013-10-24 12:01:36.000000000 +0200 -@@ -46,6 +46,8 @@ - #include - #include - -+#include -+ - #include - #include - #include diff --git a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc b/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc deleted file mode 100644 index e8f7afc99..000000000 --- a/package/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_common_stabs_reader_cc +++ /dev/null @@ -1,34 +0,0 @@ ---- mozilla-release.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-09-11 01:15:25.000000000 +0200 -+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2013-10-24 12:08:16.000000000 +0200 -@@ -34,13 +34,31 @@ - #include "common/stabs_reader.h" - - #include -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #include -+#else -+#define __define_stab(NAME, CODE, STRING) NAME=CODE, -+enum __stab_debug_code -+{ -+__define_stab (N_FUN, 0x24, "FUN") -+__define_stab (N_SLINE, 0x44, "SLINE") -+__define_stab (N_SOL, 0x84, "SOL") -+__define_stab (N_SO, 0x64, "SO") -+LAST_UNUSED_STAB_CODE -+}; -+#undef __define_stab -+#endif - #include - - #include - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ -+ - using std::vector; - - namespace google_breakpad { diff --git a/package/firefox/patches/patch-tools_profiler_core_platform-linux_cc b/package/firefox/patches/patch-tools_profiler_core_platform-linux_cc deleted file mode 100644 index da8f08abf..000000000 --- a/package/firefox/patches/patch-tools_profiler_core_platform-linux_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- firefox-42.0.orig/tools/profiler/core/platform-linux.cc 2015-10-29 23:18:01.000000000 +0100 -+++ firefox-42.0/tools/profiler/core/platform-linux.cc 2015-12-17 05:41:35.091485672 +0100 -@@ -57,7 +57,7 @@ - #include // open - #include // sysconf - #include --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #include // backtrace, backtrace_symbols - #endif // def __GLIBC__ - #include // index diff --git a/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp b/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp deleted file mode 100644 index 8e50fdbba..000000000 --- a/package/firefox/patches/patch-tools_profiler_lul_LulElf_cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- firefox-42.0.orig/tools/profiler/lul/LulElf.cpp 2015-10-29 23:18:01.000000000 +0100 -+++ firefox-42.0/tools/profiler/lul/LulElf.cpp 2015-12-17 06:09:09.809776525 +0100 -@@ -66,6 +66,9 @@ - #include "LulElfInt.h" - #include "LulMainInt.h" - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif - - #if defined(LUL_PLAT_arm_android) && !defined(SHT_ARM_EXIDX) - // bionic and older glibsc don't define it diff --git a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp b/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp deleted file mode 100644 index 44c7c5f54..000000000 --- a/package/firefox/patches/patch-xpcom_base_nsMemoryReporterManager_cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- firefox-49.0.1.orig/xpcom/base/nsMemoryReporterManager.cpp 2016-09-05 22:12:57.000000000 +0200 -+++ firefox-49.0.1/xpcom/base/nsMemoryReporterManager.cpp 2016-10-01 23:24:47.432038288 +0200 -@@ -157,6 +157,7 @@ ResidentUniqueDistinguishedAmount(int64_ - nsresult - SystemHeapSize(int64_t* aSizeOut) - { -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - struct mallinfo info = mallinfo(); - - // The documentation in the glibc man page makes it sound like |uordblks| -@@ -170,6 +171,7 @@ SystemHeapSize(int64_t* aSizeOut) - // shouldn't be a problem. Nonetheless, cast the |int|s to |size_t| before - // adding them to provide a small amount of extra overflow protection. - *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); -+#endif - return NS_OK; - } - #endif diff --git a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h b/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h deleted file mode 100644 index 3d4d0546b..000000000 --- a/package/firefox/patches/patch-xpcom_ds_nsMathUtils_h +++ /dev/null @@ -1,21 +0,0 @@ ---- firefox-45.0.orig/xpcom/ds/nsMathUtils.h 2016-03-03 22:48:07.000000000 +0100 -+++ firefox-45.0/xpcom/ds/nsMathUtils.h 2016-03-13 21:15:29.543246177 +0100 -@@ -103,12 +103,16 @@ NS_finite(double aNum) - #ifdef WIN32 - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(aNum); --#elif defined(XP_DARWIN) -+#elif defined(XP_DARWIN) || defined(__UCLIBC__) - // Darwin has deprecated |finite| and recommends |isfinite|. The former is - // not present in the iOS SDK. - return std::isfinite(aNum); - #else -- return finite(aNum); -+#ifdef _GLIBCXX_CMATH -+ return std::isfinite(aNum); -+#else -+ return isfinite(aNum); -+#endif - #endif - } - diff --git a/tasks/005-firefox b/tasks/005-firefox deleted file mode 100644 index 311689d65..000000000 --- a/tasks/005-firefox +++ /dev/null @@ -1,31 +0,0 @@ -config ADK_APPLIANCE_FIREFOX - bool "firefox kiosk appliance" - depends on ADK_TARGET_OS_LINUX && ( \ - ADK_TARGET_SYSTEM_LEMOTE_YEELONG || \ - ADK_TARGET_SYSTEM_IBM_X40 ) - select ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_GLIBC - select ADK_PACKAGE_FIREFOX - select ADK_PACKAGE_XORG_SERVER - select ADK_PACKAGE_FONT_MISC_MISC - select ADK_PACKAGE_XINIT - select ADK_PACKAGE_KBD - select ADK_PACKAGE_DROPBEAR - select ADK_PACKAGE_DROPBEAR_WITH_UTMP - select ADK_PACKAGE_E2FSCK - select ADK_PACKAGE_XDOTOOL - select BUSYBOX_NTPD - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_DROPBEAR - select ADK_RUNTIME_START_BUSYBOX_NTPD - select ADK_RUNTIME_START_BUSYBOX_SYSLOGD - select ADK_RUNTIME_START_FIREFOX - select ADK_RUNTIME_START_KBD - select ADK_LINUX_KERNEL_INPUT_EVDEV m - select ADK_LINUX_KERNEL_USB_HID m - select ADK_TARGET_USB_KEYBOARD - select ADK_TARGET_USB_MOUSE - select ADK_RUNTIME_HOSTNAME firefoxbox - help - Create a small firefox kiosk appliance. - -- cgit v1.2.3