javascript: disable build by default and remove Debian packaging of JavaScript plugin (issue #360)

This commit is contained in:
Sébastien Helleu 2020-06-13 13:51:01 +02:00
parent 99a324b76f
commit 340d6646a6
30 changed files with 125 additions and 342 deletions

View File

@ -110,7 +110,7 @@ option(ENABLE_RUBY "Enable Ruby scripting language" ON)
option(ENABLE_LUA "Enable Lua scripting language" ON)
option(ENABLE_TCL "Enable Tcl scripting language" ON)
option(ENABLE_GUILE "Enable Scheme (guile) scripting language" ON)
option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language" ON)
option(ENABLE_JAVASCRIPT "Enable JavaScript scripting language" OFF)
option(ENABLE_PHP "Enable PHP scripting language" ON)
option(ENABLE_SPELL "Enable Spell checker plugin" ON)
option(ENABLE_ENCHANT "Enable Enchant lib for Spell checker plugin" OFF)

View File

@ -89,6 +89,7 @@ Tests::
Build::
* javascript: disable build by default and remove Debian packaging of JavaScript plugin (issue #360)
* core: make GnuTLS a required dependency
* core: fix build with CMake 3.17.0
* core: fix build with cygport on Cygwin

View File

@ -159,7 +159,7 @@ AC_ARG_ENABLE(ruby, [ --disable-ruby turn off Ruby script plug
AC_ARG_ENABLE(lua, [ --disable-lua turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
AC_ARG_ENABLE(tcl, [ --disable-tcl turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
AC_ARG_ENABLE(guile, [ --disable-guile turn off Guile (scheme) script plugin (default=compiled if found)],enable_guile=$enableval,enable_guile=yes)
AC_ARG_ENABLE(javascript, [ --disable-javascript turn off JavaScript script plugin (default=compiled if found)],enable_javascript=$enableval,enable_javascript=yes)
AC_ARG_ENABLE(javascript, [ --enable-javascript turn on JavaScript script plugin (default=off)],enable_javascript=$enableval,enable_javascript=no)
AC_ARG_ENABLE(php, [ --disable-php turn off PHP script plugin (default=compiled if found)],enable_php=$enableval,enable_php=yes)
AC_ARG_ENABLE(spell, [ --disable-spell turn off Spell checker plugin (default=compiled)],enable_spell=$enableval,enable_spell=yes)
AC_ARG_ENABLE(enchant, [ --enable-enchant turn on Enchant lib for Spell checker plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)

View File

@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
@ -47,7 +46,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -77,7 +76,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -108,7 +107,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -233,19 +232,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.
Package: weechat-devel-javascript
Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${misc:Depends},
${shlibs:Depends},
weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
Conflicts: weechat-javascript
Description: Fast, light and extensible chat client - JavaScript plugin
WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
for many operating systems. Everything can be done with a keyboard.
.
This package provides the JavaScript scripting API plugin.
Package: weechat-devel-php
Architecture: any
Depends:

View File

@ -1 +0,0 @@
../debian-stable/weechat-javascript.dirs

View File

@ -1 +0,0 @@
../debian-stable/weechat-javascript.install

View File

@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
@ -46,7 +45,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -75,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -105,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
- Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@ -222,18 +221,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.
Package: weechat-javascript
Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${misc:Depends},
${shlibs:Depends},
weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
Description: Fast, light and extensible chat client - JavaScript plugin
WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
for many operating systems. Everything can be done with a keyboard.
.
This package provides the JavaScript scripting API plugin.
Package: weechat-php
Architecture: any
Depends:

View File

@ -78,15 +78,6 @@ Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
2012, Simon Arlott
License: GPL-3+
Files: src/plugins/javascript/weechat-js-api.cpp
src/plugins/javascript/weechat-js-api.h
src/plugins/javascript/weechat-js-v8.cpp
src/plugins/javascript/weechat-js-v8.h
src/plugins/javascript/weechat-js.cpp
src/plugins/javascript/weechat-js.h
Copyright: 2013, Koka El Kiwi <kokakiwi@kokakiwi.net>
License: GPL-3+
Files: src/plugins/lua/weechat-lua-api.c
Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
2012, Simon Arlott

View File

@ -1 +0,0 @@
usr/lib

View File

@ -1 +0,0 @@
usr/lib/*/weechat/plugins/javascript.so

View File

@ -231,7 +231,7 @@ Liste von häufig verwendeten Optionen:
| ENABLE_IRC | `ON`, `OFF` | ON |
kompiliert <<irc_plugin,IRC Erweiterung>>.
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
kompiliert <<scripts_plugins,JavaScript Erweiterung>>.
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -222,7 +222,7 @@ List of commonly used options:
| ENABLE_IRC | `ON`, `OFF` | ON |
Compile <<irc_plugin,IRC plugin>>.
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,JavaScript plugin>>.
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -228,7 +228,7 @@ Liste des options couramment utilisées :
| ENABLE_IRC | `ON`, `OFF` | ON |
Compiler <<irc_plugin,l'extension IRC>>.
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compiler <<scripts_plugins,l'extension JavaScript>>.
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -258,7 +258,7 @@ List of commonly used options:
| ENABLE_IRC | `ON`, `OFF` | ON |
Compile <<irc_plugin,IRC plugin>>.
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,JavaScript plugin>>.
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -229,7 +229,7 @@ CMake に対するオプションを指定するには、以下の書式を使
| ENABLE_IRC | `ON`, `OFF` | ON |
<<irc_plugin,IRC プラグイン>>のコンパイル
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
<<scripts_plugins,JavaScript プラグイン>>のコンパイル。
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -229,7 +229,7 @@ Lista popularnych opcji:
| ENABLE_IRC | `ON`, `OFF` | ON |
Kompilacja <<irc_plugin,wtyczki IRC>>.
| ENABLE_JAVASCRIPT | `ON`, `OFF` | ON |
| ENABLE_JAVASCRIPT | `ON`, `OFF` | OFF |
Kompilacja <<scripts_plugins,wtyczki javascript>>.
| ENABLE_LARGEFILE | `ON`, `OFF` | ON |

View File

@ -67,7 +67,7 @@ run "cd $BUILDDIR"
if [ "$BUILDTOOL" = "cmake" ]; then
# build with CMake
run "cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}"
run "cmake .. -DENABLE_JAVASCRIPT=ON -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}"
run "make VERBOSE=1 -j$(nproc)"
run "sudo make install"
run "ctest -V"
@ -76,7 +76,7 @@ fi
if [ "$BUILDTOOL" = "autotools" ]; then
# build with autotools
run "../autogen.sh"
run "../configure --enable-man --enable-doc --enable-tests ${BUILDARGS}"
run "../configure --enable-javascript --enable-man --enable-doc --enable-tests ${BUILDARGS}"
run "make -j$(nproc)"
run "sudo make install"
run "./tests/tests -v"

View File

@ -1 +0,0 @@
weechat_debian_sid.patch

View File

@ -1 +0,0 @@
weechat_debian_sid.patch

View File

@ -6,10 +6,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..574235330 100644
index bf94a36f1..7e7c82a21 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,20 +3,17 @@ Section: net
@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Sébastien Helleu <flashcode@flashtux.org>
Build-Depends:
@ -26,43 +26,42 @@ index a862fdd6c..574235330 100644
+ liblua5.1-0-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
@@ -76,7 +73,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@ -117,10 +116,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..c3e7ed681 100644
index ccf81cac8..d753f6856 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,20 +3,17 @@ Section: net
@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Emmanuel Bouthenot <kolter@debian.org>
Build-Depends:
@ -137,43 +136,42 @@ index c0326b3f5..c3e7ed681 100644
+ liblua5.1-0-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
@@ -74,7 +71,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any

View File

@ -1,171 +0,0 @@
diff --git a/debian-devel/control b/debian-devel/control
index ffca1a17f..5e93066ef 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
@@ -47,7 +46,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -77,7 +76,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -108,7 +107,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -233,19 +232,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.
-Package: weechat-devel-javascript
-Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
-Conflicts: weechat-javascript
-Description: Fast, light and extensible chat client - JavaScript plugin
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides the JavaScript scripting API plugin.
-
Package: weechat-devel-php
Architecture: any
Depends:
diff --git a/debian-devel/rules b/debian-devel/rules
index 16a5f9516..9f6dd8106 100755
--- a/debian-devel/rules
+++ b/debian-devel/rules
@@ -12,6 +12,7 @@ $(BUILDDIR)/Makefile:
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
-DENABLE_DOC:BOOL=ON \
-DENABLE_MAN:BOOL=ON \
+ -DENABLE_JAVASCRIPT:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
diff --git a/debian-devel/weechat-devel-javascript.dirs b/debian-devel/weechat-devel-javascript.dirs
deleted file mode 120000
index 1043d969a..000000000
--- a/debian-devel/weechat-devel-javascript.dirs
+++ /dev/null
@@ -1 +0,0 @@
-../debian-stable/weechat-javascript.dirs
\ No newline at end of file
diff --git a/debian-devel/weechat-devel-javascript.install b/debian-devel/weechat-devel-javascript.install
deleted file mode 120000
index d6f1f4a52..000000000
--- a/debian-devel/weechat-devel-javascript.install
+++ /dev/null
@@ -1 +0,0 @@
-../debian-stable/weechat-javascript.install
\ No newline at end of file
diff --git a/debian-stable/control b/debian-stable/control
index 8fd0bf1a6..d8ab6f6e2 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -14,7 +14,6 @@ Build-Depends:
liblua5.3-dev,
tcl8.6-dev,
guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
libxml2-dev,
libcurl4-gnutls-dev,
@@ -46,7 +45,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -75,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -105,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -222,18 +221,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the Guile scripting API plugin.
-Package: weechat-javascript
-Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - JavaScript plugin
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package provides the JavaScript scripting API plugin.
-
Package: weechat-php
Architecture: any
Depends:
diff --git a/debian-stable/rules b/debian-stable/rules
index 16a5f9516..9f6dd8106 100755
--- a/debian-stable/rules
+++ b/debian-stable/rules
@@ -12,6 +12,7 @@ $(BUILDDIR)/Makefile:
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
-DENABLE_DOC:BOOL=ON \
-DENABLE_MAN:BOOL=ON \
+ -DENABLE_JAVASCRIPT:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
diff --git a/debian-stable/weechat-javascript.dirs b/debian-stable/weechat-javascript.dirs
deleted file mode 100644
index 68457717b..000000000
--- a/debian-stable/weechat-javascript.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian-stable/weechat-javascript.install b/debian-stable/weechat-javascript.install
deleted file mode 100644
index 6e9829e1c..000000000
--- a/debian-stable/weechat-javascript.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/weechat/plugins/javascript.so

View File

@ -6,7 +6,7 @@ index 48082f72f..f599e28b8 100644
-12
+10
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..82f60bba5 100644
index bf94a36f1..ae29ae9ec 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -4,7 +4,7 @@ Priority: optional
@ -18,14 +18,13 @@ index a862fdd6c..82f60bba5 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,9 +13,9 @@ Build-Depends:
@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,
@ -38,7 +37,7 @@ index 48082f72f..f599e28b8 100644
-12
+10
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..b0abc205a 100644
index ccf81cac8..3e6563e42 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -4,7 +4,7 @@ Priority: optional
@ -50,14 +49,13 @@ index c0326b3f5..b0abc205a 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,9 +13,9 @@ Build-Depends:
@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,

View File

@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..0b3c016ff 100644
index bf94a36f1..8d4d60e9f 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,8 +3,7 @@ Section: net
@ -19,18 +19,16 @@ index a862fdd6c..0b3c016ff 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -12,14 +11,12 @@ Build-Depends:
@@ -12,13 +11,11 @@ Build-Depends:
python3-dev,
libaspell-dev,
liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ tcl8.5-dev,
+ guile-2.0-dev,
+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@ -39,36 +37,36 @@ index a862fdd6c..0b3c016ff 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
@@ -76,7 +73,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@ -123,7 +121,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..44206d418 100644
index ccf81cac8..ee2e092eb 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,8 +3,7 @@ Section: net
@ -136,18 +134,16 @@ index c0326b3f5..44206d418 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -12,14 +11,12 @@ Build-Depends:
@@ -12,13 +11,11 @@ Build-Depends:
python3-dev,
libaspell-dev,
liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ tcl8.5-dev,
+ guile-2.0-dev,
+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@ -156,36 +152,36 @@ index c0326b3f5..44206d418 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
@@ -74,7 +71,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any

View File

@ -1 +0,0 @@
weechat_debian_sid.patch

View File

@ -1 +0,0 @@
weechat_debian_sid.patch

View File

@ -1 +0,0 @@
weechat_debian_sid.patch

View File

@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..968534b1c 100644
index bf94a36f1..566d71f09 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,8 +3,7 @@ Section: net
@ -19,16 +19,14 @@ index a862fdd6c..968534b1c 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,13 +12,11 @@ Build-Depends:
@@ -13,12 +12,10 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@ -37,36 +35,36 @@ index a862fdd6c..968534b1c 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
@@ -76,7 +73,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@ -109,7 +107,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..a5a44c65a 100644
index ccf81cac8..b11b9b64e 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,8 +3,7 @@ Section: net
@ -122,16 +120,14 @@ index c0326b3f5..a5a44c65a 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,13 +12,11 @@ Build-Depends:
@@ -13,12 +12,10 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
- libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
- libxml2-dev,
+ guile-2.0-dev,
+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@ -140,36 +136,36 @@ index c0326b3f5..a5a44c65a 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
@@ -74,7 +71,7 @@ Description: Fast, light and extensible chat client - console client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless client
- 256 colors support
- incremental text search
- dynamic filtering of buffer content
- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
This package provides the JavaScript scripting API plugin.
This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any
@ -187,3 +183,17 @@ index c0326b3f5..a5a44c65a 100644
Package: weechat-doc
Section: doc
Architecture: all
diff --git a/debian-stable/weechat-php.dirs b/debian-stable/weechat-php.dirs
deleted file mode 100644
index 68457717b..000000000
--- a/debian-stable/weechat-php.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian-stable/weechat-php.install b/debian-stable/weechat-php.install
deleted file mode 100644
index 0a1b73563..000000000
--- a/debian-stable/weechat-php.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/weechat/plugins/php.so

View File

@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
index a862fdd6c..cf68a75dd 100644
index bf94a36f1..1eb804643 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -4,7 +4,7 @@ Priority: optional
@ -18,14 +18,13 @@ index a862fdd6c..cf68a75dd 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,9 +13,9 @@ Build-Depends:
@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,
@ -38,7 +37,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
index c0326b3f5..2a3892192 100644
index ccf81cac8..7098b52c6 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -4,7 +4,7 @@ Priority: optional
@ -50,14 +49,13 @@ index c0326b3f5..2a3892192 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
@@ -13,9 +13,9 @@ Build-Depends:
@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-dev,
+ guile-2.0-dev,
libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,

View File

@ -59,10 +59,8 @@ python3-devel ruby tcl-devel libguile2.2-devel php-devel zlib-devel"
# CMake compilation of WeeChat:
# 1. set prefix to /usr
# 2. enable build of man pages and documentation
# 3. disable javascript plugin because libv8 is not available in Cygwin
#
CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_DOC=ON \
-DENABLE_JAVASCRIPT=OFF"
CYGCMAKE_ARGS="-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_DOC=ON"
PKG_IGNORE="
etc/postinstall/weechat.sh

View File

@ -34,7 +34,7 @@ Source: https://weechat.org/files/src/%{name}-%{version}.tar.gz
URL: https://weechat.org/
Group: Productivity/Networking/IRC
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires: perl, python, ruby, lua, tcl, guile, libv8, gcrypt, gnutls, ncurses, libcurl
Requires: perl, python, ruby, lua, tcl, guile, gcrypt, gnutls, ncurses, libcurl
License: GPL
Vendor: Sébastien Helleu <flashcode@flashtux.org>
Packager: [Odin] <odin@dtdm.org>