[atril] 10/13: debian/patches: Drop 0002_forgotten-mutex-unlock.patch. Applied upstream.
Martin Wimpress
flexiondotorg-guest at moszumanska.debian.org
Thu Jul 30 19:54:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
flexiondotorg-guest pushed a commit to branch debian/experimental
in repository atril.
commit 7d1e2e4b3f739aa97ca77c9c58d3a2689ce76ab1
Author: Martin Wimpress <code at flexion.org>
Date: Thu Jul 30 17:10:31 2015 +0100
debian/patches: Drop 0002_forgotten-mutex-unlock.patch. Applied upstream.
---
debian/patches/0002_forgotten-mutex-unlock.patch | 28 ------------------------
debian/patches/series | 1 -
2 files changed, 29 deletions(-)
diff --git a/debian/patches/0002_forgotten-mutex-unlock.patch b/debian/patches/0002_forgotten-mutex-unlock.patch
deleted file mode 100644
index 4cb041a..0000000
--- a/debian/patches/0002_forgotten-mutex-unlock.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e97dcef7bb3fa143181a68b36eaa3fb02c814d32 Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Thu, 5 Mar 2015 17:21:31 +0300
-Subject: [PATCH] ev-jobs: don't forget to unlock the trylock'ed mutex
-
----
- libview/ev-jobs.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
-index d8d3043..99cfc8c 100644
---- a/libview/ev-jobs.c
-+++ b/libview/ev-jobs.c
-@@ -834,9 +834,11 @@ ev_job_fonts_run (EvJob *job)
- /* Do not block the main loop */
- if (!ev_document_doc_mutex_trylock ())
- return TRUE;
--
-- if (!ev_document_fc_mutex_trylock ())
-+
-+ if (!ev_document_fc_mutex_trylock ()) {
-+ ev_document_doc_mutex_unlock ();
- return TRUE;
-+ }
-
- #ifdef EV_ENABLE_DEBUG
- /* We use the #ifdef in this case because of the if */
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 80e6494..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0002_forgotten-mutex-unlock.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/atril.git
More information about the pkg-mate-commits
mailing list