pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/dia
Module Name: pkgsrc
Committed By: markd
Date: Tue Jun 18 09:07:25 UTC 2024
Modified Files:
pkgsrc/graphics/dia: Makefile distinfo
Added Files:
pkgsrc/graphics/dia/patches: patch-configure
patch-lib_prop__geomtypes.c patch-lib_prop__inttypes.c
patch-lib_prop__text.c patch-lib_properties.h
patch-objects_custom_custom__object.c
patch-plug-ins_postscript_diapsft2renderer.c
patch-tests-boundingbox.c patch-tests-test-objects.c
Removed Files:
pkgsrc/graphics/dia/patches: patch-aa
Log Message:
dia: fixes for more recent C via Fedora.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/graphics/dia/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/dia/distinfo
cvs rdiff -u -r1.9 -r0 pkgsrc/graphics/dia/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/dia/patches/patch-configure \
pkgsrc/graphics/dia/patches/patch-lib_prop__geomtypes.c \
pkgsrc/graphics/dia/patches/patch-lib_prop__inttypes.c \
pkgsrc/graphics/dia/patches/patch-lib_prop__text.c \
pkgsrc/graphics/dia/patches/patch-lib_properties.h \
pkgsrc/graphics/dia/patches/patch-objects_custom_custom__object.c \
pkgsrc/graphics/dia/patches/patch-tests-boundingbox.c \
pkgsrc/graphics/dia/patches/patch-tests-test-objects.c
cvs rdiff -u -r0 -r1.3 \
pkgsrc/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/dia/Makefile
diff -u pkgsrc/graphics/dia/Makefile:1.128 pkgsrc/graphics/dia/Makefile:1.129
--- pkgsrc/graphics/dia/Makefile:1.128 Wed May 29 16:32:50 2024
+++ pkgsrc/graphics/dia/Makefile Tue Jun 18 09:07:25 2024
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.128 2024/05/29 16:32:50 adam Exp $
-
-DISTNAME= dia-0.97.3
-PKGNAME= ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
-PKGREVISION= 36
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.97/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://live.gnome.org/Dia
-COMMENT= Program for creating diagrams of all kinds
-LICENSE= gnu-gpl-v2
-
-# just to convert the manpage
-TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool pkg-config msgfmt
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-USE_LANGUAGES= c c++
-
-CHECK_PORTABILITY_SKIP+= installer/macosx/dia
-
-CONFIGURE_ARGS+= --without-python
-
-SUBST_CLASSES+= intl
-SUBST_MESSAGE.intl= Fixing path to installed files.
-SUBST_STAGE.intl= pre-configure
-SUBST_FILES.intl= lib/intl.c
-SUBST_VARS.intl= PREFIX
-
-SUBST_CLASSES+= for
-SUBST_MESSAGE.for= Fixing empty "for" loops.
-SUBST_STAGE.for= pre-configure
-SUBST_FILES.for= doc/*/Makefile.in
-SUBST_SED.for= -e 's,for file in \$$(omffile); do,omffile="$$(omffile)"; for file in $$$$omffile; do,'
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/dia/distinfo
diff -u pkgsrc/graphics/dia/distinfo:1.38 pkgsrc/graphics/dia/distinfo:1.39
--- pkgsrc/graphics/dia/distinfo:1.38 Tue Oct 26 10:46:04 2021
+++ pkgsrc/graphics/dia/distinfo Tue Jun 18 09:07:25 2024
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.38 2021/10/26 10:46:04 nia Exp $
-
-BLAKE2s (dia-0.97.3.tar.xz) = 6d339078dc9ae21165e535e0f033b64eb7722524730ca5a7121bdecf64153c2f
-SHA512 (dia-0.97.3.tar.xz) = 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-Size (dia-0.97.3.tar.xz) = 5548500 bytes
-SHA1 (patch-aa) = bad171ff4f379030f05c613b362e669a53d7f6da
-SHA1 (patch-app_app__procs.c) = 867ec641d96b30123e15af9faca09a9f66a60993
-SHA1 (patch-app_load_save.c) = 2956f9ad67b8270cd84a8421abbb676af29338f2
-SHA1 (patch-be) = fc6ba43fabefca18188ab0541f4be7f19d9726d6
-SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
-SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
-SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
-SHA1 (patch-cd) = d5fdf63320e59278b5c99a07b450161ffbc1789b
-SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
-SHA1 (patch-plug-ins_postscript_paginate__psprint.c) = 59784ea73d32158f457e52132bc5c4cef375dcae
Added files:
Index: pkgsrc/graphics/dia/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-configure:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-configure Tue Jun 18 09:07:25 2024
@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+c99 removes support for implicit ints, so declare the return type
+of main explicitly. From Fedora
+
+fixes for pkgsrc python - from renamed patch-aa
+
+--- configure.orig 2014-09-05 15:08:16.000000000 +0000
++++ configure
+@@ -17571,7 +17571,7 @@ $as_echo_n "checking for png_structp in
+ png_structp pp;
+ png_infop info;
+ png_colorp cmap;
+- main() { void*foo = png_create_read_struct; }
++ int main() { void*foo = png_create_read_struct; }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ png_ok=yes
+@@ -19308,7 +19308,7 @@ $as_echo_n "checking for $am_display_PYT
+ 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 @@ $as_echo_n "checking for $am_display_PYT
+ 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 @@ else
+ { $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; }
Index: pkgsrc/graphics/dia/patches/patch-lib_prop__geomtypes.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-lib_prop__geomtypes.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-lib_prop__geomtypes.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,46 @@
+$NetBSD: patch-lib_prop__geomtypes.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24
+via Fedora
+
+--- lib/prop_geomtypes.c.orig 2014-08-24 15:46:01.000000000 +0000
++++ lib/prop_geomtypes.c
+@@ -129,9 +129,10 @@ realprop_set_from_offset(RealProperty *p
+ }
+
+ static int
+-realprop_get_data_size(RealProperty *prop)
++realprop_get_data_size(void)
+ {
+- return sizeof (prop->real_data);
++ RealProperty prop;
++ return sizeof (prop.real_data);
+ }
+
+ static const PropertyOps realprop_ops = {
+@@ -242,9 +243,10 @@ lengthprop_set_from_offset(LengthPropert
+ }
+
+ static int
+-lengthprop_get_data_size(LengthProperty *prop)
++lengthprop_get_data_size(void)
+ {
+- return sizeof (prop->length_data);
++ LengthProperty prop;
++ return sizeof (prop.length_data);
+ }
+
+ static const PropertyOps lengthprop_ops = {
+@@ -358,9 +360,10 @@ fontsizeprop_set_from_offset(FontsizePro
+ }
+
+ static int
+-fontsizeprop_get_data_size(FontsizeProperty *prop)
++fontsizeprop_get_data_size(void)
+ {
+- return sizeof (prop->fontsize_data);
++ FontsizeProperty prop;
++ return sizeof (prop.fontsize_data);
+ }
+
+ static const PropertyOps fontsizeprop_ops = {
Index: pkgsrc/graphics/dia/patches/patch-lib_prop__inttypes.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-lib_prop__inttypes.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-lib_prop__inttypes.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,46 @@
+$NetBSD: patch-lib_prop__inttypes.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24
+via Fedora
+
+--- lib/prop_inttypes.c.orig 2014-08-24 15:46:01.000000000 +0000
++++ lib/prop_inttypes.c
+@@ -122,9 +122,10 @@ charprop_set_from_offset(CharProperty *p
+ }
+
+ static int
+-charprop_get_data_size(CharProperty *prop)
++charprop_get_data_size(void)
+ {
+- return sizeof (prop->char_data);
++ CharProperty prop;
++ return sizeof (prop.char_data);
+ }
+
+
+@@ -229,9 +230,10 @@ boolprop_set_from_offset(BoolProperty *p
+ }
+
+ static int
+-boolprop_get_data_size(BoolProperty *prop)
++boolprop_get_data_size(void)
+ {
+- return sizeof (prop->bool_data);
++ BoolProperty prop;
++ return sizeof (prop.bool_data);
+ }
+
+
+@@ -339,9 +341,10 @@ intprop_set_from_offset(IntProperty *pro
+ }
+
+ static int
+-intprop_get_data_size(IntProperty *prop)
++intprop_get_data_size(void)
+ {
+- return sizeof (prop->int_data);
++ IntProperty prop;
++ return sizeof (prop.int_data);
+ }
+
+ static const PropertyOps intprop_ops = {
Index: pkgsrc/graphics/dia/patches/patch-lib_prop__text.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-lib_prop__text.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-lib_prop__text.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_prop__text.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24
+via Fedora
+
+--- lib/prop_text.c.orig 2014-08-24 15:46:01.000000000 +0000
++++ lib/prop_text.c
+@@ -208,9 +208,10 @@ stringprop_set_from_offset(StringPropert
+ }
+
+ static int
+-stringprop_get_data_size(StringProperty *prop)
++stringprop_get_data_size(void)
+ {
+- return sizeof (prop->string_data); /* only the pointer */
++ StringProperty prop;
++ return sizeof (prop.string_data); /* only the pointer */
+ }
+
+ static StringListProperty *
Index: pkgsrc/graphics/dia/patches/patch-lib_properties.h
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-lib_properties.h:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-lib_properties.h Tue Jun 18 09:07:25 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_properties.h,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24
+via Fedora
+
+--- lib/properties.h.orig 2014-08-24 15:46:01.000000000 +0000
++++ lib/properties.h
+@@ -116,7 +116,7 @@ typedef void (*PropertyType_GetFromOffse
+ void *base, guint offset, guint offset2);
+ typedef void (*PropertyType_SetFromOffset)(Property *prop,
+ void *base, guint offset, guint offset2);
+-typedef int (*PropertyType_GetDataSize)(Property *prop);
++typedef int (*PropertyType_GetDataSize)(void);
+
+
+ struct _PropertyOps {
Index: pkgsrc/graphics/dia/patches/patch-objects_custom_custom__object.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-objects_custom_custom__object.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-objects_custom_custom__object.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-objects_custom_custom__object.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24
+via Fedora
+
+--- objects/custom/custom_object.c.orig 2014-08-24 15:46:01.000000000 +0000
++++ objects/custom/custom_object.c
+@@ -372,14 +372,7 @@ void custom_setup_properties (ShapeInfo
+ info->prop_offsets[i].name = info->props[i].name;
+ info->prop_offsets[i].type = info->props[i].type;
+ info->prop_offsets[i].offset = offs;
+- /* FIXME:
+- custom_object.c:328: warning: passing arg 1 of pointer to function
+- from incompatible pointer type
+- We don't have a Property* here so there is not much we can do about.
+- Maybe it even works cause the sizeof() in *_get_data_size can be
+- calculated at compile time. Anyway, a mess ;) --hb
+- */
+- size = info->props[i].ops->get_data_size (&info->props[i]);
++ size = info->props[i].ops->get_data_size ();
+ info->ext_attr_size += size;
+ offs += size;
+ }
Index: pkgsrc/graphics/dia/patches/patch-tests-boundingbox.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-tests-boundingbox.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-tests-boundingbox.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-tests-boundingbox.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+From caddfcab250fe677ecf294fad835b71e6b10cf26 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans%breuer.org@localhost>
+Date: Fri, 3 Oct 2014 22:26:36 +0200
+Subject: [PATCH] [warningectomy] incompatible pointer types passing ...
+
+test-boundingbox.c:152:58: warning: incompatible pointer types passing 'void (const struct _TestBeziers *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)')
[-Wincompatible-pointer-types]
+ g_test_add_data_func (testpath, &_test_beziers[i], _check_one_bezier);
+ ^~~~~~~~~~~~~~~~~
+
+diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
+index f5b57250e..f542e590d 100644
+--- tests/test-boundingbox.c
++++ tests/test-boundingbox.c
+@@ -132,8 +132,9 @@ static struct _TestBeziers {
+ #undef BEZ
+
+ static void
+-_check_one_bezier (const struct _TestBeziers *test)
++_check_one_bezier (gconstpointer p)
+ {
++ const struct _TestBeziers *test = p;
+ Rectangle rect;
+ PolyBBExtras extra = {0, T*.7, T*.7, T*.7, 0 };
+
Index: pkgsrc/graphics/dia/patches/patch-tests-test-objects.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-tests-test-objects.c:1.1
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-tests-test-objects.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,51 @@
+$NetBSD: patch-tests-test-objects.c,v 1.1 2024/06/18 09:07:25 markd Exp $
+
+Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/9c481f649414190bf8d6741cbca1777e9766756b
+via Fedora
+
+--- tests/test-objects.c 2014-08-24 17:46:02.000000000 +0200
++++ tests/test-objects.c.g_test_add_data_func_2 2024-03-03 01:01:53.832977690 +0100
+@@ -39,8 +39,9 @@
+ int num_objects = 0;
+
+ static void
+-_test_creation (const DiaObjectType *type)
++_test_creation (gconstpointer user_data)
+ {
++ const DiaObjectType *type = (const DiaObjectType *)user_data;
+ int i;
+ Handle *h1 = NULL, *h2 = NULL;
+ Point point = {0, 0};
+@@ -112,8 +113,9 @@
+ }
+
+ static void
+-_test_copy (const DiaObjectType *type)
++_test_copy (gconstpointer user_data)
+ {
++ const DiaObjectType *type = (const DiaObjectType *)user_data;
+ Handle *h1 = NULL, *h2 = NULL;
+ Point from = {0, 0};
+ DiaObject *oc, *o = type->ops->create (&from, type->default_user_data, &h1, &h2);
+@@ -172,8 +174,9 @@
+ }
+
+ static void
+-_test_movement (const DiaObjectType *type)
++_test_movement (gconstpointer user_data)
+ {
++ const DiaObjectType *type = (const DiaObjectType *)user_data;
+ Handle *h1 = NULL, *h2 = NULL;
+ Point from = {0, 0};
+ DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2);
+@@ -215,8 +218,9 @@
+ }
+
+ static void
+-_test_change (const DiaObjectType *type)
++_test_change (gconstpointer user_data)
+ {
++ const DiaObjectType *type = (const DiaObjectType *)user_data;
+ Handle *h1 = NULL, *h2 = NULL;
+ Point from = {0, 0};
+ DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2);
Index: pkgsrc/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c
diff -u /dev/null pkgsrc/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c:1.3
--- /dev/null Tue Jun 18 09:07:25 2024
+++ pkgsrc/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c Tue Jun 18 09:07:25 2024
@@ -0,0 +1,82 @@
+$NetBSD: patch-plug-ins_postscript_diapsft2renderer.c,v 1.3 2024/06/18 09:07:25 markd Exp $
+
+From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans%breuer.org@localhost>
+Date: Sat, 4 May 2013 15:20:15 +0200
+Subject: [PATCH] [warningectomy] initialization from incompatible pointer type
+
+FT_Outline_Funcs take const FT_Vector* nowadays.
+
+diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
+index 63aac74b5..ed4182e5e 100644
+--- plug-ins/postscript/diapsft2renderer.c
++++ plug-ins/postscript/diapsft2renderer.c
+@@ -61,16 +61,16 @@ void draw_bezier_outline(DiaPsRenderer *renderer,
+ double pos_y
+ );
+ /* Countour traveling functions */
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ void *user_data);
+-static int paps_line_to( FT_Vector* to,
++static int paps_line_to( const FT_Vector* to,
+ void *user_data);
+-static int paps_conic_to( FT_Vector* control,
+- FT_Vector* to,
++static int paps_conic_to( const FT_Vector* control,
++ const FT_Vector* to,
+ void *user_data);
+-static int paps_cubic_to( FT_Vector* control1,
+- FT_Vector* control2,
+- FT_Vector* to,
++static int paps_cubic_to( const FT_Vector* control1,
++ const FT_Vector* control2,
++ const FT_Vector* to,
+ void *user_data);
+
+ static void dia_ps_ft2_renderer_class_init (DiaPsFt2RendererClass *klass);
+@@ -111,7 +111,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height)
+ /*======================================================================
+ outline traversing functions.
+ ----------------------------------------------------------------------*/
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -121,7 +121,7 @@ static int paps_move_to( FT_Vector* to,
+ return 0;
+ }
+
+-static int paps_line_to( FT_Vector* to,
++static int paps_line_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -131,8 +131,8 @@ static int paps_line_to( FT_Vector* to,
+ return 0;
+ }
+
+-static int paps_conic_to( FT_Vector* control,
+- FT_Vector* to,
++static int paps_conic_to( const FT_Vector* control,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -144,9 +144,9 @@ static int paps_conic_to( FT_Vector* control,
+ return 0;
+ }
+
+-static int paps_cubic_to( FT_Vector* control1,
+- FT_Vector* control2,
+- FT_Vector* to,
++static int paps_cubic_to( const FT_Vector* control1,
++ const FT_Vector* control2,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+--
+GitLab
+
Home |
Main Index |
Thread Index |
Old Index