Date: Thu, 31 Dec 2015 10:14:50 +0100
From: Natanael Copa <ncopa@alpinelinux.org>
To: =?ISO-8859-1?B?U/ZyZW4=?= Tempel <soeren+git@soeren-tempel.net>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] community/firefox: upgrade to 38.5.0
Message-ID: <20151231101450.67329230@ncopa-desktop.alpinelinux.org>
In-Reply-To: <1450772857-13719-1-git-send-email-soeren+git@soeren-tempel.net>
References: <1450772857-13719-1-git-send-email-soeren+git@soeren-tempel.net>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Tue, 22 Dec 2015 09:27:37 +0100
S=F6ren Tempel <soeren+git@soeren-tempel.net> wrote:

> There is still a warning which shows up everytime you start firefox
>=20
> console.error:
>   [CustomizableUI]
>     Custom widget with id loop-button does not return a valid node
>=20
> I isn't a critical error but if somebody knows how to fix it please let
> me know.
> ---
>  community/firefox/APKBUILD      | 18 +++++-------------
>  community/firefox/getchar.patch | 14 --------------
>  community/firefox/stat.patch    | 25 -------------------------
>  3 files changed, 5 insertions(+), 52 deletions(-)
>  delete mode 100644 community/firefox/getchar.patch
>  delete mode 100644 community/firefox/stat.patch
>=20
...

> diff --git a/community/firefox/stat.patch b/community/firefox/stat.patch
> deleted file mode 100644
> index ed7dc00..0000000
> --- a/community/firefox/stat.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> ---- ./dom/system/OSFileConstants.cpp.orig	2013-04-17 06:17:29.798371189 =
+0000
> -+++ ./dom/system/OSFileConstants.cpp	2013-04-17 06:30:30.032285977 +0000
> -@@ -509,6 +509,11 @@
> -   INT_CONSTANT(_STAT_VER),
> - #endif // defined(_STAT_VER)
> -=20
> -+  // glibc's stat/lstat/fstat are macros while uclibc's are not
> -+#if defined(__GLIBC__) && !defined(__UCLIBC__)
> -+   { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) },
> -+#endif // defined(stat)
> -+
> -   PROP_END
> - };
> -=20
> ---- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2014-0=
4-03 13:08:26.686409787 +0000
> -+++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2014-04-03 =
13:34:14.101716259 +0000
> -@@ -512,7 +512,7 @@
> -                       /*path*/   Type.fd,
> -                       /*buf*/    Type.stat.out_ptr
> -                      );
> --       } else if (Const._STAT_VER !=3D undefined) {
> -+       } else if (Const.OSFILE_STAT_MACROS !=3D undefined) {
> -          const ver =3D Const._STAT_VER;
> -          let xstat_name, lxstat_name, fxstat_name;
> -          if (OS.Constants.Sys.Name =3D=3D "SunOS") {



I think we actually need the stat.patch?

Oh, maybe not. Seems we can rely on the musl libc.so.6 ABI compat.
$ nm -D /lib/libc.musl-x86_64.so.1 | grep x
stat
0000000000048747 T __fxstat
0000000000048747 W __fxstat64
0000000000048751 T __fxstatat
0000000000048751 W __fxstatat64
0000000000048761 T __lxstat
0000000000048761 W __lxstat64
000000000004876c T __xstat
000000000004876c W __xstat64


-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---