atim pushed to video-downloader (f37). "build: Requires libadwaita >=
1.2.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 20:35:02 UTC
From ad32c33128a5228abee8f7ad03568725ab668deb Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Sep 24 2022 21:09:15 +0000
Subject: build: Requires libadwaita >= 1.2.0
---
diff --git a/video-downloader.spec b/video-downloader.spec
index 446fb18..e4ec24e 100644
--- a/video-downloader.spec
+++ b/video-downloader.spec
@@ -22,7 +22,7 @@ BuildRequires: pkgconfig(glib-2.0)
Requires: gtk4
Requires: hicolor-icon-theme
-Requires: libadwaita
+Requires: libadwaita >= 1.2.0
Requires: python3-xlib
Requires: yt-dlp
https://src.fedoraproject.org/rpms/video-downloader/c/ad32c33128a5228abee...
1Â year, 8Â months
mikelo2 pushed to google-api-python-client (rawhide). "Update to
2.63.0 - Closes rhbz#2130929"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 20:32:45 UTC
From 7712fb5bc86254cbbc1c4315d37508e1d30fe70a Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Sep 30 2022 20:32:34 +0000
Subject: Update to 2.63.0 - Closes rhbz#2130929
---
diff --git a/.gitignore b/.gitignore
index b87e739..55f0cde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/google-api-python-client-2.59.0.tar.gz
/google-api-python-client-2.60.0.tar.gz
/google-api-python-client-2.62.0.tar.gz
+/google-api-python-client-2.63.0.tar.gz
diff --git a/google-api-python-client.spec b/google-api-python-client.spec
index 113741f..5912066 100644
--- a/google-api-python-client.spec
+++ b/google-api-python-client.spec
@@ -4,7 +4,7 @@
Name: google-api-python-client
Summary: %{sum}
Epoch: 2
-Version: 2.62.0
+Version: 2.63.0
Release: %autorelease
License: ASL 2.0
diff --git a/sources b/sources
index 7829f0e..c8961b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (google-api-python-client-2.62.0.tar.gz) = 4348bce74db02f74bd386d0276de2e2ec0126e7c1b79bea962056612f868d2b2306c51663ca293672db750460bd3722a66fb22139d14f30adcd3e0d455a2118a
+SHA512 (google-api-python-client-2.63.0.tar.gz) = a8253904fc9db8687be7a04356e9e11202073ce05c77f770d51ed973e0c87db32c4b39750e1a48d813186530dfeae0f76452df7241686d6a64afbdff35626387
https://src.fedoraproject.org/rpms/google-api-python-client/c/7712fb5bc86...
1Â year, 8Â months
atim pushed to video-downloader (rawhide). "chore(update): 0.10.6"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 20:29:32 UTC
From 78d6c35f8228fd09d0b2cff1f7c3d6e76f56af44 Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Sep 30 2022 20:29:12 +0000
Subject: chore(update): 0.10.6
---
diff --git a/.gitignore b/.gitignore
index 2d5618c..0cb3b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
/video-downloader-0.10.3.tar.gz
/video-downloader-0.10.4.tar.gz
/video-downloader-0.10.5.tar.gz
+/video-downloader-0.10.6.tar.gz
diff --git a/sources b/sources
index 660e5bb..8a89909 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (video-downloader-0.10.5.tar.gz) = c825182113ca0928b9e78f067ee32b823ffef646632bd39a232e89cfe9bdefdc1d7234a17f6a779dd5cec82598edec0d878ed6ae65b74eca83b8995566b5f7ab
+SHA512 (video-downloader-0.10.6.tar.gz) = a33d66411b5cdbbf16af59f3a94b8e6971dd0ad76af03eddba0685084d8b04dc64c6ec9570af49aebda54782c84aab98c7c6a20db1ea724367a1b5ab299231a8
diff --git a/video-downloader.spec b/video-downloader.spec
index e4ec24e..a97704e 100644
--- a/video-downloader.spec
+++ b/video-downloader.spec
@@ -1,7 +1,7 @@
%global uuid com.github.unrud.VideoDownloader
Name: video-downloader
-Version: 0.10.5
+Version: 0.10.6
Release: %autorelease
Summary: Download videos from websites like YouTube and many others
https://src.fedoraproject.org/rpms/video-downloader/c/78d6c35f8228fd09d0b...
1Â year, 8Â months
pagure pushed to ansible (f35). "Drop ansible-packaging dependency
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 20:24:53 UTC
From f246aba7759fd8ea181333fa827d9bd6ad86926e Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax(a)e.email>
Date: Sep 25 2022 23:03:31 +0000
Subject: Drop ansible-packaging dependency
We'd like to have collections build against ansible-core, but this
dependency blocked us from adding "Requires: ansible-core" to
ansible-packaging, as it caused conflicts between ansible
2.9 and rpm-build (rhbz#2121892).
The remaining collections (rhbz#2126557) that haven't switched their
build requirements to ansible-packaging depend on ansible-core, so they
won't be affected.
Relates: https://bugzilla.redhat.com/2121892
Relates: https://bugzilla.redhat.com/2126557
---
diff --git a/ansible.spec b/ansible.spec
index 55a1ae9..b62fe8b 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -16,7 +16,7 @@
Name: ansible
Summary: SSH-based configuration management, deployment, and task execution system
Version: 2.9.27
-Release: 3%{?dist}
+Release: 4%{?dist}
# The main license is GPLv3+. Many of the files in lib/ansible/module_utils
# are BSD licensed. There are various files scattered throughout the codebase
@@ -156,10 +156,6 @@ Requires: sshpass
# needed for json_query filter
Requires: python3-jmespath
-# Require packaging macros if rpm-build exists
-# This makes the transition seamless for other packages
-Requires: (ansible-packaging if rpm-build)
-
%description
Ansible is a radically simple model-driven configuration management,
multi-node deployment, and remote task execution system. Ansible works
@@ -312,6 +308,10 @@ make PYTHON=/usr/bin/python3 tests-py3
%{python3_sitelib}/ansible_test
%changelog
+* Sun Sep 25 2022 Maxwell G <gotmax(a)e.email> - 2.9.27-4
+- Remove ansible-packaging dependency
+- Related: #2121892 and #2126557.
+
* Sun Jan 16 2022 Maxwell G <gotmax(a)e.email> - 2.9.27-3
- Remove macros in favor of `ansible-packaging`
- Add virtual provides for bundled libraries and add missing licenses
https://src.fedoraproject.org/rpms/ansible/c/f246aba7759fd8ea181333fa827d...
1Â year, 8Â months
pwalter pushed to mesa (f37). "mesa: split out vaapi drivers into
separate package"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 20:08:07 UTC
From 07e1e0b1628d9c55d3858c4655409768c5c0b5de Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied(a)redhat.com>
Date: Sep 28 2022 23:34:51 +0000
Subject: mesa: split out vaapi drivers into separate package
---
diff --git a/mesa.spec b/mesa.spec
index ba576f0..d9757ad 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -211,6 +211,15 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
%{summary}.
%endif
+%if 0%{?with_vaapi}
+%package vaapi-drivers
+Summary: Mesa-based VAAPI drivers
+Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description vaapi-drivers
+%{summary}.
+%endif
+
%if 0%{?with_vdpau}
%package vdpau-drivers
Summary: Mesa-based VDPAU drivers
@@ -532,13 +541,6 @@ popd
%if 0%{?with_vmware}
%{_libdir}/dri/vmwgfx_dri.so
%endif
-%{_libdir}/dri/nouveau_drv_video.so
-%if 0%{?with_r600}
-%{_libdir}/dri/r600_drv_video.so
-%endif
-%if 0%{?with_radeonsi}
-%{_libdir}/dri/radeonsi_drv_video.so
-%endif
%endif
%if 0%{?with_opencl}
%dir %{_libdir}/gallium-pipe
@@ -569,6 +571,18 @@ popd
%files omx-drivers
%{_libdir}/bellagio/libomx_mesa.so
%endif
+
+%if 0%{?with_vaapi}
+%files vaapi-drivers
+%{_libdir}/dri/nouveau_drv_video.so
+%if 0%{?with_r600}
+%{_libdir}/dri/r600_drv_video.so
+%endif
+%if 0%{?with_radeonsi}
+%{_libdir}/dri/radeonsi_drv_video.so
+%endif
+%endif
+
%if 0%{?with_vdpau}
%files vdpau-drivers
%{_libdir}/vdpau/libvdpau_nouveau.so.1*
https://src.fedoraproject.org/rpms/mesa/c/07e1e0b1628d9c55d3858c465540976...
1Â year, 8Â months
kkeithle pushed to ceph (rawhide). "ceph-17.2.4 GA (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 19:56:26 UTC
From f52b5ed6474529eb8d5ce3c8d88259dc5c271d9f Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Sep 30 2022 19:56:17 +0000
Subject: ceph-17.2.4 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
---
diff --git a/0017-gcc-12-omnibus.patch b/0017-gcc-12-omnibus.patch
index 7e4f116..4440750 100644
--- a/0017-gcc-12-omnibus.patch
+++ b/0017-gcc-12-omnibus.patch
@@ -19,26 +19,6 @@
}
}
---- ceph-16.2.7/src/common/dout.h.orig 2022-01-18 08:58:11.805226954 -0500
-+++ ceph-16.2.7/src/common/dout.h 2022-01-19 08:06:23.987388663 -0500
-@@ -99,11 +99,15 @@
- template<typename T>
- struct dynamic_marker_t {
- T value;
-- operator T() const { return value; }
-+ // constexpr ctor isn't needed as it's an aggregate type
-+ constexpr operator T() const { return value; }
- };
-
- template<typename T>
--dynamic_marker_t<T> need_dynamic(T&& t) {
-+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
-+ // deprecated in C++17 but that's fine for testing
-+ static_assert(std::is_literal_type_v<T>);
-+ static_assert(std::is_literal_type_v<dynamic_marker_t<T>>);
- return dynamic_marker_t<T>{ std::forward<T>(t) };
- }
-
--- ceph-16.2.7/src/test/librados/tier_cxx.cc.orig 2022-01-19 09:30:47.209459506 -0500
+++ ceph-16.2.7/src/test/librados/tier_cxx.cc 2022-01-19 10:02:47.783240298 -0500
@@ -114,7 +114,7 @@
diff --git a/ceph.spec b/ceph.spec
index 4cac54b..c25c654 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -120,6 +120,8 @@
%{!?python3_pkgversion: %global python3_pkgversion 3}
%{!?python3_version_nodots: %global python3_version_nodots 3}
%{!?python3_version: %global python3_version 3}
+%{!?gts_prefix: %global gts_prefix gcc-toolset-11}
+
%if ! 0%{?suse_version}
# use multi-threaded xz compression: xz level 7 using ncpus threads
@@ -147,19 +149,20 @@
%endif
%endif
-%if 0%{with seastar}
-# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin
+# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{10,11}-annobin
# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
%undefine _annotated_build
+%if 0%{?rhel} == 8 && 0%{?enable_devtoolset11:1}
+%enable_devtoolset11
%endif
#################################################################################
# main package definition
#################################################################################
Name: ceph
-Version: 17.2.3
-Release: 5%{?dist}
+Version: 17.2.4
+Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -176,7 +179,6 @@ Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: https://download.ceph.com/tarballs/ceph-%{version}.tar.gz
-#Source0: https://1.chacra.ceph.com/r/ceph/quincy/...
Patch0001: 0001-src-common-crc32c_intel_fast.patch
Patch0003: 0003-src-common-bitstr.h.patch
Patch0008: 0008-cmake-modules-Finduring.cmake.patch
@@ -188,8 +190,6 @@ Patch0017: 0017-gcc-12-omnibus.patch
Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch
Patch0019: 0019-cmake-modules-CheckCxxAtomic.cmake.patch
Patch0020: 0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch
-Patch0021: 0021-cephfs-shell.patch
-Patch0022: 0022-mon-Replace-deprecated-use-of-format_to.patch
Patch0023: 0023-src-s3select-include-s3select_parquet_intrf.h.patch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl
@@ -216,9 +216,18 @@ BuildRequires: selinux-policy-devel
BuildRequires: gperf
BuildRequires: cmake > 3.5
BuildRequires: fuse3-devel
-%if 0%{with seastar} && 0%{?rhel}
-BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3
-%else
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 9
+BuildRequires: gcc-c++ >= 11
+%endif
+%if 0%{?rhel} == 8
+BuildRequires: %{gts_prefix}-gcc-c++
+BuildRequires: %{gts_prefix}-build
+%ifarch aarch64
+BuildRequires: %{gts_prefix}-libatomic-devel
+%endif
+%endif
+%if 0%{?fedora} || 0%{?rhel} == 9
+BuildRequires: libatomic
BuildRequires: gcc-c++
%endif
BuildRequires: libatomic
@@ -228,11 +237,11 @@ BuildRequires: mold
%if 0%{with tcmalloc}
# libprofiler did not build on ppc64le until 2.7.90
%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: gperftools-devel >= 2.7.90
-BuildRequires: libunwind-devel
+BuildRequires: gperftools-devel >= 2.7.90
+BuildRequires: libunwind-devel
%endif
%if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires: gperftools-devel >= 2.6.1
+BuildRequires: gperftools-devel >= 2.6.1
%endif
%if 0%{?suse_version}
BuildRequires: gperftools-devel >= 2.4
@@ -299,6 +308,8 @@ BuildRequires: python%{python3_pkgversion}-dateutil
BuildRequires: python%{python3_pkgversion}-coverage
BuildRequires: python%{python3_pkgversion}-pyOpenSSL
BuildRequires: socat
+BuildRequires: python%{python3_pkgversion}-asyncssh
+BuildRequires: python%{python3_pkgversion}-natsort
%endif
%if 0%{with zbd}
BuildRequires: libzbd-devel
@@ -344,13 +355,12 @@ BuildRequires: systemtap-sdt-devel
%if 0%{?fedora}
BuildRequires: libubsan
BuildRequires: libasan
-BuildRequires: libatomic
%endif
-%if 0%{?rhel}
-BuildRequires: gcc-toolset-9-annobin
-BuildRequires: gcc-toolset-9-libubsan-devel
-BuildRequires: gcc-toolset-9-libasan-devel
-BuildRequires: gcc-toolset-9-libatomic-devel
+%if 0%{?rhel} == 8
+BuildRequires: %{gts_prefix}-annobin
+BuildRequires: %{gts_prefix}-annobin-plugin-gcc
+BuildRequires: %{gts_prefix}-libubsan-devel
+BuildRequires: %{gts_prefix}-libasan-devel
%endif
%endif
#################################################################################
@@ -381,6 +391,7 @@ BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
# for prometheus-alerts
BuildRequires: golang-github-prometheus-prometheus
+BuildRequires: jsonnet
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
@@ -424,6 +435,7 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL
%endif
%if 0%{?suse_version}
BuildRequires: golang-github-prometheus-prometheus
+BuildRequires: jsonnet
BuildRequires: libxmlsec1-1
BuildRequires: libxmlsec1-nss1
BuildRequires: libxmlsec1-openssl1
@@ -623,6 +635,7 @@ Group: System/Filesystems
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{python3_pkgversion}-setuptools
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{python3_pkgversion}-cherrypy
Requires: python%{python3_pkgversion}-jwt
@@ -749,9 +762,9 @@ Requires: python%{python3_pkgversion}
FUSE based client for Ceph distributed network file system
%package -n cephfs-mirror
-Summary: Ceph daemon for mirroring CephFS snapshots
+Summary: Ceph daemon for mirroring CephFS snapshots
%if 0%{?suse_version}
-Group: System/Filesystems
+Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
@@ -759,6 +772,15 @@ Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
%description -n cephfs-mirror
Daemon for mirroring CephFS snapshots between Ceph clusters.
+%package -n ceph-exporter
+Summary: Daemon for exposing perf counters as Prometheus metrics
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
+%description -n ceph-exporter
+Daemon for exposing perf counters as Prometheus metrics
+
%package -n rbd-fuse
Summary: Ceph fuse-based client
%if 0%{?suse_version}
@@ -816,7 +838,7 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: mailcap
%endif
%if 0%{?weak_deps}
-Recommends: gawk
+Recommends: gawk
%endif
%description radosgw
RADOS is a distributed object store used by the Ceph distributed
@@ -1293,10 +1315,6 @@ This package provides Ceph default alerts for Prometheus.
%endif
-%if 0%{with seastar} && 0%{?rhel}
-. /opt/rh/gcc-toolset-9/enable
-%endif
-
%if 0%{with cephfs_java}
# Find jni.h
for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
@@ -1313,7 +1331,12 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
-
+# Workaround to https://tracker.ceph.com/issues/56610
+%if 0%{?fedora} >= 37
+export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
+export CXXFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
+%endif
+
# Workaround to https://tracker.ceph.com/issues/56610
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
export CFLAGS="$RPM_OPT_FLAGS -DFMT_DEPRECATED_OSTREAM"
@@ -1342,6 +1365,9 @@ env | sort
-DWITH_MANPAGE:BOOL=ON \
-DWITH_PYTHON3:STRING=%{python3_version} \
-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF \
+%if 0%{?suse_version}
+ -DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF \
+%endif
%if 0%{without ceph_test_package}
-DWITH_TESTS:BOOL=OFF \
%endif
@@ -1427,6 +1453,10 @@ env | sort
%ifarch x86_64 aarch64
-DCMAKE_LINKER=%{_bindir}/ld.mold \
%endif
+%if 0%{with seastar}
+ -DWITH_SEASTAR:BOOL=ON \
+ -DWITH_JAEGER:BOOL=OFF \
+%endif
-DWITH_GRAFANA:BOOL=ON
%if %{with cmake_verbose_logging}
@@ -2004,6 +2034,9 @@ if [ $1 -ge 1 ] ; then
fi
fi
+%files -n ceph-exporter
+%{_bindir}/ceph-exporter
+
%files -n rbd-fuse
%{_bindir}/rbd-fuse
%{_mandir}/man8/rbd-fuse.8*
@@ -2590,6 +2623,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
+* Fri Sep 30 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.4-1
+- ceph-17.2.4 GA
+
* Mon Aug 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.3-5
- ceph-17.2.3 revised patch for libarrow-9.0.0
diff --git a/sources b/sources
index a1a5efc..c7bc69e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-17.2.3.tar.gz) = fd6e057ba8440f69423e870dddb2705d68015089ff8d97356bdc359c2ab41e19351fb1c914330de6ba05180f48e328e3ea4c877e9dd80be049e2ec5895068595
+SHA512 (ceph-17.2.4.tar.gz) = 430e916004a697bddda8cb7a83026b6e0e2b2e618e645df48c0580d16d7370d5a40d94b802db5b344faeab7c4e48d65c8ade47d0cbf0eaa0e7ddf399b09a279d
https://src.fedoraproject.org/rpms/ceph/c/f52b5ed6474529eb8d5ce3c8d88259d...
1Â year, 8Â months
kalev pushed to gnome-settings-daemon (f37). "Backport upstream patch
to default to ibus for X11 clients (#2128423)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 19:54:01 UTC
From 619b3b7a15448a1eca9c2d90b26b1956d96af6d0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 19:53:17 +0000
Subject: Backport upstream patch to default to ibus for X11 clients (#2128423)
---
diff --git a/309.patch b/309.patch
new file mode 100644
index 0000000..84efd44
--- /dev/null
+++ b/309.patch
@@ -0,0 +1,155 @@
+From 27bc0889c87a49100bf4b1c0ecf01be1629ff9c6 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg(a)gnome.org>
+Date: Tue, 20 Sep 2022 18:08:44 +0200
+Subject: [PATCH] xsettings: Always fallback to ibus
+
+Traditionally, we've used ibus strictly when necessary (i.e. there
+was an IM configured that required IBus to be enabled). A bit more
+recently, we added OSK checks so that environments with an OSK
+would also have IBus enabled so that GNOME Shell could track focus
+positions without pulling a11y.
+
+Nowadays, we simply want ibus always enabled, even if the underlying
+keymap wouldn't seemingly use its features. We anyways want it for
+the handling of emojis and dead keys.
+
+Always enable IBus for X11 clients, unless there is another IM
+configured in the global GSetting.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/705
+---
+ plugins/xsettings/gsd-xsettings-manager.c | 70 +----------------------
+ 1 file changed, 1 insertion(+), 69 deletions(-)
+
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
+index 68b6ed77..567d3bbd 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -57,8 +57,6 @@
+ #define WM_SETTINGS_SCHEMA "org.gnome.desktop.wm.preferences"
+ #define A11Y_SCHEMA "org.gnome.desktop.a11y"
+ #define A11Y_INTERFACE_SCHEMA "org.gnome.desktop.a11y.interface"
+-#define A11Y_APPLICATIONS_SCHEMA "org.gnome.desktop.a11y.applications"
+-#define INPUT_SOURCES_SCHEMA "org.gnome.desktop.input-sources"
+ #define CLASSIC_WM_SETTINGS_SCHEMA "org.gnome.shell.extensions.classic-overrides"
+
+ #define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
+@@ -77,16 +75,11 @@
+
+ #define HIGH_CONTRAST_KEY "high-contrast"
+
+-#define INPUT_SOURCES_KEY "sources"
+-#define OSK_ENABLED_KEY "screen-keyboard-enabled"
+ #define GTK_IM_MODULE_KEY "gtk-im-module"
+
+ #define GTK_SETTINGS_DBUS_PATH "/org/gtk/Settings"
+ #define GTK_SETTINGS_DBUS_NAME "org.gtk.Settings"
+
+-#define INPUT_SOURCE_TYPE_IBUS "ibus"
+-
+-#define GTK_IM_MODULE_SIMPLE "gtk-im-context-simple"
+ #define GTK_IM_MODULE_IBUS "ibus"
+
+ static const gchar introspection_xml[] =
+@@ -292,8 +285,6 @@ struct _GsdXSettingsManager
+ gint64 fontconfig_timestamp;
+
+ GSettings *interface_settings;
+- GSettings *input_sources_settings;
+- GSettings *a11y_settings;
+ GdkSeat *user_seat;
+
+ GsdXSettingsGtk *gtk;
+@@ -1341,51 +1332,6 @@ migrate_settings (void)
+ mouse_entries, G_N_ELEMENTS (mouse_entries));
+ }
+
+-static gboolean
+-need_ibus (GsdXSettingsManager *manager)
+-{
+- GVariant *sources;
+- GVariantIter iter;
+- const gchar *type;
+- gboolean needs_ibus = FALSE;
+-
+- sources = g_settings_get_value (manager->input_sources_settings,
+- INPUT_SOURCES_KEY);
+-
+- g_variant_iter_init (&iter, sources);
+- while (g_variant_iter_next (&iter, "(&s&s)", &type, NULL)) {
+- if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
+- needs_ibus = TRUE;
+- break;
+- }
+- }
+-
+- g_variant_unref (sources);
+-
+- return needs_ibus;
+-}
+-
+-static gboolean
+-need_osk (GsdXSettingsManager *manager)
+-{
+- gboolean has_touchscreen = FALSE;
+- GList *devices;
+- GdkSeat *seat;
+-
+- if (g_settings_get_boolean (manager->a11y_settings,
+- OSK_ENABLED_KEY))
+- return TRUE;
+-
+- seat = gdk_display_get_default_seat (gdk_display_get_default ());
+- devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_TOUCH);
+-
+- has_touchscreen = devices != NULL;
+-
+- g_list_free (devices);
+-
+- return has_touchscreen;
+-}
+-
+ static void
+ update_gtk_im_module (GsdXSettingsManager *manager)
+ {
+@@ -1396,10 +1342,8 @@ update_gtk_im_module (GsdXSettingsManager *manager)
+ GTK_IM_MODULE_KEY);
+ if (setting && *setting)
+ module = setting;
+- else if (need_ibus (manager) || need_osk (manager))
+- module = GTK_IM_MODULE_IBUS;
+ else
+- module = GTK_IM_MODULE_SIMPLE;
++ module = GTK_IM_MODULE_IBUS;
+
+ xsettings_manager_set_string (manager->manager, "Gtk/IMModule", module);
+ g_free (setting);
+@@ -1473,16 +1417,6 @@ gsd_xsettings_manager_start (GsdXSettingsManager *manager,
+ g_signal_connect_swapped (manager->interface_settings,
+ "changed::" GTK_IM_MODULE_KEY,
+ G_CALLBACK (update_gtk_im_module), manager);
+-
+- manager->input_sources_settings = g_settings_new (INPUT_SOURCES_SCHEMA);
+- g_signal_connect_swapped (manager->input_sources_settings,
+- "changed::" INPUT_SOURCES_KEY,
+- G_CALLBACK (update_gtk_im_module), manager);
+-
+- manager->a11y_settings = g_settings_new (A11Y_APPLICATIONS_SCHEMA);
+- g_signal_connect_swapped (manager->a11y_settings,
+- "changed::" OSK_ENABLED_KEY,
+- G_CALLBACK (update_gtk_im_module), manager);
+ update_gtk_im_module (manager);
+
+ manager->monitors_changed_id =
+@@ -1689,8 +1623,6 @@ gsd_xsettings_manager_stop (GsdXSettingsManager *manager)
+ manager->user_seat = NULL;
+ }
+
+- g_clear_object (&manager->a11y_settings);
+- g_clear_object (&manager->input_sources_settings);
+ g_clear_object (&manager->interface_settings);
+ }
+
+--
+GitLab
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index d3eacd0..32e1b3e 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -18,7 +18,7 @@
Name: gnome-settings-daemon
Version: 43.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
License: GPLv2+
@@ -26,6 +26,11 @@ URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tar...
Source1: org.gnome.settings-daemon.plugins.power.gschema.override
+# Backported from upstream
+# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/309
+# https://bugzilla.redhat.com/show_bug.cgi?id=2128423
+Patch0: 309.patch
+
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: meson >= 0.49.0
@@ -201,6 +206,9 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 43.0-2
+- Backport upstream patch to default to ibus for X11 clients (#2128423)
+
* Tue Sep 20 2022 Kalev Lember <klember(a)redhat.com> - 43.0-1
- Update to 43.0
https://src.fedoraproject.org/rpms/gnome-settings-daemon/c/619b3b7a15448a...
1Â year, 8Â months