pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Update dia to 0.97.3, provided by David H. Gu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/630045c09c2c
branches: trunk
changeset: 652876:630045c09c2c
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jun 09 08:55:22 2015 +0000
description:
Update dia to 0.97.3, provided by David H. Gutteridge in PR 49954.
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
diffstat:
graphics/dia-python/Makefile | 4 +-
graphics/dia/Makefile | 5 +-
graphics/dia/Makefile.common | 5 +-
graphics/dia/PLIST | 3 +-
graphics/dia/distinfo | 20 +-
graphics/dia/patches/patch-aa | 44 ++--
graphics/dia/patches/patch-app_load_save.c | 24 ++
graphics/dia/patches/patch-app_render_gdk.c | 89 ----------
graphics/dia/patches/patch-be | 11 +-
graphics/dia/patches/patch-cd | 8 +-
graphics/dia/patches/patch-objects_custom_shape__typeinfo_c | 15 -
graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c | 18 --
graphics/dia/patches/patch-tests_test-boundingbox_c | 16 -
graphics/dia/patches/patch-tests_test-objects_c | 17 -
14 files changed, 71 insertions(+), 208 deletions(-)
diffs (truncated from 416 to 300 lines):
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia-python/Makefile
--- a/graphics/dia-python/Makefile Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia-python/Makefile Tue Jun 09 08:55:22 2015 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:09 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2015/06/09 08:55:23 wiz Exp $
DIA_SUBPKG= -python
.include "../../graphics/dia/Makefile.common"
-PKGREVISION= 17
-
COMMENT+= (Python plugin)
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g}
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/Makefile
--- a/graphics/dia/Makefile Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/Makefile Tue Jun 09 08:55:22 2015 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2015/04/25 14:23:08 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.91 2015/06/09 08:55:22 wiz Exp $
.include "Makefile.common"
-PKGREVISION= 23
-
.include "options.mk"
# just to convert the manpage
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/Makefile.common
--- a/graphics/dia/Makefile.common Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/Makefile.common Tue Jun 09 08:55:22 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.28 2012/12/04 12:37:15 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.29 2015/06/09 08:55:22 wiz Exp $
#
# 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/}
@@ -11,6 +11,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://live.gnome.org/Dia
COMMENT= Program for creating diagrams of all kinds
+LICENSE= gnu-gpl-v2
DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/PLIST
--- a/graphics/dia/PLIST Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/PLIST Tue Jun 09 08:55:22 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2012/01/18 18:36:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/06/09 08:55:22 wiz Exp $
bin/dia
lib/dia/libaadl_objects.la
lib/dia/libart_filter.la
@@ -1900,6 +1900,7 @@
share/locale/sq/LC_MESSAGES/dia.mo
share/locale/sr/LC_MESSAGES/dia.mo
share/locale/sr@Latn/LC_MESSAGES/dia.mo
+share/locale/sr@latin/LC_MESSAGES/dia.mo
share/locale/sv/LC_MESSAGES/dia.mo
share/locale/ta/LC_MESSAGES/dia.mo
share/locale/th/LC_MESSAGES/dia.mo
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/distinfo
--- a/graphics/dia/distinfo Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/distinfo Tue Jun 09 08:55:22 2015 +0000
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.31 2014/04/15 20:34:36 asau Exp $
+$NetBSD: distinfo,v 1.32 2015/06/09 08:55:22 wiz 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) = ee6c58a9db031fc89c61939a6c3fce90dae75a8d
+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
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/patches/patch-aa
--- a/graphics/dia/patches/patch-aa Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/patches/patch-aa Tue Jun 09 08:55:22 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2012/01/18 18:36:51 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2015/06/09 08:55:23 wiz Exp $
---- configure.orig 2011-04-25 13:04:56.000000000 +0000
+--- configure.orig 2014-09-05 11:08:16.000000000 -0400
+++ configure
-@@ -18016,7 +18016,7 @@ $as_echo_n "checking for $am_display_PYT
- if test "${am_cv_python_pythondir+set}" = set; then :
+@@ -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 ||
@@ -11,8 +11,8 @@
echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-@@ -18034,7 +18034,7 @@ $as_echo_n "checking for $am_display_PYT
- if test "${am_cv_python_pyexecdir+set}" = set; then :
+@@ -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 ||
@@ -20,25 +20,25 @@
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
-@@ -18121,18 +18121,18 @@ CPPFLAGS="$save_CPPFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpython${PYTHON_VERSION}.a" >&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_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`
+ 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
+- 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
+- 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; }
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/patches/patch-app_load_save.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dia/patches/patch-app_load_save.c Tue Jun 09 08:55:22 2015 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-app_load_save.c,v 1.1 2015/06/09 08:55:23 wiz Exp $
+
+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
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/patches/patch-app_render_gdk.c
--- a/graphics/dia/patches/patch-app_render_gdk.c Tue Jun 09 08:36:46 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-$NetBSD: patch-app_render_gdk.c,v 1.1 2013/07/16 12:11:29 prlw1 Exp $
-
-Fix crash on start-up with newish glib2.
-Bug 694025 - GLib drop support for adding interfaces after class_init
-commit 213bdfe956bf8fe57c86316f68a09408fef1647e
-
---- app/render_gdk.c.orig 2009-11-07 17:13:53.000000000 +0000
-+++ app/render_gdk.c
-@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer
- gpointer window,
- int x, int y, int width, int height);
-
--static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
-+typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
-+struct _DiaGdkInteractiveRenderer
-+{
-+ DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
-+};
-+typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
-+struct _DiaGdkInteractiveRendererClass
-+{
-+ DiaGdkRendererClass parent_class; /*!< the base class */
-+};
-+#define DIA_TYPE_GDK_INTERACTIVE_RENDERER (dia_gdk_interactive_renderer_get_type ())
-+#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
-+
-+static void
-+dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
- {
- iface->clip_region_clear = clip_region_clear;
- iface->clip_region_add_rect = clip_region_add_rect;
-@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init
- iface->set_size = set_size;
- }
-
-+G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
-+ G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
-+
-+static void
-+dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
-+{
-+}
-+static void
-+dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
-+{
-+ DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
-+ DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
-+ DiaRenderer *dia_renderer = DIA_RENDERER(object);
-+
-+ dia_renderer->is_interactive = 1;
-+
-+ renderer->gc = NULL;
-+ renderer->pixmap = NULL;
-+ renderer->clip_region = NULL;
-+}
-+
- DiaRenderer *
- new_gdk_renderer(DDisplay *ddisp)
- {
- DiaGdkRenderer *renderer;
- GType renderer_type = 0;
-
-- renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
-+ renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
- renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
-- if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
-- {
-- static const GInterfaceInfo irenderer_iface_info =
-- {
-- (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
-- NULL, /* iface_finalize */
-- NULL /* iface_data */
-- };
--
-- renderer_type = DIA_TYPE_GDK_RENDERER;
-- /* register the interactive renderer interface */
-- g_type_add_interface_static (renderer_type,
-- DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
-- &irenderer_iface_info);
--
-- }
-- renderer->parent_instance.is_interactive = 1;
-- renderer->gc = NULL;
--
-- renderer->pixmap = NULL;
-- renderer->clip_region = NULL;
-
- return DIA_RENDERER(renderer);
- }
diff -r 0b2d7d6af694 -r 630045c09c2c graphics/dia/patches/patch-be
--- a/graphics/dia/patches/patch-be Tue Jun 09 08:36:46 2015 +0000
+++ b/graphics/dia/patches/patch-be Tue Jun 09 08:55:22 2015 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-be,v 1.1 2003/12/02 22:32:48 recht Exp $
+$NetBSD: patch-be,v 1.2 2015/06/09 08:55:23 wiz Exp $
---- lib/intl.c.orig 2002-09-23 21:27:44.000000000 +0200
-+++ lib/intl.c 2003-11-10 22:54:10.000000000 +0100
-@@ -65,6 +65,8 @@
Home |
Main Index |
Thread Index |
Old Index