From 5adb3c16f9236b63672f530245a9579ba9fd2145 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 21 Aug 2009 11:25:27 +0000 Subject: Changes 3.0.20: * Fix regression in 3.0.19 which causes incorrect fault handling if efax-gtk is given an invalid postscript file. * Provide new Emitter/EmitterArg and SafeEmitter/SafeEmitterArg classes for thread-safe signalling. * Provide a Callback::post() function which provides for thread-safe disconnection of a callback if the object whose method it encapsulates has been destroyed. Changes 3.0.19: * If the gtk+ version is >= 2.8.0 and X11 is the backend, use gdk X11 functions to move the program window to the current workspace if the user tries to start another instance. * Include gtk/gtk.h, gdk/gdk.h and glib.h instead of individual gtk+/glib header files. * Correct failure to print or view logfile if the logfile user setting does not have an absolute path name. * Allow choice of priorities in Callback::post() function. Provide Callback::Functor class wrapping Callback objects and further generalise Callback objects. * Improve iconified tracking. * Correct the order in which tests based on the definitions in config.h are carried out, when choosing header files to be included. * Include fsync() call after flushing fdoutbuf stream buffer. * Minor code layout improvements. --- comms/efax-gtk/Makefile | 7 ++++--- comms/efax-gtk/distinfo | 18 +++++++++--------- comms/efax-gtk/patches/patch-aa | 14 +++++++------- comms/efax-gtk/patches/patch-ab | 6 +++--- comms/efax-gtk/patches/patch-ac | 16 ++++++++-------- comms/efax-gtk/patches/patch-af | 6 +++--- comms/efax-gtk/patches/patch-ag | 8 ++++---- 7 files changed, 38 insertions(+), 37 deletions(-) (limited to 'comms') diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 83a8409c64c..dd61bee4912 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2008/12/19 12:28:38 adam Exp $ +# $NetBSD: Makefile,v 1.42 2009/08/21 11:25:27 adam Exp $ -DISTNAME= efax-gtk-3.0.18.src -PKGNAME= efax-gtk-3.0.18 +DISTNAME= efax-gtk-3.0.20.src +PKGNAME= efax-gtk-3.0.20 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/} EXTRACT_SUFX= .tgz @@ -22,5 +22,6 @@ EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc .include "../../graphics/tiff/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo index e59723c64cb..b7eff184286 100644 --- a/comms/efax-gtk/distinfo +++ b/comms/efax-gtk/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.20 2008/12/19 12:28:38 adam Exp $ +$NetBSD: distinfo,v 1.21 2009/08/21 11:25:27 adam Exp $ -SHA1 (efax-gtk-3.0.18.src.tgz) = d645166ce1e0868ab94dcac9991af6a0f04b535f -RMD160 (efax-gtk-3.0.18.src.tgz) = aceb12f99cd4200d4f4aafc8443b5eb15521d147 -Size (efax-gtk-3.0.18.src.tgz) = 1156252 bytes -SHA1 (patch-aa) = 94cd524ea47542e69d4a13704c204522f7324cd8 -SHA1 (patch-ab) = cbada5659b3a9af6862a8941c2c85ab9dccdc475 -SHA1 (patch-ac) = 5d223f5a9cacf3b60e8e5affaf9e5be8511db9be -SHA1 (patch-af) = cec7a4e35412aa46adbbb981cf20a83131792c90 -SHA1 (patch-ag) = 6f0ef55eadb264dd083287c3d77394f5481fe9b6 +SHA1 (efax-gtk-3.0.20.src.tgz) = 4e93c15218ce77d36a5cd5c73c81201ee320e5b3 +RMD160 (efax-gtk-3.0.20.src.tgz) = 4fad38bdec7fd2e562e95e15162d409428a7cfd6 +Size (efax-gtk-3.0.20.src.tgz) = 1171308 bytes +SHA1 (patch-aa) = 97f847ba7614d663a2d0824997bff529a1eba32d +SHA1 (patch-ab) = 4c5cb06bc236c7ac1aabc4cebcbfaa945b03aa7e +SHA1 (patch-ac) = 37437cfc0ca259cecfd25aa4652c8009cfdb8066 +SHA1 (patch-af) = b6e18e3966d1a09ee9f90579292b219fb009e4af +SHA1 (patch-ag) = 0ab59fbc91bf31c14a7002ea92a7e18f0a2eff73 diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa index cf251746c1f..84c9025d32a 100644 --- a/comms/efax-gtk/patches/patch-aa +++ b/comms/efax-gtk/patches/patch-aa @@ -1,20 +1,20 @@ -$NetBSD: patch-aa,v 1.9 2007/01/07 13:46:19 adam Exp $ +$NetBSD: patch-aa,v 1.10 2009/08/21 11:25:27 adam Exp $ ---- Makefile.in.orig 2006-11-04 18:51:27.000000000 +0100 +--- Makefile.in.orig 2009-08-20 17:45:42.000000000 +0200 +++ Makefile.in -@@ -338,12 +338,12 @@ uninstall-desktopDATA: +@@ -343,12 +343,12 @@ uninstall-desktopDATA: done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(datadir)" || $(mkdir_p) "$(datadir)/examples" +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" @list='$(sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ - $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(datadir)/examples/$$f'"; \ -+ $(sysconfDATA_INSTALL) "$$d$$p" "$(datadir)/examples/$$f"; \ ++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/$$f'"; \ ++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/$$f"; \ done uninstall-sysconfDATA: diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab index bd5c7fc2302..e68cfc974ab 100644 --- a/comms/efax-gtk/patches/patch-ab +++ b/comms/efax-gtk/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2007/01/07 13:46:19 adam Exp $ +$NetBSD: patch-ab,v 1.11 2009/08/21 11:25:27 adam Exp $ ---- efax/Makefile.in.orig 2007-01-07 13:49:13.000000000 +0100 +--- efax/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 +++ efax/Makefile.in -@@ -315,7 +315,7 @@ install-man1: $(man1_MANS) $(man_MANS) +@@ -317,7 +317,7 @@ install-man1: $(man1_MANS) $(man_MANS) 1*) ;; \ *) ext='1' ;; \ esac; \ diff --git a/comms/efax-gtk/patches/patch-ac b/comms/efax-gtk/patches/patch-ac index 09a6d57052a..ed0c9fbc5e6 100644 --- a/comms/efax-gtk/patches/patch-ac +++ b/comms/efax-gtk/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.9 2007/01/07 13:46:19 adam Exp $ +$NetBSD: patch-ac,v 1.10 2009/08/21 11:25:27 adam Exp $ ---- po/Makefile.in.in.orig 2007-01-07 11:44:27.000000000 +0100 +--- po/Makefile.in.in.orig 2009-01-12 14:19:29.000000000 +0100 +++ po/Makefile.in.in -@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ +@@ -39,7 +39,7 @@ INSTALL_DATA = @INSTALL_DATA@ + # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined + # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake + # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) @install_sh@ -d +mkinstalldirs = @install_sh@ -d + install_sh = $(SHELL) @install_sh@ + MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ - - GMSGFMT_ = @GMSGFMT@ diff --git a/comms/efax-gtk/patches/patch-af b/comms/efax-gtk/patches/patch-af index d6b0f8d87b1..a94215ca569 100644 --- a/comms/efax-gtk/patches/patch-af +++ b/comms/efax-gtk/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2008/12/19 12:28:38 adam Exp $ +$NetBSD: patch-af,v 1.5 2009/08/21 11:25:27 adam Exp $ ---- src/Makefile.in.orig 2008-09-07 16:23:57.000000000 +0200 +--- src/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 +++ src/Makefile.in -@@ -228,7 +228,7 @@ noinst_HEADERS = mainwindow.h dialogs.h +@@ -234,7 +234,7 @@ noinst_HEADERS = mainwindow.h dialogs.h gpl.h fax_list_manager_icons.h libegg/eggtrayicon.h INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@ diff --git a/comms/efax-gtk/patches/patch-ag b/comms/efax-gtk/patches/patch-ag index 95db77c2530..d5bf8062ead 100644 --- a/comms/efax-gtk/patches/patch-ag +++ b/comms/efax-gtk/patches/patch-ag @@ -1,9 +1,9 @@ -$NetBSD: patch-ag,v 1.5 2008/12/19 12:28:38 adam Exp $ +$NetBSD: patch-ag,v 1.6 2009/08/21 11:25:27 adam Exp $ ---- src/utils/Makefile.in.orig 2008-09-07 16:23:58.000000000 +0200 +--- src/utils/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 +++ src/utils/Makefile.in -@@ -223,7 +223,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc - tiff_handle.h cairo_handle.h +@@ -227,7 +227,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc + mem_fun.h emitter.h INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@ -AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I.. -- cgit v1.2.3