Update to 3.13.3
This commit is contained in:
Kalev Lember
parent
ee24d04b20
commit
a3150c5b2f
1
.gitignore
vendored
1
.gitignore
vendored
@ -69,3 +69,4 @@ gedit-2.31.6.tar.bz2
|
||||
/gedit-3.12.2.tar.xz
|
||||
/gedit-3.13.1.tar.xz
|
||||
/gedit-3.13.2.tar.xz
|
||||
/gedit-3.13.3.tar.xz
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
From 98efe189a8a39216de1807d009d4ae5a099eddd0 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse van den Kieboom <jessevdk@gnome.org>
|
||||
Date: Mon, 30 Jun 2014 19:19:48 +0200
|
||||
Subject: [PATCH] Hold ref to menus stored in app
|
||||
|
||||
---
|
||||
gedit/gedit-app.c | 26 +++++++++++++++++++++-----
|
||||
1 file changed, 21 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
|
||||
index ed08a75..0704623 100644
|
||||
--- a/gedit/gedit-app.c
|
||||
+++ b/gedit/gedit-app.c
|
||||
@@ -421,6 +421,22 @@ load_accels (void)
|
||||
}
|
||||
}
|
||||
|
||||
+static gpointer
|
||||
+get_builder_object_ref (GtkBuilder *builder,
|
||||
+ const gchar *name)
|
||||
+{
|
||||
+ gpointer ret;
|
||||
+
|
||||
+ ret = gtk_builder_get_object (builder, name);
|
||||
+
|
||||
+ if (ret != NULL)
|
||||
+ {
|
||||
+ g_object_ref_sink (ret);
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
gedit_app_startup (GApplication *application)
|
||||
{
|
||||
@@ -493,16 +509,16 @@ gedit_app_startup (GApplication *application)
|
||||
appmenu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
|
||||
gtk_application_set_app_menu (GTK_APPLICATION (application), appmenu);
|
||||
|
||||
- app->priv->window_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "gear_menu_withappmenu"));
|
||||
+ app->priv->window_menu = G_MENU_MODEL (get_builder_object_ref (builder, "gear_menu_withappmenu"));
|
||||
}
|
||||
else
|
||||
{
|
||||
- app->priv->window_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "gear_menu_noappmenu"));
|
||||
+ app->priv->window_menu = G_MENU_MODEL (get_builder_object_ref (builder, "gear_menu_noappmenu"));
|
||||
}
|
||||
|
||||
- app->priv->notebook_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "notebook_menu"));
|
||||
- app->priv->tab_width_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "tab_width_menu"));
|
||||
- app->priv->line_col_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "line_col_menu"));
|
||||
+ app->priv->notebook_menu = G_MENU_MODEL (get_builder_object_ref (builder, "notebook_menu"));
|
||||
+ app->priv->tab_width_menu = G_MENU_MODEL (get_builder_object_ref (builder, "tab_width_menu"));
|
||||
+ app->priv->line_col_menu = G_MENU_MODEL (get_builder_object_ref (builder, "line_col_menu"));
|
||||
}
|
||||
|
||||
g_object_unref (builder);
|
||||
--
|
||||
2.0.1
|
||||
|
||||
19
gedit.spec
19
gedit.spec
@ -11,10 +11,10 @@
|
||||
%endif
|
||||
|
||||
%define glib2_version 2.39.5
|
||||
%define gtk3_version 3.11.6
|
||||
%define gtk3_version 3.13.3
|
||||
%define pygo_version 3.0.0
|
||||
%define desktop_file_utils_version 0.9
|
||||
%define gtksourceview_version 3.11.2
|
||||
%define gtksourceview_version 3.13.2
|
||||
%define enchant_version 1.2.0
|
||||
%define isocodes_version 0.35
|
||||
%define libpeas_version 1.7.0
|
||||
@ -22,8 +22,8 @@
|
||||
Summary: Text editor for the GNOME desktop
|
||||
Name: gedit
|
||||
Epoch: 2
|
||||
Version: 3.13.2
|
||||
Release: 3%{?dist}
|
||||
Version: 3.13.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and GFDL
|
||||
Group: Applications/Editors
|
||||
#VCS: git:git://git.gnome.org/gedit
|
||||
@ -34,9 +34,6 @@ URL: http://projects.gnome.org/gedit/
|
||||
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
|
||||
Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
|
||||
|
||||
# Backported upstream fix for a crash with gtk+ 3.13.4
|
||||
Patch1: 0001-Hold-ref-to-menus-stored-in-app.patch
|
||||
|
||||
Patch4: gedit-disable-python3.patch
|
||||
|
||||
BuildRequires: gnome-common
|
||||
@ -103,7 +100,6 @@ Install gedit-devel if you want to write plugins for gedit.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
%if !%{with_python3}
|
||||
%patch4 -p1 -b .disable-python
|
||||
@ -135,7 +131,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%find_lang %{name} --with-gnome
|
||||
|
||||
%check
|
||||
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gedit.desktop
|
||||
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop
|
||||
|
||||
%post
|
||||
update-desktop-database >&/dev/null || :
|
||||
@ -156,7 +152,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
|
||||
%files -f %{name}.lang
|
||||
%doc README COPYING AUTHORS
|
||||
%{_datadir}/gedit
|
||||
%{_datadir}/applications/gedit.desktop
|
||||
%{_datadir}/applications/org.gnome.gedit.desktop
|
||||
%{_mandir}/man1/*
|
||||
%if %{with_python3}
|
||||
%{python3_sitearch}/gi/overrides/Gedit.py*
|
||||
@ -212,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
|
||||
%{_datadir}/vala/
|
||||
|
||||
%changelog
|
||||
* Wed Jul 23 2014 Kalev Lember <kalevlember@gmail.com> - 2:3.13.3-1
|
||||
- Update to 3.13.3
|
||||
|
||||
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 2:3.13.2-3
|
||||
- Rebuilt for gobject-introspection 1.41.4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user