From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 19 23:30:04 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8395916A4CE for ; Thu, 19 May 2005 23:30:04 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 800D343D49 for ; Thu, 19 May 2005 23:30:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4JNU3QG092283 for ; Thu, 19 May 2005 23:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4JNU2ec092248; Thu, 19 May 2005 23:30:02 GMT (envelope-from gnats) Resent-Date: Thu, 19 May 2005 23:30:02 GMT Resent-Message-Id: <200505192330.j4JNU2ec092248@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Radek Kozlowski" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C941316A4CE for ; Thu, 19 May 2005 23:23:58 +0000 (GMT) Received: from biggie.spekt.net (biggie.spekt.net [67.18.79.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4672443DA8 for ; Thu, 19 May 2005 23:23:57 +0000 (GMT) (envelope-from radek@raadradd.com) Received: from raadradd.homeunix.org (enp58.neoplus.adsl.tpnet.pl [83.20.5.58]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by biggie.spekt.net (Postfix) with ESMTP id 6D97942BE for ; Fri, 20 May 2005 01:23:50 +0200 (CEST) Received: from ddardaar (ddardaar [192.168.1.11]) by raadradd.homeunix.org (Postfix) with ESMTP id 038EBA536 for ; Fri, 20 May 2005 01:23:56 +0200 (CEST) Message-Id: <1116545086.0@ddardaar> Date: Fri, 20 May 2005 01:24:46 +0200 From: "Radek Kozlowski" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Subject: ports/81283: [MAINTAINER] editors/leafpad: update to 0.8.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 May 2005 23:30:04 -0000 >Number: 81283 >Category: ports >Synopsis: [MAINTAINER] editors/leafpad: update to 0.8.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 19 23:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Radek Kozlowski >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 5.4-PRERELEASE #14: Wed Mar 23 17:46:22 CET 2005 root@ddardaar:/usr/obj/usr/src/sys/DDARDAAR >Description: - update to 0.8.1 - remove files/extra-new-selector.patch (now included in the distribution) >How-To-Repeat: >Fix: --- leafpad-0.8.1.diff begins here --- diff -ruN leafpad.orig/Makefile leafpad/Makefile --- leafpad.orig/Makefile Fri May 20 00:36:07 2005 +++ leafpad/Makefile Fri May 20 01:19:01 2005 @@ -6,8 +6,7 @@ # PORTNAME= leafpad -PORTVERSION= 0.7.9 -PORTREVISION= 2 +PORTVERSION= 0.8.1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,22 +21,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIB="${PTHREAD_LIBS}" +CONFIGURE_ARGS= --enable-chooser +.if !defined(NOPORTDOCS) PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README - -.if defined (WITH_NEW_SELECTOR) -EXTRA_PATCHES= ${FILESDIR}/extra-new-selector.patch -.endif - -pre-everything:: -.if !defined(WITH_NEW_SELECTOR) - @${ECHO_MSG} "" - @${ECHO_MSG} "You may choose to compile with unsupported patch" - @${ECHO_MSG} "that lets leafpad use the new GTK file selector." - @${ECHO_MSG} "Define:" - @${ECHO_MSG} "" - @${ECHO_MSG} " WITH_NEW_SELECTOR=yes" - @${ECHO_MSG} "" .endif post-patch: diff -ruN leafpad.orig/distinfo leafpad/distinfo --- leafpad.orig/distinfo Fri May 20 00:36:07 2005 +++ leafpad/distinfo Fri May 20 00:37:24 2005 @@ -1,2 +1,2 @@ -MD5 (leafpad-0.7.9.tar.gz) = 01d851421f554cce3867e39bb258c414 -SIZE (leafpad-0.7.9.tar.gz) = 192633 +MD5 (leafpad-0.8.1.tar.gz) = 4e640c48b45f5963109b376b57a4c2be +SIZE (leafpad-0.8.1.tar.gz) = 212845 diff -ruN leafpad.orig/files/extra-new-selector.patch leafpad/files/extra-new-selector.patch --- leafpad.orig/files/extra-new-selector.patch Fri May 20 00:36:07 2005 +++ leafpad/files/extra-new-selector.patch Thu Jan 1 01:00:00 1970 @@ -1,130 +0,0 @@ ---- src/callback.c.orig Mon Dec 20 12:58:26 2004 -+++ src/callback.c Thu Feb 3 20:08:07 2005 -@@ -93,7 +93,7 @@ - - if (!check_text_modification(sd)) { - // fi = get_file_info_by_selector(OPEN, sd->fi); -- fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, OPEN); -+ fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, OPEN); - if (fi) { - if (file_open_real(sd->mainwin->textview, fi)) { - g_free(fi); -@@ -123,7 +123,7 @@ - { - FileInfo *fi; - -- fi = get_fileinfo_from_selector(sd->mainwin->window, sd->fi, SAVE); -+ fi = get_fileinfo_from_chooser(sd->mainwin->window, sd->fi, SAVE); - if (fi) { - if (file_save_real(sd->mainwin->textview, fi)) - g_free(fi); ---- src/selector.c.orig Fri Dec 24 10:35:12 2004 -+++ src/selector.c Thu Feb 3 21:02:00 2005 -@@ -310,7 +310,7 @@ - return option_menu; - } - --static GtkWidget *create_file_selector(FileInfo *selected_fi) -+static GtkWidget *create_file_chooser(FileInfo *selected_fi, GtkWidget *window) - { - GtkWidget *filesel; - GtkWidget *align; -@@ -322,12 +322,19 @@ - - title = mode ? _("Open") : _("Save As"); - -- filesel = gtk_file_selection_new(title); --// gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window)); -+ if(mode == OPEN) -+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window), -+ GTK_FILE_CHOOSER_ACTION_OPEN, -+ GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, -+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,NULL); -+ else -+ filesel = gtk_file_chooser_dialog_new(title, GTK_WINDOW(window), -+ GTK_FILE_CHOOSER_ACTION_SAVE, -+ GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, -+ GTK_STOCK_SAVE,GTK_RESPONSE_ACCEPT,NULL); - - align = gtk_alignment_new(1, 0, 0, 0); -- gtk_box_pack_end(GTK_BOX(GTK_FILE_SELECTION(filesel)->main_vbox), -- align, FALSE, FALSE, 0); -+ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(filesel),align); - table = gtk_table_new(2, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 5); - gtk_container_add(GTK_CONTAINER(align), table); -@@ -340,15 +347,15 @@ - option_menu_lineend = create_lineend_menu(selected_fi); - gtk_table_attach_defaults(GTK_TABLE(table), option_menu_lineend, 1, 2, 0, 1); - } -- gtk_widget_show_all(GTK_FILE_SELECTION(filesel)->main_vbox); -+ gtk_widget_show_all(GTK_FILE_CHOOSER(filesel)); - - if (selected_fi->filename) -- gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), selected_fi->filename); -+ gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(filesel), selected_fi->filename); - - return filesel; - } - --FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode) -+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode) - { - FileInfo *selected_fi; - GtkWidget *filesel; -@@ -366,24 +373,24 @@ - selected_fi->manual_charset = - fi->manual_charset ? g_strdup(fi->manual_charset) : NULL; - -- filesel = create_file_selector(selected_fi); -+ filesel = create_file_chooser(selected_fi,window); - - gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(window)); - - do { - res = gtk_dialog_run(GTK_DIALOG(filesel)); -- if (res == GTK_RESPONSE_OK) { -+ if (res == GTK_RESPONSE_ACCEPT) { - if (selected_fi->filename) - g_free(selected_fi->filename); - selected_fi->filename = g_strdup( -- gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel))); -+ gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel))); - if (g_file_test(selected_fi->filename, G_FILE_TEST_IS_DIR)) { - len = strlen(selected_fi->filename); - if (len < 1 || selected_fi->filename[len - 1] != G_DIR_SEPARATOR) - str = g_strconcat(selected_fi->filename, G_DIR_SEPARATOR_S, NULL); - else - str = g_strdup(selected_fi->filename); -- gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), str); -+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), str); - g_free(str); - continue; - } -@@ -397,14 +404,14 @@ - case GTK_RESPONSE_NO: - continue; - case GTK_RESPONSE_YES: -- res = GTK_RESPONSE_OK; -+ res = GTK_RESPONSE_ACCEPT; - } - } - } - gtk_widget_hide(filesel); - } while (GTK_WIDGET_VISIBLE(filesel)); - -- if (res != GTK_RESPONSE_OK) { -+ if (res != GTK_RESPONSE_ACCEPT) { - if (selected_fi->charset) - g_free(selected_fi->charset); - if (selected_fi->manual_charset) ---- src/selector.h.orig Thu Feb 3 20:17:09 2005 -+++ src/selector.h Thu Feb 3 20:17:27 2005 -@@ -30,6 +30,6 @@ - OPEN - }; - --FileInfo *get_fileinfo_from_selector(GtkWidget *window, FileInfo *fi, gint requested_mode); -+FileInfo *get_fileinfo_from_chooser(GtkWidget *window, FileInfo *fi, gint requested_mode); - - #endif /* _SELECTOR_H */ diff -ruN leafpad.orig/pkg-plist leafpad/pkg-plist --- leafpad.orig/pkg-plist Fri May 20 00:36:07 2005 +++ leafpad/pkg-plist Fri May 20 01:17:35 2005 @@ -1,6 +1,7 @@ bin/leafpad share/gnome/applications/leafpad.desktop share/gnome/pixmaps/leafpad.png +share/locale/bg/LC_MESSAGES/leafpad.mo share/locale/ca/LC_MESSAGES/leafpad.mo share/locale/cs/LC_MESSAGES/leafpad.mo share/locale/de/LC_MESSAGES/leafpad.mo @@ -11,11 +12,12 @@ share/locale/ja/LC_MESSAGES/leafpad.mo share/locale/lt/LC_MESSAGES/leafpad.mo share/locale/pl/LC_MESSAGES/leafpad.mo +share/locale/pt/LC_MESSAGES/leafpad.mo share/locale/ru/LC_MESSAGES/leafpad.mo share/locale/sv/LC_MESSAGES/leafpad.mo share/locale/ta/LC_MESSAGES/leafpad.mo +share/locale/vi/LC_MESSAGES/leafpad.mo share/locale/zh_CN/LC_MESSAGES/leafpad.mo share/locale/zh_TW/LC_MESSAGES/leafpad.mo -%%PORTDOCS%%@dirrm %%DOCSDIR%% @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true --- leafpad-0.8.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: