- updated to 1.8.9

[packages/uim.git] / uim-gnome-panel-update.patch

diff --git a/uim-gnome-panel-update.patch b/uim-gnome-panel-update.patch
index 95ab7cb0b816e11eb0a1861f61ab5c591002ffe0..92de0d1c50f563463d0052d9810b576eca7b805e 100644 (file)
--- a/uim-gnome-panel-update.patch
+++ b/uim-gnome-panel-update.patch
@@ -1,6 +1,6 @@
---- uim-1.8.8/configure.ac.orig        2020-10-17 09:24:42.226622532 +0200
-+++ uim-1.8.8/configure.ac     2020-10-17 11:11:05.698706962 +0200
-@@ -856,7 +856,7 @@
+--- uim-1.8.9/configure.ac.orig        2022-08-19 02:18:18.000000000 +0200
++++ uim-1.8.9/configure.ac     2023-01-31 17:04:41.616929265 +0100
+@@ -874,7 +874,7 @@ AC_ARG_ENABLE(gnome3-applet,
    [enable_gnome3_applet=yes])
  
  if test "x$enable_gnome3_applet" != xno; then
@@ -9,10 +9,10 @@
                      enable_gnome3_applet=yes, enable_gnome3_applet=no)
  fi
  
-@@ -865,7 +865,7 @@
+@@ -883,7 +883,7 @@ AM_CONDITIONAL(GNOME3_APPLET, test "x$en
  if test "x$enable_gnome3_applet" = xyes; then
    AC_ARG_WITH([libpanel-applet-dir], [], [LIBPANEL_APPLET_DIR=$withval], [LIBPANEL_APPLET_DIR=""])
-   if test "$LIBPANEL_APPLET_DIR" == ""; then
+   if test "$LIBPANEL_APPLET_DIR" = ""; then
 -    LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
 +    LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=modulesdir libgnome-panel`
    fi
@@ -162,9 +162,9 @@
  </section>
 +</menu>
 +</interface>
---- uim-1.8.8/gtk3/toolbar/Makefile.am.orig    2017-08-14 02:07:26.000000000 +0200
-+++ uim-1.8.8/gtk3/toolbar/Makefile.am 2020-10-18 10:12:34.632992411 +0200
-@@ -4,42 +4,27 @@
+--- uim-1.8.9/gtk3/toolbar/Makefile.am.orig    2023-01-31 07:05:10.013442140 +0100
++++ uim-1.8.9/gtk3/toolbar/Makefile.am 2023-01-31 17:07:05.979481235 +0100
+@@ -4,46 +4,27 @@ EXTRA_DIST = UimApplet.panel-applet.in.i
  if GNOME3_APPLET
  helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
  
@@ -207,9 +207,13 @@
 -      $(SED) s,@APPLET_LOCATION@,$(APPLET_LOCATION),g <$< >$@.tmp
 -      $(SED) s,@UIM_PIXMAPSDIR@,$(uim_pixmapsdir),g <$@.tmp >$@
 -
--po_files = $(wildcard $(top_srcdir)/po/*.po)
--$(applet_DATA): $(applet_in_files) $(INTLTOOL_MERGE) $(po_files)
--      LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ 
+-if USE_NLS
+-  po_files = $(wildcard $(top_srcdir)/po/*.po)
+-  $(applet_DATA): $(applet_in_files) $(INTLTOOL_MERGE) $(po_files) ;\
+-    LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+-else
+-  $(applet_DATA): $(applet_in_files) ; cp $< $@
+-endif
 -
  DISTCLEANFILES = UimApplet.panel-applet.in UimApplet.panel-applet \
                 UimApplet.panel-applet.in.tmp