unbreak with newer python-ldap

This commit is contained in:
sthen 2018-11-30 13:00:07 +00:00
parent 044239aec5
commit 9f478fad27
4 changed files with 48 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2018/06/29 22:16:10 espie Exp $
# $OpenBSD: Makefile,v 1.15 2018/11/30 13:00:07 sthen Exp $
COMMENT= Qt-based LDAP browser and utility
MODPY_EGG_VERSION=3.0.7
DISTNAME= luma-${MODPY_EGG_VERSION}
REVISION= 2
REVISION= 3
CATEGORIES= databases x11

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-luma_base_backend_SmartDataObject_py,v 1.1 2018/11/30 13:00:07 sthen Exp $
dsml is no longer a separate module in python-ldap 3.0+
Index: luma/base/backend/SmartDataObject.py
--- luma/base/backend/SmartDataObject.py.orig
+++ luma/base/backend/SmartDataObject.py
@@ -20,7 +20,6 @@
# along with this program. If not, see http://www.gnu.org/licenses/
import ldap
import ldif
-import dsml
import copy
import logging
from cStringIO import StringIO

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-luma_base_gui_Dialog_py,v 1.1 2018/11/30 13:00:07 sthen Exp $
dsml is no longer a separate module in python-ldap 3.0+
Index: luma/base/gui/Dialog.py
--- luma/base/gui/Dialog.py.orig
+++ luma/base/gui/Dialog.py
@@ -25,8 +25,6 @@ import logging
import StringIO
from string import replace
-import dsml
-
from PyQt4 import QtCore, QtGui
from .design.ExportDialogDesign import Ui_ExportDialog

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-luma_plugins_browser_gui_BrowserDialogs_py,v 1.1 2018/11/30 13:00:07 sthen Exp $
dsml is no longer a separate module in python-ldap 3.0+
Index: luma/plugins/browser/gui/BrowserDialogs.py
--- luma/plugins/browser/gui/BrowserDialogs.py.orig
+++ luma/plugins/browser/gui/BrowserDialogs.py
@@ -202,7 +202,6 @@ class DeleteDialog(QtGui.QDialog, Ui_DeleteDialog):
QDialog.reject(self)
-import dsml
import StringIO