diff options
author | B Stack <bgstack15@gmail.com> | 2019-06-15 15:50:02 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-06-15 15:50:02 +0000 |
commit | b2edddf8fc6e3719c4010afa0f7b6f05f9169f8a (patch) | |
tree | 3e315af62a6ad4f0e6b37ef80fd0715e25305ec6 | |
parent | Merge branch 'freefilesync-bump' into 'master' (diff) | |
parent | Fix typo of date in mozilla-1533969-palemoon.patch (diff) | |
download | stackrpms-b2edddf8fc6e3719c4010afa0f7b6f05f9169f8a.tar.gz stackrpms-b2edddf8fc6e3719c4010afa0f7b6f05f9169f8a.tar.bz2 stackrpms-b2edddf8fc6e3719c4010afa0f7b6f05f9169f8a.zip |
Merge branch 'palemoon-rawhide' into 'master'
compile palemoon in fc rawhide successfully
See merge request bgstack15/stackrpms!65
-rw-r--r-- | palemoon/mozilla-1533969-palemoon.patch | 45 | ||||
-rw-r--r-- | palemoon/palemoon-stackrpms.spec | 6 | ||||
-rw-r--r-- | palemoon/palemoon.spec | 6 |
3 files changed, 55 insertions, 2 deletions
diff --git a/palemoon/mozilla-1533969-palemoon.patch b/palemoon/mozilla-1533969-palemoon.patch new file mode 100644 index 0000000..d4ed4c4 --- /dev/null +++ b/palemoon/mozilla-1533969-palemoon.patch @@ -0,0 +1,45 @@ +Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1533969 +From: Emilio Cobos Álvarez (:emilio) https://bugzilla.mozilla.org/user_profile?user_id=546716 +Date: 2019-03-12 15:08 PDT +Modified for Pale Moon by: B Stack <bgstack15@gmail.com> +This patch is applicable for all versions of Fedora GNU/Linux, but it really only affects gcc >= 9.1.1 in fc == 31 +--- tools/profiler/tasktracer/GeckoTaskTracer.cpp.orig 2019-06-04 18:16:01.000000000 -0400 ++++ tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-06-13 13:16:29.160643732 -0400 +@@ -20,19 +20,19 @@ + + #include <stdarg.h> + +-// We need a definition of gettid(), but glibc doesn't provide a ++// We need a definition of gettid(), but old glibc versions don't provide a + // wrapper for it. + #if defined(__GLIBC__) + #include <unistd.h> + #include <sys/syscall.h> +-static inline pid_t gettid() ++#define gettid() static_cast<pid_t>(syscall(SYS_gettid)) + { + return (pid_t) syscall(SYS_gettid); + } + #elif defined(XP_MACOSX) + #include <unistd.h> + #include <sys/syscall.h> +-static inline pid_t gettid() ++#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid)) + { + return (pid_t) syscall(SYS_thread_selfid); + } +--- js/src/jsnativestack.cpp.orig 2019-06-04 18:16:01.000000000 -0400 ++++ js/src/jsnativestack.cpp 2019-06-14 08:13:04.080567510 -0400 +@@ -26,11 +26,7 @@ + # include <sys/syscall.h> + # include <sys/types.h> + # include <unistd.h> +-static pid_t +-gettid() +-{ +- return syscall(__NR_gettid); +-} ++# define gettid() static_cast<pid_t>(syscall(SYS_gettid)) + # endif + + #else diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec index 95f508c..1c1d13c 100644 --- a/palemoon/palemoon-stackrpms.spec +++ b/palemoon/palemoon-stackrpms.spec @@ -41,7 +41,7 @@ Name: palemoon Summary: Pale Moon web browser %endif Version: 28.5.2 -Release: 1 +Release: 2 Group: Networking/Web License: MPLv2.0 @@ -55,6 +55,7 @@ Source4: bgstack15-palemoon-prefs.js Patch0: small-icons.patch Patch1: bgstack15-palemoon.patch %endif +Patch100: mozilla-1533969-palemoon.patch Packager: Bgstack15 <bgstack15@gmail.com> %if "%{?scl_env}" != "" @@ -115,6 +116,9 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch1 -p1 %endif +# Mozilla patches +%patch100 -p0 + %build %if "%{?scl_env}" != "" thispwd=$( pwd ) diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 1508f0e..6364e32 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -41,7 +41,7 @@ Name: palemoon Summary: Pale Moon web browser %endif Version: 28.5.2 -Release: 1 +Release: 2 Group: Networking/Web License: MPLv2.0 @@ -55,6 +55,7 @@ Source4: bgstack15-palemoon-prefs.js Patch0: small-icons.patch Patch1: bgstack15-palemoon.patch %endif +Patch100: mozilla-1533969-palemoon.patch Packager: Bgstack15 <bgstack15@gmail.com> %if "%{?scl_env}" != "" @@ -115,6 +116,9 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch1 -p1 %endif +# Mozilla patches +%patch100 -p0 + %build %if "%{?scl_env}" != "" thispwd=$( pwd ) |