4 files changed, 12 insertions, 46 deletions

diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab
index 1e3cce24db3c..53fe2cc71565 100644
--- a/x11-toolkits/gal2/files/patch-ab
+++ b/x11-toolkits/gal2/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Mar 12 01:22:39 2004
-+++ Makefile.in	Fri Mar 12 01:22:55 2004
-@@ -129,7 +129,7 @@
- YACC = @YACC@
+--- Makefile.in.orig	Fri Jun  4 17:24:13 2004
++++ Makefile.in	Fri Jun  4 17:25:02 2004
+@@ -145,7 +145,7 @@
+ am__quote = @am__quote@
  gnomelocaledir = @gnomelocaledir@
- 
+ install_sh = @install_sh@
 -SUBDIRS = po gal tests docs art
 +SUBDIRS = po gal docs art
  
  pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gal-2.0.pc
+ pkgconfig_DATA = gal-2.2.pc
diff --git a/x11-toolkits/gal2/files/patch-configure b/x11-toolkits/gal2/files/patch-configure
deleted file mode 100644
index 97aea5b88117..000000000000
--- a/x11-toolkits/gal2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Aug 26 00:06:18 2002
-+++ configure	Mon Aug 26 00:06:32 2002
-@@ -8242,6 +8242,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po
index 0baf35467230..bcd97ad6fff8 100644
--- a/x11-toolkits/gal2/files/patch-po_da.po
+++ b/x11-toolkits/gal2/files/patch-po_da.po
@@ -1,5 +1,5 @@
---- po/da.po.orig	Sat Dec 27 20:57:22 2003
-+++ po/da.po	Sat Dec 27 20:57:29 2003
+--- po/da.po.orig	Sat Dec 27 21:03:49 2003
++++ po/da.po	Sat Dec 27 21:04:00 2003
 @@ -46,11 +46,11 @@
  
  #: gal/e-table/e-cell-date.c:96
diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po
index 7d52a30f8c8a..b3072e58b078 100644
--- a/x11-toolkits/gal2/files/patch-po_zh_CN.po
+++ b/x11-toolkits/gal2/files/patch-po_zh_CN.po
@@ -1,34 +1,10 @@
---- po/zh_CN.po.orig	Sat Dec 27 20:58:11 2003
-+++ po/zh_CN.po	Sat Dec 27 20:58:38 2003
-@@ -31,32 +31,32 @@
- # gal/e-table/e-cell-date.c:58
- #: gal/e-table/e-cell-date.c:58
- msgid "%l:%M %p"
--msgstr "%-H:%M"
-+msgstr "%H:%M"
- 
- # gal/e-table/e-cell-date.c:66
- #: gal/e-table/e-cell-date.c:66
- msgid "Today %l:%M %p"
--msgstr "今天 %-H:%M"
-+msgstr "今天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:81
- #: gal/e-table/e-cell-date.c:76
- msgid "Yesterday %l:%M %p"
--msgstr "昨天 %-H:%M"
-+msgstr "昨天 %H:%M"
- 
- # gal/e-table/e-cell-date.c:96
- #: gal/e-table/e-cell-date.c:88
- msgid "%a %l:%M %p"
--msgstr "%A %-H:%M"
-+msgstr "%A %H:%M"
- 
+--- po/zh_CN.po.orig	Fri Mar  5 12:17:59 2004
++++ po/zh_CN.po	Sat Mar  6 03:08:34 2004
+@@ -51,12 +51,12 @@
  # gal/e-table/e-cell-date.c:104
  #: gal/e-table/e-cell-date.c:96
  msgid "%b %d %l:%M %p"
--msgstr "%-m月%-d日 %-H:%M"
+-msgstr "%-m月%-d日 %H:%M"
 +msgstr "%m月%d日 %H:%M"
  
  # gal/e-table/e-cell-date.c:106