From f03571ca47193b53bd5daf4b78f91b2f6ee93eca Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 24 May 2002 03:26:43 +0000 Subject: Update to 1.4.1.7. --- x11/gnome-libs/Makefile | 3 +-- x11/gnome-libs/distinfo | 2 +- x11/gnome-libs/files/patch-bl | 12 ++++++------ x11/gnomelibs/Makefile | 3 +-- x11/gnomelibs/distinfo | 2 +- x11/gnomelibs/files/patch-bl | 12 ++++++------ 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 3dd53dba8f9d..1aaf9dcc8d2d 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.4.1.6 -PORTREVISION= 1 +PORTVERSION= 1.4.1.7 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index 548755c88156..4efd5364e8fc 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome/gnome-libs-1.4.1.6.tar.bz2) = 6a629eb2b5cfebf26f3d5b59d51ee83b +MD5 (gnome/gnome-libs-1.4.1.7.tar.bz2) = 3b6d1f4e6a9c56d6dc3f3f19e8397de5 diff --git a/x11/gnome-libs/files/patch-bl b/x11/gnome-libs/files/patch-bl index 6e87d04eb50c..02b86a246a0e 100644 --- a/x11/gnome-libs/files/patch-bl +++ b/x11/gnome-libs/files/patch-bl @@ -1,26 +1,26 @@ $FreeBSD$ ---- libgnomeui/gnome-init.c.orig Thu Aug 16 21:15:48 2001 -+++ libgnomeui/gnome-init.c Wed Aug 22 16:15:00 2001 -@@ -205,32 +205,8 @@ +--- libgnomeui/gnome-init.c.orig Tue May 14 06:32:19 2002 ++++ libgnomeui/gnome-init.c Thu May 23 23:09:44 2002 +@@ -205,32 +205,6 @@ switch(reason) { case POPT_CALLBACK_REASON_PRE: { - char *ctype, *old_ctype = NULL; - gboolean ctype_set; - - gnome_segv_setup (FALSE); +- gnome_segv_setup (FALSE); - ctype = setlocale (LC_CTYPE, NULL); - -- if (!strcmp(ctype, "C")) { +- if (ctype && !strcmp(ctype, "C")) { - old_ctype = g_strdup (getenv ("LC_CTYPE")); - putenv ("LC_CTYPE=en_US"); - ctype_set = TRUE; - } else - ctype_set = FALSE; - - gtk_set_locale (); +- gtk_set_locale (); - - if (ctype_set) { - char *setme; diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 3dd53dba8f9d..1aaf9dcc8d2d 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.4.1.6 -PORTREVISION= 1 +PORTVERSION= 1.4.1.7 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo index 548755c88156..4efd5364e8fc 100644 --- a/x11/gnomelibs/distinfo +++ b/x11/gnomelibs/distinfo @@ -1 +1 @@ -MD5 (gnome/gnome-libs-1.4.1.6.tar.bz2) = 6a629eb2b5cfebf26f3d5b59d51ee83b +MD5 (gnome/gnome-libs-1.4.1.7.tar.bz2) = 3b6d1f4e6a9c56d6dc3f3f19e8397de5 diff --git a/x11/gnomelibs/files/patch-bl b/x11/gnomelibs/files/patch-bl index 6e87d04eb50c..02b86a246a0e 100644 --- a/x11/gnomelibs/files/patch-bl +++ b/x11/gnomelibs/files/patch-bl @@ -1,26 +1,26 @@ $FreeBSD$ ---- libgnomeui/gnome-init.c.orig Thu Aug 16 21:15:48 2001 -+++ libgnomeui/gnome-init.c Wed Aug 22 16:15:00 2001 -@@ -205,32 +205,8 @@ +--- libgnomeui/gnome-init.c.orig Tue May 14 06:32:19 2002 ++++ libgnomeui/gnome-init.c Thu May 23 23:09:44 2002 +@@ -205,32 +205,6 @@ switch(reason) { case POPT_CALLBACK_REASON_PRE: { - char *ctype, *old_ctype = NULL; - gboolean ctype_set; - - gnome_segv_setup (FALSE); +- gnome_segv_setup (FALSE); - ctype = setlocale (LC_CTYPE, NULL); - -- if (!strcmp(ctype, "C")) { +- if (ctype && !strcmp(ctype, "C")) { - old_ctype = g_strdup (getenv ("LC_CTYPE")); - putenv ("LC_CTYPE=en_US"); - ctype_set = TRUE; - } else - ctype_set = FALSE; - - gtk_set_locale (); +- gtk_set_locale (); - - if (ctype_set) { - char *setme; -- cgit