pool/libdispatch
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 986374 from home:predivan:branches:multimedia:apps

Browse Source 
- Update to version 5.6.2
 * No upstream provided changelog.
 * Drop 563.patch and 574.patch, merged upstream/no longer required.
 * Disable i586 arch build for now.

OBS-URL: https://build.opensuse.org/request/show/986374
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/libdispatch?expand=0&rev=12
This commit is contained in:
Predrag Ivanović
2022-07-02 16:48:53 +00:00
committed by Git OBS Bridge
parent d1068e4978
commit 024c9845f2
5 changed files with 17 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
563.patch
View File

@@ -1,38 +0,0 @@
From 729e25d92d05a8c4a8136e831ec6123bbf7f2654 Mon Sep 17 00:00:00 2001
From: Evan Wilde <ewilde@apple.com>
Date: Thu, 19 Aug 2021 11:57:34 -0700
Subject: [PATCH] Removing unused refcount variable
The rebranch branch is failing to build due to an unused refcount
variable in runtime.c. The variable is only used by an os_assert and
nowhere else. I've removed it and instead put the check directly in the
assert.
---
src/BlocksRuntime/runtime.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/BlocksRuntime/runtime.c b/src/BlocksRuntime/runtime.c
index bfec1a0bf..4b7d4bfa2 100644
--- a/src/BlocksRuntime/runtime.c
+++ b/src/BlocksRuntime/runtime.c
@@ -468,18 +468,16 @@ static void _Block_byref_assign_copy(void *dest, const void *arg, const int flag
// Old compiler SPI
static void _Block_byref_release(const void *arg) {
struct Block_byref *byref = (struct Block_byref *)arg;
- int32_t refcount;
// dereference the forwarding pointer since the compiler isn't doing this anymore (ever?)
byref = byref->forwarding;
-
+
// To support C++ destructors under GC we arrange for there to be a finalizer for this
// by using an isa that directs the code to a finalizer that calls the byref_destroy method.
if ((byref->flags & BLOCK_BYREF_NEEDS_FREE) == 0) {
return; // stack or GC or global
}
- refcount = byref->flags & BLOCK_REFCOUNT_MASK;
- os_assert(refcount);
+ os_assert(byref->flags & BLOCK_REFCOUNT_MASK);
if (latching_decr_int_should_deallocate(&byref->flags)) {
if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) {
struct Block_byref_2 *byref2 = (struct Block_byref_2 *)(byref+1);

46
574.patch
View File

@@ -1,46 +0,0 @@
From 6ffc3ed464fa7930ac59b77d534a0607ef95c57f Mon Sep 17 00:00:00 2001
From: Ron Olson <tachoknight@gmail.com>
Date: Fri, 17 Sep 2021 12:21:34 -0500
Subject: [PATCH 1/2] Added no-op for variable to avoid a warning treated as
error with Clang 13
---
tests/bsdtestharness.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/bsdtestharness.c b/tests/bsdtestharness.c
index ca52d6e97..38ef26ac9 100644
--- a/tests/bsdtestharness.c
+++ b/tests/bsdtestharness.c
@@ -152,6 +152,7 @@ main(int argc, char *argv[])
assert(pid > 0);
#if defined(__linux__)
+ (void)to;
int status;
struct rusage usage;
struct timeval tv_stop, tv_wall;
From 6656bb31079e974c5886dcb81d60d785fb5874e0 Mon Sep 17 00:00:00 2001
From: Ron Olson <tachoknight@gmail.com>
Date: Tue, 21 Sep 2021 09:33:31 -0500
Subject: [PATCH 2/2] Found another spot where no-ops are necessary to keep
Clang 13 happy
---
tests/dispatch_apply.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/dispatch_apply.c b/tests/dispatch_apply.c
index fa7fab53f..2c52da993 100644
--- a/tests/dispatch_apply.c
+++ b/tests/dispatch_apply.c
@@ -57,6 +57,8 @@ static void busythread(void *ignored)
/* prevent i and j been optimized out */
volatile uint64_t i = 0, j = 0;
+ (void)i;
+ (void)j;
OSAtomicIncrement32(&busy_threads_started);
while(!all_done)

4
corelibs-libdispatch.tar.gz
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5efdfa1d2897c598acea42fc00776477bb3713645686774f5ff0818b26649e62
size 592054
oid sha256:ddf90b72521cf836e5ff6537a140fa08c4a3227f9d52d308cb4571c517030c76
size 592618

8
libdispatch.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Jul 2 11:37:03 UTC 2022 - Predrag Ivanović <predivan@mts.rs>
- Update to version 5.6.2
* No upstream provided changelog.
* Drop 563.patch and 574.patch, merged upstream/no longer required.
* Disable i586 arch build for now.
-------------------------------------------------------------------
Wed May 25 11:16:26 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

15
libdispatch.spec
View File

@@ -16,9 +16,9 @@
#
%define reltag 5.5-RELEASE
%define reltag 5.6.2-RELEASE
Name: libdispatch
Version: 5.5
Version: 5.6.2
Release: 0
Summary: Apple's Grand Central Dispatch library
License: Apache-2.0
@@ -26,11 +26,6 @@ Group: Development/Languages/C and C++
URL: https://github.com/apple/swift-corelibs-libdispatch
Source0: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{reltag}.tar.gz#/corelibs-libdispatch.tar.gz
Source1: libdispatch-rpmlintrc
# Clang13 fix for warnings treated as errors
# https://patch-diff.githubusercontent.com/raw/apple/swift-corelibs-libdispatch/pull/574.patch
Patch0: 574.patch
# https://patch-diff.githubusercontent.com/raw/apple/swift-corelibs-libdispatch/pull/563.patch
Patch1: 563.patch
# set library versions
Patch2: soversion.patch
BuildRequires: chrpath
@@ -40,6 +35,10 @@ BuildRequires: libbsd-devel
BuildRequires: libstdc++-devel
BuildRequires: llvm-gold
BuildRequires: ninja
# Disable i586 build for now
%ifarch i586
ExclusiveArch: do_not_build
%endif
%description
Grand Central Dispatch (GCD or libdispatch) provides support for
@@ -48,7 +47,7 @@ concurrent code execution on multicore hardware.
%package -n libdispatch1_3
Summary: Apple's Grand Central Dispatch library
Group: System/Libraries
Obsoletes: libdispatch
Obsoletes: libdispatch < %{version}-%{release}
Provides: libdispatch = %{version}-%{release}
%description -n libdispatch1_3