4 files changed, 38 insertions, 14 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index ee9fabb82ad0..8685060d734c 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.12 2005/10/29 22:31:15 marcus Exp $
 #
 
 PORTNAME=	gucharmap
-PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTVERSION=	1.4.4
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
@@ -23,7 +24,7 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk20
+USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils
 WANT_GNOME=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
@@ -41,7 +42,7 @@ WITH_GNOME=	yes
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
-PKGNAMESUFFIX=	-gnome
+PKGNAMESUFFIX:=	-gnome
 .else
 CONFIGURE_ARGS=	--disable-gnome
 .endif
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 439a054a5f65..e51168d1d831 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gucharmap-1.4.3.tar.bz2) = 9003427becd6fae9b2df5ddf1a6c390b
-SIZE (gnome2/gucharmap-1.4.3.tar.bz2) = 1507924
+MD5 (gnome2/gucharmap-1.4.4.tar.bz2) = c9741329d08908a271864664c3f2e91c
+SIZE (gnome2/gucharmap-1.4.4.tar.bz2) = 1450271
diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
index ce9879281483..c0abeb262374 100644
--- a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
+++ b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
@@ -1,6 +1,15 @@
---- gucharmap/gucharmap-window.c.orig	Fri Feb 27 13:11:01 2004
-+++ gucharmap/gucharmap-window.c	Wed Mar  3 22:45:21 2004
-@@ -417,8 +417,8 @@
+--- gucharmap/gucharmap-window.c.orig	Mon Jan 24 05:56:53 2005
++++ gucharmap/gucharmap-window.c	Sat Sep 17 04:04:07 2005
+@@ -82,6 +82,8 @@
+   ChaptersMode chapters_mode; 
+ };
+ 
++static GtkWindowClass *parent_class = NULL;
++
+ static void
+ status_message (GtkWidget       *widget, 
+                 const gchar     *message, 
+@@ -417,8 +419,8 @@
      {
        GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
        gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ()));
@@ -11,7 +20,7 @@
      }
  }
  
-@@ -430,8 +430,8 @@
+@@ -430,8 +432,8 @@
      {
        GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
        gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()));
@@ -22,7 +31,7 @@
      }
  }
  
-@@ -834,12 +834,12 @@
+@@ -834,12 +836,12 @@
    g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw);
  
    priv->progress = gtk_progress_bar_new ();
@@ -37,3 +46,17 @@
  #endif
    gtk_widget_show_all (hbox);
  
+@@ -886,11 +888,13 @@
+     g_free (priv->last_search);
+     */
+ #endif
++  G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+ 
+ static void
+ gucharmap_window_class_init (GucharmapWindowClass *clazz)
+ {
++  parent_class = g_type_class_peek_parent (clazz);
+   GTK_WIDGET_CLASS (clazz)->show_all = show_all;
+   G_OBJECT_CLASS (clazz)->finalize = window_finalize;
+   g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate));
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 489b356c41c4..54775771e877 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -18,8 +18,6 @@ lib/libgucharmap.so
 lib/libgucharmap.so.4
 libdata/pkgconfig/gucharmap.pc
 share/gnome/applications/gucharmap.desktop
-share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/C/figures/gucharmap_window.png
 share/gnome/help/gucharmap/C/gucharmap.xml
 share/gnome/help/gucharmap/C/legal.xml
 share/gnome/help/gucharmap/de/figures/gucharmap_window.png
@@ -82,6 +80,7 @@ share/locale/fa/LC_MESSAGES/gucharmap.mo
 share/locale/fi/LC_MESSAGES/gucharmap.mo
 share/locale/fr/LC_MESSAGES/gucharmap.mo
 share/locale/ga/LC_MESSAGES/gucharmap.mo
+share/locale/gl/LC_MESSAGES/gucharmap.mo
 share/locale/gu/LC_MESSAGES/gucharmap.mo
 share/locale/hi/LC_MESSAGES/gucharmap.mo
 share/locale/hr/LC_MESSAGES/gucharmap.mo
@@ -108,6 +107,7 @@ share/locale/pt/LC_MESSAGES/gucharmap.mo
 share/locale/pt_BR/LC_MESSAGES/gucharmap.mo
 share/locale/ro/LC_MESSAGES/gucharmap.mo
 share/locale/ru/LC_MESSAGES/gucharmap.mo
+share/locale/rw/LC_MESSAGES/gucharmap.mo
 share/locale/sk/LC_MESSAGES/gucharmap.mo
 share/locale/sq/LC_MESSAGES/gucharmap.mo
 share/locale/sr/LC_MESSAGES/gucharmap.mo
@@ -119,6 +119,7 @@ share/locale/tr/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/vi/LC_MESSAGES/gucharmap.mo
 share/locale/wa/LC_MESSAGES/gucharmap.mo
+share/locale/xh/LC_MESSAGES/gucharmap.mo
 share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/omf/gucharmap
@@ -140,7 +141,6 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 @dirrm share/gnome/help/gucharmap/es
 @dirrm share/gnome/help/gucharmap/de/figures
 @dirrm share/gnome/help/gucharmap/de
-@dirrm share/gnome/help/gucharmap/C/figures
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @dirrm include/gucharmap