r53328 - in /desktop/unstable/totem/debian: changelog patches/fix-lirc-detection.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Sep  1 18:18:45 2017
New Revision: 53328

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53328
Log:
Adjust lirc library detection check so that lirc plugin is built

Added:
    desktop/unstable/totem/debian/patches/fix-lirc-detection.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/series

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=53328&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog	[utf-8] (original)
+++ desktop/unstable/totem/debian/changelog	[utf-8] Fri Sep  1 18:18:45 2017
@@ -7,6 +7,8 @@
     - Bump minimum libglib2.0-dev to 2.35.0
   * debian/totem.install:
     - Install new thumbnailer
+  * Add fix-lirc-detection.patch:
+    - Adjust lirc library detection check so that lirc plugin is built
 
  -- Jeremy Bicha <jbicha at debian.org>  Fri, 01 Sep 2017 14:09:21 -0400
 

Added: desktop/unstable/totem/debian/patches/fix-lirc-detection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/fix-lirc-detection.patch?rev=53328&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/fix-lirc-detection.patch	(added)
+++ desktop/unstable/totem/debian/patches/fix-lirc-detection.patch	[utf-8] Fri Sep  1 18:18:45 2017
@@ -0,0 +1,29 @@
+From 09de336619ec177e6943fcc2cb2817f1b4366ea8 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 14 Aug 2017 10:40:46 +0200
+Subject: lirc: Fix lirc plugin dependency checks
+
+The pkg-config file is called lirc, not lirc_client (the name of the
+library), and the function check didn't link against liblirc_client
+either.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786258
+---
+ src/plugins/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 83d76d8..95af648 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -70,8 +70,8 @@ if plugins_option != 'none'
+     message(str)
+   endif
+ 
+-  lirc_dep = dependency('lirc_client', required: false)
+-  if lirc_dep.found() and cc.has_function('lirc_init') and cc.has_header('lirc/lirc_client.h')
++  lirc_dep = dependency('lirc', required: false)
++  if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
+     plugins += 'lirc'
+   else
+     str = 'you need lirc_client installed for the lirc plugin'

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=53328&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series	[utf-8] Fri Sep  1 18:18:45 2017
@@ -1 +1,2 @@
 disable-gtkdoc-check.patch
+fix-lirc-detection.patch