summaryrefslogtreecommitdiff
path: root/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-06-26 02:56:33 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-06-26 02:56:33 +0000
commit970a34998cf4988427d089a3b81ee34c87d8f952 (patch)
treec01eba0962985d69066d32629dccea6471fbbd19 /user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
parentf8bfd713b064991dfc46cbb7817829315932af67 (diff)
parent6397db618b31a50e11d59a19d9c89bf9a59348af (diff)
downloadpackages-970a34998cf4988427d089a3b81ee34c87d8f952.tar.gz
packages-970a34998cf4988427d089a3b81ee34c87d8f952.tar.bz2
packages-970a34998cf4988427d089a3b81ee34c87d8f952.tar.xz
packages-970a34998cf4988427d089a3b81ee34c87d8f952.zip
Merge branch 'poppler' into 'master'
Bump poppler and rebuild rdeps * `poppler` was bumped from `0.74.0` to `0.77.0`. Due to a soname bump the reverse dependencies were rebuilt: ``` atril calligra cups-filters evince tumbler ``` Notably absent is `libreoffice` which is being upgraded separately. * Likewise with `poppler-qt5`. There was not a soname bump here, but [one of the intermediate versions still appears to have had some ABI changes](https://abi-laboratory.pro/index.php?view=objects_report&l=poppler&v1=0.76.0&v2=0.76.1), so these packages were rebuilt as well: ``` kfilemetadata krita okular qpdfview tellico ``` * `exiv2` was bumped from `0.26` to `0.27.1`, which entailed a soname bump. These packages were rebuilt (there is some overlap here with the above, thus inclusion in this MR): ``` gwenview kfilemetadata kphotoalbum krita libkexiv2 ``` See merge request !255
Diffstat (limited to 'user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch')
-rw-r--r--user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch b/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
deleted file mode 100644
index 86412532d..000000000
--- a/user/exiv2/0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d775683f579543c35463ab2a8d9425da10d2f016 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 4 Oct 2017 00:15:30 -0500
-Subject: [PATCH] Amend fix for #9 to apply to other Unix systems
-
-At least the musl libc on Linux has the same issue as Mac OS X: the
-PTHREAD_RECURSIVE_* static initialiser does not exist. This is a
-documented and purposeful omission:
-
-http://www.openwall.com/lists/musl/2017/02/20/3
-
-This commit uses similar logic to the Apple test on other Unixes.
----
- src/actions.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/actions.cpp b/src/actions.cpp
-index fe14de4..aa15ec7 100644
---- a/src/actions.cpp
-+++ b/src/actions.cpp
-@@ -2051,7 +2051,11 @@ namespace {
- static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER;
- #endif
- #else
-- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+ #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-+ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+ #else
-+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER;
-+ #endif
- #endif
- #endif
-
---
-2.10.0
-