[Pkg-javascript-commits] [rainloop] 01/02: Unbundled ckeditor.

Fri Jan 12 08:28:57 UTC 2018

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

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit e52480c0e1e7becc641fca4c97112f29705431df
Author: Daniel Ring <dring at wolfishly.me>
Date:   Wed Jan 10 21:17:08 2018 -0800

    Unbundled ckeditor.
---
 debian/Makefile                      | 19 +++++--------------
 debian/copyright                     | 31 +++++++++++++++++++++++++++++++
 debian/patches/debian-ckeditor.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/rainloop.links                |  1 +
 debian/source/lintian-overrides      |  4 ++--
 6 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/debian/Makefile b/debian/Makefile
index 1219d3f..c723ea4 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -26,8 +26,8 @@ clean:
 	#cleanOpenPGP
 	rm -f rainloop/v/0.0.0/static/js/min/openpgp.*
 	#cleanCKEditor
-	rm -rf rainloop/v/0.0.0/static/ckeditor/
-	mkdir rainloop/v/0.0.0/static/ckeditor
+	rm -rf rainloop/v/0.0.0/static/ckeditor-plugins/
+	mkdir rainloop/v/0.0.0/static/ckeditor-plugins
 	#cleanDist
 	rm -rf build/dist/
 
@@ -179,19 +179,13 @@ lightgallery: | clean
 fontastic: | clean
 	cp vendors/fontastic/fonts/rainloop.* rainloop/v/0.0.0/static/css/fonts/
 
-.PHONY: ckeditor
-ckeditor:
-	cp vendors/ckeditor/*.js vendors/ckeditor/*.css rainloop/v/0.0.0/static/ckeditor/
-	cp -r vendors/ckeditor/lang  rainloop/v/0.0.0/static/ckeditor/
-	cp -r vendors/ckeditor/plugins  rainloop/v/0.0.0/static/ckeditor/
-	cp -r vendors/ckeditor/skins  rainloop/v/0.0.0/static/ckeditor/
-
 .PHONY: ckeditorPlugins
 ckeditorPlugins:
-	cp -r vendors/ckeditor-plugins/* rainloop/v/0.0.0/static/ckeditor/plugins/
+	cp -r vendors/ckeditor-plugins/plain rainloop/v/0.0.0/static/ckeditor-plugins/
+	cp -r vendors/ckeditor-plugins/signature rainloop/v/0.0.0/static/ckeditor-plugins/
 
 .PHONY: vendors
-vendors: | moment ckeditor ckeditorPlugins fontastic lightgallery
+vendors: | moment ckeditorPlugins fontastic lightgallery
 
 
 
@@ -216,15 +210,12 @@ copy: | jsMin cssMin vendors
 	#Remove VCS control files for upstream bundled libraries
 	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/.gitignore
 	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/.gitmodules
-	rm -f build/dist/rainloop/static/ckeditor/plugins/quicktable/.gitignore
 	#Remove extra license files for upstream bundled libraries
 	rm -f build/dist/rainloop/app/libraries/MailSo/LICENSE
 	rm -f build/dist/rainloop/app/libraries/Mobile_Detect/LICENSE.txt
 	rm -f build/dist/rainloop/app/libraries/lessphp/LICENSE
 	rm -f build/dist/rainloop/app/libraries/spyc/COPYING
 	rm -f build/dist/rainloop/app/libraries/tmhOAuth/LICENSE
-	rm -f build/dist/rainloop/static/ckeditor/plugins/base64image/LICENSE.md
-	rm -f build/dist/rainloop/static/ckeditor/plugins/quicktable/LICENSE
 
 .PHONY: setup
 setup: | copy
diff --git a/debian/copyright b/debian/copyright
index 1fc6f00..2d52684 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,6 +81,14 @@ Files: vendors/ckeditor/* vendors/ckeditor-plugins/*
 Copyright: 2003-2017 CKSource - Frederico Knabben
 License: GPL-3
 
+Files: vendors/ckeditor/plugins/base64image/*
+Copyright: 2014 ALL-INKL.COM - Neue Medien Munnich
+License: GPL-2 or LGPL-2.1
+
+Files: vendors/ckeditor/plugins/quicktable/*
+Copyright: 2016 ufdada
+License: GPL-2
+
 Files: vendors/inputosaurus/*
 Copyright: 2012 Dan Kielp <dan at sproutsocial.com>
 License: Expat
@@ -903,6 +911,29 @@ License: Apache-2.0
  be found in "/usr/share/common-licenses/Apache-2.0".
 
 
+License: GPL-2
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+
 License: GPL-3
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
diff --git a/debian/patches/debian-ckeditor.patch b/debian/patches/debian-ckeditor.patch
new file mode 100644
index 0000000..b78a31a
--- /dev/null
+++ b/debian/patches/debian-ckeditor.patch
@@ -0,0 +1,29 @@
+Add Debian paths for upstream's ckeditor plugins to the load process.
+--- a/dev/Common/HtmlEditor.js
++++ b/dev/Common/HtmlEditor.js
+@@ -258,6 +258,9 @@
+ 						allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
+ 						biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons');
+ 
++					window.CKEDITOR.plugins.addExternal('plain', window.location.href.split('#')[0]+'static/ckeditor-plugins/plain/');
++					window.CKEDITOR.plugins.addExternal('signature', window.location.href.split('#')[0]+'static/ckeditor-plugins/signature/');
++
+ 					if ((allowSource || !biti) && !config.toolbarGroups.__cfgInited)
+ 					{
+ 						config.toolbarGroups.__cfgInited = true;
+--- a/dev/Common/Globals.js
++++ b/dev/Common/Globals.js
+@@ -112,11 +112,11 @@
+ 		{name: 'others'}
+ 	],
+ 
+-	'removePlugins': 'liststyle',
++	'removePlugins': 'liststyle,div,elementspath,flash,horizontalrule,iframe,indentblock,justify,newpage,pagebreak,preview,print,resize,smiley,stylescombo,templates',
+ 	'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll,Source',
+ 	'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',
+ 
+-	'extraPlugins': 'plain,signature',
++	'extraPlugins': 'plain,signature,divarea',
+ 
+ 	'allowedContent': true,
+ 	'extraAllowedContent': true,
diff --git a/debian/patches/series b/debian/patches/series
index 7996cbf..655fc1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian-ckeditor.patch
 debian-libraries.patch
 disable-version-path.patch
 set-custom-data-path.patch
diff --git a/debian/rainloop.links b/debian/rainloop.links
index 992b742..ddf247a 100644
--- a/debian/rainloop.links
+++ b/debian/rainloop.links
@@ -4,3 +4,4 @@ usr/share/php/pclzip.lib.php	usr/share/rainloop/app/libraries/pclzip/pclzip.lib.
 usr/share/php/GuzzleHttp/	usr/share/rainloop/app/libraries/GuzzleHttp
 usr/share/php/			usr/share/rainloop/app/libraries/phpseclib
 usr/share/php/Predis/		usr/share/rainloop/app/libraries/Predis
+usr/share/javascript/ckeditor	usr/share/rainloop/static/ckeditor
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index b872b0d..ac6bae0 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,8 +2,8 @@
 rainloop source: source-is-missing dev/Common/Consts.js *
 rainloop source: source-is-missing vendors/jua/jua.js *
 
-#Amalgamated and minified copy of package "ckeditor"; bundled by upstream,
-#package fails to load synchronously unless amalgamated
+#Amalgamated and minified copy of package "ckeditor" bundled by upstream,
+#unused in build
 rainloop source: source-is-missing vendors/ckeditor/*
 
 #Source provided as vendors/bootstrap/js/bootstrap.orig.js

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

