pkg/49954: Please update graphics/dia to 0.97.3

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/49954: Please update graphics/dia to 0.97.3
From: dhgutteridge%sympatico.ca@localhost
Date: Sun, 7 Jun 2015 23:45:00 +0000 (UTC)
>Number:         49954
>Category:       pkg
>Synopsis:       Please update graphics/dia to 0.97.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 07 23:45:00 +0000 2015
>Originator:     David H. Gutteridge
>Release:        Current
>Organization:
>Environment:
n/a
>Description:
Please update graphics/dia to 0.97.3. (The most significant change is
the correction of various kerning issues.) The patches and change log
excerpt are provided below.

Various patches are no longer required because they've been
incorporated upstream. A few needed updating for currency. There's a
new one needed because of a portability issue, which I've reported
upstream. My comments concerning it can be found there.

--- Makefile.common.old 2014-02-11 18:37:01.000000000 -0500
+++ Makefile.common     2015-06-06 19:33:16.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # used by graphics/dia-python/Makefile
 
-DISTNAME=      dia-0.97.2
+DISTNAME=      dia-0.97.3
 PKGNAME=       ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/dia/0.97/}

--- Makefile.old        2015-05-13 12:32:25.000000000 -0400
+++ Makefile    2015-06-06 19:28:03.000000000 -0400
@@ -3,8 +3,6 @@
 
 .include "Makefile.common"
 
-PKGREVISION=   23
-
 .include "options.mk"
 
 # just to convert the manpage

--- distinfo.old        2014-06-20 01:57:53.000000000 -0400
+++ distinfo    2015-06-07 19:33:59.000000000 -0400
@@ -1,18 +1,14 @@
 $NetBSD: distinfo,v 1.31 2014/04/15 20:34:36 asau Exp $
 
-SHA1 (dia-0.97.2.tar.xz) = dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba
-RMD160 (dia-0.97.2.tar.xz) = f9270f1f2cb6ad505219463827d02e3759693796
-Size (dia-0.97.2.tar.xz) = 5507004 bytes
-SHA1 (patch-aa) = ab5acd47ba4557aa8cc4a5abb3ce1f41ea5e2574
-SHA1 (patch-app_render_gdk.c) = 2bff345b8168ef731eb977f1850fd6a725224c78
-SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
+SHA1 (dia-0.97.3.tar.xz) = 316393951daebd186ba387e1cd6e34160a458c39
+RMD160 (dia-0.97.3.tar.xz) = a984efa1663cc154f4394060af37fab146f99175
+Size (dia-0.97.3.tar.xz) = 5548500 bytes
+SHA1 (patch-aa) = bad171ff4f379030f05c613b362e669a53d7f6da
+SHA1 (patch-app_load_save.c) = 4d4cfe75b1c5ad9f50390e63b2db4bcaefe4a6fb
+SHA1 (patch-be) = 08db7c440eea343895cced29522dd487f11d4773
 SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
 SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
 SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
-SHA1 (patch-cd) = b7dd72a359fe6f36a56d2c16f94427c6977b0477
+SHA1 (patch-cd) = d5fdf63320e59278b5c99a07b450161ffbc1789b
 SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
-SHA1 (patch-objects_custom_shape__typeinfo_c) = 128477ab7cc363a490e042062379585800893626
-SHA1 (patch-plug-ins_postscript_diapsft2renderer.c) = c4933ba0133aca4e6816e796499f9710158f333d
 SHA1 (patch-plug-ins_postscript_paginate__psprint.c) = 59784ea73d32158f457e52132bc5c4cef375dcae
-SHA1 (patch-tests_test-boundingbox_c) = f05fe01fd2d79bf5b519808aa491458040097fb7
-SHA1 (patch-tests_test-objects_c) = 759b788aa55e3256758514906c1ce812fb3b6aba

$NetBSD: patch-aa,v 1.8 2012/01/18 18:36:51 drochner Exp $

--- configure.orig      2014-09-05 11:08:16.000000000 -0400
+++ configure
@@ -19308,7 +19308,7 @@
 if ${am_cv_python_pythondir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
      echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
@@ -19326,7 +19326,7 @@
 if ${am_cv_python_pyexecdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
      echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
@@ -19420,18 +19420,18 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpython${PYTHON_VERSION}.a" >&5
 $as_echo_n "checking for libpython${PYTHON_VERSION}.a... " >&6; }
 
-  py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
+  py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
 
   py_makefile="${py_config_dir}/Makefile"
   if test -f "$py_makefile"; then
       py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
     py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
 
-      if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
+      if test -e "$PYTHON_PREFIX/lib/libpython${PYTHON_VERSION}.so"; then
       PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
-    elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then
+    elif test -e "${py_prefix}/lib/libpython${PYTHON_VERSION}.a"; then
             PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }

$NetBSD: patch-cd,v 1.1 2009/12/09 10:22:04 drochner Exp $

--- doc/fr/Makefile.in.orig     2014-09-05 11:08:04.000000000 -0400
+++ doc/fr/Makefile.in
@@ -674,7 +674,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-man
+install-data-am: install-data-local
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am

$NetBSD: patch-be,v 1.1 2003/12/02 22:32:48 recht Exp $

--- lib/intl.c.orig     2014-08-24 11:46:01.000000000 -0400
+++ lib/intl.c
@@ -58,6 +58,9 @@
     read_aliases ("/usr/share/locale/locale.alias");
     read_aliases ("/usr/local/share/locale/locale.alias");
     read_aliases ("/usr/lib/X11/locale/locale.alias");
+    read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
+    read_aliases ("/usr/X11R7/lib/X11/locale/locale.alias");
+    read_aliases ("/usr/pkg/share/locale/locale.alias");
     read_aliases ("/usr/openwin/lib/locale/locale.alias");
   }
   while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))

patch-app_load_save.c:

Allow NetBSD and OpenBSD to compile by exposing the fchmod() prototype.
This has been reported upstream as:
https://bugzilla.gnome.org/show_bug.cgi?id=750536
--- app/load_save.c.orig    2014-08-24 11:46:01.000000000 -0400
+++ app/load_save.c
@@ -19,7 +19,14 @@

 /* so we get fdopen declared even when compiling with -ansi */
 #define _POSIX_C_SOURCE 200809L
-#define _BSD_SOURCE 1 /* to get the prototype for fchmod() */
+/* to get the prototype for fchmod() */
+#if defined(__NetBSD__)
+#define _NETBSD_SOURCE 1
+#elif defined(__OpenBSD__)
+#define __BSD_VISIBLE 1
+#else
+#define _BSD_SOURCE 1
+#endif

 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H

Change log:

dia-0.97.3: 2014-09-05

 * Fix double free with some SVG rendering (regression from Dia 0.97.2)
 * Fixes to cope better with updated versions of Dia's dependencies:
   - don't crash at start-up with ABI breaking GLib 2-36
   - don't assert in cairo 1.12 with invalid arc parameters
   - avoid kerning problems (character overlap) for all Pango versions
   - fix image files to be loadable by libpng16
 * Backport fixes for some seldom crashes and other annoyances, see:
   http://bugzilla.gnome.org/buglist.cgi?product=dia&target_milestone=0.97.3
 * Update translations for Brazilian Portuguese, German, Hungarian,
   Polish, Romanian, Serbian and Slovenian

>How-To-Repeat:

>Fix:
Prev by Date: pkg/49953: Please import submitted package as textproc/artha
Next by Date: Re: pkg/49953: Please import submitted package as textproc/artha
Previous by Thread: pkg/49953: Please import submitted package as textproc/artha
Next by Thread: Re: pkg/49954: Please update graphics/dia to 0.97.3
Indexes:
Home | Main Index | Thread Index | Old Index