Bump to 2.70.0

Change-Id: I2251e100608e705c82116d8d9c4b98282e8f03e9
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/glib/gutils.c b/glib/gutils.c
index 76241cd..b7a2113 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -3008,24 +3008,7 @@ g_check_setuid (void)
   value = getauxval (AT_SECURE);
   errsv = errno;
   if (errsv)
-    {
-/*
-    Apparently, Tizen is built with qemu version < 2.12.
-    
-    qemu 2.12 introduces providing AT_SECURE in auxiliary vector,
-    and the only purpose of using getauxval in glib is to get AT_SECURE.
-    
-    If g_check_setuid() bails out with error, some packages may not build,
-    as their building process requires executing tools that call g_check_setuid().
-
-    So, don't bail out with error if getauxval(AT_SECURE) fails.
-    Instead, set the result of checking suid to FALSE (no suid).
-
-       It may be reverted if all the builds are made within qemu >= 2.12.
-*/
-/*      g_error ("getauxval () failed: %s", g_strerror (errsv));*/
-      return FALSE;
-    }
+    g_error ("getauxval () failed: %s", g_strerror (errsv));
   return value;
 #elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__)
   /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */

diff --git a/LICENSE.MIT b/packaging/LICENSE.MIT
similarity index 100%
rename from LICENSE.MIT
rename to packaging/LICENSE.MIT

diff --git a/packaging/fix_getauxval_error_at_qemu.patch b/packaging/fix_getauxval_error_at_qemu.patch
new file mode 100644 (file)
index 0000000..bac4231
--- /dev/null
+++ b/packaging/fix_getauxval_error_at_qemu.patch
@@ -0,0 +1,30 @@
+diff --git a/glib/gutils.c b/glib/gutils.c
+index 4bccd7229..c983e71c3 100644
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -3011,7 +3011,24 @@ g_check_setuid (void)
+   value = getauxval (AT_SECURE);
+   errsv = errno;
+   if (errsv)
+-    g_error ("getauxval () failed: %s", g_strerror (errsv));
++    {
++/*
++    Apparently, Tizen is built with qemu version < 2.12.
++
++    qemu 2.12 introduces providing AT_SECURE in auxiliary vector,
++    and the only purpose of using getauxval in glib is to get AT_SECURE.
++
++    If g_check_setuid() bails out with error, some packages may not build,
++    as their building process requires executing tools that call g_check_setuid().
++
++    So, don't bail out with error if getauxval(AT_SECURE) fails.
++    Instead, set the result of checking suid to FALSE (no suid).
++
++    It may be reverted if all the builds are made within qemu >= 2.12.
++*/
++/*    g_error ("getauxval () failed: %s", g_strerror (errsv));*/
++      return FALSE;
++    }
+   return value;
+ #elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__)
+   /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */

diff --git a/packaging/glib2.csh b/packaging/glib2.csh
index aac46f3..7c96a88 100644 (file)
--- a/packaging/glib2.csh
+++ b/packaging/glib2.csh
@@ -324,13 +324,13 @@ switch ( $LANG )
     case lg_UG*:
        setenv G_FILENAME_ENCODING @locale,UTF-8,ISO-8859-10,CP1252
        breaksw
-    case lt_LT*:                                           
+    case lt_LT*:
        setenv G_FILENAME_ENCODING @locale,UTF-8,ISO-8859-13,CP1252
        breaksw
-    case lv_LV*:                                           
+    case lv_LV*:
        setenv G_FILENAME_ENCODING @locale,UTF-8,ISO-8859-13,CP1252
        breaksw
-    case mi_NZ*:                                           
+    case mi_NZ*:
        setenv G_FILENAME_ENCODING @locale,UTF-8,ISO-8859-13,CP1252
        breaksw
     case mk_MK*:

diff --git a/packaging/glib2.sh b/packaging/glib2.sh
index b8f63c8..9f63db1 100644 (file)
--- a/packaging/glib2.sh
+++ b/packaging/glib2.sh
@@ -321,14 +321,14 @@ case $LANG in
        ;;
     lg_UG* )
        G_FILENAME_ENCODING=@locale,UTF-8,ISO-8859-10,CP1252
-       ;;                                          
-    lt_LT* )                                        
+       ;;
+    lt_LT* )
        G_FILENAME_ENCODING=@locale,UTF-8,ISO-8859-13,CP1252
-       ;;                                          
-    lv_LV* )                                        
+       ;;
+    lv_LV* )
        G_FILENAME_ENCODING=@locale,UTF-8,ISO-8859-13,CP1252
-       ;;                                          
-    mi_NZ* )                                        
+       ;;
+    mi_NZ* )
        G_FILENAME_ENCODING=@locale,UTF-8,ISO-8859-13,CP1252
        ;;
     mk_MK* )

diff --git a/packaging/glib2.spec b/packaging/glib2.spec
index 8342951..d594f4c 100644 (file)
--- a/packaging/glib2.spec
+++ b/packaging/glib2.spec
@@ -2,45 +2,14 @@
 # should anchor any reverse-dependencies
 %global __provides_exclude_from ^(.*\\.extension-kdbus)$
 
-%define baseline 2.62
+%define baseline 2.70
 %define with_systemtap 0
 %define keepstatic 1
 %define build_dir _build
 %define build_dir_kdbus _build_kdbus
 
-# The 'meson' macro is defined in rpm macros, but it uses features from rpm 4.15 ({shrink, set_build_flags)
-# Below is a version suitable for our purposes
-%define meson \
-  CFLAGS="${CFLAGS:-%optflags}" \
-  export CFLAGS \
-  %{__meson} \\\
-        --buildtype=plain \\\
-        --prefix=%{_prefix} \\\
-        --libdir=%{_libdir} \\\
-        --libexecdir=%{_libexecdir} \\\
-        --bindir=%{_bindir} \\\
-        --sbindir=%{_sbindir} \\\
-        --includedir=%{_includedir} \\\
-        --datadir=%{_datadir} \\\
-        --mandir=%{_mandir} \\\
-        --infodir=%{_infodir} \\\
-        --localedir=%{_datadir}/locale \\\
-        --sysconfdir=%{_sysconfdir} \\\
-        --localstatedir=%{_localstatedir} \\\
-        --sharedstatedir=%{_sharedstatedir} \\\
-        --wrap-mode=%{__meson_wrap_mode} \\\
-               %{_vpath_builddir}
-# Ninja macros below are defined for ninja in e.g. fedora distro, but
-# so far they are not provided by Tizen's ninja package.
-%define __ninja %{_bindir}/ninja
-%define __ninja_common_opts -v %{?_smp_flags}
-%define ninja_build \
-               %{__ninja} %{__ninja_common_opts}
-%define ninja_install \
-               DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
-
 Name:           glib2
-Version:        2.62.3
+Version:        2.70.0
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
@@ -57,13 +26,16 @@ Source6:        macros.glib2
 # Not depending on gtk-doc shortens bootstrap compilation path.
 # Please update this file from the latest gtk-doc package:
 Source7:        gtk-doc.m4
-Source98:       q_quark_block_size.patch
+Source8:        LICENSE.MIT
 Source99:       baselibs.conf
+Source100:      q_quark_block_size.patch
+Source101:      fix_getauxval_error_at_qemu.patch
 Source1001:    glib2.manifest
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  m4
+BuildRequires:  cmake
 BuildRequires:  meson >= 0.49.2
 BuildRequires:  pkg-config
 BuildRequires:  python3
@@ -234,15 +206,17 @@ for gdbus component.
 
 %prep
 %setup -q -n %{name}-%{version}
-%{__patch} -p1 < %{SOURCE98}
+%{__patch} -p1 < %{SOURCE100}
+%{__patch} -p1 < %{SOURCE101}
 
 %build
 cp %{SOURCE3} .
+cp %{SOURCE8} .
 cp %{SOURCE1001} .
-cp -a %{S:1} %{S:2} .
-cp -a %{S:4} gnome_defaults.conf
+cp -a %{SOURCE1} %{SOURCE2} .
+cp -a %{SOURCE4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
-    cp -a %{S:7} m4macros/
+    cp -a %{SOURCE7} m4macros/
 fi
 
 %define _vpath_srcdir .
@@ -252,6 +226,7 @@ fi
 %meson \
        --default-library=both \
        -Dinstalled_tests=true \
+       -Dselinux=disabled \
        -Db_pie=true
 %meson_build
 
@@ -261,6 +236,7 @@ fi
        --default-library=both \
        -Dkdbus=true \
        -Dlibdbuspolicy=true \
+       -Dselinux=disabled \
        -Db_pie=true
 %meson_build
 
@@ -330,13 +306,13 @@ chmod 755 %{buildroot}%{_bindir}/*
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/gresource
 %{_datadir}/bash-completion/completions/gsettings
+%{_bindir}/gapplication
 %{_bindir}/gdbus
 %{_bindir}/gio
 %{_bindir}/gio-querymodules*
 %{_bindir}/glib-compile-schemas
 %{_bindir}/gresource
 %{_bindir}/gsettings
-%{_bindir}/gapplication
 
 # 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