pagure pushed to rpms/python-tomli (rawhide). "Remove the bootstrap
bcond (..more)"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:40:33 UTC
From 0ca32725ea42b539da8ce2b440b433c980f5a56c Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro(a)hroncok.cz>
Date: Nov 11 2022 11:02:51 +0000
Subject: Remove the bootstrap bcond
- flit 3.8+ no longer needs tomli on Python 3.11+
- even if we accidentally backport this to Fedora 36,
we don't need to bootstrap there any more
---
diff --git a/python-tomli.spec b/python-tomli.spec
index 77bc1b7..a7bb6d8 100644
--- a/python-tomli.spec
+++ b/python-tomli.spec
@@ -1,9 +1,3 @@
-# This package buildrequires flit_core to build the wheel, but flit_core requires tomli.
-# To bootstrap, we copy the files to appropriate locations manually and create a minimal dist-info metadata.
-# Note that as a pure Python package, the wheel contains no pre-built binary stuff.
-# When bootstrap is enabled, we don't run tests either, just an import check.
-%bcond_with bootstrap
-
Name: python-tomli
Version: 2.0.1
Release: 5%{?dist}
@@ -16,11 +10,9 @@ Source0: https://github.com/hukkin/tomli/archive/%{version}/%{name}-%{ver
BuildArch: noarch
BuildRequires: python3-devel
-%if %{without bootstrap}
# The test suite uses the stdlib's unittest framework, but we use %%pytest
# as the test runner.
BuildRequires: python3-pytest
-%endif
%global _description %{expand:
Tomli is a Python library for parsing TOML.
@@ -39,47 +31,22 @@ Summary: %{summary}
%autosetup -p1 -n tomli-%{version}
-%if %{without bootstrap}
%generate_buildrequires
%pyproject_buildrequires -r
-%endif
%build
-%if %{without bootstrap}
%pyproject_wheel
-%else
-%global distinfo tomli-%{version}+rpmbootstrap.dist-info
-mkdir %{distinfo}
-cat > %{distinfo}/METADATA << EOF
-Metadata-Version: 2.2
-Name: tomli
-Version: %{version}+rpmbootstrap
-EOF
-%endif
%install
-%if %{without bootstrap}
%pyproject_install
%pyproject_save_files tomli
-%else
-mkdir -p %{buildroot}%{python3_sitelib}
-cp -a src/tomli %{distinfo} %{buildroot}%{python3_sitelib}
-echo '%{python3_sitelib}/tomli/' > %{pyproject_files}
-echo '%{python3_sitelib}/%{distinfo}/' >> %{pyproject_files}
-%endif
%check
%py3_check_import tomli
-%if %{without bootstrap}
-# assert the properly built package has no runtime requires
-# if it does, we need to change the bootstrap metadata
-test -f %{buildroot}%{python3_sitelib}/tomli-%{version}.dist-info/METADATA
-grep '^Requires-Dist:' %{buildroot}%{python3_sitelib}/tomli-%{version}.dist-info/METADATA && exit 1 || true
%pytest
-%endif
%files -n python3-tomli -f %{pyproject_files}
https://src.fedoraproject.org/rpms/python-tomli/c/0ca32725ea42b539da8ce2b...
1 year, 4 months
ppisar pushed to rpms/perl-Prima (rawhide). "1.67 bump"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:40:17 UTC
From bf0067c3c565838e59920da0f12fc3ba33ce03d7 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar(a)redhat.com>
Date: Nov 30 2022 13:39:17 +0000
Subject: 1.67 bump
---
diff --git a/.gitignore b/.gitignore
index 8eb7b29..e18c550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/Prima-1.64.tar.gz
/Prima-1.65.tar.gz
/Prima-1.66.tar.gz
+/Prima-1.67.tar.gz
diff --git a/Prima-1.66-RT-144080-coredump-fix.patch b/Prima-1.66-RT-144080-coredump-fix.patch
deleted file mode 100644
index 9dc0eec..0000000
--- a/Prima-1.66-RT-144080-coredump-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 705131eeba48cfddb56aafcd52dca474cdbc64c8 Mon Sep 17 00:00:00 2001
-From: Dmitry Karasik <dmitry.karasik(a)teliacompany.com>
-Date: Tue, 23 Aug 2022 19:34:15 +0200
-Subject: [PATCH] RT#144080: coredump fix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Petr Písař: Ported to 1.66.
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- unix/menu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/menu.c b/unix/menu.c
-index 58e8dfe..ad58b38 100644
---- a/unix/menu.c
-+++ b/unix/menu.c
-@@ -2427,7 +2427,6 @@ apc_menu_item_begin_paint( Handle self, PEvent event)
-
- YY-> type.drawable = 1;
- YY-> type.widget = 1;
-- YY-> flags.paint = 1;
- YY-> flags.layered = pe->layered;
- #ifdef HAVE_X11_EXTENSIONS_XRENDER_H
- YY-> argb_picture = M(pe->self)->w->argb_picture;
-@@ -2437,6 +2436,7 @@ apc_menu_item_begin_paint( Handle self, PEvent event)
- YY-> visual = pe->layered ? &guts. argb_visual : &guts. visual;
- YY-> colormap = pe->layered ? guts. argbColormap : guts. defaultColormap;
- prima_prepare_drawable_for_painting(event-> gen.H, false );
-+ YY-> flags.paint = 1;
- XCHECKPOINT;
-
- return true;
---
-2.37.2
-
diff --git a/Prima-1.67-properly-detect-xrandr-version.patch b/Prima-1.67-properly-detect-xrandr-version.patch
new file mode 100644
index 0000000..e1cfea5
--- /dev/null
+++ b/Prima-1.67-properly-detect-xrandr-version.patch
@@ -0,0 +1,64 @@
+From e7cca318b1e8357939929c562a10d2c9590a6301 Mon Sep 17 00:00:00 2001
+From: Dmitry Karasik <dmitry(a)karasik.eu.org>
+Date: Tue, 29 Nov 2022 13:55:31 +0100
+Subject: [PATCH] properly detect xrandr version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar(a)redhat.com>
+---
+ Makefile.PL | 16 +++++++++++++++-
+ unix/app.c | 2 +-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 699f6b83..8ae255cd 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1721,6 +1721,19 @@ sub setup_x11_extension
+ }
+ }
+
++sub setup_xrandr
++{
++ setup_x11_extension('xrandr');
++ return unless ( $MODVERSIONS{xrandr} // '') =~ m/^(\d+)\.(\d+)/;
++ return unless $1 * 100 + $2 >= 1.5;
++ $DEFINES{HAVE_XRANDR_1_5} = 1;
++}
++
++sub setup_xcomposite
++{
++ setup_x11_extension('xcomposite');
++}
++
+ sub setup_xlibs
+ {
+ have_header( "X11/extensions/shape.h", "X11/X.h", "X11/Xlib.h", "X11/Xutil.h");
+@@ -1738,7 +1751,8 @@ NO_HARFBUZZ
+ $cmd_options{WITH_ICONV} = 0 unless $cmd_options{WITH_XFT}; # iconv is used for xft only
+ setup_iconv() if $cmd_options{WITH_ICONV};
+ setup_gtk() if $cmd_options{WITH_GTK2} || $cmd_options{WITH_GTK3};
+- setup_x11_extension($_) for qw(xrandr xcomposite);
++ setup_xrandr();
++ setup_xcomposite();
+
+ if ( $use_pkgconfig ) {
+ $DEFINES{HAVE_X11_XCURSOR_XCURSOR_H} = 1 if pkgconfig('xcursor');
+diff --git a/unix/app.c b/unix/app.c
+index d7ac812d..e97a92d7 100644
+--- a/unix/app.c
++++ b/unix/app.c
+@@ -1012,7 +1012,7 @@ apc_application_get_size( Handle self)
+ Box *
+ apc_application_get_monitor_rects( Handle self, int * nrects)
+ {
+-#if defined(HAVE_X11_EXTENSIONS_XRANDR_H) && (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR > 3))
++#if defined(HAVE_X11_EXTENSIONS_XRANDR_H) && defined(HAVE_XRANDR_1_5)
+ XRRMonitorInfo *m;
+ Box * ret = NULL;
+ int n;
+--
+2.38.1
+
diff --git a/perl-Prima.spec b/perl-Prima.spec
index 2a11510..fceb1ef 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -33,16 +33,17 @@
Name: perl-Prima
-Version: 1.66
-Release: 2%{?dist}
+Version: 1.67
+Release: 1%{?dist}
Summary: Perl graphic toolkit
# Copying: BSD-2-Clause text
# examples/tiger.eps: AGPL-3.0-or-later (bundled from GhostScript? CPAN RT#122271)
-# img/codec_jpeg.c: EXIF parser is based on io-jpeg.c from gdk-pixbuf
-# (LGPL-2.0-or-later)
+# img/codec_jpeg.c: LGPL-2.0-or-later (EXIF parser is based on io-jpeg.c
+# from gdk-pixbuf)
# img/codec_X11.c: MIT-open-group
-# img/imgscale.c: Resizing filters are based on magick/resize.c from
-# ImageMagick (ImageMagick)
+# img/imgscale.c: ImageMagick (resizing filters are based on magick/resize.c
+# from ImageMagick)
+# img/region.c: MIT-open-group AND HPND
# include/unix/queue.h: BSD-4-Clause
# LICENSE: BSD-2-Clause text and (AGPL-3.0-or-later notice for examples/tiger.eps file)
# pod/Prima/Widget/pack.pod: TCL
@@ -51,12 +52,11 @@ Summary: Perl graphic toolkit
# Prima.pm: "under the BSD License"
# Prima/PS/Unicode.pm: BSD-3-Clause
# unix/render.c: HPND-sell-variant
-License: BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-open-group AND HPND-sell-variant AND TCL AND ImageMagick AND LGPL-2.0-or-later AND AGPL-3.0-or-later
+License: BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-open-group AND HPND AND HPND-sell-variant AND TCL AND ImageMagick AND LGPL-2.0-or-later AND AGPL-3.0-or-later
URL: https://metacpan.org/dist/Prima
Source0: https://cpan.metacpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz
-# Fix a crash when activating a menu, bug #2119963, CPAN RT#144080,
-# in upstream after 1.66.
-Patch0: Prima-1.66-RT-144080-coredump-fix.patch
+# Correct XRandr detection, in upstream after 1.67
+Patch0: Prima-1.67-properly-detect-xrandr-version.patch
BuildRequires: findutils
BuildRequires: giflib-devel
BuildRequires: gcc
@@ -121,7 +121,7 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xft)
%endif
BuildRequires: pkgconfig(xpm)
-BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrandr) >= 1.5
BuildRequires: pkgconfig(xrender)
# Run-time:
BuildRequires: perl(base)
@@ -228,13 +228,14 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 \
CYGWIN_WINAPI=0 \
DEBUG=0 \
VERBOSE=1 \
+ WITH_COCOA=0 \
WITH_FRIBIDI=%{with perl_Prima_enables_fribidi} \
WITH_GTK2=%{use_gtk2} \
WITH_GTK3=%{use_gtk3} \
WITH_HARFBUZZ=%{with perl_Prima_enables_harfbuzz} \
WITH_ICONV=1 \
- WITH_OPENMP=1 \
WITH_LIBTHAI=%{with perl_Prima_enables_libthai} \
+ WITH_OPENMP=1 \
WITH_XFT=%{with perl_Prima_enables_xft}
%{make_build}
@@ -281,15 +282,23 @@ unset DISPLAY XDG_SESSION_TYPE
%license Copying LICENSE AGPLv3
# "examples" directory is installed into perl_vendorarch
%doc Changes README.md
-%{_bindir}/*
-%{perl_vendorarch}/auto/*
+%{_bindir}/podview
+%{_bindir}/prima-*
+%{_bindir}/VB
+%{perl_vendorarch}/auto/Prima
%{perl_vendorarch}/prima-gencls.pod
-%{perl_vendorarch}/Prima*
+%{perl_vendorarch}/Prima.pm
+%{perl_vendorarch}/Prima
%exclude %{perl_vendorarch}/Prima/Stress.*
%exclude %{perl_vendorarch}/Prima/sys/Test.*
%{perl_vendorarch}/vb-large.png
-%{_mandir}/man1/*
-%{_mandir}/man3/*
+%{_mandir}/man1/podview.*
+%{_mandir}/man1/prima-*.*
+%{_mandir}/man1/VB.*
+%{_mandir}/man3/pod::Prima::*
+%{_mandir}/man3/pod::prima-gencls.*
+%{_mandir}/man3/Prima.*
+%{_mandir}/man3/Prima::*
%exclude %{_mandir}/man3/Prima::Stress.*
%exclude %{_mandir}/man3/Prima::sys::Test.*
@@ -303,6 +312,9 @@ unset DISPLAY XDG_SESSION_TYPE
%{_libexecdir}/%{name}
%changelog
+* Wed Nov 30 2022 Petr Pisar <ppisar(a)redhat.com> - 1.67-1
+- 1.67 bump
+
* Wed Sep 21 2022 Petr Pisar <ppisar(a)redhat.com> - 1.66-2
- perl-Prima-Test package to require the same version of perl-Prima
diff --git a/sources b/sources
index f2587db..f399c92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Prima-1.66.tar.gz) = 6720d2c40ed84111ef041d2b492faa135027975b29c0d2cc4de43461e6bd77f933c8bcf1bc982fec19ccf952621d8b23c3e032627ac3dde19fa516d3ed85c9e9
+SHA512 (Prima-1.67.tar.gz) = 21a6400535426e23c9c83d88f2614403e28d0982e1395420744ed2a20ef19b768942ef55925b69452b81c9bba756f2d00591e8a15446659806dfebfc2ad2089e
https://src.fedoraproject.org/rpms/perl-Prima/c/bf0067c3c565838e59920da0f...
1 year, 4 months
jkucera pushed to rpms/kmail (rawhide). "Rebuild for gpgme 1.17.1"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:39:34 UTC
From 837f9a9e08673bba52765f020985e18e03b4bf69 Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera(a)redhat.com>
Date: Nov 30 2022 13:39:16 +0000
Subject: Rebuild for gpgme 1.17.1
---
diff --git a/kmail.spec b/kmail.spec
index 9e041b3..fe84c20 100644
--- a/kmail.spec
+++ b/kmail.spec
@@ -8,7 +8,7 @@
Name: kmail
Summary: Mail client
Version: 22.08.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# code (generally) GPLv2, docs GFDL
License: GPLv2 and GFDL
@@ -222,6 +222,9 @@ end
%changelog
+* Wed Nov 30 2022 Jiri Kucera <jkucera(a)redhat.com> - 22.08.3-2
+- Rebuild for gpgme 1.17.1
+
* Fri Nov 04 2022 Marc Deop i Argemí (Private) <marc(a)marcdeop.com> - 22.08.3-1
- 22.08.3
https://src.fedoraproject.org/rpms/kmail/c/837f9a9e08673bba52765f020985e1...
1 year, 4 months
pagure pushed to rpms/pytest (rawhide). "Update to 7.2.0"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:37:44 UTC
From 217ff3086d759677c9f8ad9fa0d064ee0344b51c Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar(a)redhat.com>
Date: Nov 01 2022 12:23:55 +0000
Subject: Update to 7.2.0
---
diff --git a/pytest.spec b/pytest.spec
index 62beeb6..9c89378 100644
--- a/pytest.spec
+++ b/pytest.spec
@@ -1,5 +1,5 @@
Name: pytest
-%global base_version 7.1.3
+%global base_version 7.2.0
#global prerelease ...
Version: %{base_version}%{?prerelease:~%{prerelease}}
Release: 1%{?dist}
@@ -111,7 +111,7 @@ done
%install
%pyproject_install
-%pyproject_save_files _pytest pytest
+%pyproject_save_files _pytest pytest py
mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest-%{python3_version}
ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest-3
@@ -161,6 +161,10 @@ find %{buildroot}%{python3_sitelib} \
%changelog
+* Tue Nov 01 2022 Lumír Balhar <lbalhar(a)redhat.com> - 7.2.0-1
+- Update to 7.2.0
+Resolves: rhbz#2137514
+
* Sat Sep 3 2022 Thomas Moschny <thomas.moschny(a)gmx.de> - 7.1.3-1
- Update to 7.1.3
- Fixes: rhbz#2123701
diff --git a/sources b/sources
index f5c8517..61491a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pytest-7.1.3.tar.gz) = 07a6b30fc90776dcd59972e2e4fc03ba02270bf1460faba765bfcf8b04888797be15a16a2ae947d97eb523250be200297d8a442870b3b6d56ae776b28fd18dce
+SHA512 (pytest-7.2.0.tar.gz) = a16b034c8522f0aa6ee9541b07b79be713565a6e755ab0489b38c2b0a0ed9f7857c87f952ff24c199a2e4c0d71ee26e918dd06abfe994d30ac90e32ae3e8c4d1
https://src.fedoraproject.org/rpms/pytest/c/217ff3086d759677c9f8ad9fa0d06...
1 year, 4 months
pagure pushed to rpms/python-execnet (rawhide). "Fix compatibility
with pytest 7.2 (#2142053)"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:36:17 UTC
From 8a7991f2e695abd83eee6af3d6eb0a6bf9b2dbff Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar(a)redhat.com>
Date: Nov 30 2022 13:35:30 +0000
Subject: Fix compatibility with pytest 7.2 (#2142053)
---
diff --git a/python-execnet.spec b/python-execnet.spec
index 74042b9..f994b41 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -2,7 +2,7 @@
Name: python-%{srcname}
Version: 1.9.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Distributed Python deployment and communication
License: MIT
URL: https://github.com/pytest-dev/execnet
@@ -28,6 +28,7 @@ Summary: Elastic Python Deployment
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-setuptools_scm
+BuildRequires: python3-py
BuildRequires: python3-pytest
#BuildRequires: python3-eventlet -- not yet ready for Python 3.10
BuildRequires: python3-gevent
@@ -88,6 +89,9 @@ py.test-%{python3_version} -r s \
%changelog
+* Wed Nov 30 2022 Lumír Balhar <lbalhar(a)redhat.com> - 1.9.0-8
+- Fix compatibility with pytest 7.2 (#2142053)
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
https://src.fedoraproject.org/rpms/python-execnet/c/8a7991f2e695abd83eee6...
1 year, 4 months
pagure pushed to rpms/keylime-agent-rust (rawhide). "Fix build with
bundled dependencies"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:31:24 UTC
From 3ecb4245f63ceabfaa6dff6e92e0b2fde0ea0574 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Nov 22 2022 19:29:50 +0000
Subject: Fix build with bundled dependencies
---
diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec
index fa69edc..beb27b5 100644
--- a/keylime-agent-rust.spec
+++ b/keylime-agent-rust.spec
@@ -8,6 +8,7 @@
%if 0%{?rhel}
# RHEL: Use bundled deps as it doesn't ship Rust libraries
%global bundled_rust_deps 1
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/debug/.*$
%else
# Fedora: Use only system Rust libraries
%global bundled_rust_deps 0
@@ -52,10 +53,14 @@ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz
# --exclude-crate-path "libloading#tests"
# tar jcf rust-keylime-%%{version}-vendor.tar.xz vendor
Source1: rust-keylime-%{version}-vendor.tar.xz
+## Patches for building from system Rust libraries (Fedora)
# Fix version requirement for clap to avoid FTBFS in Fedora
Patch1: rust-keylime-metadata.patch
# Use API available on rust-config-0.12.0
Patch2: rust-keylime-config-separator.patch
+## Patches for building from bundled Rust libraries (RHEL)
+# Build tss-esapi extension from source (upstream commit)
+Patch100: rust-keylime-metadata-bundled.patch
ExclusiveArch: %{rust_arches}
@@ -72,6 +77,8 @@ BuildRequires: openssl-devel
BuildRequires: libarchive-devel
BuildRequires: tpm2-tss-devel
%if 0%{?bundled_rust_deps}
+BuildRequires: clang
+BuildRequires: pkgconfig(libzmq) >= 4.1
BuildRequires: rust-toolset
%else
BuildRequires: rust-packaging >= 21-2
@@ -85,11 +92,13 @@ Conflicts: keylime-agent
Rust agent for Keylime
%prep
-%autosetup -n rust-keylime-%{version} -p1
+%autosetup -n rust-keylime-%{version} -N
%if 0%{?bundled_rust_deps}
+%autopatch -m 100 -p1
# Source1 is vendored dependencies
%cargo_prep -V 1
%else
+%autopatch -M 99 -p1
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
diff --git a/rust-keylime-metadata-bundled.patch b/rust-keylime-metadata-bundled.patch
new file mode 100644
index 0000000..4150824
--- /dev/null
+++ b/rust-keylime-metadata-bundled.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml 2022-11-01 11:14:11.349498931 +0100
++++ b/Cargo.toml 2022-11-01 14:22:01.934115151 +0100
+@@ -42,7 +42,7 @@
+ tempfile = "3.0.4"
+ tokio = {version = "1.13.1", features = ["full"]}
+ toml = "0.5"
+-tss-esapi = "7.1.0"
++tss-esapi = {version = "7.1.0", features = ["generate-bindings"]}
+ thiserror = "1.0"
+ uuid = {version = "0.8", features = ["v4"]}
+ zmq = {version = "0.9.2", optional = true}
diff --git a/sources b/sources
index 8185213..85832d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (v0.1.0.tar.gz) = 204e5cdf0901d237ed22f5265ce8c9f4c13d7d8ad4c1b64419a469213d88e584f0555f6edfbf7aa9346d2e3a86d8f7f0a0d5056a3e0ab0dfe5d170f8910fc7cf
-SHA512 (rust-keylime-0.1.0-vendor.tar.xz) = e19fccc9e0f05a9dbcc2e2bae509724b5457031765527222497d5e301b096e9a606827a4ecadff56ec6bb2c122c8c643ef310717c3a4b84c578ad219dd36cd57
+SHA512 (rust-keylime-0.1.0-vendor.tar.xz) = 469726ac4176e8bab93620293402422fe8da794773fcdbff722a5e4ef7a7377008996b002e2a260012052aa59c127de94572e8d11b25d5daa46052c5a74d9ec3
https://src.fedoraproject.org/rpms/keylime-agent-rust/c/3ecb4245f63ceabfa...
1 year, 4 months
leigh123linux pushed to rpms/muffin (rawhide). "Update to 5.6.1 release"
by notifications@fedoraproject.org
Notification time stamped 2022-11-30 13:28:58 UTC
From 3c9243686f6b45a2d71b326e70693fa61ec55f03 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux(a)gmail.com>
Date: Nov 30 2022 13:28:46 +0000
Subject: Update to 5.6.1 release
---
diff --git a/muffin.spec b/muffin.spec
index 42b8296..3da555a 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,12 +1,11 @@
Name: muffin
-Version: 5.6.0
-Release: 2%{?dist}
+Version: 5.6.1
+Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
License: GPLv2+
URL: https://github.com/linuxmint/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0: %{url}/pull/649.patch#/window_placement.patch
ExcludeArch: %{ix86}
@@ -92,6 +91,9 @@ rm -rf %{buildroot}%{_datadir}/applications/
%{_libdir}/pkgconfig/*
%changelog
+* Wed Nov 30 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.6.1-1
+- Update to 5.6.1 release
+
* Mon Nov 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 5.6.0-2
- Readd lost window placement modes
diff --git a/sources b/sources
index afcd874..710af26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (muffin-5.6.0.tar.gz) = 9d36ac4f9e9ee91c2712c51b7a7ec0223ddb3178739b6b2e644d54e425420ceb99bd72e5da129d2f8a42c5693eba144a4b0713bc550f09339a3d15136d0953dd
+SHA512 (muffin-5.6.1.tar.gz) = ee33a2f48603f007635590b3c300df787c6d389eed610016ae02702a5fbcf0d2dc9fbb0e10c4e8d9e11aa7d8be31c464c9d85fbd03443833d5b6ee829b363b3d
diff --git a/window_placement.patch b/window_placement.patch
deleted file mode 100644
index 4bddd65..0000000
--- a/window_placement.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From ae5351e44e45cab44a8997bea60cabe2a34c1dc5 Mon Sep 17 00:00:00 2001
-From: Duncan Grisby <duncan-github(a)grisby.org>
-Date: Fri, 25 Nov 2022 12:54:59 +0000
-Subject: [PATCH] Bring back window placement-mode to allow pointer and manual
- window placement.
-
----
- data/org.cinnamon.muffin.gschema.xml.in | 28 +++++++++++++++++
- debian/libmuffin0.symbols | 2 +-
- src/core/place.c | 42 ++++++++++++++++++++++++-
- src/core/prefs.c | 26 +++++++--------
- src/core/window-private.h | 1 +
- src/core/window.c | 9 ++++++
- src/meta/common.h | 19 +++++++++++
- src/meta/prefs.h | 6 ++--
- 8 files changed, 115 insertions(+), 18 deletions(-)
-
-diff --git a/data/org.cinnamon.muffin.gschema.xml.in b/data/org.cinnamon.muffin.gschema.xml.in
-index 5ee5c4edd..05099509c 100644
---- a/data/org.cinnamon.muffin.gschema.xml.in
-+++ b/data/org.cinnamon.muffin.gschema.xml.in
-@@ -5,6 +5,13 @@
- <value value="2" nick="blend"/>
- </enum>
-
-+ <enum id="placement_mode">
-+ <value value="0" nick="automatic"/>
-+ <value value="1" nick="pointer"/>
-+ <value value="2" nick="manual"/>
-+ <value value="3" nick="center"/>
-+ </enum>
-+
- <schema id="org.cinnamon.muffin" path="/org/cinnamon/muffin/"
- gettext-domain="@GETTEXT_DOMAIN@">
-
-@@ -138,6 +145,27 @@
- </description>
- </key>
-
-+ <key name="placement-mode" enum="placement_mode">
-+ <default>'automatic'</default>
-+ <summary>Window placement mode</summary>
-+ <description>
-+ The window placement mode indicates how new windows are positioned.
-+
-+ • “automatic” — the system chooses a location automatically based on
-+ the space available on the desktop, or by a simple
-+ cascade if there is no space
-+
-+ • “pointer” — new windows are placed according to the mouse pointer
-+ position
-+
-+ • “manual” — the user must manually place the new window with the
-+ mouse or keyboard.
-+
-+ • “center” — new windows are always put in the center of the active
-+ screen of the monitor
-+ </description>
-+ </key>
-+
- <key name="background-transition" enum="background_transition">
- <default>'blend'</default>
- <summary>Background transition</summary>
-diff --git a/debian/libmuffin0.symbols b/debian/libmuffin0.symbols
-index 1f2dd49e6..00249da37 100644
---- a/debian/libmuffin0.symbols
-+++ b/debian/libmuffin0.symbols
-@@ -2386,7 +2386,7 @@ libmuffin.so.0 libmuffin0 #MINVER#
- meta_prefs_get_auto_raise@Base 5.3.0
- meta_prefs_get_auto_raise_delay@Base 5.3.0
- meta_prefs_get_button_layout@Base 5.3.0
-- meta_prefs_get_center_new_windows@Base 5.3.0
-+ meta_prefs_get_new_window_placement_mode@Base 5.3.0
- meta_prefs_get_check_alive_timeout@Base 5.3.0
- meta_prefs_get_cursor_size@Base 5.3.0
- meta_prefs_get_cursor_theme@Base 5.3.0
-diff --git a/src/core/place.c b/src/core/place.c
-index 846845376..9c78b659c 100644
---- a/src/core/place.c
-+++ b/src/core/place.c
-@@ -75,6 +75,32 @@ northwestcmp (gconstpointer a, gconstpointer b)
- return 0;
- }
-
-+
-+static gboolean
-+place_by_pointer(MetaWindow *window,
-+ MetaPlacementMode placement_mode,
-+ int *new_x,
-+ int *new_y)
-+{
-+ MetaBackend *backend = meta_get_backend ();
-+ MetaCursorTracker *cursor_tracker = meta_backend_get_cursor_tracker (backend);
-+ int root_x, root_y;
-+
-+ meta_cursor_tracker_get_pointer (cursor_tracker, &root_x, &root_y, NULL);
-+
-+ MetaRectangle frame_rect;
-+ meta_window_get_frame_rect (window, &frame_rect);
-+
-+ *new_x = root_x - frame_rect.width / 2;
-+ *new_y = root_y - frame_rect.height / 2;
-+
-+ if (placement_mode == META_PLACEMENT_MODE_MANUAL)
-+ window->move_after_placement = TRUE;
-+
-+ return TRUE;
-+}
-+
-+
- static void
- find_next_cascade (MetaWindow *window,
- /* visible windows on relevant workspaces */
-@@ -323,7 +349,8 @@ window_place_centered (MetaWindow *window)
- return (type == META_WINDOW_DIALOG ||
- type == META_WINDOW_MODAL_DIALOG ||
- type == META_WINDOW_SPLASHSCREEN ||
-- (type == META_WINDOW_NORMAL && meta_prefs_get_center_new_windows ()));
-+ (type == META_WINDOW_NORMAL &&
-+ meta_prefs_get_new_window_placement_mode () == META_PLACEMENT_MODE_CENTER));
- }
-
- static void
-@@ -668,6 +695,7 @@ meta_window_place (MetaWindow *window,
- MetaBackend *backend = meta_get_backend ();
- GList *windows = NULL;
- MetaLogicalMonitor *logical_monitor;
-+ MetaPlacementMode placement_mode;
-
- meta_topic (META_DEBUG_PLACEMENT, "Placing window %s\n", window->desc);
-
-@@ -884,6 +912,18 @@ meta_window_place (MetaWindow *window,
- x = logical_monitor->rect.x;
- y = logical_monitor->rect.y;
-
-+
-+ /* Placement based on pointer position */
-+ placement_mode = meta_prefs_get_new_window_placement_mode();
-+
-+ if (placement_mode == META_PLACEMENT_MODE_POINTER ||
-+ placement_mode == META_PLACEMENT_MODE_MANUAL)
-+ {
-+ if (place_by_pointer (window, placement_mode, &x, &y))
-+ goto done_check_denied_focus;
-+ }
-+
-+
- if (find_first_fit (window, windows,
- logical_monitor,
- x, y, &x, &y))
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index aed5b6d9b..c07359abc 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -93,7 +93,7 @@ static MetaKeyCombo locate_pointer_key_combo = { 0, 0, 0 };
- static CDesktopFocusMode focus_mode = C_DESKTOP_FOCUS_MODE_CLICK;
- static CDesktopFocusNewWindows focus_new_windows = C_DESKTOP_FOCUS_NEW_WINDOWS_SMART;
- static gboolean raise_on_click = TRUE;
--static gboolean center_new_windows = FALSE;
-+static MetaPlacementMode new_window_placement_mode = META_PLACEMENT_MODE_AUTOMATIC;
- static gboolean attach_modal_dialogs = FALSE;
- static int num_workspaces = 4;
- static gboolean workspace_cycle = FALSE;
-@@ -270,6 +270,13 @@ static MetaEnumPreference preferences_enum[] =
- },
- &focus_mode,
- },
-+ {
-+ { "placement-mode",
-+ SCHEMA_MUFFIN,
-+ META_PREF_NEW_WINDOW_PLACEMENT_MODE,
-+ },
-+ &new_window_placement_mode,
-+ },
- {
- { "visual-bell-type",
- SCHEMA_GENERAL,
-@@ -324,13 +331,6 @@ static MetaBoolPreference preferences_bool[] =
- },
- &attach_modal_dialogs,
- },
-- {
-- { "center-new-windows",
-- SCHEMA_MUFFIN,
-- META_PREF_CENTER_NEW_WINDOWS,
-- },
-- ¢er_new_windows,
-- },
- {
- { "raise-on-click",
- SCHEMA_GENERAL,
-@@ -1311,10 +1311,10 @@ meta_prefs_get_focus_new_windows (void)
- return focus_new_windows;
- }
-
--gboolean
--meta_prefs_get_center_new_windows (void)
-+MetaPlacementMode
-+meta_prefs_get_new_window_placement_mode (void)
- {
-- return center_new_windows;
-+ return new_window_placement_mode;
- }
-
- gboolean
-@@ -1850,8 +1850,8 @@ meta_preference_to_string (MetaPreference pref)
- case META_PREF_FOCUS_NEW_WINDOWS:
- return "FOCUS_NEW_WINDOWS";
-
-- case META_PREF_CENTER_NEW_WINDOWS:
-- return "CENTER_NEW_WINDOWS";
-+ case META_PREF_NEW_WINDOW_PLACEMENT_MODE:
-+ return "NEW_WINDOW_PLACEMENT_MODE";
-
- case META_PREF_ATTACH_MODAL_DIALOGS:
- return "ATTACH_MODAL_DIALOGS";
-diff --git a/src/core/window-private.h b/src/core/window-private.h
-index 65b32f31f..cf859c2cd 100644
---- a/src/core/window-private.h
-+++ b/src/core/window-private.h
-@@ -238,6 +238,7 @@ struct _MetaWindow
- guint maximize_horizontally_after_placement : 1;
- guint maximize_vertically_after_placement : 1;
- guint minimize_after_placement : 1;
-+ guint move_after_placement : 1;
-
- /* The current tile mode */
- MetaTileMode tile_mode;
-diff --git a/src/core/window.c b/src/core/window.c
-index 0027f4f2b..e5df4bfd5 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -1127,6 +1127,7 @@ _meta_window_shared_new (MetaDisplay *display,
- window->maximize_horizontally_after_placement = FALSE;
- window->maximize_vertically_after_placement = FALSE;
- window->minimize_after_placement = FALSE;
-+ window->move_after_placement = FALSE;
- window->fullscreen = FALSE;
- window->require_fully_onscreen = TRUE;
- window->require_on_single_monitor = TRUE;
-@@ -2631,6 +2632,14 @@ meta_window_show (MetaWindow *window)
- timestamp = meta_display_get_current_time_roundtrip (window->display);
-
- meta_window_focus (window, timestamp);
-+
-+ if (window->move_after_placement)
-+ {
-+ timestamp = meta_display_get_current_time_roundtrip (window->display);
-+ meta_window_begin_grab_op(window, META_GRAB_OP_KEYBOARD_MOVING,
-+ FALSE, timestamp);
-+ window->move_after_placement = FALSE;
-+ }
- }
- else if (display->x11_display)
- {
-diff --git a/src/meta/common.h b/src/meta/common.h
-index 201d53755..99e1cf20f 100644
---- a/src/meta/common.h
-+++ b/src/meta/common.h
-@@ -548,6 +548,25 @@ typedef enum
- META_LAYER_LAST = 8
- } MetaStackLayer;
-
-+
-+/**
-+ * MetaPlacementMode:
-+ * @META_PLACEMENT_MODE_AUTOMATIC: Automatic
-+ * @META_PLACEMENT_MODE_POINTER: Pointer
-+ * @META_PLACEMENT_MODE_MANUAL: Manual
-+ * @META_PLACEMENT_MODE_CENTER: Center
-+ *
-+ * How new windows should be placed.
-+ */
-+typedef enum
-+{
-+ META_PLACEMENT_MODE_AUTOMATIC,
-+ META_PLACEMENT_MODE_POINTER,
-+ META_PLACEMENT_MODE_MANUAL,
-+ META_PLACEMENT_MODE_CENTER
-+} MetaPlacementMode;
-+
-+
- /* MetaGravity: (skip)
- *
- * Identical to the corresponding gravity value macros from libX11.
-diff --git a/src/meta/prefs.h b/src/meta/prefs.h
-index 8996379f7..fda8a175e 100644
---- a/src/meta/prefs.h
-+++ b/src/meta/prefs.h
-@@ -65,7 +65,7 @@
- * @META_PREF_WORKSPACES_ONLY_ON_PRIMARY: workspaces only on primary
- * @META_PREF_DRAGGABLE_BORDER_WIDTH: draggable border width
- * @META_PREF_AUTO_MAXIMIZE: auto-maximize
-- * @META_PREF_CENTER_NEW_WINDOWS: center new windows
-+ * @META_PREF_NEW_WINDOW_PLACEMENT_MODE: new window placement mode
- * @META_PREF_DRAG_THRESHOLD: drag threshold
- * @META_PREF_LOCATE_POINTER: show pointer location
- * @META_PREF_GTK_THEME: gtk theme name
-@@ -110,7 +110,7 @@ typedef enum
- META_PREF_WORKSPACES_ONLY_ON_PRIMARY,
- META_PREF_DRAGGABLE_BORDER_WIDTH,
- META_PREF_AUTO_MAXIMIZE,
-- META_PREF_CENTER_NEW_WINDOWS,
-+ META_PREF_NEW_WINDOW_PLACEMENT_MODE,
- META_PREF_DRAG_THRESHOLD,
- META_PREF_LOCATE_POINTER,
- META_PREF_CHECK_ALIVE_TIMEOUT,
-@@ -211,7 +211,7 @@ META_EXPORT
- gboolean meta_prefs_get_auto_maximize (void);
-
- META_EXPORT
--gboolean meta_prefs_get_center_new_windows (void);
-+MetaPlacementMode meta_prefs_get_new_window_placement_mode (void);
-
- META_EXPORT
- gboolean meta_prefs_get_show_fallback_app_menu (void);
https://src.fedoraproject.org/rpms/muffin/c/3c9243686f6b45a2d71b326e70693...
1 year, 4 months