[pluma] 04/05: debian/patches: Rebase 2000_disable_python_plugins.patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch ubuntu/yakkety
in repository pluma.

commit 8bc4dabf962b315a195f6934381dab6726fddcfa
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Sep 9 14:56:36 2016 +0100

    debian/patches: Rebase 2000_disable_python_plugins.patch.
---
 debian/patches/2000_disable_python_plugins.patch | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/patches/2000_disable_python_plugins.patch b/debian/patches/2000_disable_python_plugins.patch
index 1bc0b40..ed4856d 100644
--- a/debian/patches/2000_disable_python_plugins.patch
+++ b/debian/patches/2000_disable_python_plugins.patch
@@ -1,16 +1,10 @@
-Description: Completely disable all Python plugins.
+Description: Completely disable all Python plugins requiring GTK2.
 Author: Martin Wimpress <code at flexion.org>
-Abstract:
- GTK2 Python plugins are not supported in a GTK3 build of Pluma. This
- patch prevents all GTK2 Python plugins from being built so that they
- do not appear in the Pluma Preferences. Attempting to enable a GTK2
- Python plugin in GTK3 Pluma will cause Pluma to crash.
 
-diff --git a/configure.ac b/configure.ac
-index 5b28f1f..17ac2e8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -407,21 +407,9 @@ plugin-loaders/python/bindings/Makefile
+diff -rupN a/configure.ac b/configure.ac
+--- a/configure.ac	2016-09-01 22:20:40.000000000 +0100
++++ b/configure.ac	2016-09-09 14:49:19.406130619 +0100
+@@ -385,21 +385,9 @@ plugin-loaders/python/bindings/Makefile
  plugins/Makefile
  plugins/changecase/Makefile
  plugins/docinfo/Makefile
@@ -32,10 +26,9 @@ index 5b28f1f..17ac2e8 100644
  plugins/sort/Makefile
  plugins/spell/Makefile
  plugins/spell/org.mate.pluma.plugins.spell.gschema.xml
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 74aa8d8..c80139c 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
+diff -rupN a/plugins/Makefile.am b/plugins/Makefile.am
+--- a/plugins/Makefile.am	2016-09-01 22:20:40.000000000 +0100
++++ b/plugins/Makefile.am	2016-09-09 14:49:51.146275256 +0100
 @@ -1,12 +1,8 @@
  DIST_SUBDIRS =		\
  	changecase 	\
@@ -60,4 +53,3 @@ index 74aa8d8..c80139c 100644
  if ENABLE_ENCHANT
  SUBDIRS      += spell
  endif
- 
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/pluma.git