r50056 - in /desktop/unstable/libsecret/debian: changelog patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Sep  4 11:48:35 2016
New Revision: 50056

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50056
Log:
Compile vala unstable tests with SECRET_WITH_UNSTABLE=1.
Without this the generated C code compiles without the correct header
(warnings are disabled so this is not obvious). This was causing the test
to crash. (Closes: #821347)

Added:
    desktop/unstable/libsecret/debian/patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch
Modified:
    desktop/unstable/libsecret/debian/changelog
    desktop/unstable/libsecret/debian/patches/series

Modified: desktop/unstable/libsecret/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/changelog?rev=50056&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/changelog	[utf-8] Sun Sep  4 11:48:35 2016
@@ -2,8 +2,12 @@
 
   * Drop --disable-silent-rules from debian/rules. This is now handled by dh
     directly depending on whether the DH_QUIET environment variable is set.
-
- -- Michael Biebl <biebl at debian.org>  Thu, 26 May 2016 06:08:04 +0200
+  * Compile vala unstable tests with SECRET_WITH_UNSTABLE=1.
+    Without this the generated C code compiles without the correct header
+    (warnings are disabled so this is not obvious). This was causing the test
+    to crash. (Closes: #821347)
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 04 Sep 2016 12:16:44 +0200
 
 libsecret (0.18.5-1) unstable; urgency=medium
 

Added: desktop/unstable/libsecret/debian/patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch?rev=50056&op=file
==============================================================================
--- desktop/unstable/libsecret/debian/patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch	(added)
+++ desktop/unstable/libsecret/debian/patches/0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch	[utf-8] Sun Sep  4 11:48:35 2016
@@ -0,0 +1,31 @@
+From f59f2b6a82261c79e87d7b9f6ecba8538b8cac3a Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Mon, 30 May 2016 12:18:40 +1200
+Subject: [PATCH] Makefile.am: Compile vala unstable tests with
+ SECRET_WITH_UNSTABLE=1.
+
+Without this the generated C code compiles without the correct header (warnings
+are disabled so this is not obvious). This was causing the test to crash on
+Ubuntu (exact cause not diagnosed).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767002
+---
+ libsecret/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsecret/Makefile.am b/libsecret/Makefile.am
+index 0601460..7d96774 100644
+--- a/libsecret/Makefile.am
++++ b/libsecret/Makefile.am
+@@ -282,7 +282,7 @@ SUFFIXES = .vala .vala.o
+ test-vala-lang.vala.o: libsecret/test-vala-lang.vala $(VALA_TESTS_VAPIS)
+ 	$(VALA_V) $(VALAC) --compile $(VALA_TESTS_FLAGS) $<
+ test-vala-unstable.vala.o: libsecret/test-vala-unstable.vala $(VALA_TESTS_VAPIS)
+-	$(VALA_V) $(VALAC) --compile $(VALA_TESTS_FLAGS) $<
++	$(VALA_V) $(VALAC) --compile --Xcc=-DSECRET_WITH_UNSTABLE=1 $(VALA_TESTS_FLAGS) $<
+ 
+ test_vala_lang_SOURCES =
+ test_vala_lang_LDADD = \
+-- 
+2.9.3
+

Modified: desktop/unstable/libsecret/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/patches/series?rev=50056&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/patches/series	[utf-8] Sun Sep  4 11:48:35 2016
@@ -1,2 +1,3 @@
 0001-build-Port-to-Python-3.patch
 0002-libsecret-Get-rid-of-PyGI-warnings-about-unspecified.patch
+0003-Makefile.am-Compile-vala-unstable-tests-with-SECRET_.patch