Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

6 changed files with 194 additions and 25 deletions

29
.gitignore vendored
View File

@ -1 +1,28 @@
SOURCES/libwnck-3.24.1.tar.xz
libwnck-2.30.0.tar.bz2
libwnck-2.30.3.tar.bz2
/libwnck-2.30.4.tar.bz2
/libwnck-2.91.6.tar.bz2
/libwnck-3.0.2.tar.bz2
/libwnck-3.1.90.tar.xz
/libwnck-3.1.92.tar.xz
/libwnck-3.2.0.tar.xz
/libwnck-3.2.1.tar.xz
/libwnck-3.3.5.tar.xz
/libwnck-3.4.0.tar.xz
/libwnck-3.4.2.tar.xz
/libwnck-3.4.3.tar.xz
/libwnck-3.4.4.tar.xz
/libwnck-3.4.5.tar.xz
/libwnck-3.4.7.tar.xz
/libwnck-3.4.9.tar.xz
/libwnck-3.14.0.tar.xz
/libwnck-3.14.1.tar.xz
/libwnck-3.20.0.tar.xz
/libwnck-3.20.1.tar.xz
/libwnck-3.24.0.tar.xz
/libwnck-3.24.1.tar.xz
/libwnck-3.31.4.tar.xz
/libwnck-3.32.0.tar.xz
/sources
/libwnck-3.36.0.tar.xz
/libwnck-40.0.tar.xz

View File

@ -1 +0,0 @@
5c16cd0c63022cfa7cf2f824d037482cfbd9068b SOURCES/libwnck-3.24.1.tar.xz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -2,23 +2,24 @@
Summary: Window Navigator Construction Kit
Name: libwnck3
Version: 3.24.1
Version: 40.0
Release: 2%{?dist}
URL: http://download.gnome.org/sources/%{source_name}/
Source0: http://download.gnome.org/sources/%{source_name}/3.24/%{source_name}-%{version}.tar.xz
Source0: http://download.gnome.org/sources/%{source_name}/40/%{source_name}-%{version}.tar.xz
License: LGPLv2+
Group: System Environment/Libraries
Patch1: libwnck_0001-Revert-pager-do-not-change-workspace-size-from-size_.patch
BuildRequires: gcc
BuildRequires: meson
BuildRequires: gettext
BuildRequires: glib2-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
BuildRequires: gtk-doc
BuildRequires: libXres-devel
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
BuildRequires: gobject-introspection-devel
BuildRequires: libXres-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: libtool, automake, autoconf
BuildRequires: gnome-common
Requires: startup-notification
@ -29,7 +30,6 @@ about open windows, workspaces, their names/icons, and so forth.
%package devel
Summary: Libraries and headers for libwnck
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -38,33 +38,27 @@ developing applications that use %{name}.
%prep
%setup -q -n %{source_name}-%{version}
%autosetup -n %{source_name}-%{version} -p1
%build
%configure \
--disable-static \
--enable-introspection=yes \
--enable-startup-notification
%meson -Dgtk_doc=true
%meson_build
%{make_build}
%install
%{make_install}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
%meson_install
%find_lang %{source_name}-3.0 --with-gnome --all-name
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files -f %{source_name}-3.0.lang
%license COPYING
%doc AUTHORS README NEWS
%{_libdir}/%{source_name}-3.so.*
%{_libdir}/%{source_name}-3.so.0*
%{_bindir}/wnck-urgency-monitor
%{_libdir}/girepository-1.0/Wnck-3.0.typelib
@ -78,6 +72,50 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
* Tue Aug 24 2021 Wolfgang Ulbrich <fedora@raveit.de> - 40.0-2
- revert https://gitlab.gnome.org/GNOME/libwnck/-/commit/3456b74
- fixes rhbz #1971048
- and https://github.com/mate-desktop/mate-panel/issues/1230
* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
- Tighten soname globs
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Mar 28 2020 Wolfgang Ulbrich <fedora@raveit.de> - 3.36.0-1
- update to 3.36.0
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed May 01 2019 Phil Wyett <philwyett@kathenas.org> - 3.32.0-1
- Update to 3.32.0
* Fri Feb 01 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
- Update to 3.31.4
- Switch to the meson build system
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -0,0 +1,98 @@
From 89a5825eb20bfa91b91055e5a3dfe6445e6b9bd2 Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Fri, 11 Jun 2021 21:26:40 +0200
Subject: [PATCH] Revert "pager: do not change workspace size from
size_allocate"
This reverts commit 3456b747b6381f17d48629dd8fdd4d511e739b10.
---
libwnck/pager.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/libwnck/pager.c b/libwnck/pager.c
index c769d62..a563a4d 100644
--- a/libwnck/pager.c
+++ b/libwnck/pager.c
@@ -122,6 +122,8 @@ static void wnck_pager_get_preferred_height_for_width (GtkWidget *widget,
int width,
int *minimum_height,
int *natural_height);
+static void wnck_pager_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static gboolean wnck_pager_draw (GtkWidget *widget,
cairo_t *cr);
static gboolean wnck_pager_button_press (GtkWidget *widget,
@@ -247,6 +249,7 @@ wnck_pager_class_init (WnckPagerClass *klass)
widget_class->get_preferred_width_for_height = wnck_pager_get_preferred_width_for_height;
widget_class->get_preferred_height = wnck_pager_get_preferred_height;
widget_class->get_preferred_height_for_width = wnck_pager_get_preferred_height_for_width;
+ widget_class->size_allocate = wnck_pager_size_allocate;
widget_class->draw = wnck_pager_draw;
widget_class->button_press_event = wnck_pager_button_press;
widget_class->button_release_event = wnck_pager_button_release;
@@ -684,6 +687,62 @@ wnck_pager_get_preferred_height_for_width (GtkWidget *widget,
*natural_height = *minimum_height = MAX (height, 0);
}
+static gboolean
+_wnck_pager_queue_resize (gpointer data)
+{
+ gtk_widget_queue_resize (GTK_WIDGET (data));
+ return FALSE;
+}
+
+static void
+wnck_pager_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ WnckPager *pager;
+ int workspace_size;
+ GtkBorder padding;
+ int width;
+ int height;
+
+ pager = WNCK_PAGER (widget);
+
+ width = allocation->width;
+ height = allocation->height;
+
+ _wnck_pager_get_padding (pager, &padding);
+ width -= padding.left + padding.right;
+ height -= padding.top + padding.bottom;
+
+ g_assert (pager->priv->n_rows > 0);
+
+ if (pager->priv->orientation == GTK_ORIENTATION_VERTICAL)
+ {
+ if (pager->priv->show_all_workspaces)
+ workspace_size = (width - (pager->priv->n_rows - 1)) / pager->priv->n_rows;
+ else
+ workspace_size = width;
+ }
+ else
+ {
+ if (pager->priv->show_all_workspaces)
+ workspace_size = (height - (pager->priv->n_rows - 1))/ pager->priv->n_rows;
+ else
+ workspace_size = height;
+ }
+
+ workspace_size = MAX (workspace_size, 1);
+
+ if (workspace_size != pager->priv->workspace_size)
+ {
+ pager->priv->workspace_size = workspace_size;
+ g_idle_add (_wnck_pager_queue_resize, pager);
+ return;
+ }
+
+ GTK_WIDGET_CLASS (wnck_pager_parent_class)->size_allocate (widget,
+ allocation);
+}
+
static void
get_workspace_rect (WnckPager *pager,
int space,
--
2.31.1

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libwnck-40.0.tar.xz) = 059f2a2add3f95feb7759e827072905652a4dc9c6756d526743319b5016ee36191b5c9a4fb5204f85a13049c2bd1bb3d01b2456ddb3ddc8f76148a0ee1651696