diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 158d0c8f9db..e48eee542fb 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -1,24 +1,21 @@ -# $OpenBSD: Makefile,v 1.41 2018/07/01 09:02:40 espie Exp $ +# $OpenBSD: Makefile,v 1.42 2018/12/30 12:11:56 edd Exp $ COMMENT-main = easy to use LaTeX and ConTeXt editor COMMENT-python = Python scripting for TeXworks COMMENT-lua = Lua scripting for TeXworks -V = 0.4.4 -R = 1004 -DISTNAME = texworks-${V}-r${R} +V = 0.6.2 +GH_ACCOUNT = TeXworks +GH_PROJECT = texworks +GH_TAGNAME = release-${V} PKGNAME-main = texworks-${V} PKGNAME-lua = texworks-lua-${V} PKGNAME-python = texworks-python-${V} -REVISION-main = 5 -REVISION-lua = 3 -REVISION-python = 3 - EPOCH = 0 -WRKDIST = ${WRKDIR}/texworks-${V} +WRKDIST = ${WRKDIR}/texworks-release-${V} CATEGORIES = editors print HOMEPAGE = http://www.tug.org/texworks/ @@ -27,39 +24,31 @@ MAINTAINER = Edd Barrett # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MODULES = devel/qmake \ - lang/python \ +MODULES = lang/python \ lang/lua \ - x11/qt4 - -MODQMAKE_PROJECTS = plugins-src/TWLuaPlugin/TWLuaPlugin.pro \ - plugins-src/TWPythonPlugin/TWPythonPlugin.pro \ - TeXworks.pro + x11/qt5 \ + devel/cmake # c++-11 required for poppler COMPILER = base-clang ports-gcc -WANTLIB += ${COMPILER_LIBCXX} -WANTLIB += ICE QtDBus QtGui QtScript QtScriptTools QtXml SM X11 -WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.6 -WANTLIB += m poppler-qt4 pthread z +WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui +WANTLIB += Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml c hunspell-1.6 +WANTLIB += m poppler poppler-qt5 synctex z -WANTLIB-lua = ${MODLUA_WANTLIB} -WANTLIB-lua += ICE QtCore QtGui QtXml SM X11 Xext Xi Xinerama Xrender -WANTLIB-lua += fontconfig freetype m pthread ${COMPILER_LIBCXX} +WANTLIB-lua += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Concurrent Qt5Core +WANTLIB-lua += Qt5DBus Qt5Gui Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml m -WANTLIB-python = ${MODPY_WANTLIB} -WANTLIB-python += ICE QtCore QtGui QtXml SM X11 Xext Xi Xinerama Xrender -WANTLIB-python += fontconfig freetype m pthread ${COMPILER_LIBCXX} +WANTLIB-python += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui +WANTLIB-python += Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml m python2.7 MULTI_PACKAGES = -main -lua -python -MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=texworks/} - +LIB_DEPENDS = ${MODQT5_LIB_DEPENDS} \ + x11/qt5/qtscript LIB_DEPENDS-main = ${LIB_DEPENDS} \ - qt4->=4.8.2:${MODQT4_LIB_DEPENDS} \ textproc/hunspell \ - print/poppler,,-qt4 + print/poppler,-qt5 LIB_DEPENDS-lua = ${LIB_DEPENDS} \ ${MODLUA_LIB_DEPENDS} LIB_DEPENDS-python = ${LIB_DEPENDS} \ @@ -75,9 +64,15 @@ MODLUA_SA = Yes USE_GMAKE = Yes NO_TEST = Yes -SUBST_VARS += WRKINST +SUBST_VARS += MODLUA-VERSION + +CONFIGURE_STYLE = cmake +CONFIGURE_ARGS += -DWITH_PYTHON=ON \ + -DTeXworks_DIC_DIR=${TRUEPREFIX}/share/mozilla-dicts +# The handling of the manual install dir is odd. +CONFIGURE_ARGS += -DTeXworks_MAN_DIR=/man/man1 pre-configure: - cd ${WRKSRC}; ${SUBST_CMD} ${MODQMAKE_PROJECTS} + ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt .include diff --git a/editors/texworks/distinfo b/editors/texworks/distinfo index 21337387dbb..9b2da468977 100644 --- a/editors/texworks/distinfo +++ b/editors/texworks/distinfo @@ -1,2 +1,2 @@ -SHA256 (texworks-0.4.4-r1004.tar.gz) = WlGGfLiN0UlsiGZLSE2bi24mfmi+yWeooLRdPHe/9bQ= -SIZE (texworks-0.4.4-r1004.tar.gz) = 5305883 +SHA256 (texworks-release-0.6.2.tar.gz) = IohcEdkmVLDLofSAj8mqPC/dPlQ1/Ynf+aoeZ2WKYzk= +SIZE (texworks-release-0.6.2.tar.gz) = 11508277 diff --git a/editors/texworks/patches/patch-CMakeLists_txt b/editors/texworks/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..2f26bf86490 --- /dev/null +++ b/editors/texworks/patches/patch-CMakeLists_txt @@ -0,0 +1,16 @@ +$OpenBSD: patch-CMakeLists_txt,v 1.1 2018/12/30 12:11:56 edd Exp $ + +Fix manual path, find the right version of Lua. + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -327,7 +327,7 @@ ENDIF () + # ------------------------------- + + IF ( WITH_LUA ) +- FIND_PACKAGE(Lua) ++ FIND_PACKAGE(Lua "${MODLUA_VERSION}" EXACT REQUIRED) + ENDIF() + + IF ( WITH_PYTHON ) diff --git a/editors/texworks/patches/patch-TeXworks_pro b/editors/texworks/patches/patch-TeXworks_pro deleted file mode 100644 index 75bd6960804..00000000000 --- a/editors/texworks/patches/patch-TeXworks_pro +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-TeXworks_pro,v 1.5 2012/07/10 15:22:45 jasper Exp $ ---- TeXworks.pro.orig Wed Jun 29 19:03:14 2011 -+++ TeXworks.pro Mon Jul 9 16:00:26 2012 -@@ -47,11 +47,11 @@ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas - - unix:!macx { - TARGET = texworks -- isEmpty(INSTALL_PREFIX):INSTALL_PREFIX = /usr/local -+ isEmpty(INSTALL_PREFIX):INSTALL_PREFIX = ${PREFIX} - isEmpty(DATA_DIR):DATA_DIR = $$INSTALL_PREFIX/share - isEmpty(TW_HELPPATH):TW_HELPPATH = $$DATA_DIR/texworks-help - isEmpty(TW_PLUGINPATH):TW_PLUGINPATH = $$INSTALL_PREFIX/lib/texworks -- isEmpty(TW_DICPATH):TW_DICPATH = /usr/share/myspell/dicts -+ isEmpty(TW_DICPATH):TW_DICPATH = ${LOCALBASE}/share/mozilla-dicts - } else { - TARGET = TeXworks - QMAKE_CXXFLAGS += -fexceptions -@@ -144,7 +144,7 @@ win32 { # paths here are specific to my setup - QMAKE_CXXFLAGS += -DSTATIC_SCRIPTING_PLUGINS - - LIBS += -Lplugins-src/TWLuaPlugin/release -lTWLuaPlugin -- LIBS += -llua -+ LIBS += ${MODLUA_LIB} - - LIBS += -Lplugins-src/TWPythonPlugin/release -lTWPythonPlugin - LIBS += -Lc:/Python26/libs -lpython26 -@@ -243,7 +243,7 @@ unix:!macx { # installation on Unix-ish platforms - isEmpty(BIN_DIR):BIN_DIR = $$INSTALL_PREFIX/bin - isEmpty(DOCS_DIR):DOCS_DIR = $$DATA_DIR/doc/texworks - isEmpty(ICON_DIR):ICON_DIR = $$DATA_DIR/pixmaps -- isEmpty(MAN_DIR):MAN_DIR = $$DATA_DIR/man/man1 -+ isEmpty(MAN_DIR):MAN_DIR = $$INSTALL_PREFIX/man/man1 - isEmpty(DESKTOP_DIR):DESKTOP_DIR = $$DATA_DIR/applications - - target.path = $$BIN_DIR diff --git a/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro b/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro deleted file mode 100644 index b4d99f7ea10..00000000000 --- a/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro,v 1.4 2012/07/10 15:22:45 jasper Exp $ ---- plugins-src/TWLuaPlugin/TWLuaPlugin.pro.orig Wed Jun 29 19:03:14 2011 -+++ plugins-src/TWLuaPlugin/TWLuaPlugin.pro Mon Jul 9 16:08:24 2012 -@@ -46,7 +46,7 @@ macx { - - unix:!macx { # on Unix-ish platforms we rely on pkgconfig - CONFIG += link_pkgconfig -- PKGCONFIG += lua5.1 -+ PKGCONFIG += ${MODLUA_DEP} - - isEmpty(INSTALL_PREFIX):INSTALL_PREFIX = /usr/local - isEmpty(TW_PLUGINPATH):TW_PLUGINPATH = $$INSTALL_PREFIX/lib/texworks diff --git a/editors/texworks/patches/patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro b/editors/texworks/patches/patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro deleted file mode 100644 index f3b8a0d7699..00000000000 --- a/editors/texworks/patches/patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro,v 1.5 2012/06/14 09:40:58 espie Exp $ ---- plugins-src/TWPythonPlugin/TWPythonPlugin.pro.orig Wed Jun 29 18:03:14 2011 -+++ plugins-src/TWPythonPlugin/TWPythonPlugin.pro Mon Mar 12 12:02:28 2012 -@@ -50,8 +50,8 @@ macx { - - unix:!macx { # on Unix-ish platforms we should rely on pkgconfig - # Python prior to 3.x doesn't register properly with pkg-config -- INCLUDEPATH += /usr/include/python2.6/ -- LIBS += -lpython2.6 -+ INCLUDEPATH += ${LOCALBASE}/include/python${MODPY_VERSION}/ -+ LIBS += -lpython${MODPY_VERSION} - - # uncomment these lines (and comment those above) to use Python 3 - # CONFIG += link_pkgconfig diff --git a/editors/texworks/patches/patch-src_CMakeLists_txt b/editors/texworks/patches/patch-src_CMakeLists_txt new file mode 100644 index 00000000000..6fbb3704ecd --- /dev/null +++ b/editors/texworks/patches/patch-src_CMakeLists_txt @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_CMakeLists_txt,v 1.1 2018/12/30 12:11:56 edd Exp $ + +Fix undefined symbols for plugins. + +Index: src/CMakeLists.txt +--- src/CMakeLists.txt.orig ++++ src/CMakeLists.txt +@@ -159,6 +159,8 @@ ADD_EXECUTABLE( ${EXE_NAME} ${GUI_TYPE} + # Specify libraries to be linked to TeXworks. + TARGET_LINK_LIBRARIES( ${EXE_NAME} ${MODULE_LIBS} ${TeXworks_LIBS} ) + ++SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -rdynamic) ++ + # For OS X, generate `Info.plist` and add it to the `.app` bundle. + IF (APPLE) + SET(VER ${TeXworks_VERSION}) diff --git a/editors/texworks/pkg/PLIST-main b/editors/texworks/pkg/PLIST-main index abde34dab2d..5bbb32c9b41 100644 --- a/editors/texworks/pkg/PLIST-main +++ b/editors/texworks/pkg/PLIST-main @@ -1,105 +1,15 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2018/06/27 21:03:42 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2018/12/30 12:11:56 edd Exp $ @pkgpath editors/texworks @bin bin/texworks lib/texworks/ @man man/man1/texworks.1 +share/appdata/ +share/appdata/texworks.appdata.xml share/applications/texworks.desktop share/doc/texworks/ share/doc/texworks/COPYING share/doc/texworks/NEWS -share/doc/texworks/README +share/doc/texworks/README.md share/pixmaps/ share/pixmaps/TeXworks.png -share/texworks-help/ -share/texworks-help/en/ -share/texworks-help/en/Acknowledgements.html -share/texworks-help/en/AdvanceduseScripting.html -share/texworks-help/en/Beyondthismanual.html -share/texworks-help/en/CompilingTw.html -share/texworks-help/en/CustomizingTw.html -share/texworks-help/en/Firststeps.html -share/texworks-help/en/GoingfurtherEditingtools.html -share/texworks-help/en/GoingfurtherOthertools.html -share/texworks-help/en/Installation.html -share/texworks-help/en/Introduction.html -share/texworks-help/en/Regularexpressions.html -share/texworks-help/en/TeXworks-manual.pdf -share/texworks-help/en/bibname.html -share/texworks-help/en/contentsname.html -share/texworks-help/en/images/ -share/texworks-help/en/images/LMB.png -share/texworks-help/en/images/Linux.png -share/texworks-help/en/images/Mac.png -share/texworks-help/en/images/MacCmdKey.png -share/texworks-help/en/images/MacOptKey.png -share/texworks-help/en/images/RMB.png -share/texworks-help/en/images/TeXworks.png -share/texworks-help/en/images/Windows.png -share/texworks-help/en/images/cmsy10-c-41.png -share/texworks-help/en/images/cmsy10-c-4d.png -share/texworks-help/en/images/cmsy10-c-53.png -share/texworks-help/en/images/consoleOutput.png -share/texworks-help/en/images/errorParsingScript.png -share/texworks-help/en/images/example.png -share/texworks-help/en/images/iconAbortTypesetting.png -share/texworks-help/en/images/iconTypeset.png -share/texworks-help/en/images/index0x.png -share/texworks-help/en/images/index1x.png -share/texworks-help/en/images/index2x.png -share/texworks-help/en/images/index3x.png -share/texworks-help/en/images/index4x.png -share/texworks-help/en/images/index5x.png -share/texworks-help/en/images/index6x.png -share/texworks-help/en/images/index7x.png -share/texworks-help/en/images/index8x.png -share/texworks-help/en/images/interface-summary.png -share/texworks-help/en/images/replaceDialog.png -share/texworks-help/en/images/screenshotHardWrapDlg.png -share/texworks-help/en/images/toolbar1.png -share/texworks-help/en/images/toolbar2.png -share/texworks-help/en/index.css -share/texworks-help/en/index.html -share/texworks-help/en/index10.html -share/texworks-help/en/index12.html -share/texworks-help/en/index13.html -share/texworks-help/en/index14.html -share/texworks-help/en/index15.html -share/texworks-help/en/index16.html -share/texworks-help/en/index17.html -share/texworks-help/en/index18.html -share/texworks-help/en/index19.html -share/texworks-help/en/index2.html -share/texworks-help/en/index20.html -share/texworks-help/en/index21.html -share/texworks-help/en/index23.html -share/texworks-help/en/index24.html -share/texworks-help/en/index25.html -share/texworks-help/en/index26.html -share/texworks-help/en/index27.html -share/texworks-help/en/index28.html -share/texworks-help/en/index29.html -share/texworks-help/en/index30.html -share/texworks-help/en/index32.html -share/texworks-help/en/index33.html -share/texworks-help/en/index34.html -share/texworks-help/en/index36.html -share/texworks-help/en/index37.html -share/texworks-help/en/index40.html -share/texworks-help/en/index41.html -share/texworks-help/en/index42.html -share/texworks-help/en/index43.html -share/texworks-help/en/index44.html -share/texworks-help/en/index45.html -share/texworks-help/en/index46.html -share/texworks-help/en/index47.html -share/texworks-help/en/index48.html -share/texworks-help/en/index49.html -share/texworks-help/en/index5.html -share/texworks-help/en/index50.html -share/texworks-help/en/index6.html -share/texworks-help/en/index8.html -share/texworks-help/en/index9.html -share/texworks-help/en/indexname.html -share/texworks-help/en/manual.css -share/texworks-help/en/tw-help-title.txt @tag update-desktop-database