diff options
author | adam <adam@pkgsrc.org> | 2010-06-10 06:44:00 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-06-10 06:44:00 +0000 |
commit | fb7d01ce92ef88c282f73993264a7ba776602393 (patch) | |
tree | 9a80977bd68972cc4d8bc9982489232b87f1e910 /comms | |
parent | 074de86a92640d1cb3578975f9107c45955532f1 (diff) | |
download | pkgsrc-fb7d01ce92ef88c282f73993264a7ba776602393.tar.gz |
Changes 3.2.3:
* Provide compilation option for GTK+3 as well as GTK+2
* Make program configuration check for _POSIX_CLOCK_SELECTION as
well as _POSIX_MONOTONIC_CLOCK when checking the availability of
monotonic clocks for condition variables (corrects BSD builds)
* Ensure PIPE_BUF is defined in mainwindow.cpp (corrects Hurd build).
* Upgrade internal c++-gtk-utils version to 1.2.3.
Changes 3.2.2:
* Update internal copy of c++-gtk-utils to version 1.2.2 and fix
compilation error with gcc-4.5.0.
* Provide an automatic redial option where the modem is in use or
the recipient of a fax is busy.
* Get GUI to deal with a corner case where sending a fax from the
socket server to an empty number (open connection) is cancelled.
* Provide an error dialog if, on program start-up, a connection to
the dbus session message bus cannot be established.
* Use Cgu::start_timeout_seconds() instead of Cgu::start_timeout()
where glib supports it, and so bump c++-gtk-utils requirement to
version 1.2.1.
Diffstat (limited to 'comms')
-rw-r--r-- | comms/efax-gtk/Makefile | 18 | ||||
-rw-r--r-- | comms/efax-gtk/distinfo | 14 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-aa | 23 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ab | 22 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ad | 31 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-af | 13 | ||||
-rw-r--r-- | comms/efax-gtk/patches/patch-ag | 13 |
7 files changed, 74 insertions, 60 deletions
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 7b3b792cc75..38558941fab 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2010/01/29 16:17:33 joerg Exp $ +# $NetBSD: Makefile,v 1.46 2010/06/10 06:44:00 adam Exp $ -DISTNAME= efax-gtk-3.0.20.src -PKGNAME= efax-gtk-3.0.20 -PKGREVISION= 2 +DISTNAME= efax-gtk-3.2.3.src +PKGNAME= efax-gtk-3.2.3 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/} EXTRACT_SUFX= .tgz @@ -24,7 +23,16 @@ CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/spool/efax EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc +SUBST_CLASSES+= xopen +SUBST_MESSAGE.xopen= Removing _XOPEN_SOURCE=600 definition +SUBST_STAGE.xopen= post-patch +SUBST_FILES.xopen= src/Makefile.in src/utils/Makefile.in +SUBST_FILES.xopen+= src/internal/c++-gtk-utils/Makefile.in +SUBST_SED.xopen= -e 's,-D_XOPEN_SOURCE=600,,' + +.include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo index b7eff184286..e438f270c62 100644 --- a/comms/efax-gtk/distinfo +++ b/comms/efax-gtk/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.21 2009/08/21 11:25:27 adam Exp $ +$NetBSD: distinfo,v 1.22 2010/06/10 06:44:00 adam Exp $ -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 (efax-gtk-3.2.3.src.tgz) = 4c46b1cdbf2c7ab7fb82bccb48a2e655a76c302d +RMD160 (efax-gtk-3.2.3.src.tgz) = 642b8a742515a8f8ed1c0ed78d59911401a1bf9d +Size (efax-gtk-3.2.3.src.tgz) = 1280080 bytes +SHA1 (patch-aa) = 6e45e4779af6c8fd2f729daf988049ec1c31b5ed SHA1 (patch-ac) = 37437cfc0ca259cecfd25aa4652c8009cfdb8066 -SHA1 (patch-af) = b6e18e3966d1a09ee9f90579292b219fb009e4af -SHA1 (patch-ag) = 0ab59fbc91bf31c14a7002ea92a7e18f0a2eff73 +SHA1 (patch-ad) = a80a536aed81ac60a5f3e9a414c944bd33281707 diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa index 84c9025d32a..570cdd115cf 100644 --- a/comms/efax-gtk/patches/patch-aa +++ b/comms/efax-gtk/patches/patch-aa @@ -1,20 +1,23 @@ -$NetBSD: patch-aa,v 1.10 2009/08/21 11:25:27 adam Exp $ +$NetBSD: patch-aa,v 1.11 2010/06/10 06:44:00 adam Exp $ ---- Makefile.in.orig 2009-08-20 17:45:42.000000000 +0200 +--- Makefile.in.orig 2010-06-04 08:50:10.000000000 +0000 +++ Makefile.in -@@ -343,12 +343,12 @@ uninstall-desktopDATA: - done +@@ -392,15 +392,15 @@ uninstall-desktopDATA: + cd "$(DESTDIR)$(desktopdir)" && rm -f $$files install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" + test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" - @list='$(sysconf_DATA)'; for p in $$list; do \ + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + 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' '$(DESTDIR)$(datadir)/examples/$$f'"; \ -+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples" || exit $$?; \ done uninstall-sysconfDATA: diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab index e68cfc974ab..f9b7f38ce2e 100644 --- a/comms/efax-gtk/patches/patch-ab +++ b/comms/efax-gtk/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.11 2009/08/21 11:25:27 adam Exp $ +$NetBSD: patch-ab,v 1.12 2010/06/10 06:44:00 adam Exp $ ---- efax/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 +--- efax/Makefile.in.orig 2010-06-10 06:35:20.000000000 +0000 +++ efax/Makefile.in -@@ -317,7 +317,7 @@ install-man1: $(man1_MANS) $(man_MANS) - 1*) ;; \ - *) ext='1' ;; \ - esac; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$/-0.9a/'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +@@ -358,7 +358,7 @@ install-man1: $(dist_man_MANS) + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ +- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ -e 's,\.[0-9a-z]*$$,-0.9a,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad new file mode 100644 index 00000000000..c4e2b6a2566 --- /dev/null +++ b/comms/efax-gtk/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.9 2010/06/10 06:44:00 adam Exp $ + +--- configure.orig 2010-06-03 20:27:33.000000000 +0000 ++++ configure +@@ -4999,7 +4999,7 @@ $as_echo_n "checking which version of gt + # Check whether --with-gtk-version was given. + if test "${with_gtk_version+set}" = set; then : + withval=$with_gtk_version; +- if test "x$withval" == "xgtk+2"; then ++ if test "x$withval" = "xgtk+2"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+2" >&5 + $as_echo "gtk+2" >&6; } + CGU_GTK_VERSION=2 +@@ -5098,7 +5098,7 @@ $as_echo "no" >&6; } + as_fn_error "Library requirements (gtk+-2.0 >= 2.12.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + fi + +- elif test "x$withval" == "xgtk+3"; then ++ elif test "x$withval" = "xgtk+3"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+3" >&5 + $as_echo "gtk+3" >&6; } + CGU_GTK_VERSION=3 +@@ -5197,7 +5197,7 @@ $as_echo "no" >&6; } + as_fn_error "Library requirements (gtk+-3.0 >= 2.90.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + fi + +- elif test "x$withval" == "xauto"; then ++ elif test "x$withval" = "xauto"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5 + $as_echo "auto" >&6; } + diff --git a/comms/efax-gtk/patches/patch-af b/comms/efax-gtk/patches/patch-af deleted file mode 100644 index a94215ca569..00000000000 --- a/comms/efax-gtk/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.5 2009/08/21 11:25:27 adam Exp $ - ---- src/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 -+++ src/Makefile.in -@@ -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@ --AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils -+AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils - AM_CFLAGS = @GTK_CFLAGS@ -I./libegg - efax_gtk_LDADD = utils/libutils.a @LIBINTL@ @SIGC_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ @GTK_UNIX_PRINT_LIBS@ -ltiff - EXTRA_DIST = libegg/CREDITS diff --git a/comms/efax-gtk/patches/patch-ag b/comms/efax-gtk/patches/patch-ag deleted file mode 100644 index d5bf8062ead..00000000000 --- a/comms/efax-gtk/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2009/08/21 11:25:27 adam Exp $ - ---- src/utils/Makefile.in.orig 2009-08-20 17:45:41.000000000 +0200 -+++ src/utils/Makefile.in -@@ -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.. -+AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I.. - EXTRA_DIST = LGPL.TXT - all: all-am - |