[SCM] atril Debian package branch, master, updated. debian/1.8.0+dfsg1-2-2-g89300ff

Mike Gabriel sunweaver at moszumanska.debian.org
Tue Jul 1 18:32:08 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-mate/atril.git;a=commitdiff;h=ff67d11

The following commit has been merged in the master branch:
commit ff67d117c3c934e184d05cd61f6a041544690af4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 1 20:12:03 2014 +0200

    debian/patches: Add 1002_FTBFS-atril-with-clang.patch. Fix FTBFS when build with clang. (Closes: #753344).
---
 debian/patches/1002_FTBFS-atril-with-clang.patch | 16 ++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/1002_FTBFS-atril-with-clang.patch b/debian/patches/1002_FTBFS-atril-with-clang.patch
new file mode 100644
index 0000000..51ad018
--- /dev/null
+++ b/debian/patches/1002_FTBFS-atril-with-clang.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS of atril when build with the clang compiler
+Author: Alexander <sanek23994 at gmail.com>
+Forwarded: https://github.com/mate-desktop/atril/issues/82
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753344
+
+--- a/libview/ev-view.c	2014-03-01 15:53:25.000000000 +0400
++++ b/libview/ev-view.c	2014-06-30 22:25:35.306279684 +0400
+@@ -840,7 +840,7 @@
+ }
+ 
+ #if !GTK_CHECK_VERSION (3, 0, 0)
+-ev_view_set_scroll_adjustments (GtkLayout      *layout,
++void ev_view_set_scroll_adjustments (GtkLayout      *layout,
+ 				GtkAdjustment  *hadjustment,
+ 				GtkAdjustment  *vadjustment)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 95f1e35..eccd113 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001_add-keywords-key-to-desktop-files.patch
+1002_FTBFS-atril-with-clang.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
atril Debian package



More information about the pkg-mate-commits mailing list