diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2011-05-28 19:42:58 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2011-05-28 19:42:58 +0000 |
| commit | d29437f771c37d60bd9dcb45e8fd63b718380dfb (patch) | |
| tree | b24a7e4318115c7fed3964d8d09d6e42fc08d1a2 /textproc/uim/files | |
| parent | - Fix the Konqueror double-POST regression. (diff) | |
Update to 1.7.0.
Notes
Notes:
svn path=/head/; revision=274766
Diffstat (limited to 'textproc/uim/files')
| -rw-r--r-- | textproc/uim/files/extra-patch-gtk_Makefile.in | 19 | ||||
| -rw-r--r-- | textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt | 10 |
2 files changed, 16 insertions, 13 deletions
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in index 84d2f6f6d215..606969264255 100644 --- a/textproc/uim/files/extra-patch-gtk_Makefile.in +++ b/textproc/uim/files/extra-patch-gtk_Makefile.in @@ -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 \ diff --git a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt index 233edf9148df..29436386c833 100644 --- a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt +++ b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt @@ -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}) |