From 0649b067a3c7f5f2f70aa393269d0d5a7738bff6 Mon Sep 17 00:00:00 2001 From: cube Date: Mon, 19 Jan 2004 15:52:40 +0000 Subject: Make this compile with gcc3. Should fix PR 24151. --- graphics/gphoto/distinfo | 17 ++++- graphics/gphoto/patches/patch-ae | 21 +++++++ graphics/gphoto/patches/patch-ai | 29 +++++++++ graphics/gphoto/patches/patch-ao | 23 +++++++ graphics/gphoto/patches/patch-ap | 25 ++++++++ graphics/gphoto/patches/patch-aq | 57 +++++++++++++++++ graphics/gphoto/patches/patch-ar | 75 ++++++++++++++++++++++ graphics/gphoto/patches/patch-as | 19 ++++++ graphics/gphoto/patches/patch-at | 23 +++++++ graphics/gphoto/patches/patch-au | 19 ++++++ graphics/gphoto/patches/patch-av | 19 ++++++ graphics/gphoto/patches/patch-aw | 45 +++++++++++++ graphics/gphoto/patches/patch-ax | 133 +++++++++++++++++++++++++++++++++++++++ graphics/gphoto/patches/patch-ay | 17 +++++ graphics/gphoto/patches/patch-az | 19 ++++++ graphics/gphoto/patches/patch-ba | 13 ++++ 16 files changed, 553 insertions(+), 1 deletion(-) create mode 100644 graphics/gphoto/patches/patch-ae create mode 100644 graphics/gphoto/patches/patch-ai create mode 100644 graphics/gphoto/patches/patch-ao create mode 100644 graphics/gphoto/patches/patch-ap create mode 100644 graphics/gphoto/patches/patch-aq create mode 100644 graphics/gphoto/patches/patch-ar create mode 100644 graphics/gphoto/patches/patch-as create mode 100644 graphics/gphoto/patches/patch-at create mode 100644 graphics/gphoto/patches/patch-au create mode 100644 graphics/gphoto/patches/patch-av create mode 100644 graphics/gphoto/patches/patch-aw create mode 100644 graphics/gphoto/patches/patch-ax create mode 100644 graphics/gphoto/patches/patch-ay create mode 100644 graphics/gphoto/patches/patch-az create mode 100644 graphics/gphoto/patches/patch-ba (limited to 'graphics') diff --git a/graphics/gphoto/distinfo b/graphics/gphoto/distinfo index 4d20466a68b..4bc5094fb9d 100644 --- a/graphics/gphoto/distinfo +++ b/graphics/gphoto/distinfo @@ -1,4 +1,19 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:15 wiz Exp $ +$NetBSD: distinfo,v 1.3 2004/01/19 15:52:40 cube Exp $ SHA1 (gphoto-0.4.3.tar.gz) = f0606444ca0b3c37065b022cbe28ae265704af39 Size (gphoto-0.4.3.tar.gz) = 709336 bytes +SHA1 (patch-ae) = 35f5286f36759f533ddf0301ae263eca5589c7c3 +SHA1 (patch-ai) = 4f049409172a9c327e5bdf1d275863dc115a6c80 +SHA1 (patch-ao) = 752aef4f1ca6d4ca20b7d88688d7de3ab27137d2 +SHA1 (patch-ap) = bf5f5f42216bd47d2fdfaf0f8c28c9b4bf775cd9 +SHA1 (patch-aq) = f31567b62da9c1616563819bb14af448bfcfb01a +SHA1 (patch-ar) = 4480452473fe430b50b125305b02301e039ae58a +SHA1 (patch-as) = f738f3f4ac38483580f32ad7b2b03a17123d360d +SHA1 (patch-at) = 24b00b79ecdd0ee87baf0ee6215d21df393f26c0 +SHA1 (patch-au) = d6a59af49fa17f7a23487b2ee723b7f34e46e661 +SHA1 (patch-av) = 2c4aaa7b7f73829880be3c0b7f2bae40370c7ad8 +SHA1 (patch-aw) = f896c6774c04e60419dc81847412dae9286216f7 +SHA1 (patch-ax) = d52694837311a05d310280a11497e13ad8648229 +SHA1 (patch-ay) = 31bed2ab061434fd28ffeda727babfd17f1bbe6e +SHA1 (patch-az) = 0a4bc130750db709a5f4d808453f44ae20028e81 +SHA1 (patch-ba) = 2c08925c186f5a34cc1328b82ed95319bcec01b3 diff --git a/graphics/gphoto/patches/patch-ae b/graphics/gphoto/patches/patch-ae new file mode 100644 index 00000000000..c567949d29a --- /dev/null +++ b/graphics/gphoto/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.3 2004/01/19 15:52:40 cube Exp $ + +--- kodak/kodak_dc210.c.orig 2000-01-20 22:42:17.000000000 +0100 ++++ kodak/kodak_dc210.c +@@ -789,11 +789,11 @@ char *kodak_dc210_summary() + char *kodak_dc210_description() + { + +- return("Enhanced Kodak DC210 support +-by TimeCop +-http://www.ne.jp/asahi/linux/timecop +-based on original code +-by Brian Hirt ++ return("Enhanced Kodak DC210 support\n\ ++by TimeCop \n\ ++http://www.ne.jp/asahi/linux/timecop\n\ ++based on original code\n\ ++by Brian Hirt \n\ + http://www.mobygames.com"); + + } diff --git a/graphics/gphoto/patches/patch-ai b/graphics/gphoto/patches/patch-ai new file mode 100644 index 00000000000..4933be65a27 --- /dev/null +++ b/graphics/gphoto/patches/patch-ai @@ -0,0 +1,29 @@ +$NetBSD: patch-ai,v 1.3 2004/01/19 15:52:40 cube Exp $ + +--- kodak/kodak_dc2x.c.orig 1999-12-05 19:48:53.000000000 +0100 ++++ kodak/kodak_dc2x.c +@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken, + char *kodak_dc2x_description() { + + return( +-"Kodak DC25 and DC20 support +-by Del Simmons . +-This code is working on my DC25 but +-I know it will have some problems with +-the DC20. If you have a DC20, please +-give it a shot and let me know all +-the places it fails. If compiling for +-the DC20, please try removng the -DDC25 +-flag from the Makefile in the kodak ++"Kodak DC25 and DC20 support \n\ ++by Del Simmons . \n\ ++This code is working on my DC25 but \n\ ++I know it will have some problems with \n\ ++the DC20. If you have a DC20, please \n\ ++give it a shot and let me know all \n\ ++the places it fails. If compiling for\n\ ++the DC20, please try removng the -DDC25\n\ ++flag from the Makefile in the kodak \n\ + directory. Thanks!"); + } + diff --git a/graphics/gphoto/patches/patch-ao b/graphics/gphoto/patches/patch-ao new file mode 100644 index 00000000000..37cdb12a0f8 --- /dev/null +++ b/graphics/gphoto/patches/patch-ao @@ -0,0 +1,23 @@ +$NetBSD: patch-ao,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- directory/directory.c.orig 1999-07-02 01:11:05.000000000 +0200 ++++ directory/directory.c +@@ -206,12 +206,12 @@ char *dir_summary() { + static char *dir_description() { + + return( +-"Browse Directory\nScott Fritzinger +-Allows the user to \"open\" a directory of +-images and all gPhoto functions will work +-on those images (HTML Gallery, etc...)\n +-This will not work in command-line mode, +-due to the high amount of input needed ++"Browse Directory\nScott Fritzinger \ ++Allows the user to \"open\" a directory of \ ++images and all gPhoto functions will work \ ++on those images (HTML Gallery, etc...)\n\ ++This will not work in command-line mode, \ ++due to the high amount of input needed \ + to set it up."); + + } diff --git a/graphics/gphoto/patches/patch-ap b/graphics/gphoto/patches/patch-ap new file mode 100644 index 00000000000..3f6c687f09d --- /dev/null +++ b/graphics/gphoto/patches/patch-ap @@ -0,0 +1,25 @@ +$NetBSD: patch-ap,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- fuji/fujilib.c.orig 2000-01-11 03:13:33.000000000 +0100 ++++ fuji/fujilib.c +@@ -1157,13 +1157,13 @@ char *fuji_summary() { + + char *fuji_description() { + return( +-"Generic Fuji +-Matthew G. Martin +-Based on fujiplay by +-Thierry Bousch +- +-Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700 +-, Apple QuickTake 200,Samsung Kenox SSC-350N cameras, ++"Generic Fuji\n\ ++Matthew G. Martin\n\ ++Based on fujiplay by\n\ ++Thierry Bousch\n\ ++\n\ ++Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700\n\ ++, Apple QuickTake 200,Samsung Kenox SSC-350N cameras, \n\ + but may support other Fuji cams as well."); + } + diff --git a/graphics/gphoto/patches/patch-aq b/graphics/gphoto/patches/patch-aq new file mode 100644 index 00000000000..d12dd371303 --- /dev/null +++ b/graphics/gphoto/patches/patch-aq @@ -0,0 +1,57 @@ +$NetBSD: patch-aq,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- kodak/dc21x/main.c.orig 2000-01-20 22:42:18.000000000 +0100 ++++ kodak/dc21x/main.c +@@ -54,29 +54,29 @@ void print_info( int type ) + + void usage(void) + { +- printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp] +- +- Usage: +- -s n Use /dev/ttySn for camera port +- -q Minimum messages to console [script use] +- +- -i [n] Display Camera [ or picture n ] information +- -n Display number of pictures in camera +- -d n Delete image number n from camera +- -D Delete all images from camera +- -t [filename] Take a picture, save to filename +- -r [n] [fname] Retrieve picture n, save as fname +- -R Retrieve all pictures, save as imageNNN.jpg +- +- -z 1|0 Set resolution to [1:High,0:Low] +- -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good] +- -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro] +- -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash] +- [3:RedEyeAuto,4:RedEyeFlash] +- +- Some options can be combined, for example: +- cam -s 2 -z 0 -q -f 1 -t webcam.jpg +- ++ printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp]\n\ ++\n\ ++ Usage:\n\ ++ -s n Use /dev/ttySn for camera port\n\ ++ -q Minimum messages to console [script use]\n\ ++ \n\ ++ -i [n] Display Camera [ or picture n ] information\n\ ++ -n Display number of pictures in camera\n\ ++ -d n Delete image number n from camera\n\ ++ -D Delete all images from camera\n\ ++ -t [filename] Take a picture, save to filename\n\ ++ -r [n] [fname] Retrieve picture n, save as fname\n\ ++ -R Retrieve all pictures, save as imageNNN.jpg\n\ ++\n\ ++ -z 1|0 Set resolution to [1:High,0:Low]\n\ ++ -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good]\n\ ++ -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro]\n\ ++ -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash]\n\ ++ [3:RedEyeAuto,4:RedEyeFlash]\n\ ++ \n\ ++ Some options can be combined, for example:\n\ ++ cam -s 2 -z 0 -q -f 1 -t webcam.jpg\n\ ++\n\ + "); + } + diff --git a/graphics/gphoto/patches/patch-ar b/graphics/gphoto/patches/patch-ar new file mode 100644 index 00000000000..d5d8975c0ab --- /dev/null +++ b/graphics/gphoto/patches/patch-ar @@ -0,0 +1,75 @@ +$NetBSD: patch-ar,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- philips/philips.h.orig 1999-11-20 17:28:41.000000000 +0100 ++++ philips/philips.h +@@ -86,38 +86,38 @@ typedef struct PHILIPS_CFG { + + + static char *philips_description_string = +-"Philips/Ricoh gPhoto Library +-Bob Paauwe +-http://www.bobsplace.com/philips/ +- +-The following cameras are known to work: +-Philips ESP60 +-Philips ESP80 +-Ricoh RDC-300 +-Ricoh RDC-300Z +-Ricoh RDC-4200 +-Ricoh RDC-4300 +-Ricoh RDC-5000 +- +-Should work with other Ricoh and Philips +-models but I need the identifier number for +-them. If you have a: +- +- RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50, +- ESP60, or ESP2 +- +-please bring up the configuration dialog +-box and send me the number that appears in +-the status bar as Unkown model nnnn. +- +-Known Issues as of 8/25/1999: +- 1) Thumbnails are only displayed +- in black & white. (except RDC-5000) +- 2) philips_get_preview function only +- works for Philips ESP80/Ricoh 4x00 +- cameras. +- 3) Every other thumbnail times out +- with RDC-5000. ++"Philips/Ricoh gPhoto Library\n\ ++Bob Paauwe \n\ ++http://www.bobsplace.com/philips/\n\ ++\n\ ++The following cameras are known to work:\n\ ++Philips ESP60\n\ ++Philips ESP80\n\ ++Ricoh RDC-300\n\ ++Ricoh RDC-300Z\n\ ++Ricoh RDC-4200\n\ ++Ricoh RDC-4300\n\ ++Ricoh RDC-5000\n\ ++\n\ ++Should work with other Ricoh and Philips\n\ ++models but I need the identifier number for\n\ ++them. If you have a:\n\ ++\n\ ++ RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50, \n\ ++ ESP60, or ESP2 \n\ ++\n\ ++please bring up the configuration dialog\n\ ++box and send me the number that appears in\n\ ++the status bar as Unkown model nnnn.\n\ ++\n\ ++Known Issues as of 8/25/1999:\n\ ++ 1) Thumbnails are only displayed\n\ ++ in black & white. (except RDC-5000)\n\ ++ 2) philips_get_preview function only\n\ ++ works for Philips ESP80/Ricoh 4x00\n\ ++ cameras.\n\ ++ 3) Every other thumbnail times out \n\ ++ with RDC-5000.\n\ + "; + + diff --git a/graphics/gphoto/patches/patch-as b/graphics/gphoto/patches/patch-as new file mode 100644 index 00000000000..b4132a21bed --- /dev/null +++ b/graphics/gphoto/patches/patch-as @@ -0,0 +1,19 @@ +$NetBSD: patch-as,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- photopc/olympus.c.orig 1999-06-25 02:25:46.000000000 +0200 ++++ photopc/olympus.c +@@ -594,10 +594,10 @@ char *oly_summary() { + char *oly_description() { + + return( +-"Olympus/PhotoPC Digital Camera Support +-Scott Fritzinger +-using the photoPC library by +-Eugene Crosser ++"Olympus/PhotoPC Digital Camera Support\n\ ++Scott Fritzinger \n\ ++using the photoPC library by\n\ ++Eugene Crosser \n\ + http://www.average.org/digicam"); + } + diff --git a/graphics/gphoto/patches/patch-at b/graphics/gphoto/patches/patch-at new file mode 100644 index 00000000000..decf9b55a70 --- /dev/null +++ b/graphics/gphoto/patches/patch-at @@ -0,0 +1,23 @@ +$NetBSD: patch-at,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- ricoh/ricoh_300z.c.orig 1999-10-03 01:41:37.000000000 +0200 ++++ ricoh/ricoh_300z.c +@@ -914,12 +914,12 @@ char *ricoh_300z_summary() { + char *ricoh_300z_description() { + + return( +-"Ricoh 300Z +-Clifford Wright +- +-*The Ricoh 300Z does not support thumbnail +-previewing, so the thumbnails that appear +-are place holders until the actual images ++"Ricoh 300Z\n\ ++Clifford Wright \n\ ++\n\ ++*The Ricoh 300Z does not support thumbnail\n\ ++previewing, so the thumbnails that appear\n\ ++are place holders until the actual images\n\ + are downloaded."); + } + diff --git a/graphics/gphoto/patches/patch-au b/graphics/gphoto/patches/patch-au new file mode 100644 index 00000000000..431805fe843 --- /dev/null +++ b/graphics/gphoto/patches/patch-au @@ -0,0 +1,19 @@ +$NetBSD: patch-au,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- sony/command.c.orig 1999-05-27 20:32:06.000000000 +0200 ++++ sony/command.c +@@ -288,11 +288,11 @@ char* return_buf; + break; + } + sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num); +- strcat(status_buf, tmp_buf, sizeof(tmp_buf)); ++ strlcat(status_buf, tmp_buf, sizeof(tmp_buf)); + sprintf(tmp_buf, "Date: %02d/%02d/%02d\n", month, date, year); +- strcat(status_buf, tmp_buf, sizeof(tmp_buf)); ++ strlcat(status_buf, tmp_buf, sizeof(tmp_buf)); + sprintf(tmp_buf, "Time: %02d:%02d\n",hour, minutes); +- strcat(status_buf, tmp_buf, sizeof(tmp_buf)); ++ strlcat(status_buf, tmp_buf, sizeof(tmp_buf)); + } + /* return (buf[2]); ok*/ + strcpy(return_buf, status_buf); diff --git a/graphics/gphoto/patches/patch-av b/graphics/gphoto/patches/patch-av new file mode 100644 index 00000000000..312f32b2df9 --- /dev/null +++ b/graphics/gphoto/patches/patch-av @@ -0,0 +1,19 @@ +$NetBSD: patch-av,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- sony/dsc_f1.c.orig 1999-05-27 20:32:06.000000000 +0200 ++++ sony/dsc_f1.c +@@ -166,10 +166,10 @@ int dsc_f1_delete_image (int picNum) { + + char *dsc_f1_description () { + return( +- "Sony DSC-F1 Digital Camera Support\n +- M. Adam Kendall \n\n +- Based on the chotplay CLI interface from\n +- Ken-ichi Hayashi\n\n ++ "Sony DSC-F1 Digital Camera Support\n\ ++ M. Adam Kendall \n\n\ ++ Based on the chotplay CLI interface from\n\ ++ Ken-ichi Hayashi\n\n\ + This lib may not work. YMMV\n"); + } + diff --git a/graphics/gphoto/patches/patch-aw b/graphics/gphoto/patches/patch-aw new file mode 100644 index 00000000000..5a16df0d56d --- /dev/null +++ b/graphics/gphoto/patches/patch-aw @@ -0,0 +1,45 @@ +$NetBSD: patch-aw,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- sony/dscf55/rsony.c.orig 2000-01-26 15:36:22.000000000 +0100 ++++ sony/dscf55/rsony.c +@@ -378,26 +378,26 @@ char *sony_dscf55_summary() + */ + char *sony_dscf55_description() + { +- return "Sony DSC F55/505 gPhoto Library +-Mark Davies +-Sony DSC F55 and DSC F505 cameras. +-Still image support. +-* Mpegs are downloadable in standalone +- version only. ++ return "Sony DSC F55/505 gPhoto Library\n\ ++Mark Davies \n\ ++Sony DSC F55 and DSC F505 cameras.\n\ ++Still image support.\n\ ++* Mpegs are downloadable in standalone\n\ ++ version only.\n\ + "; + } + + + char *sony_msac_sr1_description() + { +- return "Sony DSC F55/505 gPhoto Library +-Mark Davies +-Sony MSAC-SR1 and Memory Stick used +-by DCR-PC100. +-Still image support. Patches by +-Bernd Seemann +-* Mpegs are downloadable in +-standalone version only. ++ return "Sony DSC F55/505 gPhoto Library\n\ ++Mark Davies \n\ ++Sony MSAC-SR1 and Memory Stick used\n\ ++by DCR-PC100.\n\ ++Still image support. Patches by\n\ ++Bernd Seemann \n\ ++* Mpegs are downloadable in\n\ ++standalone version only.\n\ + "; + } + 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; + } diff --git a/graphics/gphoto/patches/patch-ay b/graphics/gphoto/patches/patch-ay new file mode 100644 index 00000000000..3bc5e8afb96 --- /dev/null +++ b/graphics/gphoto/patches/patch-ay @@ -0,0 +1,17 @@ +$NetBSD: patch-ay,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- src/gallery.c.orig 2000-03-06 22:23:06.000000000 +0100 ++++ src/gallery.c +@@ -271,9 +271,9 @@ void gallery_main() { + + if (Thumbnails.next == NULL) { + error_dialog( +-"Please retrieve the index first, +-and select the images to include +-in the gallery by clicking on them. ++"Please retrieve the index first,\n\ ++and select the images to include\n\ ++in the gallery by clicking on them.\n\ + Then, re-run the HTML Gallery."); + return; + } diff --git a/graphics/gphoto/patches/patch-az b/graphics/gphoto/patches/patch-az new file mode 100644 index 00000000000..cecb653a9b2 --- /dev/null +++ b/graphics/gphoto/patches/patch-az @@ -0,0 +1,19 @@ +$NetBSD: patch-az,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- src/main.c.orig 2000-03-06 22:23:06.000000000 +0100 ++++ src/main.c +@@ -277,10 +277,10 @@ int main (int argc, char *argv[]) { + /* put anything here to do on the first run */ + developer_dialog_create(); + error_dialog( +-"Could not load config file. +-Resetting to defaults. +-Click on \"Select Port-Camera Model\" +-in the Configure menu to set your ++"Could not load config file.\n\ ++Resetting to defaults.\n\ ++Click on \"Select Port-Camera Model\"\n\ ++in the Configure menu to set your\n\ + camera model and serial port"); + } + gtk_main(); diff --git a/graphics/gphoto/patches/patch-ba b/graphics/gphoto/patches/patch-ba new file mode 100644 index 00000000000..1bb566c3355 --- /dev/null +++ b/graphics/gphoto/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1 2004/01/19 15:52:40 cube Exp $ + +--- src/util.c.orig 2000-03-06 22:23:06.000000000 +0100 ++++ src/util.c +@@ -257,7 +257,7 @@ void save_image (char *filename, struct + else + { + snprintf(errormsg,1024, +-"The image couldn't be saved to %s because of the following error: ++"The image couldn't be saved to %s because of the following error: \n\ + %s",filename,sys_errlist[errno]); + error_dialog(errormsg); + } -- cgit v1.2.3