r52246 - in /desktop/unstable/gjs/debian: changelog patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Mar 15 11:21:07 2017
New Revision: 52246

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52246
Log:
d/p/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch: Backport
an upstream patch to look in pkglibdir for (private) libraries, in the
installed test runner. Should fix the installed tests, and thus the
autopkgtests.

Added:
    desktop/unstable/gjs/debian/patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch
Modified:
    desktop/unstable/gjs/debian/changelog
    desktop/unstable/gjs/debian/patches/series

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=52246&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog	[utf-8] Wed Mar 15 11:21:07 2017
@@ -8,6 +8,10 @@
     since the GjsPrivate library requires GObject, GLib and Gtk. gjs-tests
     depends transitively on this package, so remove the gir1.2-gtk-3.0
     dependency from there.
+  * d/p/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch: Backport
+    an upstream patch to look in pkglibdir for (private) libraries, in the
+    installed test runner. Should fix the installed tests, and thus the
+    autopkgtests.
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 18 Oct 2016 14:20:48 +0200
 

Added: desktop/unstable/gjs/debian/patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch?rev=52246&op=file
==============================================================================
--- desktop/unstable/gjs/debian/patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch	(added)
+++ desktop/unstable/gjs/debian/patches/0001-installed-tests-Prepend-pkglibdir-to-library-path.patch	[utf-8] Wed Mar 15 11:21:07 2017
@@ -0,0 +1,30 @@
+From 880c6238b0a060b011e87526c244d0be9072e692 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento at gmail.com>
+Date: Wed, 11 Jan 2017 22:08:08 -0800
+Subject: [PATCH] installed-tests: Prepend pkglibdir to library path
+
+Typelibs don't include the full path to the shared library on every
+platform, so we need to add pkglibdir to GIRespository's library search
+path when running the tests installed.
+
+Backported to 1.6 by Iain Lane <laney at debian.org>
+
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=776938
+Applied-Upstream: 1.47.4
+---
+ Makefile-test.am                | 1 +
+ installed-tests/gjs-unit.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+Index: b/installed-tests/gjs-unit.cpp
+===================================================================
+--- a/installed-tests/gjs-unit.cpp
++++ b/installed-tests/gjs-unit.cpp
+@@ -171,6 +171,7 @@
+         js_test_dir = g_build_filename(g_getenv ("TOP_SRCDIR"), "installed-tests", "js", NULL);
+     } else {
+         g_irepository_prepend_search_path(INSTTESTDIR);
++        g_irepository_prepend_library_path(PKGLIBDIR);
+         js_test_dir = g_build_filename(INSTTESTDIR, "js", NULL);
+     }
+ 

Modified: desktop/unstable/gjs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/series?rev=52246&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gjs/debian/patches/series	[utf-8] Wed Mar 15 11:21:07 2017
@@ -0,0 +1 @@
+0001-installed-tests-Prepend-pkglibdir-to-library-path.patch