From 816676fee58a82d7a41a4f5cf4d938a6f1da11ea Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Jan 25 2020 20:30:47 +0000 Subject: Update to 2.2.11 - New upstream release 2.2.11 - This is a minor maintenance release and minor feature release; the only exception to that is the Python 3 compatibility, which is a major change and may introduce new bugs - Double click selection has been improved (for example selecting a function name that has underscores), and is now configurable per language - Bluefish now has a feature to fill a line with spaces up to a mouse click, so you can start typing in any position on the screen (with a fixed width font) - A crash when running very large replace actions on disk on many files has been fixed - Search and replace now ignores backup files by default - Cursor highlighting and line highlighting have been fixed for a rare bug - A small new feature has been added, to insert output from an external command in the current cursor position - Many language files have seen updates, most notably CSS, Python and HTML - A data loss bug - when an unknown encoding was selected - was fixed; the fallback is now to save as UTF-8 - A bug when saving with unknown characters in the filename has also been fixed - Printing has been improved, such as printing in landscape - Some small tweaks to the UI have been implemented, e.g. can now search in files in the filebrowser (right click a directory) - Search results can now be shown in the output pane - The current identifier can be selected using - Various fixes when Bluefish is run on top of Wayland --- diff --git a/bluefish-2.2.10-no-python.patch b/bluefish-2.2.10-no-python.patch deleted file mode 100644 index dc01055..0000000 --- a/bluefish-2.2.10-no-python.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- data/Makefile.am -+++ data/Makefile.am -@@ -10,6 +10,13 @@ nobase_bfdata_DATA = \ - default_accelmap \ - encodings \ - snippets \ -+ colorprofiles/Light_theme \ -+ colorprofiles/Dark_theme -+ -+bfdata_SCRIPTS = -+ -+if ENABLE_ZENCODING_PLUGIN -+nobase_bfdata_DATA += \ - lipsum/__init__.py \ - lipsum/data/dictionary.txt \ - lipsum/data/sample.txt \ -@@ -21,13 +28,12 @@ nobase_bfdata_DATA = \ - jsbeautifier/unpackers/myobfuscate.py \ - jsbeautifier/unpackers/__init__.py \ - jsbeautifier/unpackers/evalbased.py \ -- jsbeautifier/unpackers/urlencode.py \ -- colorprofiles/Light_theme \ -- colorprofiles/Dark_theme -+ jsbeautifier/unpackers/urlencode.py - --bfdata_SCRIPTS = \ -+bfdata_SCRIPTS += \ - lorem-ipsum-generator \ - jsbeautify \ - jsmin.py \ - css_decompressor \ - cssmin.py -+endif ---- src/bfwin_uimanager.c -+++ src/bfwin_uimanager.c -@@ -892,8 +892,10 @@ static const GtkActionEntry global_actio - {"DeleteLine", NULL, N_("_Delete Line"), "y", N_("Delete the current line"), - G_CALLBACK(ui_delete_line)}, - {"WordCount", NULL, N_("_Word Count"), NULL, N_("Word count"), G_CALLBACK(ui_word_count)}, -+#ifdef HAVE_PYTHON - {"LoremIpsum", NULL, N_("Lorem Ipsum generator"), NULL, N_("Lorem Ipsum generator"), - G_CALLBACK(ui_lorem_ipsum)}, -+#endif - {"RelativeFilename", NULL, N_("Insert Relative Filename"), NULL, N_("Insert Relative Filename"), - G_CALLBACK(ui_insert_relative_filename)}, - {"AbsoluteFilename", NULL, N_("Insert Absolute Filename"), NULL, N_("Insert Absolute Filename"), -@@ -911,8 +913,10 @@ static const GtkActionEntry global_actio - {"RewrapLines", NULL, N_("Rewrap _Lines"), NULL, N_("Rewrap lines"), G_CALLBACK(ui_rewrap_lines)}, - {"StripTrailingWhitespace", NULL, N_("Strip T_railing Whitespace"), NULL, N_("Strip trailing whitespace"), - G_CALLBACK(ui_strip_trailing_whitespace)}, -+#ifdef HAVE_PYTHON - {"JsBeautify", NULL, N_("Javascript beautifier"), NULL, N_("Javascript beautifier"), - G_CALLBACK(ui_jsbeautify)}, -+#endif - {"BrowserPreview", BF_STOCK_BROWSER_PREVIEW, N_("Preview in browser"), NULL, N_("Preview in browser"), - G_CALLBACK(ui_browser_preview)} - }; ---- src/rcfile.c -+++ src/rcfile.c -@@ -788,6 +788,7 @@ GList *update_filters(GList *current, gb - defaults = - g_list_append(defaults, - array_from_arglist(_("PHP Beautifier"), "|php_beautifier -t|", NULL)); -+#ifdef HAVE_PYTHON - #ifdef WIN32 - defaults = - g_list_append(defaults, -@@ -809,6 +810,7 @@ GList *update_filters(GList *current, gb - g_list_append(defaults, - array_from_arglist(_("Compress CSS"), "|"PKGDATADIR"/cssmin.py|", NULL)); - #endif -+#endif - defaults = - g_list_append(defaults, - array_from_arglist(_("CSS tidy"), "|csstidy --preserve_css=true -|", NULL)); ---- data/Makefile.in -+++ data/Makefile.in -@@ -89,6 +89,27 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+@ENABLE_ZENCODING_PLUGIN_TRUE@am__append_1 = \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/__init__.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/dictionary.txt \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/sample.txt \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/lipsum.xml \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/__init__.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/__version__.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/packer.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/javascriptobfuscator.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/myobfuscate.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/__init__.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/evalbased.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/urlencode.py -+ -+@ENABLE_ZENCODING_PLUGIN_TRUE@am__append_2 = \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ lorem-ipsum-generator \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautify \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ jsmin.py \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ css_decompressor \ -+@ENABLE_ZENCODING_PLUGIN_TRUE@ cssmin.py -+ - subdir = data - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -@@ -384,7 +405,6 @@ pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ --runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -397,32 +417,10 @@ SUBDIRS = bflang bflib templates - EXTRA_DIST = $(nobase_bfdata_DATA) $(bfdata_SCRIPTS) - MAINTAINERCLEANFILES = Makefile.in - bfdatadir = $(pkgdatadir) --nobase_bfdata_DATA = \ -- default_accelmap \ -- encodings \ -- snippets \ -- lipsum/__init__.py \ -- lipsum/data/dictionary.txt \ -- lipsum/data/sample.txt \ -- lipsum/data/lipsum.xml \ -- jsbeautifier/__init__.py \ -- jsbeautifier/__version__.py \ -- jsbeautifier/unpackers/packer.py \ -- jsbeautifier/unpackers/javascriptobfuscator.py \ -- jsbeautifier/unpackers/myobfuscate.py \ -- jsbeautifier/unpackers/__init__.py \ -- jsbeautifier/unpackers/evalbased.py \ -- jsbeautifier/unpackers/urlencode.py \ -- colorprofiles/Light_theme \ -- colorprofiles/Dark_theme -- --bfdata_SCRIPTS = \ -- lorem-ipsum-generator \ -- jsbeautify \ -- jsmin.py \ -- css_decompressor \ -- cssmin.py -- -+nobase_bfdata_DATA = default_accelmap encodings snippets \ -+ colorprofiles/Light_theme colorprofiles/Dark_theme \ -+ $(am__append_1) -+bfdata_SCRIPTS = $(am__append_2) - all: all-recursive - - .SUFFIXES: diff --git a/bluefish-2.2.10-shellbang.patch b/bluefish-2.2.10-shellbang.patch deleted file mode 100644 index 521785b..0000000 --- a/bluefish-2.2.10-shellbang.patch +++ /dev/null @@ -1,264 +0,0 @@ ---- data/cssmin.py -+++ data/cssmin.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - """`cssmin` - A Python port of the YUI CSS compressor.""" ---- data/jsbeautify -+++ data/jsbeautify -@@ -1,7 +1,7 @@ --#! /usr/bin/env python -+#! /usr/bin/python2 - # - # Stub script to run jsbeautifier - # - import sys - from jsbeautifier import main --sys.exit(main()) -\ No newline at end of file -+sys.exit(main()) ---- data/jsmin.py -+++ data/jsmin.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - # This code is original from jsmin by Douglas Crockford, it was translated to - # Python by Baruch Even. It was rewritten by Dave St.Germain for speed. ---- data/lorem-ipsum-generator -+++ data/lorem-ipsum-generator -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - - import sys - from os.path import abspath, exists ---- src/plugin_zencoding/zencoding/actions/basic.py -+++ src/plugin_zencoding/zencoding/actions/basic.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - """ ---- src/plugin_zencoding/zencoding/actions/__init__.py -+++ src/plugin_zencoding/zencoding/actions/__init__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - # import all actions -@@ -12,4 +12,4 @@ for file in os.listdir(os.path.dirname(_ - - __import__(__name__, globals(), locals(), __sub_modules) - --del __sub_modules -\ No newline at end of file -+del __sub_modules ---- src/plugin_zencoding/zencoding/actions/token.py -+++ src/plugin_zencoding/zencoding/actions/token.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' ---- src/plugin_zencoding/zencoding/filters/comment.py -+++ src/plugin_zencoding/zencoding/filters/comment.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -44,4 +44,4 @@ def process(tree, profile): - add_comments(item, i) - process(item, profile) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/css.py -+++ src/plugin_zencoding/zencoding/filters/css.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - ''' - Process CSS properties: replaces snippets, augumented with ! char, with -@@ -20,4 +20,4 @@ def process(tree, profile): - - process(item, profile) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/escape.py -+++ src/plugin_zencoding/zencoding/filters/escape.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -28,4 +28,4 @@ def process(tree, profile=None): - - process(item) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/format-css.py -+++ src/plugin_zencoding/zencoding/filters/format-css.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -21,4 +21,4 @@ def process(tree, profile): - - process(item, profile) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/format.py -+++ src/plugin_zencoding/zencoding/filters/format.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - """ -@@ -179,4 +179,4 @@ def process(tree, profile, level=0): - - process(item, profile, level + 1) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/haml.py -+++ src/plugin_zencoding/zencoding/filters/haml.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -157,4 +157,4 @@ def process(tree, profile, level=0): - - process(item, profile, level + 1) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/html.py -+++ src/plugin_zencoding/zencoding/filters/html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' ---- src/plugin_zencoding/zencoding/filters/__init__.py -+++ src/plugin_zencoding/zencoding/filters/__init__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - import os.path -@@ -14,4 +14,4 @@ for file in os.listdir(os.path.dirname(_ - - __import__(__name__, globals(), locals(), __sub_modules) - --del __sub_modules -\ No newline at end of file -+del __sub_modules ---- src/plugin_zencoding/zencoding/filters/single-line.py -+++ src/plugin_zencoding/zencoding/filters/single-line.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - ''' - Output abbreviation on a single line (i.e. no line breaks) -@@ -26,4 +26,4 @@ def process(tree, profile): - - process(item, profile) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/trim.py -+++ src/plugin_zencoding/zencoding/filters/trim.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - ''' - Trim filter: removes characters at the beginning of the text -@@ -19,4 +19,4 @@ def process(tree, profile): - - process(item, profile) - -- return tree -\ No newline at end of file -+ return tree ---- src/plugin_zencoding/zencoding/filters/xsl.py -+++ src/plugin_zencoding/zencoding/filters/xsl.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -30,4 +30,4 @@ def process(tree, profile): - if item.type == 'tag' and item.name.lower() in tags and item.children: - trim_attribute(item) - -- process(item, profile) -\ No newline at end of file -+ process(item, profile) ---- src/plugin_zencoding/zencoding/html_matcher.py -+++ src/plugin_zencoding/zencoding/html_matcher.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - - ''' -@@ -270,4 +270,4 @@ def _find_pair(html, start_ix, mode='xht - - ix += 1 - -- return action(opening_tag, closing_tag, start_ix) -\ No newline at end of file -+ return action(opening_tag, closing_tag, start_ix) ---- src/plugin_zencoding/zencoding/resources.py -+++ src/plugin_zencoding/zencoding/resources.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - ''' - @author Sergey Chikuyonok (serge.che@gmail.com) -@@ -367,4 +367,4 @@ if not user_settings: - pass - - if user_settings: -- set_vocabulary(user_settings, VOC_USER) -\ No newline at end of file -+ set_vocabulary(user_settings, VOC_USER) ---- src/plugin_zencoding/zencoding/utils.py -+++ src/plugin_zencoding/zencoding/utils.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - ''' - Core Zen Coding library. Contains various text manipulation functions: diff --git a/bluefish-2.2.11-no-python.patch b/bluefish-2.2.11-no-python.patch new file mode 100644 index 0000000..7adb8c8 --- /dev/null +++ b/bluefish-2.2.11-no-python.patch @@ -0,0 +1,150 @@ +--- data/Makefile.am ++++ data/Makefile.am +@@ -10,6 +10,13 @@ nobase_bfdata_DATA = \ + default_accelmap \ + encodings \ + snippets \ ++ colorprofiles/Light_theme \ ++ colorprofiles/Dark_theme ++ ++bfdata_SCRIPTS = ++ ++if ENABLE_ZENCODING_PLUGIN ++nobase_bfdata_DATA += \ + lipsum/__init__.py \ + lipsum/data/dictionary.txt \ + lipsum/data/sample.txt \ +@@ -21,13 +28,12 @@ nobase_bfdata_DATA = \ + jsbeautifier/unpackers/myobfuscate.py \ + jsbeautifier/unpackers/__init__.py \ + jsbeautifier/unpackers/evalbased.py \ +- jsbeautifier/unpackers/urlencode.py \ +- colorprofiles/Light_theme \ +- colorprofiles/Dark_theme ++ jsbeautifier/unpackers/urlencode.py + +-bfdata_SCRIPTS = \ ++bfdata_SCRIPTS += \ + lorem-ipsum-generator \ + jsbeautify \ + jsmin.py \ + css_decompressor \ + cssmin.py ++endif +--- src/bfwin_uimanager.c ++++ src/bfwin_uimanager.c +@@ -912,8 +912,10 @@ static const GtkActionEntry global_actio + {"DeleteLine", NULL, N_("_Delete Line"), "y", N_("Delete the current line"), + G_CALLBACK(ui_delete_line)}, + {"WordCount", NULL, N_("_Word Count"), NULL, N_("Word count"), G_CALLBACK(ui_word_count)}, ++#ifdef HAVE_PYTHON + {"LoremIpsum", NULL, N_("Lorem Ipsum generator"), NULL, N_("Lorem Ipsum generator"), + G_CALLBACK(ui_lorem_ipsum)}, ++#endif + {"RelativeFilename", NULL, N_("Insert Relative Filename"), NULL, N_("Insert Relative Filename"), + G_CALLBACK(ui_insert_relative_filename)}, + {"AbsoluteFilename", NULL, N_("Insert Absolute Filename"), NULL, N_("Insert Absolute Filename"), +@@ -931,8 +933,10 @@ static const GtkActionEntry global_actio + {"RewrapLines", NULL, N_("Rewrap _Lines"), NULL, N_("Rewrap lines"), G_CALLBACK(ui_rewrap_lines)}, + {"StripTrailingWhitespace", NULL, N_("Strip T_railing Whitespace"), NULL, N_("Strip trailing whitespace"), + G_CALLBACK(ui_strip_trailing_whitespace)}, ++#ifdef HAVE_PYTHON + {"JsBeautify", NULL, N_("Javascript beautifier"), NULL, N_("Javascript beautifier"), + G_CALLBACK(ui_jsbeautify)}, ++#endif + {"BrowserPreview", BF_STOCK_BROWSER_PREVIEW, N_("Preview in browser"), NULL, N_("Preview in browser"), + G_CALLBACK(ui_browser_preview)} + }; +--- src/rcfile.c ++++ src/rcfile.c +@@ -789,6 +789,7 @@ GList *update_filters(GList *current, gb + defaults = + g_list_append(defaults, + array_from_arglist(_("PHP Beautifier"), "|php_beautifier -t|", NULL)); ++#ifdef HAVE_PYTHON + #ifdef WIN32 + defaults = + g_list_append(defaults, +@@ -810,6 +811,7 @@ GList *update_filters(GList *current, gb + g_list_append(defaults, + array_from_arglist(_("Compress CSS"), "|"PKGDATADIR"/cssmin.py|", NULL)); + #endif ++#endif + defaults = + g_list_append(defaults, + array_from_arglist(_("CSS tidy"), "|csstidy - --preserve_css=true --silent=true |", NULL)); +--- data/Makefile.in ++++ data/Makefile.in +@@ -89,6 +89,27 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ ++@ENABLE_ZENCODING_PLUGIN_TRUE@am__append_1 = \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/__init__.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/dictionary.txt \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/sample.txt \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ lipsum/data/lipsum.xml \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/__init__.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/__version__.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/packer.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/javascriptobfuscator.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/myobfuscate.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/__init__.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/evalbased.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautifier/unpackers/urlencode.py ++ ++@ENABLE_ZENCODING_PLUGIN_TRUE@am__append_2 = \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ lorem-ipsum-generator \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsbeautify \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ jsmin.py \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ css_decompressor \ ++@ENABLE_ZENCODING_PLUGIN_TRUE@ cssmin.py ++ + subdir = data + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +@@ -395,7 +416,6 @@ program_transform_name = @program_transf + psdir = @psdir@ + pyexecdir = @pyexecdir@ + pythondir = @pythondir@ +-runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +@@ -408,32 +428,10 @@ SUBDIRS = bflang bflib templates + EXTRA_DIST = $(nobase_bfdata_DATA) $(bfdata_SCRIPTS) + MAINTAINERCLEANFILES = Makefile.in + bfdatadir = $(pkgdatadir) +-nobase_bfdata_DATA = \ +- default_accelmap \ +- encodings \ +- snippets \ +- lipsum/__init__.py \ +- lipsum/data/dictionary.txt \ +- lipsum/data/sample.txt \ +- lipsum/data/lipsum.xml \ +- jsbeautifier/__init__.py \ +- jsbeautifier/__version__.py \ +- jsbeautifier/unpackers/packer.py \ +- jsbeautifier/unpackers/javascriptobfuscator.py \ +- jsbeautifier/unpackers/myobfuscate.py \ +- jsbeautifier/unpackers/__init__.py \ +- jsbeautifier/unpackers/evalbased.py \ +- jsbeautifier/unpackers/urlencode.py \ +- colorprofiles/Light_theme \ +- colorprofiles/Dark_theme +- +-bfdata_SCRIPTS = \ +- lorem-ipsum-generator \ +- jsbeautify \ +- jsmin.py \ +- css_decompressor \ +- cssmin.py +- ++nobase_bfdata_DATA = default_accelmap encodings snippets \ ++ colorprofiles/Light_theme colorprofiles/Dark_theme \ ++ $(am__append_1) ++bfdata_SCRIPTS = $(am__append_2) + all: all-recursive + + .SUFFIXES: diff --git a/bluefish-2.2.11-shellbang.patch b/bluefish-2.2.11-shellbang.patch new file mode 100644 index 0000000..a873ab5 --- /dev/null +++ b/bluefish-2.2.11-shellbang.patch @@ -0,0 +1,272 @@ +--- data/css_decompressor ++++ data/css_decompressor +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + +--- data/cssmin.py ++++ data/cssmin.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """`cssmin` - A Python port of the YUI CSS compressor.""" +--- data/jsbeautify ++++ data/jsbeautify +@@ -1,7 +1,7 @@ +-#! /usr/bin/env python ++#! /usr/bin/python2 + # + # Stub script to run jsbeautifier + # + import sys + from jsbeautifier import main +-sys.exit(main()) +\ No newline at end of file ++sys.exit(main()) +--- data/jsmin.py ++++ data/jsmin.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + # This code is original from jsmin by Douglas Crockford, it was translated to + # Python by Baruch Even. It was rewritten by Dave St.Germain for speed. +--- data/lorem-ipsum-generator ++++ data/lorem-ipsum-generator +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + + import sys + from os.path import abspath, exists +--- src/plugin_zencoding/zencoding/actions/basic.py ++++ src/plugin_zencoding/zencoding/actions/basic.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +--- src/plugin_zencoding/zencoding/actions/__init__.py ++++ src/plugin_zencoding/zencoding/actions/__init__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + # import all actions +@@ -12,4 +12,4 @@ for file in os.listdir(os.path.dirname(_ + + __import__(__name__, globals(), locals(), __sub_modules) + +-del __sub_modules +\ No newline at end of file ++del __sub_modules +--- src/plugin_zencoding/zencoding/actions/token.py ++++ src/plugin_zencoding/zencoding/actions/token.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +--- src/plugin_zencoding/zencoding/filters/comment.py ++++ src/plugin_zencoding/zencoding/filters/comment.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -44,4 +44,4 @@ def process(tree, profile): + add_comments(item, i) + process(item, profile) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/css.py ++++ src/plugin_zencoding/zencoding/filters/css.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + ''' + Process CSS properties: replaces snippets, augumented with ! char, with +@@ -20,4 +20,4 @@ def process(tree, profile): + + process(item, profile) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/escape.py ++++ src/plugin_zencoding/zencoding/filters/escape.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -28,4 +28,4 @@ def process(tree, profile=None): + + process(item) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/format-css.py ++++ src/plugin_zencoding/zencoding/filters/format-css.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -21,4 +21,4 @@ def process(tree, profile): + + process(item, profile) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/format.py ++++ src/plugin_zencoding/zencoding/filters/format.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +@@ -179,4 +179,4 @@ def process(tree, profile, level=0): + + process(item, profile, level + 1) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/haml.py ++++ src/plugin_zencoding/zencoding/filters/haml.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -157,4 +157,4 @@ def process(tree, profile, level=0): + + process(item, profile, level + 1) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/html.py ++++ src/plugin_zencoding/zencoding/filters/html.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +--- src/plugin_zencoding/zencoding/filters/__init__.py ++++ src/plugin_zencoding/zencoding/filters/__init__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + import os.path +@@ -14,4 +14,4 @@ for file in os.listdir(os.path.dirname(_ + + __import__(__name__, globals(), locals(), __sub_modules) + +-del __sub_modules +\ No newline at end of file ++del __sub_modules +--- src/plugin_zencoding/zencoding/filters/single-line.py ++++ src/plugin_zencoding/zencoding/filters/single-line.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + ''' + Output abbreviation on a single line (i.e. no line breaks) +@@ -26,4 +26,4 @@ def process(tree, profile): + + process(item, profile) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/trim.py ++++ src/plugin_zencoding/zencoding/filters/trim.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + ''' + Trim filter: removes characters at the beginning of the text +@@ -19,4 +19,4 @@ def process(tree, profile): + + process(item, profile) + +- return tree +\ No newline at end of file ++ return tree +--- src/plugin_zencoding/zencoding/filters/xsl.py ++++ src/plugin_zencoding/zencoding/filters/xsl.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -30,4 +30,4 @@ def process(tree, profile): + if item.type == 'tag' and item.name.lower() in tags and item.children: + trim_attribute(item) + +- process(item, profile) +\ No newline at end of file ++ process(item, profile) +--- src/plugin_zencoding/zencoding/html_matcher.py ++++ src/plugin_zencoding/zencoding/html_matcher.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + ''' +@@ -270,4 +270,4 @@ def _find_pair(html, start_ix, mode='xht + + ix += 1 + +- return action(opening_tag, closing_tag, start_ix) +\ No newline at end of file ++ return action(opening_tag, closing_tag, start_ix) +--- src/plugin_zencoding/zencoding/resources.py ++++ src/plugin_zencoding/zencoding/resources.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + ''' + @author Sergey Chikuyonok (serge.che@gmail.com) +@@ -367,4 +367,4 @@ if not user_settings: + pass + + if user_settings: +- set_vocabulary(user_settings, VOC_USER) +\ No newline at end of file ++ set_vocabulary(user_settings, VOC_USER) +--- src/plugin_zencoding/zencoding/utils.py ++++ src/plugin_zencoding/zencoding/utils.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + ''' + Core Zen Coding library. Contains various text manipulation functions: diff --git a/bluefish.spec b/bluefish.spec index b0a09c0..112c7e3 100644 --- a/bluefish.spec +++ b/bluefish.spec @@ -1,6 +1,6 @@ -%global pkgver 2.2.10 +%global pkgver 2.2.11 #global prerel rc1 -%global rpmrel 13 +%global rpmrel 1 Name: bluefish Version: %{pkgver} @@ -10,8 +10,8 @@ License: GPLv3+ URL: http://bluefish.openoffice.nl/ Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2 Patch0: bluefish-2.2.10-strict-aliasing.patch -Patch1: bluefish-2.2.10-shellbang.patch -Patch2: bluefish-2.2.10-no-python.patch +Patch1: bluefish-2.2.11-shellbang.patch +Patch2: bluefish-2.2.11-no-python.patch BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: enchant-devel >= 1.4.2 @@ -91,6 +91,7 @@ Files common to every architecture version of %{name}. %patch0 # Avoid use of /usr/bin/env in shipped scripts +# Also change /usr/bin/python → /usr/bin/python2 (for now) %patch1 # Strip all python content if we don't have Python @@ -136,7 +137,7 @@ desktop-file-validate \ # %%{bluefish_docdir} even though we put them in the # shared-data subpackage install -m 644 -p -t %{buildroot}%{bluefish_docdir}/ \ - AUTHORS ChangeLog %{!?_licensedir:COPYING} NEWS README TODO + AUTHORS ChangeLog %{!?_licensedir:COPYING} README TODO # Unpackaged files rm -f %{buildroot}%{_libdir}/%{name}/*.la @@ -205,6 +206,34 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_mandir}/man1/%{name}.1* %changelog +* Sat Jan 25 2020 Paul Howarth - 2.2.11-1 +- Update to 2.2.11 + - This is a minor maintenance release and minor feature release; the only + exception to that is the Python 3 compatibility, which is a major change + and may introduce new bugs + - Double click selection has been improved (for example selecting a function + name that has underscores), and is now configurable per language + - Bluefish now has a feature to fill a line with spaces up to a mouse click, + so you can start typing in any position on the screen (with a fixed width + font) + - A crash when running very large replace actions on disk on many files has + been fixed + - Search and replace now ignores backup files by default + - Cursor highlighting and line highlighting have been fixed for a rare bug + - A small new feature has been added, to insert output from an external + command in the current cursor position + - Many language files have seen updates, most notably CSS, Python and HTML + - A data loss bug - when an unknown encoding was selected - was fixed; the + fallback is now to save as UTF-8 + - A bug when saving with unknown characters in the filename has also been + fixed + - Printing has been improved, such as printing in landscape + - Some small tweaks to the UI have been implemented, e.g. can now search in + files in the filebrowser (right click a directory) + - Search results can now be shown in the output pane + - The current identifier can be selected using + - Various fixes when Bluefish is run on top of Wayland + * Mon Nov 4 2019 Paul Howarth - 2.2.10-13 - Disable Python functionality on F-32, EL-8 onwards as it requires Python 2 https://bugzilla.redhat.com/show_bug.cgi?id=1737907 diff --git a/sources b/sources index a307c8b..2f5f570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bluefish-2.2.10.tar.bz2) = ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb +SHA512 (bluefish-2.2.11.tar.bz2) = ae9ef04d5d005fa770b542a6a573ac60d4b8c4dd605723012322a63647399ccb76689791ee373308ce13a1772719ab1003929fce415cf1df7e83ef2f26271fa0