poezio: 0.10 -> 0.11

This commit is contained in:
Franz Pletz 2017-02-12 15:55:35 +01:00
parent 8e19dc565e
commit cf4775571f
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
3 changed files with 3 additions and 109 deletions

View file

@ -1,80 +0,0 @@
diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py
--- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200
+++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100
@@ -34,9 +34,9 @@
"""
-from plugin import BasePlugin
-import tabs
-from decorators import command_args_parser
+from poezio.plugin import BasePlugin
+import poezio.tabs
+from poezio.decorators import command_args_parser
def move(text, step, spacing):
new_text = text + (" " * spacing)
diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py
--- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200
+++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100
@@ -22,11 +22,11 @@
"""
-from plugin import BasePlugin
+from poezio.plugin import BasePlugin
import difflib
+import collections
from functools import wraps
-import tabs
-from config import config
+from poezio.config import config
shim_message_fields = ('txt nick_color time str_time nickname user identifier'
' highlight me old_message revisions jid ack')
@@ -61,10 +61,6 @@
rev -= 1
return ''.join(acc)
-Message.__repr__ = repr_message
-Message.__str__ = repr_message
-
-
def corrections_enabled(func):
@wraps(func)
diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py
--- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200
+++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100
@@ -1,4 +1,4 @@
-from plugin import BasePlugin
+from poezio.plugin import BasePlugin
import tracemalloc
import cProfile, pstats, io
diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py
--- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200
+++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100
@@ -1,6 +1,6 @@
-from plugin import BasePlugin
-import tabs
-import multiuserchat as muc
+from poezio.plugin import BasePlugin
+import poezio.tabs
+import poezio.multiuserchat as muc
class Plugin(BasePlugin):
def init(self):
diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py
--- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200
+++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100
@@ -20,8 +20,7 @@
.. _XEP-0186: https://xmpp.org/extensions/xep-0186.html
"""
-from plugin import BasePlugin
-import tabs
+from poezio.plugin import BasePlugin
class Plugin(BasePlugin):
def init(self):

View file

@ -1,25 +0,0 @@
diff -ruN a/src/config.py b/src/config.py
--- a/src/config.py 2015-07-31 19:35:37.000000000 +0000
+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000
@@ -14,6 +14,7 @@
import logging.config
import os
+import stat
import sys
import pkg_resources
@@ -563,6 +564,13 @@
copy2(default, options.filename)
elif path.isfile(other):
copy2(other, options.filename)
+
+ # Inside the nixstore, the reference file is readonly, so is the copy.
+ # Make it writable by the user who just created it.
+ if os.path.exists(options.filename):
+ os.chmod(options.filename,
+ os.stat(options.filename).st_mode | stat.S_IWUSR)
+
global firstrun
firstrun = True

View file

@ -30186,7 +30186,7 @@ EOF
poezio = buildPythonApplication rec {
name = "poezio-${version}";
version = "0.10";
version = "0.11";
disabled = pythonOlder "3.4";
@ -30194,13 +30194,12 @@ EOF
propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ];
src = pkgs.fetchurl {
url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz";
sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn";
url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz";
sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0";
};
patches = [
../development/python-modules/poezio/fix_gnupg_import.patch
../development/python-modules/poezio/fix_plugins_imports.patch
];
checkPhase = ''