Update to 1.7.0.

This commit is contained in:
MANTANI Nobutaka 2011-05-28 19:42:58 +00:00
parent 6958649e0f
commit d29437f771
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=274766
15 changed files with 32 additions and 28 deletions

View file

@ -19,7 +19,7 @@ USE_GNOME= gtk20
.endif
LIB_DEPENDS= anthy.1:${PORTSDIR}/japanese/anthy \
uim.7:${PORTSDIR}/textproc/uim
uim.8:${PORTSDIR}/textproc/uim
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}

View file

@ -6,7 +6,7 @@
#
PORTNAME= uim-el
PORTVERSION= 1.6.1
PORTVERSION= 1.7.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}

View file

@ -1,2 +1,2 @@
SHA256 (uim-1.6.1.tar.bz2) = ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
SIZE (uim-1.6.1.tar.bz2) = 6192431
SHA256 (uim-1.7.0.tar.bz2) = aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
SIZE (uim-1.7.0.tar.bz2) = 6402469

View file

@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gnome
COMMENT= GNOME applets of uim input method
USE_GNOME= gtk20 gnomepanel libgnomeui
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
MASTERDIR= ${.CURDIR}/../../textproc/uim

View file

@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gtk
COMMENT= GTK+ modules of uim input method
USE_GNOME= gtk20
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}

View file

@ -9,7 +9,7 @@ PKGNAMESUFFIX= -kde
COMMENT= KDE panel applet of uim input method
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
RUN_DEPENDS= uim-pref-qt:${PORTSDIR}/textproc/uim-qt
USE_GCC= 4.2+

View file

@ -10,7 +10,7 @@ PKGNAMESUFFIX= -kde4
COMMENT= KDE4 panel applet of uim input method
BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4
USE_GCC= 4.2+

View file

@ -15,7 +15,7 @@ COMMENT= Uim plugin using m17n library input method
BUILD_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db
LIB_DEPENDS= m17n.4:${PORTSDIR}/devel/m17n-lib \
uim.7:${PORTSDIR}/textproc/uim
uim.8:${PORTSDIR}/textproc/uim
RUN_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db
MASTERDIR= ${.CURDIR}/../../textproc/uim

View file

@ -12,7 +12,7 @@ COMMENT= QT modules of uim input method
USE_QT_VER= 3
USE_AUTOTOOLS= libtool
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}

View file

@ -9,7 +9,7 @@ PKGNAMESUFFIX= -qt4
COMMENT= Qt4 modules of uim input method
LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build qt3support uic

View file

@ -6,7 +6,7 @@
#
PORTNAME= uim
PORTVERSION= 1.6.1
PORTVERSION= 1.7.0
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)

View file

@ -1,2 +1,2 @@
SHA256 (uim-1.6.1.tar.bz2) = ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
SIZE (uim-1.6.1.tar.bz2) = 6192431
SHA256 (uim-1.7.0.tar.bz2) = aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
SIZE (uim-1.7.0.tar.bz2) = 6402469

View file

@ -1,22 +1,25 @@
--- gtk/Makefile.in.orig 2010-08-11 16:30:55.000000000 +0900
+++ gtk/Makefile.in 2010-10-16 21:33:40.000000000 +0900
@@ -85,8 +85,6 @@
--- gtk/Makefile.in.orig 2011-05-17 13:16:12.000000000 +0900
+++ gtk/Makefile.in 2011-05-29 02:29:01.000000000 +0900
@@ -82,10 +82,6 @@
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(moduledir)"
LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la $(am__append_1)
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
-@GTK2_TRUE@ $(am__append_1)
am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
@@ -452,8 +450,8 @@
@@ -443,9 +439,8 @@
@GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
@GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
@GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
-@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la $(am__append_1)
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \
+@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
+@GTK2_TRUE@ -luim $(am__append_1)
+@GTK2_TRUE@ -luim \
@GTK2_TRUE@ $(am__append_1)
@GTK2_TRUE@IM_UIM_SOURCES = \
@GTK2_TRUE@ gtk-im-uim.c gtk-im-uim.h key-util-gtk.c key-util-gtk.h \
@GTK2_TRUE@ uim-cand-win-gtk.c uim-cand-win-gtk.h \

View file

@ -1,11 +1,11 @@
--- qt4/toolbar/CMakeLists.txt.orig 2010-10-17 02:55:35.000000000 +0900
+++ qt4/toolbar/CMakeLists.txt 2010-10-17 02:56:00.000000000 +0900
@@ -15,8 +15,6 @@
--- qt4/toolbar/CMakeLists.txt.orig 2011-05-11 02:45:18.000000000 +0900
+++ qt4/toolbar/CMakeLists.txt 2011-05-29 03:23:18.000000000 +0900
@@ -16,8 +16,6 @@
kde4_add_plugin(plasma_applet_uim ${uim_SRCS})
target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
- ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim.so
- ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim-scm.so
- ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim.so
- ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim-scm.so
-luim -luim-scm)
install(TARGETS plasma_applet_uim DESTINATION ${PLUGIN_INSTALL_DIR})

View file

@ -32,7 +32,7 @@ lib/libuim-scm.so.1
lib/libuim.a
lib/libuim.la
lib/libuim.so
lib/libuim.so.7
lib/libuim.so.8
lib/uim/plugin/libuim-custom-enabler.a
lib/uim/plugin/libuim-custom-enabler.la
lib/uim/plugin/libuim-custom-enabler.so
@ -321,6 +321,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/zm_dark_background.svg
%%DATADIR%%/plugin.scm
%%DATADIR%%/predict-custom.scm
%%DATADIR%%/predict-google-suggest.scm
%%DATADIR%%/predict-look-skk.scm
%%DATADIR%%/predict-look.scm
%%DATADIR%%/predict-sqlite3.scm