diff options
author | cube <cube@pkgsrc.org> | 2004-01-19 15:52:40 +0000 |
---|---|---|
committer | cube <cube@pkgsrc.org> | 2004-01-19 15:52:40 +0000 |
commit | 184b926ff54d65fa57432d5a75df6dfa78756559 (patch) | |
tree | cd38eeaa0dcda8a10169fc2616a521b5bbe6b176 /graphics/gphoto/patches/patch-ax | |
parent | f5956437afbc9874211ed26d0250858df662fc98 (diff) | |
download | pkgsrc-184b926ff54d65fa57432d5a75df6dfa78756559.tar.gz |
Make this compile with gcc3. Should fix PR 24151.
Diffstat (limited to 'graphics/gphoto/patches/patch-ax')
-rw-r--r-- | graphics/gphoto/patches/patch-ax | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/graphics/gphoto/patches/patch-ax b/graphics/gphoto/patches/patch-ax new file mode 100644 index 00000000000..06eebdb796b --- /dev/null +++ b/graphics/gphoto/patches/patch-ax @@ -0,0 +1,133 @@ +$NetBSD: patch-ax,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- src/callbacks.c.orig 2000-03-06 22:23:06.000000000 +0100 ++++ src/callbacks.c +@@ -790,18 +790,18 @@ void save_config() { + void version_dialog() { + char msg[1024]; + +- sprintf(msg, " +-Version Information +-------------------- +- +-Current Version: %s +- +-New features all over the place. Please see +-the ChangeLog for more information. +- +-As always, report bugs gphoto-devel@gphoto.org +- +-Thanx much. ++ sprintf(msg, "\n\ ++Version Information\n\ ++-------------------\n\ ++\n\ ++Current Version: %s\n\ ++\n\ ++New features all over the place. Please see\n\ ++the ChangeLog for more information.\n\ ++\n\ ++As always, report bugs gphoto-devel@gphoto.org\n\ ++\n\ ++Thanx much.\n\ + ", VERSION); + + error_dialog(msg); +@@ -865,27 +865,27 @@ void usersmanual_dialog() { + + void faq_dialog() { + error_dialog( +-"Please visit http://www.gphoto.org/help.php3 ++"Please visit http://www.gphoto.org/help.php3 \n\ + for the current FAQ list."); + } + + void show_license() { + +- error_dialog(" +-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 Software Foundation; either version 2 of the License, or +-(at your option) any later version. +- +-This program is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-GNU General Public License for more details. +- +-You should have received a copy of the GNU General Public License +-along with this program; if not, write to the Free Software +-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +- ++ error_dialog("\n\ ++This program is free software; you can redistribute it and/or modify\n\ ++it under the terms of the GNU General Public License as published by\n\ ++the Free Software Foundation; either version 2 of the License, or\n\ ++(at your option) any later version.\n\ ++\n\ ++This program is distributed in the hope that it will be useful,\n\ ++but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ ++GNU General Public License for more details.\n\ ++\n\ ++You should have received a copy of the GNU General Public License\n\ ++along with this program; if not, write to the Free Software\n\ ++Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\ ++\n\ + See http://www.gnu.org for more details on the GNU project."); + } + +@@ -1238,9 +1238,9 @@ void save_opened_image (int i, char *fil + + if (gdk_imlib_save_image(node->imlibimage,filename, NULL) == 0) { + error_dialog( +- "Could not save image. Please make +- sure that you typed the image +- extension and that permissions for ++ "Could not save image. Please make\n\ ++ sure that you typed the image\n\ ++ extension and that permissions for\n\ + the directory are correct."); + return; + } +@@ -1370,11 +1370,11 @@ void print_pic () { + gtk_box_pack_end_defaults(GTK_BOX(hbox),entry); + + label = gtk_label_new( +-"* The filename is appended to the end +- of the command. +-* The \"-r\" flag is needed to delete +- the temporary file. If not used, a +- temporary file will be in your $HOME/.gphoto ++"* The filename is appended to the end\n\ ++ of the command.\n\ ++* The \"-r\" flag is needed to delete \n\ ++ the temporary file. If not used, a \n\ ++ temporary file will be in your $HOME/.gphoto\n\ + directory."); + gtk_widget_show(label); + gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); +@@ -1814,9 +1814,9 @@ void post_process_change (GtkWidget *wid + FALSE, FALSE, 0); + + label = gtk_label_new( +-" +-Note: gPhoto will replace \"%s\" in the script command-line +-with the full path to the selected image. See the User's Manual ++"\n\ ++Note: gPhoto will replace \"%s\" in the script command-line\n\ ++with the full path to the selected image. See the User's Manual\n\ + in the Help menu for more information. "); + gtk_widget_show(label); + gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); +@@ -1832,8 +1832,8 @@ in the Help menu for more information. " + if ((strstr(gtk_entry_get_text(GTK_ENTRY(script)), "%s") == NULL) + && GTK_TOGGLE_BUTTON(pp)->active) { + error_dialog( +-"Missing \"%s\" in the post-processing entry. +-This is required so the post-processing program ++"Missing \"%s\" in the post-processing entry.\n\ ++This is required so the post-processing program\n\ + knows where the image is located."); + return; + } |