Accepting request 695717 from GNOME:Factory
Scripted push of project GNOME:Next (forwarded request 695616 from dimstar) OBS-URL: https://build.opensuse.org/request/show/695717 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gedit?expand=0&rev=128
This commit is contained in:
Git OBS Bridge
commit
baa6b59665
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eaf3b17856a0fb7c6f363c2ebbf4f26c5be6eb6552a49e58c44aee0fcb789163
|
||||
size 3155628
|
||||
3
gedit-3.32.0.tar.xz
Normal file
3
gedit-3.32.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c9e2e2a865c962ef172892a5d3459dc834871761ae6456b68436b3b577f22ad3
|
||||
size 14793216
|
||||
@ -1,13 +1,12 @@
|
||||
Index: gedit-3.27.92/data/org.gnome.gedit.desktop.in.in
|
||||
===================================================================
|
||||
--- gedit-3.27.92.orig/data/org.gnome.gedit.desktop.in.in 2017-11-08 18:49:04.000000000 +0100
|
||||
+++ gedit-3.27.92/data/org.gnome.gedit.desktop.in.in 2018-03-06 22:09:32.816610068 +0100
|
||||
@@ -5,7 +5,7 @@ Exec=gedit %U
|
||||
--- orig-gedit-3.31.3/data/org.gnome.gedit.desktop.in.in 2018-10-21 15:48:49.000000000 +0200
|
||||
+++ gedit-3.31.3/data/org.gnome.gedit.desktop.in.in 2019-01-03 14:24:10.125418509 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
-MimeType=text/plain;
|
||||
+MimeType=application/x-awk;application/x-csh;application/x-perl;application/x-php;application/x-shellscript;text/plain;text/x-c;text/x-c++;text/x-c++hdr;text/x-chdr;text/x-c++src;text/x-csrc;text/x-fortran;text/x-java;text/x-log;text/x-makefile;text/x-moc;text/x-pascal;text/x-patch;text/x-python;text/x-readme;text/x-scheme;text/x-tcl;text/x-tex;
|
||||
Icon=gedit
|
||||
Categories=GNOME;GTK;Utility;TextEditor;
|
||||
X-GNOME-DocPath=gedit/gedit.xml
|
||||
# TRANSLATORS: Do NOT translate or transliterate this text!
|
||||
# This is an icon file name.
|
||||
Icon=org.gnome.gedit
|
||||
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
From a622fda63726adaabd02fa0c1786b75a921b1973 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien Lafargue <slafargue@gnome.org>
|
||||
Date: Mon, 19 Nov 2018 19:46:56 +0100
|
||||
Subject: [PATCH] document selector: make search caseless
|
||||
|
||||
---
|
||||
gedit/gedit-open-document-selector.c | 36 +++++++++++++++++++++++-----
|
||||
1 file changed, 30 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c
|
||||
index 5389ef0bd..3e3d9a293 100644
|
||||
--- a/gedit/gedit-open-document-selector.c
|
||||
+++ b/gedit/gedit-open-document-selector.c
|
||||
@@ -436,6 +436,23 @@ fileitem_setup (FileItem *item)
|
||||
return candidate;
|
||||
}
|
||||
|
||||
+static inline gboolean
|
||||
+is_filter_in_candidate (const gchar *candidate,
|
||||
+ const gchar *filter)
|
||||
+{
|
||||
+ gchar *candidate_fold;
|
||||
+ gboolean ret;
|
||||
+
|
||||
+ g_assert (candidate != NULL);
|
||||
+ g_assert (filter != NULL);
|
||||
+
|
||||
+ candidate_fold = g_utf8_casefold (candidate, -1);
|
||||
+ ret = (strstr (candidate_fold, filter) != NULL);
|
||||
+
|
||||
+ g_free (candidate_fold);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
/* If filter == NULL then items are
|
||||
* not checked against the filter.
|
||||
*/
|
||||
@@ -445,6 +462,10 @@ fileitem_list_filter (GList *items,
|
||||
{
|
||||
GList *new_items = NULL;
|
||||
GList *l;
|
||||
+ gchar *filter_fold = NULL;
|
||||
+
|
||||
+ if (filter != NULL)
|
||||
+ filter_fold = g_utf8_casefold (filter, -1);
|
||||
|
||||
for (l = items; l != NULL; l = l->next)
|
||||
{
|
||||
@@ -453,16 +474,19 @@ fileitem_list_filter (GList *items,
|
||||
|
||||
item = l->data;
|
||||
candidate = fileitem_setup (item);
|
||||
-
|
||||
- if (candidate && (filter == NULL || strstr (candidate, filter)))
|
||||
+ if (candidate != NULL)
|
||||
{
|
||||
- new_items = g_list_prepend (new_items,
|
||||
- gedit_open_document_selector_copy_fileitem_item (item));
|
||||
- }
|
||||
+ if (filter == NULL || is_filter_in_candidate (candidate, filter_fold))
|
||||
+ {
|
||||
+ new_items = g_list_prepend (new_items,
|
||||
+ gedit_open_document_selector_copy_fileitem_item (item));
|
||||
+ }
|
||||
|
||||
- g_free (candidate);
|
||||
+ g_free (candidate);
|
||||
+ }
|
||||
}
|
||||
|
||||
+ g_free (filter_fold);
|
||||
new_items = g_list_reverse (new_items);
|
||||
return new_items;
|
||||
}
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From ea7999b7b59dbc05570485561ecab2a6334a220e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien Lafargue <slafargue@gnome.org>
|
||||
Date: Mon, 26 Nov 2018 19:29:53 +0100
|
||||
Subject: [PATCH] file-browser: fix assert when going up in the tree
|
||||
|
||||
---
|
||||
plugins/filebrowser/gedit-file-browser-store.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/filebrowser/gedit-file-browser-store.c b/plugins/filebrowser/gedit-file-browser-store.c
|
||||
index 08baeb593..915941e71 100644
|
||||
--- a/plugins/filebrowser/gedit-file-browser-store.c
|
||||
+++ b/plugins/filebrowser/gedit-file-browser-store.c
|
||||
@@ -1263,7 +1263,7 @@ row_deleted (GeditFileBrowserStore *model,
|
||||
GtkTreePath *copy;
|
||||
|
||||
/* We should always be called when the row is still inserted */
|
||||
- g_return_if_fail (node->inserted == TRUE);
|
||||
+ g_return_if_fail (node->inserted == TRUE || NODE_IS_DUMMY (node));
|
||||
|
||||
hidden = FILE_IS_HIDDEN (node->flags);
|
||||
node->flags &= ~GEDIT_FILE_BROWSER_STORE_FLAG_IS_HIDDEN;
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From ad121f657157339ffc89a99e04efa3e5e5515721 Mon Sep 17 00:00:00 2001
|
||||
From: Corey Daley <cdaley@redhat.com>
|
||||
Date: Thu, 1 Nov 2018 19:30:00 +0100
|
||||
Subject: [PATCH] notebook: Allow closing of tabs with middle mouse button
|
||||
|
||||
---
|
||||
gedit/gedit-notebook.c | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
|
||||
index fcf22c39a..d06dd4983 100644
|
||||
--- a/gedit/gedit-notebook.c
|
||||
+++ b/gedit/gedit-notebook.c
|
||||
@@ -146,7 +146,6 @@ gedit_notebook_button_press_event (GtkWidget *widget,
|
||||
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
|
||||
|
||||
if (event->type == GDK_BUTTON_PRESS &&
|
||||
- event->button == GDK_BUTTON_SECONDARY &&
|
||||
(event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
|
||||
{
|
||||
gint tab_clicked;
|
||||
@@ -157,10 +156,19 @@ gedit_notebook_button_press_event (GtkWidget *widget,
|
||||
GtkWidget *tab;
|
||||
|
||||
tab = gtk_notebook_get_nth_page (notebook, tab_clicked);
|
||||
+ switch (event->button)
|
||||
+ {
|
||||
+ case GDK_BUTTON_SECONDARY:
|
||||
+ g_signal_emit (G_OBJECT (widget), signals[SHOW_POPUP_MENU], 0, event, tab);
|
||||
+ return GDK_EVENT_STOP;
|
||||
|
||||
- g_signal_emit (G_OBJECT (widget), signals[SHOW_POPUP_MENU], 0, event, tab);
|
||||
+ case GDK_BUTTON_MIDDLE:
|
||||
+ g_signal_emit (G_OBJECT (notebook), signals[TAB_CLOSE_REQUEST], 0, tab);
|
||||
+ return GDK_EVENT_STOP;
|
||||
|
||||
- return GDK_EVENT_STOP;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@ -1,3 +1,64 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 11 09:00:10 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 3.32.0:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 4 08:38:46 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 3.31.92:
|
||||
+ Fix segfault in open document selector.
|
||||
+ Update help for app menu changes.
|
||||
+ Miscellaneous fixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 19 10:04:02 UTC 2019 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.31.90:
|
||||
+ Switch to meson.
|
||||
+ Drop autotools support.
|
||||
+ Add tests to validate AppStream metadata and .desktop.
|
||||
+ Flatpak and Snap versions now bundle gedit-plugins.
|
||||
+ Fix some issues resulting from the GNOME 3.32 menu changes.
|
||||
+ Drop gconf conversion file.
|
||||
+ Miscellaneous fixes.
|
||||
- Switch to meson build system, add meson BuildRequires and macros.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 3 13:11:31 UTC 2019 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.31.3:
|
||||
+ Update README and rename to README.md.
|
||||
+ Update new app icon.
|
||||
+ Fix searching with upper case characters in recent files popup.
|
||||
+ Fix symbolic icons in file browser with dark themes.
|
||||
+ Use a color for search matching in recent files popup that
|
||||
works better with dark themes.
|
||||
+ Clean up deprecations and more.
|
||||
- Changes from version 3.31.2:
|
||||
+ Follow GNOME 3.32 menu guidelines.
|
||||
+ Allow closing tabs with middle-click.
|
||||
- Changes from version 3.31.1:
|
||||
+ Fix tarball and version number from previous release.
|
||||
- Changes from version 3.31.0:
|
||||
+ Redesign the app icon.
|
||||
+ Migrate to gettext and stop using intltool.
|
||||
+ Switch from gtksourceview3 to gtksourceview4.
|
||||
+ Fix file chooser not opening in correct location after first
|
||||
time.
|
||||
+ Miscellaneous build and translation fixes.
|
||||
+ Updated translations.
|
||||
- Replace pkgconfig(gtksourceview-3.0) with
|
||||
pkgconfig(gtksourceview-4) BuildRequires following upstream
|
||||
changes.
|
||||
- Drop intltool BuildRequires, no longer needed.
|
||||
- Rebase gedit-desktop.patch.
|
||||
- Drop upstream fixed patches:
|
||||
+ gedit-notebook-close-with-mmb.patch
|
||||
+ gedit-document-selector-make-search-caseless.patch
|
||||
+ gedit-fix-assert-when-going-up-in-tree.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 7 16:10:58 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
|
||||
40
gedit.spec
40
gedit.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gedit
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,30 +18,24 @@
|
||||
|
||||
%bcond_without python_bindings
|
||||
Name: gedit
|
||||
Version: 3.30.2
|
||||
Version: 3.32.0
|
||||
Release: 0
|
||||
Summary: UTF-8 text editor
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/Text/Editors
|
||||
URL: https://wiki.gnome.org/Apps/Gedit
|
||||
Source0: http://download.gnome.org/sources/gedit/3.30/%{name}-%{version}.tar.xz
|
||||
Source0: https://download.gnome.org/sources/gedit/3.32/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE gedit-desktop.patch -- Adds more MIME types.
|
||||
Patch0: gedit-desktop.patch
|
||||
# PATCH-FIX-OPENSUSE gedit-plugins-python-env.patch bjorn.lie@gmail.com -- Fix python env
|
||||
Patch1: gedit-plugins-python-env.patch
|
||||
# PATCH-FIX-UPSTREAM gedit-notebook-close-with-mmb.patch -- notebook: Allow closing of tabs with middle mouse button
|
||||
Patch2: gedit-notebook-close-with-mmb.patch
|
||||
# PATCH-FIX-UPSTREAM gedit-document-selector-make-search-caseless.patch -- document selector: make search caseless
|
||||
Patch3: gedit-document-selector-make-search-caseless.patch
|
||||
# PATCH-FIX-UPSTREAM gedit-fix-assert-when-going-up-in-tree.patch -- file-browser: fix assert when going up in the tree
|
||||
Patch4: gedit-fix-assert-when-going-up-in-tree.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gobject-introspection-devel >= 0.9.3
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: intltool >= 0.50.1
|
||||
BuildRequires: iso-codes-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-base >= 3.2.3
|
||||
BuildRequires: translation-update-upstream
|
||||
@ -52,7 +46,7 @@ BuildRequires: pkgconfig(gmodule-2.0)
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas)
|
||||
BuildRequires: pkgconfig(gspell-1) >= 0.2.5
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
|
||||
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.22.0
|
||||
BuildRequires: pkgconfig(gtksourceview-4)
|
||||
BuildRequires: pkgconfig(libpeas-1.0) >= 1.14.1
|
||||
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1
|
||||
BuildRequires: pkgconfig(libsoup-2.4)
|
||||
@ -111,30 +105,31 @@ This subpackage contains the header files for creating gedit plugins.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
translation-update-upstream
|
||||
translation-update-upstream po %{name}
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-python \
|
||||
%meson \
|
||||
-Dintrospection=true \
|
||||
-Dvapi=true \
|
||||
-Dplugins=true \
|
||||
-Ddocumentation=true \
|
||||
%{nil}
|
||||
%make_build
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%meson_install
|
||||
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%fdupes %{buildroot}%{_prefix}
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc NEWS README
|
||||
%doc NEWS README.md
|
||||
%doc %{_datadir}/help/C/%{name}/
|
||||
%{_bindir}/gedit
|
||||
%{_bindir}/gnome-text-editor
|
||||
%{_datadir}/metainfo/org.gnome.gedit.appdata.xml
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/dbus-1/services/org.gnome.gedit.service
|
||||
%{_datadir}/GConf/gsettings/gedit.convert
|
||||
# %%{_datadir}/gedit/gir-1.0/ lives in -devel
|
||||
%exclude %{_datadir}/gedit/gir-1.0/
|
||||
%{_datadir}/gedit/
|
||||
@ -147,7 +142,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
|
||||
%dir %{_libdir}/gedit/
|
||||
%{_libdir}/gedit/libgedit.so
|
||||
%{_libdir}/gedit/libgedit-3.14.so
|
||||
%{_libdir}/gedit/girepository-1.0/
|
||||
%dir %{_libdir}/gedit/plugins/
|
||||
# Explicitly list plugins so we know when we miss one
|
||||
@ -183,11 +178,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%if %{with python_bindings}
|
||||
%files -n python3-gedit
|
||||
%{python3_sitearch}/gi/overrides/Gedit*
|
||||
%{python3_sitearch}/gi/overrides/__pycache__/Gedit*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS ChangeLog HACKING MAINTAINERS
|
||||
%doc AUTHORS HACKING MAINTAINERS
|
||||
%doc %{_datadir}/gtk-doc/html/gedit/
|
||||
%{_datadir}/gedit/gir-1.0/
|
||||
%{_includedir}/*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user