Merge lp:~fjkong/gedit/ubuntu into lp:~ubuntu-desktop/gedit/ubuntu

[FanJun Kong - ( BH1SCW )]

  * Remove two patches: git_revert_gtk322.patch
                        git_revert_gtksourceview322.patch
      + libgtk-3-dev (>= 3.21.3)
      + libgtksourceview-3.0-dev (>= 3.21.2)

[Iain Lane (laney)]

Thanks!

I just reworded the changelog a little bit - please see the branch.

Uploading now

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-18 20:39:11 +0000
+++ debian/changelog	2016-11-02 11:42:07 +0000
@@ -1,3 +1,12 @@
+gedit (3.22.0-1ubuntu2) zesty; urgency=medium
+
+  * Remove two patches: git_revert_gtk322.patch
+                        git_revert_gtksourceview322.patch
+      + libgtk-3-dev (>= 3.21.3)
+      + libgtksourceview-3.0-dev (>= 3.21.2)
+
+ -- FJKong <[e-mail]>  Sat, 29 Oct 2016 04:04:52 +0800
+
 gedit (3.22.0-1ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2016-09-18 20:37:48 +0000
+++ debian/control	2016-11-02 11:42:07 +0000
@@ -18,8 +18,8 @@
                libgspell-1-dev (>= 0.2.5),
                libxml2-dev (>= 2.5.0),
                libglib2.0-dev (>= 2.44),
-               libgtk-3-dev (>= 3.19.0),
-               libgtksourceview-3.0-dev (>= 3.19.4),
+               libgtk-3-dev (>= 3.21.3),
+               libgtksourceview-3.0-dev (>= 3.21.2),
                libpeas-dev (>= 1.14.1),
                libx11-dev,
                python3 (>= 3.2.3),
@@ -90,7 +90,7 @@
 Depends: ${misc:Depends},
          gedit (>= ${gnome:Version}),
          gedit (<< ${gnome:NextVersion}),
-         libgtksourceview-3.0-dev (>= 3.19.4),
+         libgtksourceview-3.0-dev (>= 3.21.2),
          libpeas-dev (>= 1.14.1)
 Description: official text editor of the GNOME desktop environment (development files)
  gedit is a text editor which supports most standard editor features,

=== modified file 'debian/control.in'
--- debian/control.in	2016-09-18 20:37:48 +0000
+++ debian/control.in	2016-11-02 11:42:07 +0000
@@ -14,8 +14,8 @@
                libgspell-1-dev (>= 0.2.5),
                libxml2-dev (>= 2.5.0),
                libglib2.0-dev (>= 2.44),
-               libgtk-3-dev (>= 3.19.0),
-               libgtksourceview-3.0-dev (>= 3.19.4),
+               libgtk-3-dev (>= 3.21.3),
+               libgtksourceview-3.0-dev (>= 3.21.2),
                libpeas-dev (>= 1.14.1),
                libx11-dev,
                python3 (>= 3.2.3),
@@ -86,7 +86,7 @@
 Depends: ${misc:Depends},
          gedit (>= ${gnome:Version}),
          gedit (<< ${gnome:NextVersion}),
-         libgtksourceview-3.0-dev (>= 3.19.4),
+         libgtksourceview-3.0-dev (>= 3.21.2),
          libpeas-dev (>= 1.14.1)
 Description: official text editor of the GNOME desktop environment (development files)
  gedit is a text editor which supports most standard editor features,

=== removed file 'debian/patches/git_revert_gtk322.patch'
--- debian/patches/git_revert_gtk322.patch	2016-09-18 20:37:48 +0000
+++ debian/patches/git_revert_gtk322.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-From d4918b70e76604c77abf43f8b9f708e632ca675f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <[e-mail]>
-Date: Mon, 29 Aug 2016 10:08:43 +0200
-Subject: gedit-open-document-selector: Add max-content-height
-
-This is an (intentional) behavior change in GtkScrolledWindow, without
-this, the scrolled window can grow without limits and exceed the
-supported size of a texture.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=770430
----
- gedit/gedit-open-document-selector.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index da64884..e90cd33 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@ AC_SUBST(GEDIT_API_VERSION)
- 
- # Dependencies
- GLIB_REQUIRED=2.44
--GTK_REQUIRED=3.21.3
-+GTK_REQUIRED=3.19.0
- GTKSOURCEVIEW_REQUIRED=3.21.2
- LIBPEAS_REQUIRED=1.14.1
- LIBXML_REQUIRED=2.5.0
-diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c
-index 77075cd..1221d33 100644
---- a/gedit/gedit-open-document-selector.c
-+++ b/gedit/gedit-open-document-selector.c
-@@ -1053,8 +1053,6 @@ on_treeview_allocate (GtkWidget                 *widget     G_GNUC_UNUSED,
- 	treeview_height = row_height * limit_capped;
- 	gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (selector->scrolled_window),
- 	                                            treeview_height);
--	gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (selector->scrolled_window),
--	                                            treeview_height);
- 
- 	gtk_widget_set_size_request (selector->placeholder_box, -1, treeview_height);
- }
--- 
-cgit v0.12

=== removed file 'debian/patches/git_revert_gtksourceview322.patch'
--- debian/patches/git_revert_gtksourceview322.patch	2016-09-06 16:47:19 +0000
+++ debian/patches/git_revert_gtksourceview322.patch	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-From dc41eb699946f861d948435c3eb20aa30095b4e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <[e-mail]>
-Date: Sat, 4 Jun 2016 17:49:41 +0200
-Subject: search: use gtk_source_search_context_replace2()
-
-gtk_source_search_context_replace() is deprecated.
----
- README                        |  2 +-
- configure.ac                  |  2 +-
- gedit/gedit-commands-search.c | 12 ++++++------
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-Index: gedit-3.21.90/README
-===================================================================
---- gedit-3.21.90.orig/README
-+++ gedit-3.21.90/README
-@@ -64,7 +64,7 @@ Information about gedit mailing lists ca
- Installation
- ============
- 
--gedit requires GTK+ >= 3.20.0, GtkSourceView >= 3.21.2 and
-+gedit requires GTK+ >= 3.20.0, GtkSourceView >= 3.20.0 and
- libpeas >= 1.14.1 libraries. It also has a run-time dependency on an
- icon theme for its icons. If gedit fails to display icons, installing
- GNOME's default adwaita-icon-theme is a simple way of providing them.
-Index: gedit-3.21.90/configure.ac
-===================================================================
---- gedit-3.21.90.orig/configure.ac
-+++ gedit-3.21.90/configure.ac
-@@ -19,7 +19,7 @@ AC_SUBST(GEDIT_API_VERSION)
- # Dependencies
- GLIB_REQUIRED=2.44
- GTK_REQUIRED=3.19.0
--GTKSOURCEVIEW_REQUIRED=3.21.2
-+GTKSOURCEVIEW_REQUIRED=3.19.4
- LIBPEAS_REQUIRED=1.14.1
- LIBXML_REQUIRED=2.5.0
- GSPELL_REQUIRED=0.2.5
-Index: gedit-3.21.90/gedit/gedit-commands-search.c
-===================================================================
---- gedit-3.21.90.orig/gedit/gedit-commands-search.c
-+++ gedit-3.21.90/gedit/gedit-commands-search.c
-@@ -174,12 +174,11 @@ forward_search_finished (GtkSourceSearch
- 	GtkTextIter match_start;
- 	GtkTextIter match_end;
- 
--	found = gtk_source_search_context_forward_finish2 (search_context,
--							   result,
--							   &match_start,
--							   &match_end,
--							   NULL,
--							   NULL);
-+	found = gtk_source_search_context_forward_finish (search_context,
-+							  result,
-+							  &match_start,
-+							  &match_end,
-+							  NULL);
- 
- 	buffer = gtk_source_search_context_get_buffer (search_context);
- 
-@@ -280,12 +279,11 @@ backward_search_finished (GtkSourceSearc
- 	GtkTextIter match_end;
- 	GtkSourceBuffer *buffer;
- 
--	found = gtk_source_search_context_backward_finish2 (search_context,
--							    result,
--							    &match_start,
--							    &match_end,
--							    NULL,
--							    NULL);
-+	found = gtk_source_search_context_backward_finish (search_context,
-+							   result,
-+							   &match_start,
-+							   &match_end,
-+							   NULL);
- 
- 	buffer = gtk_source_search_context_get_buffer (search_context);
- 
-@@ -424,12 +422,12 @@ do_replace (GeditReplaceDialog *dialog,
- 
- 	gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start, &end);
- 
--	gtk_source_search_context_replace2 (search_context,
--					    &start,
--					    &end,
--					    unescaped_replace_text,
--					    -1,
--					    &error);
-+	gtk_source_search_context_replace (search_context,
-+					   &start,
-+					   &end,
-+					   unescaped_replace_text,
-+					   -1,
-+					   &error);
- 
- 	g_free (unescaped_replace_text);
- 
-Index: gedit-3.21.90/gedit/gedit-view-frame.c
-===================================================================
---- gedit-3.21.90.orig/gedit/gedit-view-frame.c
-+++ gedit-3.21.90/gedit/gedit-view-frame.c
-@@ -323,12 +323,11 @@ start_search_finished (GtkSourceSearchCo
- 	gboolean found;
- 	GtkSourceBuffer *buffer;
- 
--	found = gtk_source_search_context_forward_finish2 (search_context,
--							   result,
--							   &match_start,
--							   &match_end,
--							   NULL,
--							   NULL);
-+	found = gtk_source_search_context_forward_finish (search_context,
-+							  result,
-+							  &match_start,
-+							  &match_end,
-+							  NULL);
- 
- 	buffer = gtk_source_search_context_get_buffer (search_context);
- 
-@@ -387,12 +386,11 @@ forward_search_finished (GtkSourceSearch
- 	GtkTextIter match_end;
- 	gboolean found;
- 
--	found = gtk_source_search_context_forward_finish2 (search_context,
--							   result,
--							   &match_start,
--							   &match_end,
--							   NULL,
--							   NULL);
-+	found = gtk_source_search_context_forward_finish (search_context,
-+							  result,
-+							  &match_start,
-+							  &match_end,
-+							  NULL);
- 
- 	if (found)
- 	{
-@@ -445,12 +443,11 @@ backward_search_finished (GtkSourceSearc
- 	gboolean found;
- 	GtkSourceBuffer *buffer;
- 
--	found = gtk_source_search_context_backward_finish2 (search_context,
--							    result,
--							    &match_start,
--							    &match_end,
--							    NULL,
--							    NULL);
-+	found = gtk_source_search_context_backward_finish (search_context,
-+							   result,
-+							   &match_start,
-+							   &match_end,
-+							   NULL);
- 
- 	buffer = gtk_source_search_context_get_buffer (search_context);
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-09-18 20:37:48 +0000
+++ debian/patches/series	2016-11-02 11:42:07 +0000
@@ -4,5 +4,3 @@
 05_menu_label.patch
 08_multiarch_fallback.patch
 unity_no_csd.patch
-git_revert_gtk322.patch
-git_revert_gtksourceview322.patch