Control: tags 941488 + patch Control: tags 941488 + pending Hiya,
I thought I'd be helpful (to speed along the glib2.0 migration), so I've prepared an NMU for dbus-test-runner (versioned as 16.10.0~bzr100+repack1-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer, or cancel it yourself, upload it under your own name or anything similar. Cheers! -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ]
diff -Nru dbus-test-runner-16.10.0~bzr100+repack1/debian/changelog dbus-test-runner-16.10.0~bzr100+repack1/debian/changelog
--- dbus-test-runner-16.10.0~bzr100+repack1/debian/changelog 2018-11-02 21:43:17.000000000 +0000
+++ dbus-test-runner-16.10.0~bzr100+repack1/debian/changelog 2019-10-02 10:02:52.000000000 +0100
@@ -1,3 +1,15 @@
+dbus-test-runner (16.10.0~bzr100+repack1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/dont-build-with-werror.patch: Don't build with -Werror;
+ this is a bad idea for release builds as it means you get build failures
+ for deprecations (Closes: #941488)
+ * debian/patches/replace-deprecated-functions.patch: tests: Replace
+ deprecated g_main_{pending,iteration} with current
+ g_main_context_{pending,iteration}
+
+ -- Iain Lane <i...@orangesquash.org.uk> Wed, 02 Oct 2019 10:02:52 +0100
+
dbus-test-runner (16.10.0~bzr100+repack1-4) unstable; urgency=medium
* debian/control:
diff -Nru dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/dont-build-with-werror.patch dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/dont-build-with-werror.patch
--- dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/dont-build-with-werror.patch 1970-01-01 01:00:00.000000000 +0100
+++ dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/dont-build-with-werror.patch 2019-10-02 09:59:33.000000000 +0100
@@ -0,0 +1,97 @@
+Description: Don't build with -Werror; this is a bad idea for release builds as it means you get build failures for deprecations
+Author: Iain Lane <la...@debian.org>
+Origin: https://bazaar.launchpad.net/~indicator-applet-developers/dbus-test-runner/trunk.16.10/revision/102
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 24a3f1f..7c44544 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ $(COVERAGE_CFLAGS) \
+ -I$(top_srcdir) \
+ -DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \
+- -Wall -Werror -Wextra
++ -Wall -Wextra
+ dbus_test_runner_LDADD = $(DBUS_TEST_RUNNER_LIBS) \
+ $(top_builddir)/libdbustest/libdbustest.la
+ dbus_test_runner_LDFLAGS = $(COVERAGE_LDFLAGS)
+diff --git a/build.sh b/build.sh
+index 11bd1ed..4c691ab 100755
+--- a/build.sh
++++ b/build.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-gcc -o dbus-test-runner `pkg-config --cflags --libs glib-2.0 gobject-2.0` dbus-test-runner.c -Wall -Werror
++gcc -o dbus-test-runner `pkg-config --cflags --libs glib-2.0 gobject-2.0` dbus-test-runner.c -Wall
+diff --git a/libdbustest/Makefile.am b/libdbustest/Makefile.am
+index d76ff52..d048a83 100644
+--- a/libdbustest/Makefile.am
++++ b/libdbustest/Makefile.am
+@@ -40,7 +40,7 @@
+ -DBUSTLE_DUAL_MONITOR="\"$(pkgdatadir)/dbus-test-bustle-handler\"" \
+ -DWATCHDOG="\"$(pkglibexecdir)/dbus-test-watchdog\"" \
+ -DG_LOG_DOMAIN=\"libdbustest\" \
+- -Wall -Werror -Wextra
++ -Wall -Wextra
+
+ libdbustest_la_LIBADD = \
+ libdbustest-generated.la \
+@@ -59,7 +59,7 @@
+ $(DBUS_TEST_RUNNER_CFLAGS) \
+ -I$(builddir) \
+ -DG_LOG_DOMAIN=\"libdbustest\" \
+- -Wall -Werror
++ -Wall
+
+ libdbustest_generated_la_SOURCES = \
+ dbus-mock-iface.h \
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7eccc63..4f4aad9 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -245,7 +245,7 @@
+ test-own-name.c
+ test_own_name_CFLAGS = \
+ $(DBUS_TEST_RUNNER_CFLAGS) \
+- -Wall -Werror
++ -Wall
+ test_own_name_LDADD = \
+ $(DBUS_TEST_RUNNER_LIBS)
+
+@@ -253,7 +253,7 @@
+ test-check-name.c
+ test_check_name_CFLAGS = \
+ $(DBUS_TEST_RUNNER_CFLAGS) \
+- -Wall -Werror
++ -Wall
+ test_check_name_LDADD = \
+ $(DBUS_TEST_RUNNER_LIBS)
+
+@@ -351,7 +351,7 @@
+ -I$(top_srcdir) \
+ -DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
+ -DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
+- -Wall -Werror
++ -Wall
+ test_libdbustest_LDADD = \
+ $(DBUS_TEST_RUNNER_LIBS) \
+ $(top_builddir)/libdbustest/libdbustest.la
+@@ -360,7 +360,7 @@
+ test-libdbustest-getname.c
+ test_libdbustest_getname_CFLAGS = \
+ $(DBUS_TEST_RUNNER_CFLAGS) \
+- -Wall -Werror
++ -Wall
+ test_libdbustest_getname_LDADD = \
+ $(DBUS_TEST_RUNNER_LIBS)
+
+@@ -389,7 +389,7 @@
+ -I$(top_srcdir) \
+ -DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
+ -DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
+- -Wall -Werror
++ -Wall
+ test_libdbustest_mock_LDADD = \
+ $(DBUS_TEST_RUNNER_LIBS) \
+ $(top_builddir)/libdbustest/libdbustest.la
diff -Nru dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/replace-deprecated-functions.patch dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/replace-deprecated-functions.patch
--- dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/replace-deprecated-functions.patch 1970-01-01 01:00:00.000000000 +0100
+++ dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/replace-deprecated-functions.patch 2019-10-02 10:00:28.000000000 +0100
@@ -0,0 +1,30 @@
+Description: tests: Replace deprecated g_main_{pending,iteration} with current g_main_context_{pending,iteration}
+Author: Iain Lane <la...@debian.org>
+Origin: https://bazaar.launchpad.net/~indicator-applet-developers/dbus-test-runner/trunk.16.10/revision/109
+
+diff --git a/tests/test-libdbustest-mock.c b/tests/test-libdbustest-mock.c
+index 2ebaa66..321206a 100644
+--- a/tests/test-libdbustest-mock.c
++++ b/tests/test-libdbustest-mock.c
+@@ -389,8 +389,8 @@
+ g_assert(dbus_test_dbus_mock_object_emit_signal(mock, obj, "testsig", NULL, NULL, NULL));
+
+ g_usleep(100000);
+- while (g_main_pending())
+- g_main_iteration(TRUE);
++ while (g_main_context_pending(NULL))
++ g_main_context_iteration(NULL, TRUE);
+
+ g_assert(signal_count == 1);
+
+@@ -410,8 +410,8 @@
+ g_assert(dbus_test_dbus_mock_object_emit_signal(mock, obj, "testsig_abc", G_VARIANT_TYPE("(sss)"), g_variant_new_parsed("('a', 'b', 'c')"), NULL));
+
+ g_usleep(100000);
+- while (g_main_pending())
+- g_main_iteration(TRUE);
++ while (g_main_context_pending(NULL))
++ g_main_context_iteration(NULL, TRUE);
+
+ g_assert(signal_abc_count == 1);
+
diff -Nru dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/series dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/series
--- dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/series 2018-11-02 21:39:06.000000000 +0000
+++ dbus-test-runner-16.10.0~bzr100+repack1/debian/patches/series 2019-10-02 09:58:22.000000000 +0100
@@ -1,3 +1,5 @@
+dont-build-with-werror.patch
+replace-deprecated-functions.patch
0001_spelling-error.patch
1001_use-mate-common.patch
1002_new-gobject-private-api.patch
signature.asc
Description: PGP signature
