cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it build with qt 4.8.2

Browse Source
This commit is contained in:
espie 2012-06-14 09:39:34 +00:00
parent b60dcae74a
commit beb7460c91
4 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/texworks/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2012/05/15 18:22:18 jasper Exp $
# $OpenBSD: Makefile,v 1.16 2012/06/14 09:39:34 espie Exp $
COMMENT-main = easy to use LaTeX and ConTeXt editor
COMMENT-python = Python scripting for TeXworks
@ -47,7 +47,7 @@ MULTI_PACKAGES = -main -lua -python
MASTER_SITES = http://texworks.googlecode.com/files/
LIB_DEPENDS-main = qt4->=4.7.2:${MODQT4_LIB_DEPENDS} \
LIB_DEPENDS-main = qt4->=4.8.2:${MODQT4_LIB_DEPENDS} \
textproc/hunspell \
x11/dbus \
print/poppler,-qt4

15
editors/texworks/patches/patch-TeXworks_pro
View File

@ -1,17 +1,12 @@
$OpenBSD: patch-TeXworks_pro,v 1.2 2012/04/20 08:41:27 edd Exp $
--- TeXworks.pro.orig Wed Jun 29 18:03:14 2011
+++ TeXworks.pro Thu Apr 19 17:10:51 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}
$OpenBSD: patch-TeXworks_pro,v 1.3 2012/06/14 09:39:34 espie Exp $
--- TeXworks.pro.orig Wed Jun 29 19:03:14 2011
+++ TeXworks.pro Wed Jun 13 11:15:34 2012
@@ -51,7 +51,7 @@ unix:!macx {
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
+ isEmpty(TW_DICPATH):TW_DICPATH = /usr/local/share/mozilla-dicts
} else {
TARGET = TeXworks
QMAKE_CXXFLAGS += -fexceptions

20
editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro
View File

@ -1,14 +1,12 @@
$OpenBSD: patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro,v 1.2 2012/04/20 08:41:27 edd Exp $
--- plugins-src/TWLuaPlugin/TWLuaPlugin.pro.orig Mon Mar 12 11:46:27 2012
+++ plugins-src/TWLuaPlugin/TWLuaPlugin.pro Mon Mar 12 11:47:38 2012
@@ -44,6 +44,10 @@ macx {
INCLUDEPATH += /usr/local/include
}
$OpenBSD: patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro,v 1.3 2012/06/14 09:39:34 espie Exp $
--- plugins-src/TWLuaPlugin/TWLuaPlugin.pro.orig Wed Jun 29 19:03:14 2011
+++ plugins-src/TWLuaPlugin/TWLuaPlugin.pro Wed Jun 13 11:22:30 2012
@@ -46,7 +46,7 @@ macx {
+openbsd-g++* {
+ LIBS += -L${LOCALBASE}/lib -llua
+}
+
unix:!macx { # on Unix-ish platforms we rely on pkgconfig
CONFIG += link_pkgconfig
PKGCONFIG += lua5.1
- PKGCONFIG += lua5.1
+ PKGCONFIG += lua
isEmpty(INSTALL_PREFIX):INSTALL_PREFIX = /usr/local
isEmpty(TW_PLUGINPATH):TW_PLUGINPATH = $$INSTALL_PREFIX/lib/texworks

10
editors/texworks/patches/patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro,v 1.3 2012/04/20 08:41:27 edd 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
$OpenBSD: patch-plugins-src_TWPythonPlugin_TWPythonPlugin_pro,v 1.4 2012/06/14 09:39:34 espie Exp $
--- plugins-src/TWPythonPlugin/TWPythonPlugin.pro.orig Wed Jun 29 19:03:14 2011
+++ plugins-src/TWPythonPlugin/TWPythonPlugin.pro Wed Jun 13 11:15:34 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}
+ INCLUDEPATH += /usr/local/include/python2.7/
+ LIBS += -lpython2.7
# uncomment these lines (and comment those above) to use Python 3
# CONFIG += link_pkgconfig