From owner-freebsd-gnome@FreeBSD.ORG Fri Jun 27 04:33:07 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3AFAD37B401; Fri, 27 Jun 2003 04:33:07 -0700 (PDT) Received: from asa.gascom.net.ru (gsn.gascom.ru [217.17.160.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6C0743FB1; Fri, 27 Jun 2003 04:33:05 -0700 (PDT) (envelope-from asa@asa.gascom.net.ru) Received: from asa.gascom.net.ru (localhost [127.0.0.1]) by asa.gascom.net.ru (8.12.8p1/8.12.8) with ESMTP id h5RBX3cc000839; Fri, 27 Jun 2003 15:33:03 +0400 (MSD) (envelope-from asa@asa.gascom.net.ru) Received: (from asa@localhost) by asa.gascom.net.ru (8.12.8p1/8.12.8/Submit) id h5RBX288000838; Fri, 27 Jun 2003 15:33:02 +0400 (MSD) Date: Fri, 27 Jun 2003 15:33:02 +0400 (MSD) Message-Id: <200306271133.h5RBX288000838@asa.gascom.net.ru> To: FreeBSD-gnats-submit@freebsd.org From: Sergey Akifyev X-send-pr-version: 3.113 X-GNATS-Notify: cc: FreeBSD GNOME Users Subject: update devel/anjuta-devel to 1.1.97 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Sergey Akifyev List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2003 11:33:07 -0000 >Submitter-Id: current-users >Originator: Sergey Akifyev >Organization: JSC Gascom >Confidential: no >Synopsis: update devel/anjuta-devel to 1.1.97 >Severity: non-critical >Priority: medium >Category: ports >Class: update >Release: FreeBSD 4.8-RELEASE i386 >Environment: System: FreeBSD asa.gascom.net.ru 4.8-RELEASE FreeBSD 4.8-RELEASE #5: Fri May 16 11:18:03 MSD 2003 asa@boulder.gascom.ru:/usr/src/sys/compile/ASA i386 >Description: update devel/anjuta-devel to 1.1.97 >How-To-Repeat: apply following patch >Fix: diff -ruN anjuta-devel.orig/Makefile anjuta-devel/Makefile --- anjuta-devel.orig/Makefile Fri Jun 27 14:45:44 2003 +++ anjuta-devel/Makefile Fri Jun 27 14:46:15 2003 @@ -6,8 +6,7 @@ # PORTNAME= anjuta -PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTVERSION= 1.1.97 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta diff -ruN anjuta-devel.orig/distinfo anjuta-devel/distinfo --- anjuta-devel.orig/distinfo Fri Jun 27 14:45:44 2003 +++ anjuta-devel/distinfo Fri Jun 27 14:48:31 2003 @@ -1 +1 @@ -MD5 (anjuta-1.1.1.tar.gz) = 377ae3ad98242f50970da985b484eb15 +MD5 (anjuta-1.1.97.tar.gz) = fc938d304f29f62353ab5fdf48c93685 diff -ruN anjuta-devel.orig/files/patch-src-stack_trace_cbs.c anjuta-devel/files/patch-src-stack_trace_cbs.c --- anjuta-devel.orig/files/patch-src-stack_trace_cbs.c Fri Jun 27 14:45:44 2003 +++ anjuta-devel/files/patch-src-stack_trace_cbs.c Thu Jan 1 03:00:00 1970 @@ -1,20 +0,0 @@ ---- src/stack_trace_cbs.c.orig Tue May 13 11:02:44 2003 -+++ src/stack_trace_cbs.c Tue May 13 11:03:51 2003 -@@ -42,6 +42,8 @@ - { - /* update the current index iterator and number in the stack trace object */ - GtkTreeIter iter; -+ GdkEventButton *bevent; -+ - if (!get_current_iter (st,&iter)) - return FALSE; - -@@ -49,7 +51,7 @@ - st->current_index_iter = gtk_tree_iter_copy (&iter); - st->current_index = get_index_from_iter (st,&iter); - -- GdkEventButton *bevent = (GdkEventButton *) event; -+ bevent = (GdkEventButton *) event; - if (bevent->button != 3) - return FALSE; - bevent->button = 1; diff -ruN anjuta-devel.orig/files/patch-src_getline.c anjuta-devel/files/patch-src_getline.c --- anjuta-devel.orig/files/patch-src_getline.c Fri Jun 27 14:45:44 2003 +++ anjuta-devel/files/patch-src_getline.c Thu Jan 1 03:00:00 1970 @@ -1,80 +0,0 @@ ---- src/getline.c.orig Tue Mar 25 14:58:33 2003 -+++ src/getline.c Sun May 18 14:45:40 2003 -@@ -1,5 +1,5 @@ - /* -- * getline.c Copyright (C) 2003 Michael Tindal -+ * getline.c Copyright (C) 2003 Alexander Nedotsukov - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free -@@ -20,35 +20,48 @@ - #include - #include - #include -+#include - --int getline (char** line, int* size, int fd) -+/* GNU libc getline() compatibility */ -+ -+int -+getline(char** line, size_t* size, FILE* fp) - { -- int len, res; -- short brk = 0; -- char* buf = malloc(2096); -- char buf2[1]; -- -- strcpy (buf, ""); -+ static const size_t line_grow_by = 80; /* in most texts line fits console */ -+ int ch; -+ size_t i; - -- while (!brk) -- { -- if ((res = read(fd, buf2, 1)) < 0) -- return -1; -- if (res != 0) // check for end-of-line -- strcat(buf, buf2); -- if (buf2[0] == '\n' || res == 0) -- brk = 1; -+ if (line == NULL || size == NULL || fp == NULL) { /* illegal call */ -+ errno = EINVAL; -+ return -1; - } -- -- if (*line == NULL) -- { -- *line = (char*)malloc(strlen(buf)); -+ if (*line == NULL && *size) { /* logically incorrect */ -+ errno = EINVAL; -+ return -1; -+ } -+ -+ i = 0; -+ while (1) { -+ ch = fgetc(fp); -+ if (ch == EOF) -+ break; -+ /* ensure bufer still large enough for ch and trailing null */ -+ if ((*size - i) <= 1) { -+ *line = (char*)realloc(*line, *size += line_grow_by); -+ if (*line == NULL) { -+ errno = ENOMEM; -+ return -1; -+ } -+ } -+ *(*line + i++) = (char)ch; -+ if (ch == '\n') -+ break; - } - -- strcpy(*line, buf); -- *size = strlen(*line); -+ *(*line + i) = 0; - -- return *size; -+ return ferror(fp) ? -1 : i; - } - - #endif -+ diff -ruN anjuta-devel.orig/pkg-plist anjuta-devel/pkg-plist --- anjuta-devel.orig/pkg-plist Fri Jun 27 14:45:44 2003 +++ anjuta-devel/pkg-plist Fri Jun 27 15:26:24 2003 @@ -25,8 +25,6 @@ share/gnome/anjuta/glade/start-with-import.png share/gnome/anjuta/glade/start-with-open.png share/gnome/anjuta/glade/start-with-wizard.png -share/gnome/anjuta/glade/windows-style-docked.png -share/gnome/anjuta/glade/windows-style-undocked.png share/gnome/anjuta/gnome/ChangeLog share/gnome/anjuta/gnome/Makefile.am share/gnome/anjuta/gnome/aclocal-include.m4 @@ -82,6 +80,7 @@ share/gnome/anjuta/properties/conf.properties share/gnome/anjuta/properties/cpp.properties share/gnome/anjuta/properties/cs.properties +share/gnome/anjuta/properties/css.properties share/gnome/anjuta/properties/eiffel.properties share/gnome/anjuta/properties/fortran.properties share/gnome/anjuta/properties/html.properties @@ -121,7 +120,7 @@ %%PORTDOCS%%share/doc/anjuta/ScintillaDoc.html %%PORTDOCS%%share/doc/anjuta/TODO share/gnome/anjuta/gdl/glade/layout.glade -share/gnome/apps/Development/anjuta.desktop +share/gnome/applications/anjuta.desktop share/gnome/mime-info/anjuta.mime share/gnome/pixmaps/anjuta/anjuta_icon.png share/gnome/pixmaps/anjuta/anjuta_logo.png @@ -169,12 +168,10 @@ share/gnome/pixmaps/anjuta/build.xpm share/gnome/pixmaps/anjuta/build_all.xpm share/gnome/pixmaps/anjuta/calltip.xpm -share/gnome/pixmaps/anjuta/cfolder.xpm share/gnome/pixmaps/anjuta/close_file_small.xpm share/gnome/pixmaps/anjuta/close_project.png share/gnome/pixmaps/anjuta/compile.xpm share/gnome/pixmaps/anjuta/configure.xpm -share/gnome/pixmaps/anjuta/console.xpm share/gnome/pixmaps/anjuta/continue.xpm share/gnome/pixmaps/anjuta/debug.xpm share/gnome/pixmaps/anjuta/debug_stop.xpm @@ -183,18 +180,6 @@ share/gnome/pixmaps/anjuta/error-next.png share/gnome/pixmaps/anjuta/error-prev-16.png share/gnome/pixmaps/anjuta/error-prev.png -share/gnome/pixmaps/anjuta/file_c.png -share/gnome/pixmaps/anjuta/file_core.png -share/gnome/pixmaps/anjuta/file_cpp.png -share/gnome/pixmaps/anjuta/file_exec.png -share/gnome/pixmaps/anjuta/file_file.png -share/gnome/pixmaps/anjuta/file_h.png -share/gnome/pixmaps/anjuta/file_html.png -share/gnome/pixmaps/anjuta/file_i18n.png -share/gnome/pixmaps/anjuta/file_icon.png -share/gnome/pixmaps/anjuta/file_pix.png -share/gnome/pixmaps/anjuta/file_text.png -share/gnome/pixmaps/anjuta/file_unknown.png share/gnome/pixmaps/anjuta/fold_close.xpm share/gnome/pixmaps/anjuta/fold_open.xpm share/gnome/pixmaps/anjuta/fold_toggle.xpm @@ -209,8 +194,6 @@ share/gnome/pixmaps/anjuta/indent_set.xpm share/gnome/pixmaps/anjuta/inspect.xpm share/gnome/pixmaps/anjuta/interrupt.xpm -share/gnome/pixmaps/anjuta/ledgreen.xpm -share/gnome/pixmaps/anjuta/ledred.xpm share/gnome/pixmaps/anjuta/madeinanjuta.xcf share/gnome/pixmaps/anjuta/messages.xpm share/gnome/pixmaps/anjuta/mini-modules.xpm @@ -222,23 +205,18 @@ share/gnome/pixmaps/anjuta/mini_locals.xpm share/gnome/pixmaps/anjuta/mini_term.xpm share/gnome/pixmaps/anjuta/new_folder.xpm -share/gnome/pixmaps/anjuta/ofolder.xpm share/gnome/pixmaps/anjuta/open_project.png share/gnome/pixmaps/anjuta/password.png share/gnome/pixmaps/anjuta/pointer.xpm share/gnome/pixmaps/anjuta/preferences-build.png share/gnome/pixmaps/anjuta/preferences-cvs.png share/gnome/pixmaps/anjuta/preferences-editor.png +share/gnome/pixmaps/anjuta/preferences-encodings.png share/gnome/pixmaps/anjuta/preferences-general.png share/gnome/pixmaps/anjuta/preferences-indentation.png share/gnome/pixmaps/anjuta/preferences-messages.png share/gnome/pixmaps/anjuta/preferences-print.png share/gnome/pixmaps/anjuta/preferences-terminal.png -share/gnome/pixmaps/anjuta/print_color.xpm -share/gnome/pixmaps/anjuta/print_landscape.xpm -share/gnome/pixmaps/anjuta/print_layout.xpm -share/gnome/pixmaps/anjuta/print_nocolor.xpm -share/gnome/pixmaps/anjuta/print_portrait.xpm share/gnome/pixmaps/anjuta/project.xpm share/gnome/pixmaps/anjuta/registers.xpm share/gnome/pixmaps/anjuta/run_to_cursor.xpm @@ -284,7 +262,6 @@ share/locale/ru/LC_MESSAGES/anjuta.mo share/locale/sk/LC_MESSAGES/anjuta.mo share/locale/sv/LC_MESSAGES/anjuta.mo -share/locale/ta/LC_MESSAGES/anjuta.mo share/locale/tr/LC_MESSAGES/anjuta.mo share/locale/uk/LC_MESSAGES/anjuta.mo share/locale/zh_CN/LC_MESSAGES/anjuta.mo