diff options
author | tnn <tnn> | 2015-04-01 11:34:55 +0000 |
---|---|---|
committer | tnn <tnn> | 2015-04-01 11:34:55 +0000 |
commit | 735060bcacac9fc9f06274147076c84f17ae6f89 (patch) | |
tree | f8b6f9a29e3c05800730f7b3d3059fa5447b11a3 /devel | |
parent | f52823210aa2e27595131a6ac9f52094bc20ee5f (diff) | |
download | pkgsrc-735060bcacac9fc9f06274147076c84f17ae6f89.tar.gz |
Remove obsolete python 2.6 patch. Also make sure we append to
PYTHON_VERSIONS_INCOMPATIBLE in options.mk so it we don't overwrite the
default value.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/py-tryton/Makefile | 4 | ||||
-rw-r--r-- | devel/py-tryton/distinfo | 3 | ||||
-rw-r--r-- | devel/py-tryton/options.mk | 6 | ||||
-rw-r--r-- | devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py | 20 |
4 files changed, 6 insertions, 27 deletions
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile index 8a3a4ba38a7..52160fb8c93 100644 --- a/devel/py-tryton/Makefile +++ b/devel/py-tryton/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2015/03/20 00:58:38 tnn Exp $ +# $NetBSD: Makefile,v 1.15 2015/04/01 11:34:55 tnn Exp $ TRYTON_MODULE_NAME= tryton .include "../../devel/py-trytond/Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MAINTAINER= rodent@NetBSD.org diff --git a/devel/py-tryton/distinfo b/devel/py-tryton/distinfo index 6958fee10f8..741706bb84c 100644 --- a/devel/py-tryton/distinfo +++ b/devel/py-tryton/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2015/03/20 00:58:38 tnn Exp $ +$NetBSD: distinfo,v 1.10 2015/04/01 11:34:55 tnn Exp $ SHA1 (tryton-3.4/tryton-3.4.2.tar.gz) = 9ee78df1ee11e22e194a5b0301ebcf87cb603dae RMD160 (tryton-3.4/tryton-3.4.2.tar.gz) = a4653be2e510073c360ab06cdb61404b08618bdf Size (tryton-3.4/tryton-3.4.2.tar.gz) = 824683 bytes -SHA1 (patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py) = 9729de7c5f58cdb0f061ab80020232e723277a0e diff --git a/devel/py-tryton/options.mk b/devel/py-tryton/options.mk index 6c372d94cac..cccd7224cd6 100644 --- a/devel/py-tryton/options.mk +++ b/devel/py-tryton/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2014/05/18 15:08:33 rodent Exp $ +# $NetBSD: options.mk,v 1.5 2015/04/01 11:34:55 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.py-tryton PKG_SUPPORTED_OPTIONS= cdecimal goocalendar pytz simplejson @@ -7,12 +7,12 @@ PKG_SUGGESTED_OPTIONS+= cdecimal pytz simplejson .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mcdecimal) -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-cdecimal not available because obsolete +PYTHON_VERSIONS_INCOMPATIBLE+= 33 34 # py-cdecimal not available because obsolete DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal .endif .if !empty(PKG_OPTIONS:Mgoocalendar) -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gtk2 via py-goocanvas via py-goocalendar +PYTHON_VERSIONS_INCOMPATIBLE+= 33 34 # py-gtk2 via py-goocanvas via py-goocalendar DEPENDS+= ${PYPKGPREFIX}-goocalendar-[0-9]*:../../time/py-goocalendar .endif diff --git a/devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py b/devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py deleted file mode 100644 index 4f6a6e4098e..00000000000 --- a/devel/py-tryton/patches/patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-tryton_gui_window_view__form_view_form__gtk_multiselection.py,v 1.2 2015/03/20 00:58:38 tnn Exp $ - -Fixes python 2.6 support. Patch can go away when python26 does. - ---- tryton/common/treeviewcontrol.py.orig 2015-02-09 23:43:55.000000000 +0000 -+++ tryton/common/treeviewcontrol.py -@@ -3,11 +3,11 @@ - import gtk - import gobject - --MOVEMENT_KEYS = {gtk.keysyms.Up, gtk.keysyms.Down, gtk.keysyms.space, -+MOVEMENT_KEYS = set((gtk.keysyms.Up, gtk.keysyms.Down, gtk.keysyms.space, - gtk.keysyms.Left, gtk.keysyms.KP_Left, - gtk.keysyms.Right, gtk.keysyms.KP_Right, - gtk.keysyms.Home, gtk.keysyms.KP_Home, -- gtk.keysyms.End, gtk.keysyms.KP_End} -+ gtk.keysyms.End, gtk.keysyms.KP_End)) - - __all__ = ['TreeViewControl'] - |