aboutsummaryrefslogtreecommitdiff
path: root/textproc/uim
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-10-21 15:21:13 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-10-21 15:21:13 +0000
commita0bcd2cf684ff6bc2faf242e6678282f20a3ee44 (patch)
treea5029ff30555b3a7ee0621f4dd5aacb832fde1d8 /textproc/uim
parentb7fb6d6f05e67910c9ecd4b0e0e1e0a130f8f54f (diff)
downloadports-a0bcd2cf684ff6bc2faf242e6678282f20a3ee44.tar.gz
ports-a0bcd2cf684ff6bc2faf242e6678282f20a3ee44.zip
Use USES=pathfix where applicable.
PR: 213195 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D8093
Notes
Notes: svn path=/head/; revision=424427
Diffstat (limited to 'textproc/uim')
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in10
-rw-r--r--textproc/uim/files/extra-patch-gtk2_pad_Makefile.in8
-rw-r--r--textproc/uim/files/extra-patch-gtk2_pref_Makefile.in8
-rw-r--r--textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in8
-rw-r--r--textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in24
-rw-r--r--textproc/uim/files/patch-Makefile.in11
-rw-r--r--textproc/uim/files/patch-emacs_Makefile.in6
-rw-r--r--textproc/uim/files/patch-po_Makefile.in.in6
-rw-r--r--textproc/uim/files/patch-qt4_immodule_plugin.cpp6
-rw-r--r--textproc/uim/files/patch-scm_sj3-custom.scm4
-rw-r--r--textproc/uim/files/patch-sigscheme_doc_Makefile.in6
-rw-r--r--textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in11
-rw-r--r--textproc/uim/files/patch-uim_uim.c8
-rw-r--r--textproc/uim/files/patch-uim_uim.h6
-rw-r--r--textproc/uim/files/patch-xim_convdisp.cpp12
16 files changed, 52 insertions, 84 deletions
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d72844234675..d065d704e1fc 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -16,7 +16,7 @@ COMMENT?= Input method library
USE_LDCONFIG= yes
WANT_GNOME= yes
USE_GNOME+= glib20 intltool
-USES+= gettext gmake iconv libedit libtool pkgconfig perl5 tar:bzip2
+USES+= gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2
USE_PERL5= build
GNU_CONFIGURE= yes
diff --git a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
index 6e38e60ba9b1..83ea3314bf75 100644
--- a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
@@ -1,7 +1,7 @@
---- gtk2/immodule/Makefile.in.orig 2012-04-01 04:00:38.000000000 +0900
-+++ gtk2/immodule/Makefile.in 2012-04-01 04:04:21.000000000 +0900
-@@ -82,8 +82,7 @@
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+--- gtk2/immodule/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ gtk2/immodule/Makefile.in
+@@ -105,8 +105,7 @@ am__uninstall_files_from_dir = { \
+ }
am__installdirs = "$(DESTDIR)$(moduledir)"
LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
@@ -10,7 +10,7 @@
@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 \
-@@ -411,8 +410,8 @@
+@@ -442,8 +441,8 @@ moduledir = $(uim_gtk_im_module_path)/@G
@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@
diff --git a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
index 01f417ff8f36..f36e2e0db757 100644
--- a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/pad/Makefile.in.orig 2012-04-01 03:20:14.000000000 +0900
-+++ gtk2/pad/Makefile.in 2012-04-01 03:21:13.000000000 +0900
-@@ -63,9 +63,7 @@
+--- gtk2/pad/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ gtk2/pad/Makefile.in
+@@ -80,9 +80,7 @@ am__uim_input_pad_ja_SOURCES_DIST = ja.c
@GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \
@GTK2_TRUE@ uim_input_pad_ja-ja.$(OBJEXT)
uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
@@ -11,7 +11,7 @@
uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -353,8 +351,8 @@
+@@ -378,8 +376,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK2_TRUE@uim_input_pad_ja_SOURCES = ja.c
diff --git a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
index a76eec25decd..b73282d6a8cb 100644
--- a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/pref/Makefile.in.orig 2012-04-01 03:22:10.000000000 +0900
-+++ gtk2/pref/Makefile.in 2012-04-01 03:28:01.000000000 +0900
-@@ -69,9 +69,6 @@
+--- gtk2/pref/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ gtk2/pref/Makefile.in
+@@ -86,9 +86,6 @@ am__uim_pref_gtk_SOURCES_DIST = gtk.c gt
@GTK2_4_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT)
uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = \
@@ -10,7 +10,7 @@
@GTK2_4_TRUE@@PREF_TRUE@ $(am__append_1)
uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
-@@ -367,9 +364,9 @@
+@@ -392,9 +389,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
@GTK2_4_TRUE@@PREF_TRUE@ ../immodule/key-util-gtk.h
@GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
diff --git a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
index ca383192b6b6..aa90ca6a2e75 100644
--- a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/switcher/Makefile.in.orig 2012-04-01 03:28:48.000000000 +0900
-+++ gtk2/switcher/Makefile.in 2012-04-01 03:30:27.000000000 +0900
-@@ -63,11 +63,7 @@
+--- gtk2/switcher/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ gtk2/switcher/Makefile.in
+@@ -80,11 +80,7 @@ am__uim_im_switcher_gtk_SOURCES_DIST = g
@GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \
@GTK2_TRUE@ uim_im_switcher_gtk-gtk.$(OBJEXT)
uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
@@ -13,7 +13,7 @@
uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -356,10 +352,9 @@
+@@ -381,10 +377,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
uim_pixmapsdir = @uim_pixmapsdir@
@GTK2_TRUE@uim_im_switcher_gtk_SOURCES = gtk.c
diff --git a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
index cdb29fc9811f..0b3e2e0e187e 100644
--- a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
@@ -1,6 +1,6 @@
---- gtk2/toolbar/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900
-+++ gtk2/toolbar/Makefile.in 2012-04-01 04:11:24.000000000 +0900
-@@ -71,10 +71,7 @@
+--- gtk2/toolbar/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ gtk2/toolbar/Makefile.in
+@@ -88,10 +88,7 @@ am__uim_toolbar_applet_SOURCES_DIST = ap
@APPLET_GNOME_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \
@APPLET_GNOME_TRUE@ uim_toolbar_applet-common-gtk.$(OBJEXT)
uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
@@ -12,7 +12,7 @@
uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -82,9 +79,7 @@
+@@ -99,9 +96,7 @@ uim_toolbar_applet_LINK = $(LIBTOOL) --t
am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \
uim_toolbar_gtk-common-gtk.$(OBJEXT)
uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
@@ -23,7 +23,7 @@
uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -94,10 +89,7 @@
+@@ -111,10 +106,7 @@ am_uim_toolbar_gtk_systray_OBJECTS = \
uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
uim_toolbar_gtk_systray_OBJECTS = \
$(am_uim_toolbar_gtk_systray_OBJECTS)
@@ -35,7 +35,7 @@
uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -412,16 +404,16 @@
+@@ -443,9 +435,9 @@ uim_pixmapsdir = @uim_pixmapsdir@
EXTRA_DIST = GNOME_UimApplet.server.in.in
helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
@@ -48,15 +48,7 @@
@APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
- # recent version of gcc has the option to suppress the warning
- #uim_toolbar_applet_CFLAGS += -Wno-overlength-strings
- @APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = applet-gnome.c common-gtk.c
--@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers
-+@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
- @APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server
- @APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in)
- @APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in)
-@@ -429,9 +421,9 @@
+@@ -460,9 +452,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
@APPLET_GNOME_TRUE@ GNOME_UimApplet.server.in.tmp
uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c
@@ -69,7 +61,7 @@
uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
-@@ -440,9 +432,9 @@
+@@ -471,9 +463,9 @@ uim_toolbar_gtk_systray_SOURCES = systra
uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
@X11_LIBS@ \
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
deleted file mode 100644
index f7281bebff4b..000000000000
--- a/textproc/uim/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2007-03-15 05:37:43.000000000 +0900
-+++ Makefile.in 2007-09-25 00:15:31.000000000 +0900
-@@ -316,7 +316,7 @@
- uim.pc.in uim.desktop uim.spec.in uim.spec \
- intltool-extract.in intltool-merge.in intltool-update.in
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = uim.pc
- desktopdir = $(datadir)/applications
- desktop_in_files = uim.desktop.in
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
index e110aa935ef7..75fc0515604a 100644
--- a/textproc/uim/files/patch-emacs_Makefile.in
+++ b/textproc/uim/files/patch-emacs_Makefile.in
@@ -1,6 +1,6 @@
---- emacs/Makefile.in.orig 2013-03-31 19:14:02.000000000 +0900
-+++ emacs/Makefile.in 2013-05-13 22:11:19.000000000 +0900
-@@ -872,21 +872,6 @@
+--- emacs/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ emacs/Makefile.in
+@@ -872,21 +872,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
diff --git a/textproc/uim/files/patch-po_Makefile.in.in b/textproc/uim/files/patch-po_Makefile.in.in
index f46b94abb208..ebd95543f233 100644
--- a/textproc/uim/files/patch-po_Makefile.in.in
+++ b/textproc/uim/files/patch-po_Makefile.in.in
@@ -1,6 +1,6 @@
---- po/Makefile.in.in.orig 2007-09-25 01:35:53.000000000 +0900
-+++ po/Makefile.in.in 2007-09-25 01:36:59.000000000 +0900
-@@ -33,7 +33,7 @@
+--- po/Makefile.in.in.orig 2013-06-30 04:27:11 UTC
++++ po/Makefile.in.in
+@@ -33,7 +33,7 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
diff --git a/textproc/uim/files/patch-qt4_immodule_plugin.cpp b/textproc/uim/files/patch-qt4_immodule_plugin.cpp
index 79b5b551db23..878b3d0ecc7f 100644
--- a/textproc/uim/files/patch-qt4_immodule_plugin.cpp
+++ b/textproc/uim/files/patch-qt4_immodule_plugin.cpp
@@ -8,9 +8,7 @@ Date: Sun Mar 2 13:26:18 2014 +0200
- Stop relying on implicit includes that may not always work and
explicitly include <clocale> for the setlocale(3) call.
-diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
-index cb5863a..be2b9f2 100644
---- qt4/immodule/plugin.cpp
+--- qt4/immodule/plugin.cpp.orig 2013-06-30 04:26:20 UTC
+++ qt4/immodule/plugin.cpp
@@ -34,6 +34,8 @@
@@ -19,5 +17,5 @@ index cb5863a..be2b9f2 100644
+#include <clocale>
+
#include <QtCore/QStringList>
+ #include <QtGui/QInputContext>
#ifdef Q_WS_X11
- # include <QtGui/QX11Info>
diff --git a/textproc/uim/files/patch-scm_sj3-custom.scm b/textproc/uim/files/patch-scm_sj3-custom.scm
index 7886bcda53c3..53c1f4995ec0 100644
--- a/textproc/uim/files/patch-scm_sj3-custom.scm
+++ b/textproc/uim/files/patch-scm_sj3-custom.scm
@@ -1,5 +1,5 @@
---- scm/sj3-custom.scm.orig 2010-10-17 14:09:36.000000000 +0900
-+++ scm/sj3-custom.scm 2010-10-17 14:10:09.000000000 +0900
+--- scm/sj3-custom.scm.orig 2013-06-30 04:26:09 UTC
++++ scm/sj3-custom.scm
@@ -339,7 +339,7 @@
(N_ "SJ3 user name")
(N_ "long description will be here."))
diff --git a/textproc/uim/files/patch-sigscheme_doc_Makefile.in b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
index 46c9c30d01b4..d00f0fb7dd4f 100644
--- a/textproc/uim/files/patch-sigscheme_doc_Makefile.in
+++ b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
@@ -1,6 +1,6 @@
---- sigscheme/doc/Makefile.in.orig 2007-09-25 01:31:53.000000000 +0900
-+++ sigscheme/doc/Makefile.in 2007-09-25 01:33:45.000000000 +0900
-@@ -151,7 +151,7 @@
+--- sigscheme/doc/Makefile.in.orig 2016-10-14 09:57:35 UTC
++++ sigscheme/doc/Makefile.in
+@@ -210,7 +210,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in b/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
deleted file mode 100644
index bbdc4069ecd5..000000000000
--- a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigscheme/libgcroots/Makefile.in.orig 2007-09-25 01:58:25.000000000 +0900
-+++ sigscheme/libgcroots/Makefile.in 2007-09-25 01:59:00.000000000 +0900
-@@ -345,7 +345,7 @@
- include/gc_config_macros.h include/private/gc_hdrs.h \
- include/private/gc_locks.h include/private/gc_priv.h \
- include/private/gcconfig.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gcroots.pc
- libgcroots_la_SOURCES = mark.c gcroots.c
-
diff --git a/textproc/uim/files/patch-uim_uim.c b/textproc/uim/files/patch-uim_uim.c
index 60da58bd3278..4e27f596b90c 100644
--- a/textproc/uim/files/patch-uim_uim.c
+++ b/textproc/uim/files/patch-uim_uim.c
@@ -1,6 +1,6 @@
---- uim/uim.c.orig 2008-04-29 10:39:34.000000000 +0900
-+++ uim/uim.c 2009-01-24 10:11:56.000000000 +0900
-@@ -90,10 +90,10 @@ fatal_error_hook(void)
+--- uim/uim.c.orig 2013-06-30 04:26:09 UTC
++++ uim/uim.c
+@@ -101,10 +101,10 @@ fatal_error_hook(void)
uim_fatal_error("an unhandled error raised from Scheme interpreter");
}
@@ -13,7 +13,7 @@
char *sys_load_path;
if (uim_initialized)
-@@ -108,7 +108,7 @@ uim_init(void)
+@@ -119,7 +119,7 @@ uim_init(void)
uim_scm_init(sys_load_path);
uim_scm_set_fatal_error_hook(fatal_error_hook);
diff --git a/textproc/uim/files/patch-uim_uim.h b/textproc/uim/files/patch-uim_uim.h
index d21e789c219f..a7bd530e6be2 100644
--- a/textproc/uim/files/patch-uim_uim.h
+++ b/textproc/uim/files/patch-uim_uim.h
@@ -1,6 +1,6 @@
---- uim/uim.h.orig 2008-09-07 23:05:06.000000000 +0900
-+++ uim/uim.h 2009-01-24 11:20:11.000000000 +0900
-@@ -431,7 +431,7 @@ struct uim_code_converter {
+--- uim/uim.h.orig 2013-06-30 04:26:09 UTC
++++ uim/uim.h
+@@ -430,7 +430,7 @@ struct uim_code_converter {
*
* @return 0 on success, otherwise -1
*/
diff --git a/textproc/uim/files/patch-xim_convdisp.cpp b/textproc/uim/files/patch-xim_convdisp.cpp
index fa4d1d08d4ba..d063027340da 100644
--- a/textproc/uim/files/patch-xim_convdisp.cpp
+++ b/textproc/uim/files/patch-xim_convdisp.cpp
@@ -1,6 +1,6 @@
---- ./xim/convdisp.cpp.orig 2009-01-21 11:16:35.000000000 +0900
-+++ ./xim/convdisp.cpp 2009-01-23 02:41:58.000000000 +0900
-@@ -87,14 +87,14 @@
+--- xim/convdisp.cpp.orig 2013-06-30 04:26:09 UTC
++++ xim/convdisp.cpp
+@@ -87,14 +87,14 @@ init_default_xftfont() {
gXftFont = XftFontOpen(XimServer::gDpy, DefaultScreen(XimServer::gDpy),
XFT_FAMILY, XftTypeString, fontname,
XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -17,7 +17,7 @@
}
}
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ update_default_xftfont() {
DefaultScreen(XimServer::gDpy),
XFT_FAMILY, XftTypeString, fontname,
XFT_PIXEL_SIZE, XftTypeDouble, (double)DEFAULT_FONT_SIZE,
@@ -26,7 +26,7 @@
if (xftfont) {
if (gXftFont)
XftFontClose(XimServer::gDpy, gXftFont);
-@@ -387,7 +387,7 @@
+@@ -387,7 +387,7 @@ PeWin::PeWin(Window pw, const char *im_l
DefaultScreen(XimServer::gDpy),
XFT_FAMILY, XftTypeString, gXftFontName,
XFT_PIXEL_SIZE, XftTypeDouble, (double)mXftFontSize,
@@ -35,7 +35,7 @@
}
mXftDraw = XftDrawCreate(XimServer::gDpy, mPixmap,
DefaultVisual(XimServer::gDpy, scr_num),
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ void PeWin::set_xftfont(const char *xfld
DefaultScreen(XimServer::gDpy),
XFT_FAMILY, XftTypeString, gXftFontName,
XFT_PIXEL_SIZE, XftTypeDouble, (double)size,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 12:55:39 +0000