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

Don't hardcode the qt3 plugins path in the configure.ac patch but

Browse Source 
use a variable from CONFIGURE_ENV.

No bump needed, didn't build before.
This commit is contained in:
bernd 2008-06-07 09:58:40 +00:00
parent d65884a185
commit 353b525288
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inputmethods/uim/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2008/06/06 17:23:18 bernd Exp $
# $OpenBSD: Makefile,v 1.11 2008/06/07 09:58:40 bernd Exp $
COMMENT-main= multilingual input method library
COMMENT-gtk= uim for gtk
COMMENT-qt= uim for qt
@ -87,7 +87,7 @@ MAKE_FLAGS= moduledir='${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules' \
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
CONFIGURE_ENV+= LDFLAGS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -L${X11BASE}/lib'
CONFIGURE_ENV+= QTDIR=${MODQT_QTDIR}
CONFIGURE_ENV+= QTDIR=${MODQT_QTDIR} QTPLUGINSDIR=${LOCALBASE}/${MODQT_PLUGINS}
CONFIGURE_ARGS= --without-canna --with-anthy --without-prime \
--with-gtk2 --without-gnome2 \

40
inputmethods/uim/patches/patch-configure_ac
View File

@ -1,27 +1,27 @@
$OpenBSD: patch-configure_ac,v 1.3 2007/04/08 14:58:04 espie Exp $
--- configure.ac.orig Sat Jan 6 18:43:43 2007
+++ configure.ac Mon Feb 5 04:01:08 2007
@@ -796,10 +796,16 @@ if test x$use_qt = xyes ; then
$OpenBSD: patch-configure_ac,v 1.4 2008/06/07 09:58:40 bernd Exp $
--- configure.ac.orig Wed Mar 14 18:26:47 2007
+++ configure.ac Sat Jun 7 11:37:24 2008
@@ -794,15 +794,10 @@ if test x$use_qt = xyes ; then
fi
UIC=$HOST_UIC
# GUESS plugins dir for immodule installation
AC_MSG_CHECKING(for qt-immodule plugins dir)
- # GUESS plugins dir for immodule installation
- AC_MSG_CHECKING(for qt-immodule plugins dir)
- if test ! -d "$QTDIR/plugins"; then
- AC_MSG_RESULT(no)
+ if test ! -d "$QTDIR/plugins-31"; then
+ if test ! -d "$QTDIR/plugins"; then
+ AC_MSG_RESULT(no)
+ else
+ QT_PLUGINSDIR=$QTDIR/plugins
+ AC_MSG_RESULT($QT_PLUGINSDIR)
+ AC_SUBST(QT_PLUGINSDIR)
+ fi
else
- else
- QT_PLUGINSDIR=$QTDIR/plugins
+ QT_PLUGINSDIR=$QTDIR/plugins-31
AC_MSG_RESULT($QT_PLUGINSDIR)
AC_SUBST(QT_PLUGINSDIR)
fi
@@ -814,13 +820,10 @@ if test x$use_qt = xyes ; then
- AC_MSG_RESULT($QT_PLUGINSDIR)
- AC_SUBST(QT_PLUGINSDIR)
- fi
+ # set plugins dir for immodule installation
+ QT_PLUGINSDIR=$QTPLUGINSDIR
+ AC_MSG_RESULT($QT_PLUGINSDIR)
+ AC_SUBST(QT_PLUGINSDIR)
# Process for compiler & linker flags
QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
@@ -814,13 +809,10 @@ if test x$use_qt = xyes ; then
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS