summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-06-13 14:46:53 -0400
committerB Stack <bgstack15@gmail.com>2019-06-13 14:46:53 -0400
commitd13a222e7c1c16ceb7cafa04638746d052964861 (patch)
tree5cdddd79779acbf4d1466b4d967aef0e49b5653a
parentMerge branch 'scite-bump' into 'master' (diff)
downloadstackrpms-d13a222e7c1c16ceb7cafa04638746d052964861.tar.gz
stackrpms-d13a222e7c1c16ceb7cafa04638746d052964861.tar.bz2
stackrpms-d13a222e7c1c16ceb7cafa04638746d052964861.zip
add mozilla-1533969 for palemoon
-rw-r--r--palemoon/mozilla-1533969-palemoon.patch29
-rw-r--r--palemoon/palemoon-stackrpms.spec6
-rw-r--r--palemoon/palemoon.spec6
3 files changed, 39 insertions, 2 deletions
diff --git a/palemoon/mozilla-1533969-palemoon.patch b/palemoon/mozilla-1533969-palemoon.patch
new file mode 100644
index 0000000..074f0fd
--- /dev/null
+++ b/palemoon/mozilla-1533969-palemoon.patch
@@ -0,0 +1,29 @@
+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: 2091-03-12 15:08 PDT
+Modified for Pale Moon by: B Stack <bgstack15@gmail.com>
+--- 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);
+ }
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 )
bgstack15