pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt5-qscintilla py-qt5-qscintilla: moved to base

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Mon Jun 29 15:28:39 2020 +0200
Changeset:	425a3b30b66022d8d19af43b12950a0112e33da1

Removed Files:
	py-qt5-qscintilla/DESCR
	py-qt5-qscintilla/Makefile
	py-qt5-qscintilla/PLIST
	py-qt5-qscintilla/buildlink3.mk
	qt5-qscintilla/DESCR
	qt5-qscintilla/Makefile
	qt5-qscintilla/Makefile.common
	qt5-qscintilla/PLIST
	qt5-qscintilla/buildlink3.mk
	qt5-qscintilla/distinfo
	qt5-qscintilla/patches/patch-Python_configure.py
	qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
	qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro

Log Message:
qt5-qscintilla py-qt5-qscintilla: moved to base

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=425a3b30b66022d8d19af43b12950a0112e33da1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-qt5-qscintilla/DESCR                            | 15 -----
 py-qt5-qscintilla/Makefile                         | 31 ---------
 py-qt5-qscintilla/PLIST                            | 62 ------------------
 py-qt5-qscintilla/buildlink3.mk                    | 18 -----
 qt5-qscintilla/DESCR                               |  2 -
 qt5-qscintilla/Makefile                            | 18 -----
 qt5-qscintilla/Makefile.common                     | 25 -------
 qt5-qscintilla/PLIST                               | 76 ----------------------
 qt5-qscintilla/buildlink3.mk                       | 20 ------
 qt5-qscintilla/distinfo                            |  9 ---
 qt5-qscintilla/patches/patch-Python_configure.py   | 40 ------------
 qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp   | 47 -------------
 qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro | 15 -----
 13 files changed, 378 deletions(-)

diffs:
diff --git a/py-qt5-qscintilla/DESCR b/py-qt5-qscintilla/DESCR
deleted file mode 100644
index 9eceb46208..0000000000
--- a/py-qt5-qscintilla/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-These are the python-bindings for QScintilla2.
-
-Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
-maintaining GUI (graphical user interface) applications.
-
-Qt is written in C++ and is fully object-oriented. It has everything you need
-to create professional GUI applications. And it enables you to create them
-quickly.
-
-Qt is a multi-platform toolkit. When developing software with Qt, you can run
-it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98.
-Simply recompile your source code on the platform you want.
-
-Qt cuts down the complexity in implementing large and complex systems. Its
-ingenious signal-slot technology enables true component programming.
diff --git a/py-qt5-qscintilla/Makefile b/py-qt5-qscintilla/Makefile
deleted file mode 100644
index 6b3f1f51d8..0000000000
--- a/py-qt5-qscintilla/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2020/06/02 08:23:07 adam Exp $
-
-.include "../../wip/qt5-qscintilla/Makefile.common"
-
-PKGNAME=	${PYPKGPREFIX}-qt5-${DISTNAME:tl}
-COMMENT=	QScintilla -- Python bindings
-
-BUILD_DIRS=	Python
-PY_PATCHPLIST=	yes
-
-MAKE_FLAGS+=		TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
-INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
-LIBS+=			-lqscintilla2
-MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
-
-do-configure:
-	cd ${WRKSRC}/Python && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
-		--pyqt PyQt5 \
-		--qmake=${QTDIR}/bin/qmake \
-		--sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
-		--pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-		--qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-		--qsci-libdir=${QTDIR}/lib \
-		--apidir=${QTDIR}/qsci${PYVERSSUFFIX}
-
-.include "../../lang/python/extension.mk"
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=${PKGVERSION_NOREV}
-.include "../../wip/qt5-qscintilla/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/py-qt5-qscintilla/PLIST b/py-qt5-qscintilla/PLIST
deleted file mode 100644
index f21facd6d6..0000000000
--- a/py-qt5-qscintilla/PLIST
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2020/01/26 12:53:34 rhialto Exp $
-${PYSITELIB}/PyQt5/Qsci.pyi
-${PYSITELIB}/PyQt5/Qsci.so
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/INSTALLER
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/QScintilla-${PKGVERSION}.dist-info/RECORD
-qt5/qsci${PYVERSSUFFIX}/api/python/QScintilla2.api
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciabstractapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciapis.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommand.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscicommandset.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscidocument.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexer.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeravs.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbash.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerbatch.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercmake.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercoffeescript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercpp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercsharp.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercss.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexercustom.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerd.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerdiff.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeredifact.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerfortran77.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerhtml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeridl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjava.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjavascript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerjson.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerlua.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermakefile.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermarkdown.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexermatlab.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeroctave.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpascal.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerperl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpo.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpostscript.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpov.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerproperties.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerpython.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerruby.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerspice.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexersql.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertcl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexertex.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerverilog.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexervhdl.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexerxml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscilexeryaml.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimacro.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod4.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimod5.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscimodcommon.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciprinter.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintilla.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qsciscintillabase.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyle.sip
-share/sip${PYVERSSUFFIX}/PyQt5/Qsci/qscistyledtext.sip
diff --git a/py-qt5-qscintilla/buildlink3.mk b/py-qt5-qscintilla/buildlink3.mk
deleted file mode 100644
index 64f8a13251..0000000000
--- a/py-qt5-qscintilla/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2020/06/02 08:23:07 adam Exp $
-
-BUILDLINK_TREE+=	py-qt5-qscintilla
-
-.if !defined(PY_QT5_QSCINTILLA_BUILDLINK3_MK)
-PY_QT5_QSCINTILLA_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.2
-BUILDLINK_ABI_DEPENDS.py-qt5-qscintilla+=	${PYPKGPREFIX}-qt5-qscintilla>=2.11.2nb7
-BUILDLINK_PKGSRCDIR.py-qt5-qscintilla?=		../../wip/py-qt5-qscintilla
-
-.include "../../x11/py-sip/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../wip/qt5-qscintilla/buildlink3.mk"
-.endif	# PY_QT5_QSCINTILLA_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py-qt5-qscintilla
diff --git a/qt5-qscintilla/DESCR b/qt5-qscintilla/DESCR
deleted file mode 100644
index 33ed3a9801..0000000000
--- a/qt5-qscintilla/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Qscintilla is a Qt port of Neil Hodgson's scintilla(devel/scintilla)
-C++ editor control.
diff --git a/qt5-qscintilla/Makefile b/qt5-qscintilla/Makefile
deleted file mode 100644
index 4dc0af4559..0000000000
--- a/qt5-qscintilla/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2020/04/12 08:28:14 adam Exp $
-
-.include "../../wip/qt5-qscintilla/Makefile.common"
-
-PKGNAME=	qt5-${DISTNAME:tl}
-COMMENT=	Scintilla C++ editor class for Qt5
-
-BUILD_DIRS=	Qt4Qt5
-
-USE_TOOLS+=	gmake
-
-MAKE_ENV+=	QTPREFIX=${QTDIR}
-INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR}
-
-do-configure:
-	cd ${WRKSRC}/Qt4Qt5 && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/qt5-qscintilla/Makefile.common b/qt5-qscintilla/Makefile.common
deleted file mode 100644
index 1aff581c43..0000000000
--- a/qt5-qscintilla/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2019/10/29 17:45:24 kamil Exp $
-#
-# used by wip/qt5-qscintilla/Makefile
-# used by wip/py-qt5-qscintilla/Makefile
-
-DISTNAME=	QScintilla-2.11.5
-CATEGORIES=	x11
-MASTER_SITES=	https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-LICENSE=	gnu-gpl-v3
-
-USE_LANGUAGES=	c++
-USE_LIBTOOL=	yes
-
-DISTINFO_FILE=	${.CURDIR}/../../wip/qt5-qscintilla/distinfo
-PATCHDIR=	${.CURDIR}/../../wip/qt5-qscintilla/patches
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-.include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.endif
-.include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/qt5-qscintilla/PLIST b/qt5-qscintilla/PLIST
deleted file mode 100644
index 5eec6d33aa..0000000000
--- a/qt5-qscintilla/PLIST
+++ /dev/null
@@ -1,76 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/26 13:19:17 kamil Exp $
-qt5/include/Qsci/qsciabstractapis.h
-qt5/include/Qsci/qsciapis.h
-qt5/include/Qsci/qscicommand.h
-qt5/include/Qsci/qscicommandset.h
-qt5/include/Qsci/qscidocument.h
-qt5/include/Qsci/qsciglobal.h
-qt5/include/Qsci/qscilexer.h
-qt5/include/Qsci/qscilexeravs.h
-qt5/include/Qsci/qscilexerbash.h
-qt5/include/Qsci/qscilexerbatch.h
-qt5/include/Qsci/qscilexercmake.h
-qt5/include/Qsci/qscilexercoffeescript.h
-qt5/include/Qsci/qscilexercpp.h
-qt5/include/Qsci/qscilexercsharp.h
-qt5/include/Qsci/qscilexercss.h
-qt5/include/Qsci/qscilexercustom.h
-qt5/include/Qsci/qscilexerd.h
-qt5/include/Qsci/qscilexerdiff.h
-qt5/include/Qsci/qscilexeredifact.h
-qt5/include/Qsci/qscilexerfortran.h
-qt5/include/Qsci/qscilexerfortran77.h
-qt5/include/Qsci/qscilexerhtml.h
-qt5/include/Qsci/qscilexeridl.h
-qt5/include/Qsci/qscilexerjava.h
-qt5/include/Qsci/qscilexerjavascript.h
-qt5/include/Qsci/qscilexerjson.h
-qt5/include/Qsci/qscilexerlua.h
-qt5/include/Qsci/qscilexermakefile.h
-qt5/include/Qsci/qscilexermarkdown.h
-qt5/include/Qsci/qscilexermatlab.h
-qt5/include/Qsci/qscilexeroctave.h
-qt5/include/Qsci/qscilexerpascal.h
-qt5/include/Qsci/qscilexerperl.h
-qt5/include/Qsci/qscilexerpo.h
-qt5/include/Qsci/qscilexerpostscript.h
-qt5/include/Qsci/qscilexerpov.h
-qt5/include/Qsci/qscilexerproperties.h
-qt5/include/Qsci/qscilexerpython.h
-qt5/include/Qsci/qscilexerruby.h
-qt5/include/Qsci/qscilexerspice.h
-qt5/include/Qsci/qscilexersql.h
-qt5/include/Qsci/qscilexertcl.h
-qt5/include/Qsci/qscilexertex.h
-qt5/include/Qsci/qscilexerverilog.h
-qt5/include/Qsci/qscilexervhdl.h
-qt5/include/Qsci/qscilexerxml.h
-qt5/include/Qsci/qscilexeryaml.h
-qt5/include/Qsci/qscimacro.h
-qt5/include/Qsci/qsciprinter.h
-qt5/include/Qsci/qsciscintilla.h
-qt5/include/Qsci/qsciscintillabase.h
-qt5/include/Qsci/qscistyle.h
-qt5/include/Qsci/qscistyledtext.h
-qt5/lib/libqscintilla2_qt5.so
-qt5/lib/libqscintilla2_qt5.so.15
-qt5/lib/libqscintilla2_qt5.so.15.0
-qt5/lib/libqscintilla2_qt5.so.15.0.0
-qt5/mkspecs/features/qscintilla2.prf
-qt5/qsci/api/python/Python-2.4.api
-qt5/qsci/api/python/Python-2.5.api
-qt5/qsci/api/python/Python-2.6.api
-qt5/qsci/api/python/Python-2.7.api
-qt5/qsci/api/python/Python-3.1.api
-qt5/qsci/api/python/Python-3.2.api
-qt5/qsci/api/python/Python-3.3.api
-qt5/qsci/api/python/Python-3.4.api
-qt5/qsci/api/python/Python-3.5.api
-qt5/qsci/api/python/Python-3.6.api
-qt5/qsci/api/python/Python-3.7.api
-qt5/qsci/api/python/Python-3.8.api
-qt5/translations/qscintilla_cs.qm
-qt5/translations/qscintilla_de.qm
-qt5/translations/qscintilla_es.qm
-qt5/translations/qscintilla_fr.qm
-qt5/translations/qscintilla_pt_br.qm
diff --git a/qt5-qscintilla/buildlink3.mk b/qt5-qscintilla/buildlink3.mk
deleted file mode 100644
index 46b316495c..0000000000
--- a/qt5-qscintilla/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/04/12 08:28:14 adam Exp $
-
-BUILDLINK_TREE+=	qt5-qscintilla
-
-.if !defined(QT5_QSCINTILLA_BUILDLINK3_MK)
-QT5_QSCINTILLA_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=2.11.2
-BUILDLINK_ABI_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=2.11.2nb5
-BUILDLINK_PKGSRCDIR.qt5-qscintilla?=	../../wip/qt5-qscintilla
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-.include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.endif
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.endif	# QT5_QSCINTILLA_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-qt5-qscintilla
diff --git a/qt5-qscintilla/distinfo b/qt5-qscintilla/distinfo
deleted file mode 100644
index 9493fd2bdf..0000000000
--- a/qt5-qscintilla/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2020/03/19 14:00:14 brook Exp $
-
-SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0
-RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb
-SHA512 (QScintilla-2.11.5.tar.gz) = 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
-Size (QScintilla-2.11.5.tar.gz) = 3007564 bytes
-SHA1 (patch-Python_configure.py) = c447d37537924272a632a76a32ab3b2afc690bb4
-SHA1 (patch-Qt4Qt5_qsciapis.cpp) = 00466d4b0fe635c55566aa4b07a3de52e63274bd
-SHA1 (patch-Qt4Qt5_qscintilla.pro) = b798a34cdde64789db0e1cf2b9c28c5698027f95
diff --git a/qt5-qscintilla/patches/patch-Python_configure.py b/qt5-qscintilla/patches/patch-Python_configure.py
deleted file mode 100644
index 317355763f..0000000000
--- a/qt5-qscintilla/patches/patch-Python_configure.py
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-Avoid app bundles and use proper dylib id on Darwin.
-
---- Python/configure.py.orig	2020-06-09 14:28:23.000000000 +0000
-+++ Python/configure.py
-@@ -1470,7 +1470,7 @@ def _generate_pro(target_config, opts, m
-         pro.write('QT += %s\n' % qt)
- 
-     pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release'))
--    pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin plugin_bundle'))
-+    pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
- 
-     config = qmake_config.get('CONFIG')
-     if config:
-@@ -1511,7 +1511,7 @@ win32 {
-     PY_MODULE = %s.so
- 
-     macx {
--        PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
-+        PY_MODULE_SRC = $(TARGET)
- 
-         QMAKE_LFLAGS += "-undefined dynamic_lookup"
- 
-@@ -1621,12 +1621,11 @@ INSTALLS += sip
-     if not opts.static:
-         dylib = module_config.get_mac_wrapped_library_file(target_config)
- 
--        if dylib:
--            pro.write('''
-+        pro.write('''
- macx {
--    QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
-+    QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -id $$target.path/$$PY_MODULE $$PY_MODULE)
- }
--''' % (os.path.basename(dylib), dylib))
-+''')
- 
-     pro.write('\n')
-     pro.write('HEADERS = sipAPI%s.h\n' % mname)
diff --git a/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp b/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
deleted file mode 100644
index 6235c8b2e1..0000000000
--- a/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-qsciapis.cpp,v 1.1 2020/01/26 12:54:15 rhialto Exp $
-
-Search in qt5/qsci*/api/.../*.api.
-
---- Qt4Qt5/qsciapis.cpp.orig	2019-06-25 12:49:27.000000000 +0000
-+++ Qt4Qt5/qsciapis.cpp
-@@ -982,6 +982,7 @@ QString QsciAPIs::prepName(const QString
- // Return installed API files.
- QStringList QsciAPIs::installedAPIFiles() const
- {
-+#if 0
-     QString qtdir = QLibraryInfo::location(QLibraryInfo::DataPath);
- 
-     QDir apidir = QDir(QString("%1/qsci/api/%2").arg(qtdir).arg(lexer()->lexer()));
-@@ -996,4 +997,32 @@ QStringList QsciAPIs::installedAPIFiles(
-         filenames << fi.absoluteFilePath();
- 
-     return filenames;
-+#endif
-+
-+    QString datapath = QLibraryInfo::location(QLibraryInfo::DataPath);
-+    QString lexerdir = lexer()->lexer();
-+
-+    QStringList filenames;
-+
-+    QStringList filters;
-+    filters << "*.api";
-+
-+    QStringList qscifilters;
-+    qscifilters << "qsci*";
-+
-+    // Find QTDIR/qsci*/api/LEXER/*.api
-+    QDir datadir = QDir(datapath);
-+    QFileInfoList dlist = datadir.entryInfoList(qscifilters, QDir::AllDirs, QDir::IgnoreCase);
-+
-+    foreach (QFileInfo di, dlist) {
-+	QString qscidir = di.absoluteFilePath();
-+	QDir apidir = QDir(QString("%1/api/%2").arg(qscidir).arg(lexerdir));
-+
-+	QFileInfoList flist = apidir.entryInfoList(filters, QDir::Files, QDir::IgnoreCase);
-+
-+	foreach (QFileInfo fi, flist)
-+	    filenames << fi.absoluteFilePath();
-+    }
-+
-+    return filenames;
- }
diff --git a/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro b/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
deleted file mode 100644
index 2b48fe96aa..0000000000
--- a/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qscintilla.pro,v 1.1 2020/03/08 20:55:17 brook Exp $
-
-Add full path to installed library names on Darwin.
-
---- Qt4Qt5/qscintilla.pro.orig	2020-06-09 14:28:23.000000000 +0000
-+++ Qt4Qt5/qscintilla.pro
-@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) {
- }
- 
- macx:!CONFIG(staticlib) {
--    QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
-+    QMAKE_POST_LINK += install_name_tool -id $$target.path/$(TARGET1) $(TARGET)
- }
- 
- INCLUDEPATH += . ../include ../lexlib ../src
Home | Main Index | Thread Index | Old Index