Bump to glib 2.52.2

tests: add gdbus-peer test back
Glib 2.51.1 moved gdbus-peer to programs compiled
only when dbus-daemon is detected. We can't easily make
dbus-daemon to be detected without creating a cycle in
the packages dependencies. Thus, I added an option
to force building programs dependent on dbus-daemon
without checking its presence.

Change-Id: Iac77bc4491ff4cadd7263edf510153bd4a38838a

diff --git a/.gbs.conf b/.gbs.conf
deleted file mode 100644 (file)
index fa9fdc5..0000000
--- a/.gbs.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-upstream_branch = upstream
-upstream_tag = ${upstreamversion}

diff --git a/configure.ac b/configure.ac
index 9f3a1a2..b9817ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3324,7 +3324,7 @@ AC_SUBST(DBUS1_LIBS)
 AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
 
 AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon])
-AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ])
+AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon || test x$FORCE_DBUS_TESTS = x1 ])
 
 # Check whether MSVC toolset is explicitly set
 AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])

diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
index 7d5920a..6779dcf 100644 (file)
--- a/m4macros/glibtests.m4
+++ b/m4macros/glibtests.m4
@@ -25,4 +25,12 @@ AC_DEFUN([GLIB_TESTS],
     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
   fi
+  AC_ARG_ENABLE(force-dbus-tests,
+                AS_HELP_STRING([--enable-force-dbus-tests],
+                               [Force including dbus tests even if dbus-daemon is not detected]),
+                [case ${enableval} in
+                  yes) FORCE_DBUS_TESTS="1"  ;;
+                  no)  FORCE_DBUS_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-force-dbus-tests]) ;;
+                 esac])
 ])

diff --git a/packaging/glib2.spec b/packaging/glib2.spec
index 65b536f..321eba3 100644 (file)
--- a/packaging/glib2.spec
+++ b/packaging/glib2.spec
@@ -3,12 +3,12 @@
 %global __provides_exclude_from ^(.*\\.extension-kdbus)$
 
 %bcond_with coverage
-%define baseline 2.40
+%define baseline 2.52
 %define with_systemtap 0
 %define keepstatic 1
 
 Name:           glib2
-Version:        2.44.1
+Version:        2.52.2
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
@@ -41,7 +41,7 @@ BuildRequires:  systemtap-sdt-devel
 # Needed for gresource
 BuildRequires:  pkgconfig(libelf) >= 0.8.12
 BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcre) >= 8.13
 BuildRequires:  pkgconfig(zlib)
 # Enable support for libdbuspolicy (only for kdbus transport)
 BuildRequires:  pkgconfig(libdbuspolicy1)
@@ -191,7 +191,7 @@ Summary:        Set of tests for gdbus component
 Requires:       %{name} = %{version}
 
 %description tests
-This package is part of 'dbus-integratnion-tests' framework and contains set of tests
+This package is part of 'dbus-integration-tests' framework and contains set of tests
 for gdbus component.
 
 %if %{with coverage}
@@ -235,10 +235,12 @@ export CFLAGS+=" -D_TIZEN_DBUS_TOUCH"
     --enable-libdbuspolicy \
     --enable-always-build-tests \
     --enable-installed-tests \
+    --enable-force-dbus-tests \
 %if %{with coverage}
-       --disable-gcov-coverage \
+    --disable-gcov-coverage \
 %endif
-    --with-pcre=system
+    --with-pcre=system \
+    --enable-libmount=no
 
 %{__make} %{?_smp_mflags} V=1
 
@@ -258,11 +260,10 @@ popd
 %if %{with coverage}
 %reconfigure \
     --disable-static \
-%if %{with dbuspolicy}
     --enable-libdbuspolicy \
-%endif
     --with-pcre=system \
-       --enable-gcov-coverage
+    --enable-libmount=no \
+    --enable-gcov-coverage
 
 %{__make} %{?_smp_mflags} V=1
 
@@ -282,10 +283,12 @@ find g* -name '*.gcno' -exec mv '{}' coverage-objects ';'
 %endif
     --enable-always-build-tests \
     --enable-installed-tests \
+    --enable-force-dbus-tests \
 %if %{with coverage}
-       --disable-gcov-coverage \
+    --disable-gcov-coverage \
 %endif
-    --with-pcre=system
+    --with-pcre=system \
+    --enable-libmount=no
 
 %{__make} %{?_smp_mflags} V=1
 
@@ -385,6 +388,7 @@ install -m 0644 coverage-objects/* %{cov_lib_dir}/objects
 %{_bindir}/gresource
 %{_bindir}/gsettings
 %{_bindir}/gapplication
+%{_bindir}/gio
 # We put those files here, but they don't really belong here. They just don't
 # have a better home... The zzz-glib2 scripts could arguably be in
 # libglib but that would break the shared library policy.
@@ -475,6 +479,7 @@ popd
 %{_datadir}/glib-2.0/gdb/
 %{_datadir}/glib-2.0/gettext/
 %{_datadir}/glib-2.0/schemas/gschema.dtd
+%{_datadir}/glib-2.0/valgrind/glib.supp
 %{_includedir}/glib-2.0
 %{_includedir}/gio-unix-2.0
 %{_libdir}/lib*.so
@@ -482,6 +487,7 @@ popd
 %{_libdir}/glib-2.0/include/
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
+%{_datadir}/gettext/its/gschema.*
 %if 0%{?with_systemtap}
 %{_datadir}/systemtap/tapset/*.stp
 %endif