[packages/dia] - updated to latest 0.98.0 snapshot

Wed Mar 12 10:18:09 CET 2025

commit dc27b9162ef9a38bcdb779edcc3dc522ee119749
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 12 10:08:30 2025 +0100

    - updated to latest 0.98.0 snapshot

 dia.spec         | 24 ++++++++---------
 emf-detect.patch | 81 --------------------------------------------------------
 2 files changed, 11 insertions(+), 94 deletions(-)
---

diff --git a/dia.spec b/dia.spec
index 88fc550..ca4efd2 100644
--- a/dia.spec
+++ b/dia.spec
@@ -9,15 +9,15 @@ Summary(ru.UTF-8):	Программа для рисования диаграмм
 Summary(uk.UTF-8):	Програма для малювання діаграм
 Summary(zh_CN.UTF-8):	基于GTK+的流程图程序
 Name:		dia
-%define	gitref	399526892d86d7e00e2f565e6c50b73c1195c810
-%define	snap	20230920
-Version:	0.97.3.%{snap}
-Release:	4
+%define	gitref	6b20252f45b1410e3e17528a9600358f688004ed
+%define	snap	20250311
+Version:	0.98.0
+Release:	0.%{snap}.1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	https://gitlab.gnome.org/GNOME/dia/-/archive/%{gitref}/%{name}-%{snap}.tar.bz2
-# Source0-md5:	a22cfc481bb22461ca63dc47e1693411
+# Source0-md5:	2187873abe217dc542fda9ed3cd75c72
 Source1:	http://dia-installer.de/shapes/central_data_processing/central_data_processing.zip
 # Source1-md5:	103865b35609d2a0f8a0e034c49cf130
 Source2:	http://dia-installer.de/shapes/chemistry_lab/chemistry_lab.zip
@@ -62,8 +62,7 @@ Source21:	http://dia-installer.de/shapes/value_stream_mapping/value_stream_mappi
 # Source21-md5:	98705330f435f06c7a8864b543ef4617
 Patch0:		%{name}-wmf-cast.patch
 Patch1:		soname.patch
-Patch2:		emf-detect.patch
-URL:		https://live.gnome.org/Dia
+URL:		https://wiki.gnome.org/Apps/Dia
 BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	dblatex
 BuildRequires:	docbook-style-xsl
@@ -90,6 +89,7 @@ BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
+BuildRequires:	xpm-pixbuf-devel
 BuildRequires:	zlib-devel
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
@@ -158,24 +158,22 @@ PostScript(TM).
 %setup -q -n %{name}-%{gitref}
 %patch -P 0 -p1
 %patch -P 1 -p1
-%patch -P 2 -p1
 
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' \
 	plug-ins/python/doxrev.py \
 	plug-ins/python/gtkcons.py
 
 %build
-CXXFLAGS="%{rpmcxxflags} -std=c++2a"
-%meson build \
+%meson \
 	--default-library=shared \
 	-Dtests=false
 
-%ninja_build -C build
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%ninja_install -C build
+%meson_install
 
 unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE1}
 unzip -n -d $RPM_BUILD_ROOT%{_datadir}/%{name} %{SOURCE2}
diff --git a/emf-detect.patch b/emf-detect.patch
deleted file mode 100644
index 1716e4a..0000000
--- a/emf-detect.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- dia-399526892d86d7e00e2f565e6c50b73c1195c810/meson.build~	2023-09-16 11:51:53.000000000 +0200
-+++ dia-399526892d86d7e00e2f565e6c50b73c1195c810/meson.build	2023-09-20 03:02:24.782540486 +0200
-@@ -32,7 +32,7 @@
- libpoppler_dep = dependency('poppler', version: '> 0.62.0', required: false)
- libpopplercpp_dep = dependency('poppler-cpp', required: false)
- conf.set('HAVE_POPPLER', libpoppler_dep.found() and libpopplercpp_dep.found())
--libemf_dep = cc.find_library('emf', required: false)
-+libemf_dep = cc.find_library('EMF', required: false)
- conf.set('HAVE_LIBEMF', libemf_dep.found())
- libogdf_dep = cc.find_library('ogdf', required: false)
- conf.set('HAVE_OGDF', libogdf_dep.found())
---- dia-399526892d86d7e00e2f565e6c50b73c1195c810/plug-ins/wmf/wmf.cpp.orig	2023-09-20 03:16:33.087448310 +0200
-+++ dia-399526892d86d7e00e2f565e6c50b73c1195c810/plug-ins/wmf/wmf.cpp	2023-09-20 03:16:06.856486686 +0200
-@@ -60,7 +60,7 @@
- 
- #include <pango/pangowin32.h>
- 
--#elif HAVE_LIBEMF
-+#elif defined(HAVE_LIBEMF)
- /* We have to define STRICT to make libemf/64 work. Otherwise there is
- wmf.cpp:1383:40: error: cast from 'void*' to 'W32::HDC' loses precision
-  */
-@@ -177,7 +177,7 @@
-     W32::HPEN hOldPen;
-     if (colour) {
- 	W32::COLORREF rgb = W32COLOR(colour);
--#if defined(G_OS_WIN32) || HAVE_LIBEMF
-+#if defined(G_OS_WIN32) || defined(HAVE_LIBEMF)
- 	if ((renderer->platform_is_nt && renderer->hPrintDC) || renderer->target_emf) {
-           W32::LOGBRUSH logbrush;
- 	  W32::DWORD    dashes[6];
-@@ -255,7 +255,6 @@
- #else
- #  define DIAG_NOTE my_log
- #endif
--#ifdef G_OS_WIN32
- static void
- my_log(WmfRenderer* renderer, const char* format, ...)
- {
-@@ -273,7 +272,6 @@
- 
-     g_free(string);
- }
--#endif
- 
- /*
-  * renderer interface implementation
-@@ -1377,7 +1375,6 @@
-   g_object_class_override_property (object_class, PROP_FONT_HEIGHT, "font-height");
- }
- 
--#ifdef G_OS_WIN32
- /* plug-in export api */
- static gboolean
- export_data(DiagramData *data, DiaContext *ctx,
-@@ -1412,7 +1409,7 @@
-     bbox.bottom = (int)((data->extents.bottom - data->extents.top) * scale *
-         100 * W32::GetDeviceCaps(refDC, VERTSIZE) / W32::GetDeviceCaps(refDC, VERTRES));
- 
--#if HAVE_LIBEMF
-+#ifdef HAVE_LIBEMF
-     FILE* ofile = g_fopen (filename, "w");
-     if (ofile)
-       file = CreateEnhMetaFileWithFILEA (refDC, ofile, &bbox, "Created with Dia/libEMF\0");
-@@ -1548,6 +1545,7 @@
- };
- 
- 
-+#ifdef G_OS_WIN32
- static DiaObjectChange *
- print_callback (DiagramData *data,
-                 const char  *filename,
-@@ -1599,7 +1597,7 @@
-     filter_register_export(&emf_export_filter);
- 
-     filter_register_callback (&cb_gdi_print);
--#elif HAVE_LIBEMF
-+#elif defined(HAVE_LIBEMF)
-     /* not sure if libEMF really saves EMF ;) */
-     filter_register_export(&emf_export_filter);
- #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dia.git/commitdiff/dc27b9162ef9a38bcdb779edcc3dc522ee119749

