Compare commits

..

No commits in common. "2f0b64696534527455f424de09390f1b3a9d5924" and "dd52269c544d19a9abeaf66fdefa7561f02baf16" have entirely different histories.

5 changed files with 9 additions and 72 deletions

View File

@ -1,49 +0,0 @@
From 7acdd3c6f6934f47b8974ebc2190a59ea5d2ed17 Mon Sep 17 00:00:00 2001
From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
Date: Fri, 2 Oct 2020 16:08:23 -0300
Subject: [PATCH] GladeGtkBox: fix glade_gtk_box_post_create
Some widgets with contruct properties like GtkMessageDialog get
rebuilt right after they are created on project loading so we need
to check glade_project_is_loading() intead of GLADE_CREATE_LOAD
and use the object ad the connect data to make sure it gets disconected
if it was the object being rebuilt
Fix issue #479 "Glade 3.36.0 segfaults when opening a file"
---
plugins/gtk+/glade-gtk-box.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/gtk+/glade-gtk-box.c b/plugins/gtk+/glade-gtk-box.c
index 0c157a6d..a0252b6a 100644
--- a/plugins/gtk+/glade-gtk-box.c
+++ b/plugins/gtk+/glade-gtk-box.c
@@ -58,9 +58,9 @@ glade_gtk_box_create_editable (GladeWidgetAdaptor *adaptor,
}
static void
-glade_gtk_box_parse_finished (GladeProject *project, GladeWidget *gbox)
+glade_gtk_box_parse_finished (GladeProject *project, GObject *box)
{
- GObject *box = glade_widget_get_object (gbox);
+ GladeWidget *gbox = glade_widget_get_from_gobject (box);
glade_widget_property_set (gbox, "use-center-child",
gtk_box_get_center_widget (GTK_BOX (box)) != NULL);
@@ -87,11 +87,11 @@ glade_gtk_box_post_create (GladeWidgetAdaptor *adaptor,
g_signal_connect (G_OBJECT (gwidget), "configure-end",
G_CALLBACK (glade_gtk_box_configure_end), container);
- if (reason == GLADE_CREATE_LOAD)
+ if (glade_project_is_loading (project))
{
g_signal_connect_object (project, "parse-finished",
G_CALLBACK (glade_gtk_box_parse_finished),
- gwidget, 0);
+ container, 0);
}
}
--
GitLab

BIN
glade-3.22.1.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,11 +1,10 @@
Name: glade
Version: 3.36.0
Release: 3
Version: 3.22.1
Release: 5
Summary: User Interface Designer for GTK+
License: GPLv2+ and LGPLv2+
URL: https://glade.gnome.org/
Source0: https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-%{version}.tar.xz
Patch0001: backport-GladeGtkBox-fix-glade_gtk_box_post_create.patch
Source0: https://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-%{version}.tar.xz
BuildRequires: chrpath desktop-file-utils docbook-style-xsl gettext gtk3-devel intltool
BuildRequires: itstool libxml2-devel pygobject3-devel python3-devel webkit2gtk3-devel
@ -43,7 +42,7 @@ developing applications that use Glade widget library.
%package_help
%prep
%autosetup -n %{name}-%{version} -p1
%autosetup -n %{name}-%{version}
%build
export PYTHON=%{__python3}
@ -64,8 +63,8 @@ chrpath --delete %{buildroot}%{_libdir}/glade/modules/*.so
%find_lang glade --with-gnome
%check
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Glade.appdata.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/glade.appdata.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/glade.desktop
%files
%defattr(-,root,root)
@ -73,10 +72,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.deskt
%{_bindir}/glade
%{_bindir}/glade-previewer
%{_datadir}/locale/*
%{_datadir}/applications/org.gnome.Glade.desktop
%{_datadir}/applications/glade.desktop
%{_datadir}/help/*
%{_datadir}/icons/*
%{_datadir}/metainfo/org.gnome.Glade.appdata.xml
%{_datadir}/metainfo/glade.appdata.xml
%files libs
%defattr(-,root,root)
@ -96,19 +95,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Glade.deskt
%{_datadir}/gir-1.0/Gladeui-2.0.gir
%files help
%doc AUTHORS NEWS
%doc AUTHORS NEWS README
%{_mandir}/man1/*
%changelog
* Mon Feb 19 2024 liweigang <izmirvii@gmail.com> - 3.36.0-3
- fix CVE-2020-36774
* Mon Mar 14 2022 zhanzhimin <zhanzhimin@h-partners.com> - 3.36.0-2
- delete old so file
* Thu Jul 23 2020 hanhui <hanhui15@huawei.com> - 3.36.0-1
- update to 3.36.0
* Fri Nov 8 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.22.1-5
- Type:bugfix
- Id:NA

View File

@ -1,4 +0,0 @@
version_control: gitlab.gnome
src_repo: glade
tag_prefix: GLADE3?_
seperator: "_"