head	1.6;
access;
symbols
	pkgsrc-2013Q2:1.6.0.24
	pkgsrc-2013Q2-base:1.6
	pkgsrc-2012Q4:1.6.0.22
	pkgsrc-2012Q4-base:1.6
	pkgsrc-2011Q4:1.6.0.20
	pkgsrc-2011Q4-base:1.6
	pkgsrc-2011Q2:1.6.0.18
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2009Q4:1.6.0.16
	pkgsrc-2009Q4-base:1.6
	pkgsrc-2008Q4:1.6.0.14
	pkgsrc-2008Q4-base:1.6
	pkgsrc-2008Q3:1.6.0.12
	pkgsrc-2008Q3-base:1.6
	cube-native-xorg:1.6.0.10
	cube-native-xorg-base:1.6
	pkgsrc-2008Q2:1.6.0.8
	pkgsrc-2008Q2-base:1.6
	pkgsrc-2008Q1:1.6.0.6
	pkgsrc-2008Q1-base:1.6
	pkgsrc-2007Q4:1.6.0.4
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.6.0.2
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.5.0.2
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.4.0.6
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.4
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.2
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.3.0.4
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.2
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.2.0.14
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.12
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.10
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.8
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.6
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.4
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.2
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.1.0.2
	pkgsrc-2004Q1-base:1.1;
locks; strict;
comment	@# @;


1.6
date	2007.09.20.00.02.51;	author wiz;	state dead;
branches;
next	1.5;

1.5
date	2007.04.11.18.06.55;	author drochner;	state Exp;
branches;
next	1.4;

1.4
date	2006.09.18.16.38.45;	author jmmv;	state Exp;
branches;
next	1.3;

1.3
date	2006.01.20.03.16.14;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2004.04.01.19.09.07;	author jmmv;	state dead;
branches;
next	1.1;

1.1
date	2004.01.17.00.21.01;	author xtraeme;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Move gnome2-utils to gnome-utils to make directory name match PKGNAME.
@
text
@$NetBSD: patch-ac,v 1.5 2007/04/11 18:06:55 drochner Exp $

--- gnome-screenshot/screenshot-save.c.orig	2007-03-10 14:19:50.000000000 +0100
+++ gnome-screenshot/screenshot-save.c
@@@@ -115,7 +115,8 @@@@ read_pipe_from_child (GIOChannel   *sour
 
       status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
 
-      if (status == G_IO_STATUS_NORMAL)
+      if (status == G_IO_STATUS_NORMAL
+	&& error_message != NULL && strcmp (error_message, "OK") != 0)
 	{
 	  message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
 	  dialog = gtk_message_dialog_new (NULL, 0,
@@@@ -226,8 +227,7 @@@@ screenshot_save_start (GdkPixbuf    *pix
 		   ERROR_MESSAGE,
 		   strlen (ERROR_MESSAGE));
 	}
-      /* By closing the pipe, we let the main process know that we're
-       * done saving it. */
+      write (pipe_from_child[1], "OK", strlen ("OK"));
       close (pipe_from_child[1]);
       read (parent_exit_notification[0], &c, 1);
 
@@@@ -243,7 +243,7 @@@@ screenshot_save_start (GdkPixbuf    *pix
 
       channel = g_io_channel_unix_new (pipe_from_child[0]);
       g_io_add_watch (channel,
-		      G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+		      G_IO_IN | G_IO_ERR | G_IO_NVAL,
 		      read_pipe_from_child,
 		      NULL);
       g_io_channel_unref (channel);
@


1.5
log
@update to 2.18.0
This moves this pkg to the new stable gnome branch, too much to list here.
@
text
@d1 1
a1 1
$NetBSD$
@


1.4
log
@Fix the gnome-screenshot application under NetBSD and close PR pkg/31936.
Bump PKGREVISION to 2.

NetBSD's poll(2) raises a POLLIN event when a file descriptor is closed;
Linux doesn't seem to do this.  This caused an unexpected G_IO_IN event
in gnome-screenshot's code that was used to detect errors, instead of the
G_IO_HUP it was expecting.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.3 2006/01/20 03:16:14 joerg Exp $
d3 1
a3 1
--- gnome-screenshot/screenshot-save.c.orig	2006-06-11 13:19:30.000000000 +0200
d5 1
a5 3
@@@@ -14,8 +14,6 @@@@ static char *tmp_filename = NULL;
 static SaveFunction save_callback = NULL;
 static gpointer save_user_data = NULL;
d7 1
a7 2
-extern int errno;
-
d9 7
a15 19
 
 /* Strategy for saving:
@@@@ -98,6 +96,7 @@@@ read_pipe_from_child (GIOChannel   *sour
       GtkWidget *dialog;
 
       g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
+      if (error_message != NULL && strcmp (error_message, "OK") != 0) {
       message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
       dialog = gtk_message_dialog_new (NULL, 0,
 				       GTK_MESSAGE_ERROR,
@@@@ -106,6 +105,7 @@@@ read_pipe_from_child (GIOChannel   *sour
       gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
       exit (1);
+      }
     }
 
   (*save_callback) (save_user_data);
@@@@ -194,8 +194,7 @@@@ screenshot_save_start (GdkPixbuf    *pix
d25 1
a25 1
@@@@ -211,7 +210,7 @@@@ screenshot_save_start (GdkPixbuf    *pix
@


1.3
log
@Add DragonFly support. Fix errno.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- gnome-screenshot/screenshot-save.c.orig	2006-01-20 02:52:06.000000000 +0000
d5 1
a5 1
@@@@ -12,8 +12,6 @@@@ static char *tmp_filename = NULL;
d14 35
@


1.2
log
@Update to 2.6.0:

GNOME Utilities 2.6.0
=====================

GNOME Dictionary

	* Build fixes [Dennis]

GNOME Floppy

	* Build fixes [Dennis]


GNOME Search Tool

	* Updated online user help [Breda]

GNOME System Log

	* Build fixes [Dennis]

Translations

	* Alastair McKinstry (ga)
	* Åsmund Skjæveland (nn)
	* Christian Neumair (de)
	* Dafydd Tomos (cy)
	* Gareth Owen (en_GB)
	* Isam Bayazidi (ar)
	* Laurent Dhima (sq)
	* Leonid Kanter (ru)
	* Maxim Dziumanenko (uk)
	* Mugurel Tudor (ro)
	* Runa Bhattacharjee (bn)
	* Sanlig Badral (mn)
	* Vladimir \"Kaladan\" Petkov (bg)
	* Welther José O. Esteves (pt_BR)

Miscellaneous

	* README, NEWS: Update for new release.

GNOME Utilities 2.5.90
======================

GNOME Dictionary

	* Fix bug #128647  Remember smart lookup settings between invocations [Fernando Herrera]
	* Fix bug #127292  Remove use of deprecated function [Fernando Herrera]
	* Fix bug #130457  Add bugzilla information [Fernando Herrera]
	* Fix bug #129283  Use gnome-icon-theme for window icon [Michael Terry]
	* Fix bug #106700  Use ngettext for plurals [Michael Terry]
	* Fix bug #124643  Remove unused GtkAlignment [Kjartan Maraas]
	* Many multihead fixes [Dennis Smit]

GNOME System Log

	* Fix bug #129283  Use gnome-icon-theme for window icon [Michael Terry]
	* Fix bug #106700  Use ngettext for plurals [Christian Neumair]
	* Mark various strings for translation [Maxim Dzumanenko]
	* Use the gtk+ 2.4 file chooser

GNOME Search Tool

	* Fix bug #119720  Add a 'Move to Trash' popup menu item [Cranston]
	* Fix bug #126525  New default animation  [jimmac]
	* Fix bug #132043, #128454, #128378  Accessibility fixes [Padraig Obriain]
	* Fix bug #136419  Update help documentation for GNOME 2.6 [Breda McColgan]
	* Fix bug #124656  Various memory leaks fixed [Kjartan Maraas]
	* Fix bug #123191  AIX portability fixes [Sandie Vanderme]
	* Fix bug #129283  Fix window icon [Michael Terry]
	* Fix bug #106700  Use ngettext for plurals [Christian Neumair]
	* Reduce search results' memory usage
	* Improve search performance
	* Add middle button drag and drop support to listview
	* Animation file is moved to the gnome-icon-theme module
	* Improve handling of sockets and fifos
	* Hide backup files by default
	* Use shared-mime-info database for determining file types
	* Add support for %e and %O strftime modifiers
	* Improve HIG compliance of alert dialogs
	* Use the gtk+ 2.4 file chooser

GNOME Floppy

	* Fix bug #110918 & 123831  Fixed volume name handling [Stephane Demurget]
	* Fix bug #104327  Added devfs device name support [Stephane Demurget]
	* Fix bug #129283  Use gnome-icon-theme for window icon [Michael Terry]
	* Fix bug #106700  Use ngettext for plurals [Chrisian Neumair]
	* Fix bug #127484  Use new help documenation [Balamurali Viswanathan]
	* Updated help links.

Translations

	* Takeshi Aihana, Ales Nyakhaychyk, Paisa Seeluangsawat,  Christian Rose,
	  Andras Timar, Funda Wang, Danilo Segan, Ole Laursen, Alessio Frusciante
	  Pauli Virtanen, Christophe Merlet, Duarte Loreto, Priit Laes,
	  Åsmund Skjæveland, Tomasz Kloczko, Guntupalli Karunakar, Nikos Charonitakis,
	  Alastair McKinstry, Miloslav Trmac, Kostas Papadimas, Changwoo Ryu
	  Vincent van Adrighem, Laurent Dhima, Alessio Frusciante, Zygimantas Berucka,
	  Artur Flinta, Ole Laursen, Metin Emirov, Laurent Dhima, Sanlig Badral,
	  Francisco Javier F. Serrador, and many more...


Miscellaneous

	* README, NEWS: Update for new release.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2004/01/17 00:21:01 xtraeme Exp $
d3 5
a7 3
--- gsearchtool/Makefile.in.orig	2004-01-17 01:15:34.000000000 +0100
+++ gsearchtool/Makefile.in	2004-01-17 01:16:02.000000000 +0100
@@@@ -142,7 +142,7 @@@@
d9 2
a10 1
 bin_PROGRAMS = gnome-search-tool
a11 3
-schemadir = $(sysconfdir)/gconf/schemas
+schemadir = @@GCONF_SCHEMA_FILE_DIR@@
 schema_DATA = gnome-search-tool.schemas
d13 1
a13 1
 gnome_search_tool_SOURCES = \
@


1.1
log
@Install all schema files into GCONF_SCHEMA_FILE_DIR, reported by
Min Sik Kim in PR pkg/24121.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@

