summaryrefslogtreecommitdiff
path: root/textproc/uim/files
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/uim/files')
-rw-r--r--textproc/uim/files/patch-Makefile.in14
-rw-r--r--textproc/uim/files/patch-configure21
-rw-r--r--textproc/uim/files/patch-emacs_Makefile.in18
-rw-r--r--textproc/uim/files/patch-gtk:Makefile.in26
-rw-r--r--textproc/uim/files/patch-helper:Makefile.in12
-rw-r--r--textproc/uim/files/patch-scm:Makefile.in20
-rw-r--r--textproc/uim/files/patch-uim:scim.cpp14
7 files changed, 55 insertions, 70 deletions
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
index c73f080216db..c7c93b8da70e 100644
--- a/textproc/uim/files/patch-Makefile.in
+++ b/textproc/uim/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Apr 7 13:38:51 2004
-+++ Makefile.in Wed Apr 7 23:23:22 2004
-@@ -201,7 +201,7 @@
-
- DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update
+--- Makefile.in.orig Fri Dec 16 17:11:10 2005
++++ Makefile.in Sat Dec 24 03:01:18 2005
+@@ -335,7 +335,7 @@
+ uim.pc.in ChangeLog.old uim.desktop autogen.sh
+ DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = uim.pc
-
- noinst_PROGRAMS = $(gtk_entry) uim-agent
+ desktopdir = $(datadir)/applications
+ desktop_in_files = uim.desktop.in
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
deleted file mode 100644
index 71bd426e8d70..000000000000
--- a/textproc/uim/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Sun Aug 1 22:33:54 2004
-+++ configure Sun Aug 1 22:34:13 2004
-@@ -19203,18 +19203,6 @@
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test "x" != "xno-xml"; then
-- echo "$as_me:$LINENO: checking for XML::Parser" >&5
--echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
-- else
-- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
-
- # Remove file type tags (using []) from po/POTFILES.
-
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
new file mode 100644
index 000000000000..41b7fb305fd0
--- /dev/null
+++ b/textproc/uim/files/patch-emacs_Makefile.in
@@ -0,0 +1,18 @@
+--- emacs/Makefile.in.orig Fri Dec 16 17:10:53 2005
++++ emacs/Makefile.in Sat Dec 24 07:41:33 2005
+@@ -670,15 +670,6 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-install-dist_uimel_lispDATA: $(dist_uimel_lisp_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(uimel_lispdir)" || $(mkdir_p) "$(DESTDIR)$(uimel_lispdir)"
+- @list='$(dist_uimel_lisp_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(dist_uimel_lispDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uimel_lispdir)/$$f'"; \
+- $(dist_uimel_lispDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uimel_lispdir)/$$f"; \
+- done
+
+ uninstall-dist_uimel_lispDATA:
+ @$(NORMAL_UNINSTALL)
diff --git a/textproc/uim/files/patch-gtk:Makefile.in b/textproc/uim/files/patch-gtk:Makefile.in
index ac634886e5e4..6750131592fe 100644
--- a/textproc/uim/files/patch-gtk:Makefile.in
+++ b/textproc/uim/files/patch-gtk:Makefile.in
@@ -1,25 +1,25 @@
---- gtk/Makefile.in.orig Wed Mar 2 02:29:13 2005
-+++ gtk/Makefile.in Wed Mar 2 02:37:44 2005
-@@ -308,15 +308,15 @@
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- moduleLTLIBRARIES_INSTALL = $(INSTALL)
+--- gtk/Makefile.in.orig Fri Dec 16 17:10:56 2005
++++ gtk/Makefile.in Sat Dec 24 03:04:10 2005
+@@ -381,15 +381,15 @@
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(moduledir)
+- test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
- @list='$(module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \
-- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
- else :; fi; \
- done
+@GTK2_TRUE@ @$(NORMAL_INSTALL)
-+@GTK2_TRUE@ $(mkinstalldirs) $(DESTDIR)$(moduledir)
++@GTK2_TRUE@ test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
+@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+@GTK2_TRUE@ if test -f $$p; then \
-+@GTK2_TRUE@ f="`echo $$p | sed -e 's|^.*/||'`"; \
-+@GTK2_TRUE@ echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \
-+@GTK2_TRUE@ $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \
++@GTK2_TRUE@ f=$(am__strip_dir) \
++@GTK2_TRUE@ echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
++@GTK2_TRUE@ $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+@GTK2_TRUE@ else :; fi; \
+@GTK2_TRUE@ done
diff --git a/textproc/uim/files/patch-helper:Makefile.in b/textproc/uim/files/patch-helper:Makefile.in
index b2c7abf24154..7b67242c125c 100644
--- a/textproc/uim/files/patch-helper:Makefile.in
+++ b/textproc/uim/files/patch-helper:Makefile.in
@@ -1,9 +1,9 @@
---- helper/Makefile.in.orig Wed Apr 7 05:45:42 2004
-+++ helper/Makefile.in Wed Apr 7 22:21:03 2004
-@@ -203,7 +203,7 @@
-
- @APPLET_TRUE@uim_helper_applet_SOURCES = helper-applet.c helper-toolbar-common-gtk.c
-
+--- helper/Makefile.in.orig Fri Dec 16 17:10:59 2005
++++ helper/Makefile.in Sat Dec 24 03:05:26 2005
+@@ -422,7 +422,7 @@
+ @APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
+ @APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@ @GNOME2_CFLAGS@ -Wall
+ @APPLET_TRUE@uim_toolbar_applet_SOURCES = toolbar-applet-gnome.c toolbar-common-gtk.c
-@APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
+@APPLET_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
@APPLET_TRUE@server_DATA = GNOME_UimApplet.server
diff --git a/textproc/uim/files/patch-scm:Makefile.in b/textproc/uim/files/patch-scm:Makefile.in
deleted file mode 100644
index f6476fc0ce15..000000000000
--- a/textproc/uim/files/patch-scm:Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- scm/Makefile.in.orig Tue Nov 22 03:25:25 2005
-+++ scm/Makefile.in Tue Nov 22 03:27:10 2005
-@@ -283,6 +283,8 @@
- tcode.scm \
- tutcode.scm tutcode-key-custom.scm \
- hangul.scm hangul2.scm hangul3.scm romaja.scm \
-+ byeoru.scm byeoru-dic.scm byeoru-symbols.scm \
-+ byeoru-custom.scm byeoru-key-custom.scm \
- viqr.scm \
- ipa-x-sampa.scm \
- latin.scm \
-@@ -293,7 +295,7 @@
- uim-module-manager.scm\
- $(am__append_1)
-
--module_names = "pyload" $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5) "tcode" "tutcode" "hangul" "viqr" "ipa-x-sampa" "latin" $(am__append_6) $(am__append_7)
-+module_names = "pyload" $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5) "tcode" "tutcode" "byeoru" "hangul" "viqr" "ipa-x-sampa" "latin" $(am__append_6) $(am__append_7)
- subdir = scm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/uim/files/patch-uim:scim.cpp b/textproc/uim/files/patch-uim:scim.cpp
index 863f6e36452f..c0176673863d 100644
--- a/textproc/uim/files/patch-uim:scim.cpp
+++ b/textproc/uim/files/patch-uim:scim.cpp
@@ -1,6 +1,14 @@
---- uim/scim.cpp.orig Wed Sep 21 00:27:36 2005
-+++ uim/scim.cpp Wed Sep 21 00:29:33 2005
-@@ -175,7 +175,7 @@
+--- uim/scim.cpp.orig Wed Dec 7 21:39:32 2005
++++ uim/scim.cpp Sat Dec 24 04:13:02 2005
+@@ -43,7 +43,6 @@
+ #include "uim.h"
+ #include "uim-scm.h"
+ #include "uim-compat-scm.h"
+-#include "context.h"
+
+ using namespace scim;
+
+@@ -175,7 +174,7 @@
return uim_scm_f();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 04:08:52 +0000