From owner-freebsd-ports Sat Apr 1 15:20:18 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 3F71237BBEA for ; Sat, 1 Apr 2000 15:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA11166; Sat, 1 Apr 2000 15:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 1BBA837B96C for ; Sat, 1 Apr 2000 15:19:26 -0800 (PST) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA10996; Sat, 1 Apr 2000 15:19:26 -0800 (PST) (envelope-from nobody@FreeBSD.org) Message-Id: <200004012319.PAA10996@freefall.freebsd.org> Date: Sat, 1 Apr 2000 15:19:26 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/17740: Update port: devel/gide Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17740 >Category: ports >Synopsis: Update port: devel/gide >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 1 15:20:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Divide patch one file per patch New file: patches/patch-az patches/patch-ba Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/devel/gide/patches/patch-aa devel/gide/patches/patch-aa --- /usr/ports/devel/gide/patches/patch-aa Sun Apr 2 00:15:01 2000 +++ devel/gide/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,62 +0,0 @@ ---- src/gI_help.c.orig Sat Apr 1 22:15:30 2000 -+++ src/gI_help.c Sat Apr 1 22:17:15 2000 -@@ -370,8 +370,8 @@ - - /* FIXME: We should let the user select which font they want */ - -- normal = gdk_font_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1"); -- bold = gdk_font_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1"); -+ normal = gdk_fontset_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1,*"); -+ bold = gdk_fontset_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*"); - - hbox_man_ctrls = gtk_hbox_new( FALSE, 4 ); - gtk_container_add( GTK_CONTAINER( vbox_main ), hbox_man_ctrls ); ---- src/gide.c.orig Sat Apr 1 22:15:32 2000 -+++ src/gide.c Sat Apr 1 22:23:13 2000 -@@ -223,7 +223,7 @@ - - cfg->fontname = (gchar *) realloc( cfg->fontname, 100 ); - -- strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1" ); -+ strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1,*" ); - /* cfg->font = NULL;*/ - cfg->disable_font_stuff = FALSE; - cfg->bgcol = NULL; -@@ -298,7 +298,7 @@ - } - cfg->style = gtk_style_new(); - gdk_font_unref( cfg->style->font ); -- cfg->style->font = gdk_font_load( cfg->fontname ); -+ cfg->style->font = gdk_fontset_load( cfg->fontname ); - /* if( !cfg->style->font ) - { - strcpy( cfg->fontname, "default font???" ); -@@ -419,7 +419,7 @@ - } - cfg->style = gtk_style_new(); - gdk_font_unref( cfg->style->font ); -- if( (new_font = gdk_font_load( cfg->fontname )) ) -+ if( (new_font = gdk_fontset_load( cfg->fontname )) ) - { - cfg->style->font = new_font; - } ---- extra/gide.scm.orig Sat Apr 1 22:24:49 2000 -+++ extra/gide.scm Sat Apr 1 22:26:18 2000 -@@ -23,7 +23,7 @@ - (define tmpdir "/tmp") - - ;; Editor --(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1") -+(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*") - (define disable_font #f) - (define wordwrap #t) - (define autosave #f) -@@ -40,7 +40,7 @@ - (define toolbar-custom #f) - (define toolbar-custom-list - '()) --(define bash "/bin/bash") -+(define bash "/bin/sh") - (define xterm "xterm") - - ;; Projects diff -urN /usr/ports/devel/gide/patches/patch-ar devel/gide/patches/patch-ar --- /usr/ports/devel/gide/patches/patch-ar Tue Feb 29 12:04:29 2000 +++ devel/gide/patches/patch-ar Sun Apr 2 02:58:34 2000 @@ -1,5 +1,14 @@ --- src/gide.c.orig Sun Feb 27 00:59:52 2000 -+++ src/gide.c Mon Feb 28 00:50:43 2000 ++++ src/gide.c Sun Apr 2 02:51:26 2000 +@@ -223,7 +223,7 @@ + + cfg->fontname = (gchar *) realloc( cfg->fontname, 100 ); + +- strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1" ); ++ strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1,*" ); + /* cfg->font = NULL;*/ + cfg->disable_font_stuff = FALSE; + cfg->bgcol = NULL; @@ -260,16 +260,16 @@ cfg->tab_width = 4; @@ -20,3 +29,21 @@ cfg->xterm = (gchar *) realloc( cfg->xterm, 10 ); strcpy( cfg->xterm, "xterm" ); +@@ -298,7 +298,7 @@ + } + cfg->style = gtk_style_new(); + gdk_font_unref( cfg->style->font ); +- cfg->style->font = gdk_font_load( cfg->fontname ); ++ cfg->style->font = gdk_fontset_load( cfg->fontname ); + /* if( !cfg->style->font ) + { + strcpy( cfg->fontname, "default font???" ); +@@ -419,7 +419,7 @@ + } + cfg->style = gtk_style_new(); + gdk_font_unref( cfg->style->font ); +- if( (new_font = gdk_font_load( cfg->fontname )) ) ++ if( (new_font = gdk_fontset_load( cfg->fontname )) ) + { + cfg->style->font = new_font; + } diff -urN /usr/ports/devel/gide/patches/patch-az devel/gide/patches/patch-az --- /usr/ports/devel/gide/patches/patch-az Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-az Sun Apr 2 02:59:18 2000 @@ -0,0 +1,13 @@ +--- src/gI_help.c.orig Sun Apr 2 02:47:20 2000 ++++ src/gI_help.c Sun Apr 2 02:52:39 2000 +@@ -370,8 +370,8 @@ + + /* FIXME: We should let the user select which font they want */ + +- normal = gdk_font_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1"); +- bold = gdk_font_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1"); ++ normal = gdk_fontset_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1,*"); ++ bold = gdk_fontset_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*"); + + hbox_man_ctrls = gtk_hbox_new( FALSE, 4 ); + gtk_container_add( GTK_CONTAINER( vbox_main ), hbox_man_ctrls ); diff -urN /usr/ports/devel/gide/patches/patch-ba devel/gide/patches/patch-ba --- /usr/ports/devel/gide/patches/patch-ba Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-ba Sun Apr 2 02:54:00 2000 @@ -0,0 +1,20 @@ +--- extra/gide.scm.orig Tue Dec 7 03:32:32 1999 ++++ extra/gide.scm Sun Apr 2 02:53:52 2000 +@@ -23,7 +23,7 @@ + (define tmpdir "/tmp") + + ;; Editor +-(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1") ++(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*") + (define disable_font #f) + (define wordwrap #t) + (define autosave #f) +@@ -40,7 +40,7 @@ + (define toolbar-custom #f) + (define toolbar-custom-list + '()) +-(define bash "/bin/bash") ++(define bash "/bin/sh") + (define xterm "xterm") + + ;; Projects >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message