diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-13 00:08:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-13 00:08:30 +0100 |
commit | 0ebcd2cbf178600b5eb36b2f24cdbb3d2f4a9000 (patch) | |
tree | 941e6ba8c256dd27e9f9ca634f08d4bf0278798e /app-office/dia | |
parent | f0ddcad13515f66d2f3bf827d33c277bdba7e1dd (diff) |
gentoo auto-resync : 13:06:2024 - 00:08:29
Diffstat (limited to 'app-office/dia')
-rw-r--r-- | app-office/dia/Manifest | 2 | ||||
-rw-r--r-- | app-office/dia/dia-0.97.3-r3.ebuild | 93 | ||||
-rw-r--r-- | app-office/dia/files/dia-0.97.3-c99.patch | 284 |
3 files changed, 379 insertions, 0 deletions
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest index 096382906a86..420f3ae8c0e5 100644 --- a/app-office/dia/Manifest +++ b/app-office/dia/Manifest @@ -1,8 +1,10 @@ AUX dia-0.97.0-gnome-doc.patch 1961 BLAKE2B 6b6835a487e4b1ada0a1e67cb3ce123b0b4b3e67c86e9478ac0f401ae70f8f1381ef068a2ca6e116313db42d09bdb7abb523bf9a34856a1a39f7e4b0c9c3a84f SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186 AUX dia-0.97.2-underlinking.patch 969 BLAKE2B 00c56ce70b89e2e78c565ac106633e00601f917c9964f36812f3eddb3031df26c3446591e043b90da6890a0623c99bdf5d0bbd34b468d54bcdfeee8b6ae13bf2 SHA512 556bfd779c6487b20fdca5cd4b6de3d4855db87d68db17549a802719024130cad55a249f9db5329960622a0857b1b3ec009f7a8fd173c27bb5ed1953af9a4ee0 +AUX dia-0.97.3-c99.patch 8986 BLAKE2B a8934d816cbb11ea794a91f4e88c41ff32acf2ff4f5e2048c295e3413ab961eb3190c2fceaa9dc4f87bd2a61fc4d955c8d6ed21e76e7de4d460ed938ea637939 SHA512 ef01b3d8f51c8ea984642e53abf4d09f8205b0f3527d8c73e1de2536e4be5f7ddda029fe446a6cf2c8ebeb93c45799704b016219ac4fc75d309b633793a69a6c AUX dia-0.97.3-configure-clang16.patch 2023 BLAKE2B 301d6f35218db4f095b7aa5b1fa10c5bfe3d3007334cf402b26d9cbbf56b2431ce8f94057fe5207fb8f45a591e88ff607396137bf8c471bac0a97c47c2cfc0c4 SHA512 788aa004c2d5074e206a555bf8f8f35b7fa7657fb6186a5972acd9803e3d73c5a305f858740a85c35b32f72643bfe7fa2983a9e5c4d45984e910a25af3527118 AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7 AUX dia-0.97.3-slibtool.patch 316 BLAKE2B 8882a51ab33a81cb8df4180878996baa167b724328df61d55b742cf3c8750d3ce63be07c3631684ea76ef03f9802ecc1f3cda64c803bbe3f7bb87628d02c1e4d SHA512 2160eb2d7e9b2f5e3b4af5c227713e9001685d40f39181e24713049fba2b1bdf3899f7e7e8926ad9cf525c4848fb6206c26ccea7b22de8a578ae616aaab9a4e4 DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa EBUILD dia-0.97.3-r2.ebuild 2620 BLAKE2B 9d82927ec49ff8fc3e9167f2d61c76a3e39a2387f319773e2f41e000412de958863b3b36624ce1c626265f53f1c2c9da70301ce9c2d2f3eca6485b272679f7e7 SHA512 dc9b0039c9c310048c43e591dc311f35ca11c3b1cc6a137ce891eced0368644ec4c9a1e71f06d60af48e4f6dde77faf17bb9370757df7603179f881bc44616d2 +EBUILD dia-0.97.3-r3.ebuild 2661 BLAKE2B f4fbea7ceb00372e7be423ff656aa34dbc2d99e10c998747af3953f2f701512517f01e3b3f7ac280718806ab2517c34ad61f053165468fff38000ca14008d129 SHA512 085d7e07dd420efd9e7c21b6c8b843aca9e9510a3766c879515e5890ec1c31688f37fd6db9f2a3892e3374262ddc673d749da1de08736592db9ff5e2e757bcf1 MISC metadata.xml 773 BLAKE2B c654cf30f7cac3a198911772f4af09dce74ead25e1b2e501f092929c5967640a1df80d110579a7ffc3777f735ca5f485a5348eb707243266af574ccd8f38f160 SHA512 949a675449bdd4533153d890d5d8106d4c447fce85b33624e9ae693d0dc485b8e764a8d52174c509077ab7c304093313a894d41ed267f100a31923a89356e72f diff --git a/app-office/dia/dia-0.97.3-r3.ebuild b/app-office/dia/dia-0.97.3-r3.ebuild new file mode 100644 index 000000000000..fa2c9290e428 --- /dev/null +++ b/app-office/dia/dia-0.97.3-r3.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GNOME2_EAUTORECONF="yes" +inherit gnome2 + +DESCRIPTION="Diagram/flowchart creation program" +HOMEPAGE="https://wiki.gnome.org/Apps/Dia" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +# the doc USE flag doesn't seem to do anything without docbook2html +# cairo support is preferred as explained by upstream at: +# https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6 +IUSE="+cairo doc" + +RDEPEND=" + >=dev-libs/glib-2:2 + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/popt + >=media-libs/freetype-2 + >=media-libs/libart_lgpl-2 + media-libs/libpng:= + sys-libs/zlib + x11-libs/gtk+:2 + x11-libs/pango + cairo? ( x11-libs/cairo ) + doc? ( + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + doc? ( dev-libs/libxslt )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690 + "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761 + "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1 + "${FILESDIR}"/${PN}-0.97.3-slibtool.patch + "${FILESDIR}"/${PN}-0.97.3-configure-clang16.patch + "${FILESDIR}"/${PN}-0.97.3-c99.patch +) + +src_prepare() { + if ! use doc; then + # Skip man generation + sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die + fi + + # Fix naming conflict on Darwin/OSX, upstream bug #723869 + sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die + + # Upstream bug #737254 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die + + # Upstream bug #737255 + sed -i -e "/localedir/d" configure.in || die + + gnome2_src_prepare +} + +src_configure() { + # --exec-prefix makes Python look for modules in the Prefix + # --enable-gnome only adds support for deprecated stuff, bug #442294 + # https://bugzilla.redhat.com/show_bug.cgi?id=996759 + gnome2_src_configure \ + --exec-prefix="${EPREFIX}/usr" \ + --disable-gnome \ + --disable-libemf \ + $(use_enable doc db2html) \ + $(use_with cairo) \ + --without-python \ + --without-swig \ + --without-hardbooks +} + +src_install() { + gnome2_src_install + dodoc KNOWN_BUGS RELEASE-PROCESS + + # Install second desktop file for integrated mode (bug #415495, upstream #588208) + sed -e 's|^Exec=dia|Exec=dia --integrated|' \ + -e '/^Name/ s|$| (integrated mode)|' \ + "${ED}"/usr/share/applications/dia.desktop \ + > "${ED}"/usr/share/applications/dia-integrated.desktop || die +} diff --git a/app-office/dia/files/dia-0.97.3-c99.patch b/app-office/dia/files/dia-0.97.3-c99.patch new file mode 100644 index 000000000000..6ee2cb2df322 --- /dev/null +++ b/app-office/dia/files/dia-0.97.3-c99.patch @@ -0,0 +1,284 @@ +https://bugs.gentoo.org/883069 +https://src.fedoraproject.org/rpms/dia/raw/rawhide/f/dia-0.97.3-const-ft_vector.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_1.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_2.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-get_data_size.patch + +From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001 +From: Hans Breuer <hans@breuer.org> +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. +--- a/plug-ins/postscript/diapsft2renderer.c ++++ b/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 + +From caddfcab250fe677ecf294fad835b71e6b10cf26 Mon Sep 17 00:00:00 2001 +From: Hans Breuer <hans@breuer.org> +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); + ^~~~~~~~~~~~~~~~~ +test-svg.c:117:55: warning: incompatible pointer types passing 'void (const PathData *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)') [-Wincompatible-pointer-types] + g_test_add_data_func (testpath, &_test_path[i], _check_one_path); + ^~~~~~~~~~~~~~~ +--- a/tests/test-boundingbox.c ++++ b/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 }; + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/9c481f649414190bf8d6741cbca1777e9766756b + +--- a/tests/test-objects.c ++++ b/tests/test-objects.c.g_test_add_data_func_2 +@@ -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); + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24 + +--- a/lib/prop_geomtypes.c ++++ b/lib/prop_geomtypes.c.get_data_size +@@ -129,9 +129,10 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 = { +--- a/lib/prop_inttypes.c ++++ b/lib/prop_inttypes.c.get_data_size +@@ -122,9 +122,10 @@ + } + + 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 @@ + } + + 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 @@ + } + + 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 = { +--- a/lib/prop_text.c ++++ b/lib/prop_text.c.get_data_size +@@ -208,9 +208,10 @@ + } + + 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 * +--- a/lib/properties.h ++++ b/lib/properties.h.get_data_size +@@ -116,7 +116,7 @@ + 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 { +--- a/objects/custom/custom_object.c ++++ b/objects/custom/custom_object.c.get_data_size +@@ -372,14 +372,7 @@ + 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; + } |