glib2.0 1:2.66.0-1 (aarch64;znver1;x86_64;i686) 2020-12432
9999

Submitter nobodydead [@T] gmail.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/825262
Packages
gio2.0-64-1:2.66.0-1.aarch64.binary
gio2.0-64-debuginfo-1:2.66.0-1.aarch64.debuginfo
glib2.0-1:2.66.0-1.aarch64.source
glib2.0-common-1:2.66.0-1.aarch64.binary
glib2.0-common-debuginfo-1:2.66.0-1.aarch64.debuginfo
glib2.0-debuginfo-1:2.66.0-1.aarch64.debuginfo
glib2.0-debugsource-1:2.66.0-1.aarch64.binary
glib2.0-systemtap-1:2.66.0-1.aarch64.binary
glib-gettextize-1:2.66.0-1.aarch64.binary
lib64gio2.0_0-1:2.66.0-1.aarch64.binary
lib64gio2.0_0-debuginfo-1:2.66.0-1.aarch64.debuginfo
lib64glib2.0_0-1:2.66.0-1.aarch64.binary
lib64glib2.0_0-debuginfo-1:2.66.0-1.aarch64.debuginfo
lib64glib2.0-devel-1:2.66.0-1.aarch64.binary
lib64glib2.0-devel-debuginfo-1:2.66.0-1.aarch64.debuginfo
lib64gmodule2.0_0-1:2.66.0-1.aarch64.binary
lib64gmodule2.0_0-debuginfo-1:2.66.0-1.aarch64.debuginfo
lib64gobject2.0_0-1:2.66.0-1.aarch64.binary
lib64gobject2.0_0-debuginfo-1:2.66.0-1.aarch64.debuginfo
lib64gthread2.0_0-1:2.66.0-1.aarch64.binary
lib64gthread2.0_0-debuginfo-1:2.66.0-1.aarch64.debuginfo
gio2.0-32-1:2.66.0-1.znver1.binary
gio2.0-32-debuginfo-1:2.66.0-1.znver1.debuginfo
gio2.0-64-1:2.66.0-1.znver1.binary
gio2.0-64-debuginfo-1:2.66.0-1.znver1.debuginfo
glib2.0-1:2.66.0-1.znver1.source
glib2.0-common-1:2.66.0-1.znver1.binary
glib2.0-common-debuginfo-1:2.66.0-1.znver1.debuginfo
glib2.0-debugsource-1:2.66.0-1.znver1.binary
glib2.0-systemtap-1:2.66.0-1.znver1.binary
glib-gettextize-1:2.66.0-1.znver1.binary
lib64gio2.0_0-1:2.66.0-1.znver1.binary
lib64gio2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
lib64glib2.0_0-1:2.66.0-1.znver1.binary
lib64glib2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
lib64glib2.0-devel-1:2.66.0-1.znver1.binary
lib64glib2.0-devel-debuginfo-1:2.66.0-1.znver1.debuginfo
lib64gmodule2.0_0-1:2.66.0-1.znver1.binary
lib64gmodule2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
lib64gobject2.0_0-1:2.66.0-1.znver1.binary
lib64gobject2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
lib64gthread2.0_0-1:2.66.0-1.znver1.binary
lib64gthread2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
libgio2.0_0-1:2.66.0-1.znver1.binary
libgio2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
libglib2.0_0-1:2.66.0-1.znver1.binary
libglib2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
libglib2.0-devel-1:2.66.0-1.znver1.binary
libgmodule2.0_0-1:2.66.0-1.znver1.binary
libgmodule2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
libgobject2.0_0-1:2.66.0-1.znver1.binary
libgobject2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
libgthread2.0_0-1:2.66.0-1.znver1.binary
libgthread2.0_0-debuginfo-1:2.66.0-1.znver1.debuginfo
gio2.0-32-1:2.66.0-1.x86_64.binary
gio2.0-32-debuginfo-1:2.66.0-1.x86_64.debuginfo
gio2.0-64-1:2.66.0-1.x86_64.binary
gio2.0-64-debuginfo-1:2.66.0-1.x86_64.debuginfo
glib2.0-1:2.66.0-1.x86_64.source
glib2.0-common-1:2.66.0-1.x86_64.binary
glib2.0-common-debuginfo-1:2.66.0-1.x86_64.debuginfo
glib2.0-debugsource-1:2.66.0-1.x86_64.binary
glib2.0-systemtap-1:2.66.0-1.x86_64.binary
glib-gettextize-1:2.66.0-1.x86_64.binary
lib64gio2.0_0-1:2.66.0-1.x86_64.binary
lib64gio2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
lib64glib2.0_0-1:2.66.0-1.x86_64.binary
lib64glib2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
lib64glib2.0-devel-1:2.66.0-1.x86_64.binary
lib64glib2.0-devel-debuginfo-1:2.66.0-1.x86_64.debuginfo
lib64gmodule2.0_0-1:2.66.0-1.x86_64.binary
lib64gmodule2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
lib64gobject2.0_0-1:2.66.0-1.x86_64.binary
lib64gobject2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
lib64gthread2.0_0-1:2.66.0-1.x86_64.binary
lib64gthread2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
libgio2.0_0-1:2.66.0-1.x86_64.binary
libgio2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
libglib2.0_0-1:2.66.0-1.x86_64.binary
libglib2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
libglib2.0-devel-1:2.66.0-1.x86_64.binary
libgmodule2.0_0-1:2.66.0-1.x86_64.binary
libgmodule2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
libgobject2.0_0-1:2.66.0-1.x86_64.binary
libgobject2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
libgthread2.0_0-1:2.66.0-1.x86_64.binary
libgthread2.0_0-debuginfo-1:2.66.0-1.x86_64.debuginfo
gio2.0-32-1:2.66.0-1.i686.binary
gio2.0-32-debuginfo-1:2.66.0-1.i686.debuginfo
glib2.0-1:2.66.0-1.i686.source
glib2.0-common-1:2.66.0-1.i686.binary
glib2.0-common-debuginfo-1:2.66.0-1.i686.debuginfo
glib2.0-debuginfo-1:2.66.0-1.i686.debuginfo
glib2.0-debugsource-1:2.66.0-1.i686.binary
glib2.0-systemtap-1:2.66.0-1.i686.binary
glib-gettextize-1:2.66.0-1.i686.binary
libgio2.0_0-1:2.66.0-1.i686.binary
libgio2.0_0-debuginfo-1:2.66.0-1.i686.debuginfo
libglib2.0_0-1:2.66.0-1.i686.binary
libglib2.0_0-debuginfo-1:2.66.0-1.i686.debuginfo
libglib2.0-devel-1:2.66.0-1.i686.binary
libglib2.0-devel-debuginfo-1:2.66.0-1.i686.debuginfo
libgmodule2.0_0-1:2.66.0-1.i686.binary
libgmodule2.0_0-debuginfo-1:2.66.0-1.i686.debuginfo
libgobject2.0_0-1:2.66.0-1.i686.binary
libgobject2.0_0-debuginfo-1:2.66.0-1.i686.debuginfo
libgthread2.0_0-1:2.66.0-1.i686.binary
libgthread2.0_0-debuginfo-1:2.66.0-1.i686.debuginfo
Build Date 2020-09-14 18:39:57 +0000 UTC
Last Updated 2020-09-19 03:27:23.894962662 +0000 UTC
$ git diff --patch-with-stat --summary 0a542a7ae30dd3bd477ed37b2f71acdcf4ef5f61..f7a126b2bac8c078e7c703916087666ca04c7b5d

 .abf.yml                                           |   2 +-
 ....64.3-workaround-32bit-test-build-failure.patch |  12 ++
 glib-2.64.5-clang.patch                            |  12 ++
 glib2.0.spec                                       | 160 ++++++++++++++++++++-
 4 files changed, 182 insertions(+), 4 deletions(-)
 create mode 100644 glib-2.64.3-workaround-32bit-test-build-failure.patch
 create mode 100644 glib-2.64.5-clang.patch

diff --git a/.abf.yml b/.abf.yml
index 2065e20..8b5c618 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  glib-2.64.2.tar.xz: 50e0ef5a45cc3d8117aa74d2aa01f216157ad682
+  glib-2.66.0.tar.xz: f2bf625fa3f93be73841c4a6417adcc110ba09a8
diff --git a/glib-2.64.3-workaround-32bit-test-build-failure.patch b/glib-2.64.3-workaround-32bit-test-build-failure.patch
new file mode 100644
index 0000000..580ba31
--- /dev/null
+++ b/glib-2.64.3-workaround-32bit-test-build-failure.patch
@@ -0,0 +1,12 @@
+diff -up glib-2.64.3/gio/tests/meson.build.omv~ glib-2.64.3/gio/tests/meson.build
+--- glib-2.64.3/gio/tests/meson.build.omv~	2020-05-21 14:17:18.823661348 +0200
++++ glib-2.64.3/gio/tests/meson.build	2020-05-21 14:17:40.166898353 +0200
+@@ -669,7 +669,7 @@ if not meson.is_cross_build() or meson.h
+ 
+   ld = find_program('ld', required : false)
+ 
+-  if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
++  if false and build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+     test_gresource_binary = custom_target('test5.gresource',
+       input : 'test5.gresource.xml',
+       output : 'test5.gresource',
diff --git a/glib-2.64.5-clang.patch b/glib-2.64.5-clang.patch
new file mode 100644
index 0000000..aa40bfb
--- /dev/null
+++ b/glib-2.64.5-clang.patch
@@ -0,0 +1,12 @@
+diff -uraN glib-2.66.0/glib/gmacros.h omv-glib-2.66.0/glib/gmacros.h
+--- glib-2.66.0/glib/gmacros.h	2020-09-10 12:42:41.000000000 +0200
++++ omv-glib-2.66.0/glib/gmacros.h	2020-09-14 02:57:02.086073430 +0200
+@@ -557,7 +557,7 @@
+  *
+  * Since: 2.60
+  */
+-#if    __GNUC__ > 6
++#if    __GNUC__ > 6 || defined(__clang__)
+ #define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
+ #elif g_macro__has_attribute (fallthrough)
+ #define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
diff --git a/glib2.0.spec b/glib2.0.spec
index 2b1a246..2ac3db5 100644
--- a/glib2.0.spec
+++ b/glib2.0.spec
@@ -1,3 +1,10 @@
+# glib2.0 is used by wine
+%ifarch %{x86_64}
+%bcond_without compat32
+%else
+%bcond_with compat32
+%endif
+
 %global __requires_exclude bin/python3
 %define _python_bytecompile_build 0
 
@@ -14,7 +21,6 @@
 # (tpg) optimize it a bit
 %global optflags %optflags -O3
 
-# Note that this is NOT a relocatable package
 %define api 2.0
 %define major 0
 %define libname %mklibname %{name}_ %{major}
@@ -30,10 +36,18 @@
 %endif
 %define gio gio2.0-%{bit}
 
+%define lib32name lib%{name}_%{major}
+%define lib32gio libgio%{api}_%{major}
+%define lib32gmodule libgmodule%{api}_%{major}
+%define lib32gthread libgthread%{api}_%{major}
+%define lib32gobject libgobject%{api}_%{major}
+%define dev32name lib%{name}-devel
+%define gio32 gio2.0-32
+
 Summary:	GIMP Toolkit and GIMP Drawing Kit support library
 Name:		glib%{api}
 Epoch:		1
-Version:	2.64.2
+Version:	2.66.0
 Release:	1
 Group:		System/Libraries
 License:	LGPLv2+
@@ -42,13 +56,15 @@ Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/%(echo %{version} |cut -d.
 Source1:	glib20.sh
 Source2:	glib20.csh
 Patch0:		glib-2.34.1-no-warnings.patch
+Patch1:		glib-2.64.3-workaround-32bit-test-build-failure.patch
+Patch2:		glib-2.64.5-clang.patch
 # (tpg) ClearLinux patches
 # (tpg) Doing the malloc_trim every sleep is too much
 #Patch10:	memory.patch
 #Patch11:	madvise.patch
 Patch12:	wakeups.patch
 Patch13:	gerror-return-on-null.patch
-Patch14:	0001-Remove-debugging-in-gspawn.c.patch
+#Patch14:	0001-Remove-debugging-in-gspawn.c.patch
 # dont remove it!!!
 #Patch15:	disable-tests.patch
 
@@ -71,12 +87,23 @@ BuildRequires:	pkgconfig(libpcre) >= 8.11
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	pkgconfig(mount)
 BuildRequires:	pkgconfig(libelf)
+BuildRequires:	pkgconfig(blkid)
 %if !%{with bootstrap}
 BuildRequires:	pkgconfig(gamin)
 %endif
 %if %{enable_gtkdoc}
 BuildRequires:	pkgconfig(gtk-doc) >= 0.10
 %endif
+%if %{with compat32}
+BuildRequires:	devel(libpcre)
+BuildRequires:	devel(libffi)
+BuildRequires:	devel(libblkid)
+BuildRequires:	devel(libmount)
+BuildRequires:	devel(libelf)
+BuildRequires:	devel(libz)
+BuildRequires:	devel(libmount)
+BuildRequires:	devel(libdbus-1)
+%endif
 
 %description
 Glib is a handy library of utility functions. This C
@@ -213,6 +240,80 @@ BuildRequires:	systemtap-devel >= 3.0
 %description systemtap
 Systemtap integration for %{name}.
 
+%if %{with compat32}
+%package -n %{lib32name}
+Summary:	%{summary} (32-bit)
+Group:		%{group}
+
+%description -n %{lib32name}
+This package contains the library needed to run programs dynamically
+linked with libglib.
+
+%package -n %{lib32gio}
+Summary:	%{summary} (32-bit)
+Group:		%{group}
+
+%description -n %{lib32gio}
+This package contains the library needed to run programs dynamically
+linked with libgio.
+
+%package -n %{lib32gmodule}
+Summary:	%{summary} (32-bit)
+Group:		%{group}
+
+%description -n %{lib32gmodule}
+This package contains the library needed to run programs dynamically
+linked with libgmodule.
+
+%package -n %{lib32gobject}
+Summary:	%{summary} (32-bit)
+Group:		%{group}
+
+%description -n %{lib32gobject}
+This package contains the library needed to run programs dynamically
+linked with libgobject.
+
+%package -n %{lib32gthread}
+Summary:	%{summary} (32-bit)
+Group:		%{group}
+
+%description -n %{lib32gthread}
+This package contains the library needed to run programs dynamically
+linked with libgthread.
+
+%package -n %{gio32}
+Summary:	GIO is the input, output and streaming API of glib (32-bit)
+Group:		%{group}
+
+%description -n %{gio32}
+GIO is the input, output and streaming API of glib. It on the one hand
+provides a set of various streaming classes to access data from different
+sources in a convenient way and on the other hand it provides a high level
+file system abstraction to access file and directories not only local but also
+on the network. For the latter you need to install gvfs.
+
+%package -n %{dev32name}
+Summary:	Development libraries and header files of %{name} (32-bit)
+Group:		Development/C
+Requires:	glib-gettextize = %{EVRD}
+Requires:	%{name}-common = %{EVRD}
+Requires:	%{lib32name} = %{EVRD}
+Requires:	%{lib32gio} = %{EVRD}
+Requires:	%{lib32gmodule} = %{EVRD}
+Requires:	%{lib32gobject} = %{EVRD}
+Requires:	%{lib32gthread} = %{EVRD}
+Requires:	%{devname} = %{EVRD}
+Requires:	devel(libpcre)
+Requires:	devel(libz)
+Requires:	devel(libmount)
+Requires:	devel(libffi)
+
+%description -n %{dev32name}
+Development libraries and header files for the support library for the GIMP's X
+libraries, which are available as public libraries.  GLIB includes generally
+useful data structures.
+%endif
+
 %prep
 %autosetup -n glib-%{version} -p1
 
@@ -231,6 +332,16 @@ rm -rf glib/pcre/*.[ch]
 %global ldflags %{ldflags} -fuse-ld=gold
 %endif
 
+%if %{with compat32}
+%meson32 \
+	-Dman=false \
+	-Dsystemtap=false \
+	-Dinstalled_tests=false \
+	-Dgio_module_dir="%{_prefix}/lib/gio/modules" \
+	-Dselinux=disabled
+%ninja_build -C build32
+%endif
+
 %if %{with crosscompile}
 export glib_cv_stack_grows=no
 export glib_cv_uscore=no
@@ -303,6 +414,13 @@ ninja -C build -t clean
 #make check
 
 %install
+%if %{with compat32}
+%ninja_install -C build32
+mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-32
+mkdir -p %{buildroot}%{_prefix}/lib/gio/modules
+touch %{buildroot}%{_prefix}/lib/gio/modules/giomodule.cache
+chrpath --delete %{buildroot}%{_prefix}/lib/*.so
+%endif
 %meson_install
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
@@ -437,3 +555,39 @@ fi
 %doc AUTHORS NEWS README
 %doc %{_datadir}/gtk-doc/html/*
 %endif
+
+%if %{with compat32}
+%files -n %{lib32gio}
+%{_prefix}/lib/libgio-%{api}.so.%{major}*
+
+%files -n %{lib32name}
+%{_prefix}/lib/libglib-%{api}.so.%{major}*
+
+%files -n %{lib32gmodule}
+%{_prefix}/lib/libgmodule-%{api}.so.%{major}*
+
+%files -n %{lib32gthread}
+%{_prefix}/lib/libgthread-%{api}.so.%{major}*
+
+%files -n %{lib32gobject}
+%{_prefix}/lib/libgobject-%{api}.so.%{major}*
+
+%files -n %{gio32}
+%{_bindir}/gio-querymodules-32
+%dir %{_prefix}/lib/gio/
+%dir %{_prefix}/lib/gio/modules/
+%ghost %{_prefix}/lib/gio/modules/giomodule.cache
+
+%files -n %{dev32name}
+%{_prefix}/lib/lib*.so
+%{_prefix}/lib/glib-%{api}/include/
+%{_prefix}/lib/pkgconfig/*
+%{_datadir}/gdb/auto-load/%{_prefix}/lib/lib*-gdb.py
+
+# automatic update of gio module cache
+%transfiletriggerpostun -n %{gio32} --  %{_prefix}/lib/gio/modules/
+%{_bindir}/gio-querymodules-32 %{_prefix}/lib/gio/modules
+
+%transfiletriggerin -n %{gio32} --  %{_prefix}/lib/gio/modules/
+%{_bindir}/gio-querymodules-32 %{_prefix}/lib/gio/modules
+%endif
Not Available
benbullard79 [@T] cox.netPerfect packages, no one ever says a word!6d 20hrs
benbullard79 [@T] cox.netFantastic!6d 20hrs