aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-01-13 11:40:38 +0100
committerRasmus Thomsen <oss@cogitri.dev>2020-01-13 11:40:38 +0100
commit2b76134829d46c01f4939f92aa815108146e3993 (patch)
tree35ac8197bebf58b2b05854a3b9c31180ab44c293
parent93c19ffd47a4de390d77caf31f1112b2a62c6cd4 (diff)
downloadaports-2b76134829d46c01f4939f92aa815108146e3993.tar.bz2
aports-2b76134829d46c01f4939f92aa815108146e3993.tar.xz
Revert "community/gjs: upgrade to 1.58.4"
This reverts commit 93c19ffd47a4de390d77caf31f1112b2a62c6cd4. Ugh, merge script merged this to master and not 3.11-stable
-rw-r--r--community/gjs/382.patch87
1 files changed, 0 insertions, 87 deletions
diff --git a/community/gjs/382.patch b/community/gjs/382.patch
deleted file mode 100644
index a1ee5c9335..0000000000
--- a/community/gjs/382.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From d57324ac7324e1e7810b8601466572646f0782bd Mon Sep 17 00:00:00 2001
-From: Philip Chimento <philip.chimento@gmail.com>
-Date: Tue, 7 Jan 2020 23:52:00 -0500
-Subject: [PATCH] build: Prefer signal.h to sys/signal.h
-
-It seems that signal.h is the correct header to include, but on win32 it
-is still sys/signal.h.
-
-Closes: #295
----
- gjs/context.h | 6 ++++--
- gjs/profiler.cpp | 8 +++++---
- meson.build | 5 ++++-
- tools/gjs-private-iwyu.imp | 4 ++--
- 4 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/gjs/context.h b/gjs/context.h
-index b173c32c..dd6a36f7 100644
---- a/gjs/context.h
-+++ b/gjs/context.h
-@@ -30,8 +30,10 @@
-
- #include <stdbool.h> /* IWYU pragma: keep */
-
--#ifndef _WIN32
--# include <sys/signal.h> /* for siginfo_t */
-+#ifdef HAVE_SIGNAL_H
-+# include <signal.h> /* for siginfo_t */
-+#else
-+# include <sys/signal.h>
- #endif
-
- #include <glib-object.h>
-diff --git a/gjs/profiler.cpp b/gjs/profiler.cpp
-index 74c99f07..c4abaca8 100644
---- a/gjs/profiler.cpp
-+++ b/gjs/profiler.cpp
-@@ -21,10 +21,12 @@
- * IN THE SOFTWARE.
- */
-
--#include <config.h> // for ENABLE_PROFILER, HAVE_SYS_SYSCALL_H, HAVE_UNISTD_H, HAVE_SYS_SIGNAL_H
-+#include <config.h> // for ENABLE_PROFILER, HAVE_SYS_SYSCALL_H, HAVE_UNISTD_H
-
--#ifdef HAVE_SYS_SIGNAL_H
--# include <sys/signal.h> // for siginfo_t, sigevent, ...
-+#ifdef HAVE_SIGNAL_H
-+# include <signal.h> // for siginfo_t, sigevent, sigaction, SIGPROF, ...
-+#else
-+# include <sys/signal.h>
- #endif
-
- #include <glib-object.h>
-diff --git a/meson.build b/meson.build
-index 072a3e1d..2c188286 100644
---- a/meson.build
-+++ b/meson.build
-@@ -283,7 +283,10 @@ if build_readline
- endif
- header_conf.set('HAVE_SYS_SYSCALL_H', cxx.check_header('sys/syscall.h'))
- header_conf.set('HAVE_UNISTD_H', cxx.check_header('unistd.h'))
--header_conf.set('HAVE_SYS_SIGNAL_H', cxx.check_header('sys/signal.h'))
-+have_signal_h = cxx.check_header('signal.h')
-+header_conf.set('HAVE_SIGNAL_H', have_signal_h)
-+header_conf.set('HAVE_SYS_SIGNAL_H', cxx.check_header('sys/signal.h',
-+ required: not have_signal_h))
-
- # enable GNU extensions on systems that have them
- header_conf.set('_GNU_SOURCE', 1)
-diff --git a/tools/gjs-private-iwyu.imp b/tools/gjs-private-iwyu.imp
-index 43fe827c..19ffbcbd 100644
---- a/tools/gjs-private-iwyu.imp
-+++ b/tools/gjs-private-iwyu.imp
-@@ -3,8 +3,8 @@
- {"include": ["<bits/std_abs.h>", "private", "<stdlib.h>", "public"]},
- {"include": ["<bits/std_function.h>", "private", "<functional>", "public"]},
- {"include": ["@<bits/stdint-.*>", "private", "<stdint.h>", "public"]},
-- {"include": ["<bits/types/sigevent_t.h>", "private", "<sys/signal.h>", "public"]},
-- {"include": ["<bits/types/siginfo_t.h>", "private", "<sys/signal.h>", "public"]},
-+ {"include": ["<bits/types/sigevent_t.h>", "private", "<signal.h>", "public"]},
-+ {"include": ["<bits/types/siginfo_t.h>", "private", "<signal.h>", "public"]},
- {"include": ["<bits/types/struct_itimerspec.h>", "private", "<time.h>", "public"]},
- {"include": ["<bits/types/struct_timespec.h>", "private", "<time.h>", "public"]},
- {"include": ["<bits/types/timer_t.h>", "private", "<sys/types.h>", "public"]},
---
-2.24.1
-