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

Update to uim-1.8.8.

Browse Source 
Release notes since 1.8.6:
https://github.com/uim/uim/releases/tag/1.8.8
https://github.com/uim/uim/releases/tag/1.8.7

ok sthen@
This commit is contained in:
bentley 2019-03-11 11:16:05 +00:00
parent f9daf0f3e3
commit caf60eeb49
6 changed files with 87 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
inputmethods/uim/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2018/10/24 14:28:06 sthen Exp $
# $OpenBSD: Makefile,v 1.63 2019/03/11 11:16:05 bentley Exp $
DPB_PROPERTIES= tag:kde3
@ -11,7 +11,7 @@ COMMENT-qt4= uim for QT4
CATEGORIES= inputmethods japanese chinese
V= 1.8.6
V= 1.8.8
DISTNAME= uim-$V
PKGNAME-main= uim-$V
PKGNAME-gtk= uim-gtk-$V
@ -19,14 +19,12 @@ PKGNAME-gtk3= uim-gtk3-$V
PKGNAME-kde= uim-kde-$V
PKGNAME-qt= uim-qt-$V
PKGNAME-qt4= uim-qt4-$V
REVISION= 8
MASTER_SITES= https://github.com/uim/uim/releases/download/uim-$V/
MASTER_SITES= https://github.com/uim/uim/releases/download/$V/
HOMEPAGE= https://github.com/uim/uim
SHARED_LIBS += gcroots 0.0 # .1.0
SHARED_LIBS += uim-scm 0.0 # .0.0
SHARED_LIBS += uim 1.0 # .6.0
SHARED_LIBS += uim 1.1 # .6.0
SHARED_LIBS += uim-custom 0.0 # .2.0
# BSD
@ -46,11 +44,12 @@ USE_GMAKE= Yes
RUN_DEPENDS-main= devel/desktop-file-utils
WANTLIB-main += ${cWANTLIB}
WANTLIB-main += Xft anthy anthydic c curses expat ${COMPILER_LIBCXX}
WANTLIB-main += util xcb z
WANTLIB-main += ${cWANTLIB} ${COMPILER_LIBCXX}
WANTLIB-main += Xft anthy anthydic c curses edit expat gcroots
WANTLIB-main += sqlite3 util xcb z
LIB_DEPENDS-main= inputmethods/anthy
LIB_DEPENDS-main= inputmethods/anthy \
devel/libgcroots
WANTLIB-gtk += ${cWANTLIB}
@ -58,7 +57,7 @@ WANTLIB-gtk += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr
WANTLIB-gtk += atk-1.0 c cairo expat ffi gcroots gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB-gtk += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB-gtk += gthread-2.0 gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0
WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB-gtk += pangoft2-1.0 pcre pixman-1 png pthread fribidi
WANTLIB-gtk += uim uim-custom uim-scm xcb xcb-render xcb-shm z
LIB_DEPENDS-gtk= inputmethods/uim \
@ -66,11 +65,11 @@ LIB_DEPENDS-gtk= inputmethods/uim \
WANTLIB-gtk3 += ${cWANTLIB}
WANTLIB-gtk3 += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
WANTLIB-gtk3 += Xrandr Xtst atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB-gtk3 += Xrandr atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB-gtk3 += dbus-1 expat ffi gcroots gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB-gtk3 += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
WANTLIB-gtk3 += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom
WANTLIB-gtk3 += pcre pixman-1 png pthread uim uim-custom fribidi
WANTLIB-gtk3 += uim-scm xcb xcb-render xcb-shm z epoxy
LIB_DEPENDS-gtk3= inputmethods/uim \
@ -81,6 +80,7 @@ WANTLIB-kde += DCOP GL ICE SM X11-xcb Xcursor Xdamage Xfixes
WANTLIB-kde += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm art_lgpl_2 drm
WANTLIB-kde += expat gcroots glapi idn jpeg kdefx lcms mng png pthread
WANTLIB-kde += qt-mt ${COMPILER_LIBCXX} uim uim-scm util xcb xcb-dri2
WANTLIB-kde += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
WANTLIB-kde += xcb-glx z
LIB_DEPENDS-kde= inputmethods/uim \
@ -91,6 +91,7 @@ WANTLIB-qt += GL ICE SM X11-xcb Xcursor Xdamage Xfixes
WANTLIB-qt += Xft Xi Xinerama Xmu Xrandr Xt Xxf86vm c drm expat gcroots
WANTLIB-qt += glapi jpeg lcms mng png pthread ${COMPILER_LIBCXX}
WANTLIB-qt += uim uim-custom uim-scm xcb xcb-dri2 xcb-glx z
WANTLIB-qt += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
inputmethods/uim
@ -102,7 +103,7 @@ WANTLIB-qt4 += uim-custom uim-scm
LIB_DEPENDS-qt4= ${MODQT4_LIB_DEPENDS} \
inputmethods/uim
AUTOCONF_VERSION= 2.68
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE}/include' \
@ -114,7 +115,8 @@ CONFIGURE_ARGS= --with-qt \
--with-qt-immodule \
--with-qt4 \
--with-qt4-immodule \
--with-anthy-utf8
--with-anthy-utf8 \
--with-libgcroots
post-install:
rm ${PREFIX}/lib/uim/plugin/*.{a,la}

4
inputmethods/uim/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (uim-1.8.6.tar.gz) = DuvPWyGS0M0RAYrb1p41i/oGLTtdY8HdC3PV9j63r+c=
SIZE (uim-1.8.6.tar.gz) = 8195769
SHA256 (uim-1.8.8.tar.gz) = Rrk0Y94nt2s9A5040dl7aKya3aYpaUrv+I2cSxhNVgQ=
SIZE (uim-1.8.8.tar.gz) = 7827966

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

@ -1,40 +1,51 @@
$OpenBSD: patch-configure_ac,v 1.6 2015/01/09 16:45:37 ajacoutot Exp $
--- configure.ac.orig Sun Jun 30 06:26:20 2013
+++ configure.ac Fri Jan 9 09:57:19 2015
@@ -1387,15 +1387,10 @@ if test x$use_qt = xyes ; then
fi
UIC=$HOST_UIC
$OpenBSD: patch-configure_ac,v 1.7 2019/03/11 11:16:05 bentley Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -32,7 +32,7 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PATH_PROG(SH, sh)
AC_PATH_PROG(RSVG, rsvg-convert)
-AC_PATH_PROG(CSI, csi)
+AC_PATH_PROG(CSI, )
AC_PATH_PROGS(MD5, md5 md5sum)
AC_PATH_PROGS(SHA1, sha1 sha1sum)
AC_PATH_PROGS(SED, sed gsed)
@@ -971,15 +971,10 @@ if test "x$with_qt" = xyes; then
fi
UIC=$HOST_UIC
- # GUESS plugins dir for immodule installation
- AC_MSG_CHECKING(for qt-immodule plugins dir)
- 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
+ # set plugins dir for immodule installation
+ QT_PLUGINSDIR=$QTPLUGINSDIR
+ AC_MSG_RESULT($QT_PLUGINSDIR)
+ AC_SUBST(QT_PLUGINSDIR)
- # GUESS plugins dir for immodule installation
- AC_MSG_CHECKING(for qt-immodule plugins dir)
- 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
+ # 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"
@@ -1407,13 +1402,10 @@ if test x$use_qt = xyes ; then
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
- AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
- AC_MSG_ERROR([Cannot find QT libraries.])))
+ AC_CHECK_LIB(qt-mt, main, QT_LIB='-pthread -lqt-mt',
+ AC_MSG_ERROR([Cannot find QT libraries.]), -pthread)
# Process for compiler & linker flags
QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
@@ -991,13 +986,10 @@ if test "x$with_qt" = xyes; then
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_CHECK_LIB(qt, main, QT_LIB=-lqt,
- AC_CHECK_LIB(qt-mt, main, QT_LIB=-lqt-mt,
- AC_MSG_ERROR([Cannot find QT libraries.])))
+ AC_CHECK_LIB(qt-mt, main, QT_LIB='-pthread -lqt-mt',
+ AC_MSG_ERROR([Cannot find QT libraries.]), -pthread)
- if test "$QT_LIB" = "-lqt-mt"; then
- QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
- fi
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
- if test "$QT_LIB" = "-lqt-mt"; then
- QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
- fi
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
LDFLAGS=$_SAVE_LDFLAGS
QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11"
LDFLAGS=$_SAVE_LDFLAGS
QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11"

23
inputmethods/uim/patches/patch-qt3_toolbar_Makefile_in
View File

@ -1,15 +1,16 @@
$OpenBSD: patch-qt3_toolbar_Makefile_in,v 1.1 2015/01/09 16:45:37 ajacoutot Exp $
$OpenBSD: patch-qt3_toolbar_Makefile_in,v 1.2 2019/03/11 11:16:05 bentley Exp $
Undefined references to libc functions.
--- qt3/toolbar/Makefile.in.orig Fri Jan 9 10:26:52 2015
+++ qt3/toolbar/Makefile.in Fri Jan 9 10:27:43 2015
@@ -508,7 +508,7 @@ EXTRA_DIST = uimapplet.desktop.in
@APPLET_KDE_TRUE@@QT_TRUE@ common-quimhelpertoolbar.h common-uimstateindicator.h
Index: qt3/toolbar/Makefile.in
--- qt3/toolbar/Makefile.in.orig
+++ qt3/toolbar/Makefile.in
@@ -623,7 +623,7 @@ EXTRA_DIST = uimapplet.desktop.in
@KDE_APPLET_TRUE@@QT_TRUE@ common-quimhelpertoolbar.h common-uimstateindicator.h
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
@KDE_APPLET_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
-@KDE_APPLET_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
+@KDE_APPLET_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
@KDE_APPLET_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
@KDE_APPLET_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \
@KDE_APPLET_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore

8
inputmethods/uim/patches/patch-qt4_immodule_plugin_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-qt4_immodule_plugin_cpp,v 1.1 2017/05/06 17:23:35 espie Exp $
$OpenBSD: patch-qt4_immodule_plugin_cpp,v 1.2 2019/03/11 11:16:05 bentley Exp $
Index: qt4/immodule/plugin.cpp
--- qt4/immodule/plugin.cpp.orig
+++ qt4/immodule/plugin.cpp
@@ -46,6 +46,7 @@
#include "quiminfomanager.h"
@@ -68,6 +68,7 @@
# undef None
#endif
#include "quiminputcontext_with_slave.h"
+#include <locale.h>

17
inputmethods/uim/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2018/06/27 21:03:55 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2019/03/11 11:16:05 bentley Exp $
@pkgpath inputmethods/uim
@pkgpath inputmethods/uim,-gnome
@bin bin/uim-el-agent
@ -9,7 +9,6 @@
@bin bin/uim-module-manager
@bin bin/uim-sh
@bin bin/uim-xim
include/gcroots.h
include/uim/
include/uim/dynlib.h
include/uim/uim-custom.h
@ -22,9 +21,6 @@ include/uim/uim-scm.h
include/uim/uim-util.h
include/uim/uim.h
include/uim/version.h
lib/libgcroots.a
lib/libgcroots.la
@lib lib/libgcroots.so.${LIBgcroots_VERSION}
lib/libuim-custom.a
lib/libuim-custom.la
@lib lib/libuim-custom.so.${LIBuim-custom_VERSION}
@ -34,19 +30,21 @@ lib/libuim-scm.la
lib/libuim.a
lib/libuim.la
@lib lib/libuim.so.${LIBuim_VERSION}
lib/pkgconfig/gcroots.pc
lib/pkgconfig/uim.pc
lib/uim/
lib/uim/plugin/
lib/uim/plugin/libuim-anthy-utf8.so
lib/uim/plugin/libuim-anthy.so
lib/uim/plugin/libuim-custom-enabler.so
lib/uim/plugin/libuim-editline.so
lib/uim/plugin/libuim-fileio.so
lib/uim/plugin/libuim-lolevel.so
lib/uim/plugin/libuim-look.so
lib/uim/plugin/libuim-process.so
lib/uim/plugin/libuim-skk.so
lib/uim/plugin/libuim-socket.so
lib/uim/plugin/libuim-sqlite3.so
lib/uim/plugin/libuim-xkb.so
@bin libexec/uim-helper-server
@man man/man1/uim-xim.1
share/applications/uim.desktop
@ -298,8 +296,6 @@ share/uim/pixmaps/skk.png
share/uim/pixmaps/skk.svg
share/uim/pixmaps/skk_dark_background.png
share/uim/pixmaps/skk_dark_background.svg
share/uim/pixmaps/social-ime.png
share/uim/pixmaps/social-ime.svg
share/uim/pixmaps/tcode.png
share/uim/pixmaps/tcode.svg
share/uim/pixmaps/tcode_dark_background.png
@ -352,7 +348,6 @@ share/uim/pyload.scm
share/uim/pyunihan.scm
share/uim/rk.scm
share/uim/romaja.scm
share/uim/scim.scm
share/uim/sj3-custom.scm
share/uim/sj3-key-custom.scm
share/uim/sj3.scm
@ -362,9 +357,6 @@ share/uim/skk-dialog.scm
share/uim/skk-editor.scm
share/uim/skk-key-custom.scm
share/uim/skk.scm
share/uim/social-ime-custom.scm
share/uim/social-ime-key-custom.scm
share/uim/social-ime.scm
share/uim/socket.scm
share/uim/sqlite3.scm
share/uim/sxml-tools.scm
@ -396,6 +388,7 @@ share/uim/wlos.scm
share/uim/wnn-custom.scm
share/uim/wnn-key-custom.scm
share/uim/wnn.scm
share/uim/xkb.scm
share/uim/xmload.scm
share/uim/yahoo-jp-custom.scm
share/uim/yahoo-jp-key-custom.scm