Merge pull request #11566 from 4fury-c3440d8/new

dia, tageditor.

desktop/misc/ayatana-ido/pspec.xml

@@ -13,14 +13,15 @@
 		<PartOf>desktop.misc</PartOf>
 		<Summary>Ayatana Indicator Display Objects.</Summary>
 		<Description>The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, two technologies developed by Canonical Ltd. for the Unity7 desktop.</Description>
-		<Archive sha1sum="09c9f5cc97cf41d7c455400c066f5e5aeff21652" type="targz">
+		<Archive sha1sum="05049088cf0058fc3d38f44d9ed4c67d58822ff7" type="targz">
-			https://github.com/AyatanaIndicators/ayatana-ido/archive/refs/tags/0.9.2.tar.gz
+			https://github.com/AyatanaIndicators/ayatana-ido/archive/refs/tags/0.9.3.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
 			<Dependency>gtk-doc</Dependency>
 			<Dependency>gtk3-devel</Dependency>
 			<Dependency>vala-devel</Dependency>
+			<Dependency>gtest-devel</Dependency>
 			<Dependency>gobject-introspection-devel</Dependency>
 		</BuildDependencies>
 		<Patches>
@@ -57,6 +58,13 @@
 	</Package>
 
 	<History>
+		<Update release="5">
+			<Date>2023-03-08</Date>
+			<Version>0.9.3</Version>
+			<Comment>Version bump</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="4">
 			<Date>2022-08-07</Date>
 			<Version>0.9.2</Version>

editor/scite/pspec.xml

@@ -13,8 +13,8 @@
 		<PartOf>editor</PartOf>
 		<Summary>SCIntilla based Text Editor.</Summary>
 		<Description>Scintilla is a free source code editing component which includes useful features such as syntax styling, error indicators, folding, code completion and call tips.</Description>
-		<Archive sha1sum="cfefdb72758774cbf42f6eac892f94c56bc789ec" type="targz">
+		<Archive sha1sum="1a38ad9b6f379437c6cc03ebbd4c4ee001700c6a" type="targz">
-			mirrors://sourceforge/project/scintilla/SciTE/5.3.2/scite532.tgz
+			mirrors://sourceforge/project/scintilla/SciTE/5.3.4/scite534.tgz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>lua-devel</Dependency>
@@ -43,6 +43,13 @@
 	</Package>
 
 	<History>
+		<Update release="7">
+			<Date>2023-03-08</Date>
+			<Version>5.3.4</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="6">
 			<Date>2023-01-03</Date>
 			<Version>5.3.2</Version>

multimedia/editor/tageditor/actions.py

@@ -4,30 +4,22 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools, cmaketools
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
 
 j = ''.join([
     ' -DCMAKE_BUILD_TYPE=Release',
     ' -DDISABLE_DEPRECATED_QT_FEATURES=ON',
     ' -DQT_PACKAGE_PREFIX=Qt6',
     ' -DJS_PROVIDER=none',
-    ' -DWEBVIEW_PROVIDER=none -L '
+    ' -DWEBVIEW_PROVIDER=none',
+    ' -B_build -G Ninja -L '
     ])
 
 def setup():
-	pisitools.cxxflags.add("-Wno-unused-result")
+	cmaketools.configure(j)
-	cmaketools.configure("-B_build %s" % j)
 
 def build():
-	shelltools.cd("_build")
+	mesontools.build("-C _build")
-	cmaketools.make()
 
 def install():
-	shelltools.cd("_build")
+	mesontools.install("-C _build")
-	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-	pisitools.dodoc("../LICENSE", "../README.md")
-

multimedia/editor/tageditor/pspec.xml

@@ -15,11 +15,13 @@
 		<Description>
 			A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska.
 		</Description>
-		<Archive sha1sum="3bf7630e05cd38e1f113fcc10e10054d6e41cc4d" type="targz">
+		<Archive sha1sum="22b283d76e25db64ed5b6cdc65b6d16b99a159c4" type="targz">
-			https://github.com/Martchus/tageditor/archive/refs/tags/v3.7.7.tar.gz
+			https://github.com/Martchus/tageditor/archive/refs/tags/v3.7.8.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
+			<Dependency>ninja</Dependency>
+			<Dependency>appstream</Dependency>
 			<Dependency>qt6-linguist</Dependency>
 			<Dependency>cppunit-devel</Dependency>
 			<Dependency>qt6-base-devel</Dependency>
@@ -48,6 +50,13 @@
 	</Package>
 
 	<History>
+		<Update release="8">
+			<Date>2023-03-08</Date>
+			<Version>3.7.8</Version>
+			<Comment>Version bump</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="7">
 			<Date>2023-02-02</Date>
 			<Version>3.7.7</Version>

multimedia/misc/tagparser/actions.py

@@ -4,21 +4,19 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools, cmaketools
-from pisi.actionsapi import cmaketools
+
-from pisi.actionsapi import pisitools
+i = ''.join([
-from pisi.actionsapi import get
+    ' -DCMAKE_BUILD_TYPE=Release',
+    ' -DBUILD_SHARED_LIBS=ON',
+    ' -B_build -G Ninja -L '
+    ])
 
 def setup():
-	cmaketools.configure("-B_build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -L")
+	cmaketools.configure(i)
 
 def build():
-	shelltools.cd("_build")
+	mesontools.build("-C _build")
-	cmaketools.make()
 
 def install():
-	shelltools.cd("_build")
+	mesontools.install("-C _build")
-	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-	pisitools.dodoc("../LICENSE", "../README.md")
-

multimedia/misc/tagparser/pspec.xml

@@ -13,11 +13,12 @@
 		<PartOf>multimedia.misc</PartOf>
 		<Summary>C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags.</Summary>
 		<Description>C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags.</Description>
-		<Archive sha1sum="7eac2d7b4fd1f20fb7ad6d0c74d28eaf6b61b9a4" type="targz">
+		<Archive sha1sum="df3895ba218a8195f1929e7910c2233cbb6fb265" type="targz">
-			https://github.com/Martchus/tagparser/archive/refs/tags/v11.5.1.tar.gz
+			https://github.com/Martchus/tagparser/archive/refs/tags/v11.6.0.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
+			<Dependency>ninja</Dependency>
 			<Dependency>doxygen</Dependency>
 			<Dependency>zlib-devel</Dependency>
 			<Dependency>openssl-devel</Dependency>
@@ -55,6 +56,13 @@
 	</Package>
 
 	<History>
+		<Update release="8">
+			<Date>2023-03-08</Date>
+			<Version>11.6.0</Version>
+			<Comment>Version bump</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="7">
 			<Date>2023-02-02</Date>
 			<Version>11.5.1</Version>

office/misc/dia/actions.py

@@ -0,0 +1,29 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file https://www.gnu.org/licenses/gpl-3.0.txt
+
+from pisi.actionsapi import autotools, pisitools, get
+
+i = ''.join([
+    ' --with-python',
+    ' --with-swig',
+    ' --disable-nls',
+    ' --disable-gnome',
+    ' --disable-static '
+    ' --disable-hardbooks',
+    ])
+
+def setup():
+	pisitools.dosed("Makefile.in", "samples po sheets", "samples sheets")
+	autotools.configure(i)
+
+def build():
+	autotools.make()
+
+def install():
+	autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+	pisitools.removeDir("/usr/share/man/fr")
+
+	pisitools.dodoc("AUTHORS", "MAINTAINERS", "NEWS", "THANKS")

office/misc/dia/files/CVE-2019-19451.patch

@@ -0,0 +1,12 @@
+diff --git a/app/app_procs.c b/app/app_procs.c
+index d0f2d3d..423fe2f 100644
+--- a/app/app_procs.c
++++ b/app/app_procs.c
+@@ -801,6 +801,7 @@ app_init (int argc, char **argv)
+ 
+ 	if (!filename) {
+ 	  g_print (_("Filename conversion failed: %s\n"), filenames[i]);
++	  ++i;
+ 	  continue;
+ 	}
+ 

office/misc/dia/files/dia-unregister-import.patch

@@ -0,0 +1,37 @@
+From a6e2409b85414b3d82dacd390ce9c9f007e254e8 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka@redhat.com>
+Date: Wed, 5 Sep 2012 11:12:59 +0200
+Subject: [PATCH] Unregister vdx, xfig import filters during plugin unloading.
+
+---
+ plug-ins/vdx/vdx.c   | 1 +
+ plug-ins/xfig/xfig.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/plug-ins/vdx/vdx.c b/plug-ins/vdx/vdx.c
+index 64bc4b0..82ddc4b 100644
+--- a/plug-ins/vdx/vdx.c
++++ b/plug-ins/vdx/vdx.c
+@@ -43,6 +43,7 @@ static void
+ _plugin_unload (PluginInfo *info)
+ {
+     filter_unregister_export(&vdx_export_filter);
++    filter_unregister_import(&vdx_import_filter);
+ }
+ 
+ 
+diff --git a/plug-ins/xfig/xfig.c b/plug-ins/xfig/xfig.c
+index 966c294..10d68aa 100644
+--- a/plug-ins/xfig/xfig.c
++++ b/plug-ins/xfig/xfig.c
+@@ -41,6 +41,7 @@ static void
+ _plugin_unload (PluginInfo *info)
+ {
+     filter_unregister_export(&xfig_export_filter);
++    filter_unregister_import(&xfig_import_filter);
+ }
+ 
+ 
+-- 
+1.7.11.4
+

office/misc/dia/files/isinf.patch

@@ -0,0 +1,16 @@
+--- ./configure.orig
++++ ./configure
+@@ -17436,11 +17436,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char isinf ();
++#include <math.h>
+ int
+ main ()
+ {
+-return isinf ();
++return isinf (0.0);
+   ;
+   return 0;
+ }

office/misc/dia/pspec.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+	<Source>
+		<Name>dia</Name>
+		<Homepage>http://wiki.gnome.org/Apps/Dia</Homepage>
+		<Packager>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Packager>
+		<License>GPL-2</License>
+		<IsA>app:gui</IsA>
+		<PartOf>office.misc</PartOf>
+		<Summary>Versatile diagramming tool.</Summary>
+		<Description>Dia is a program for drawing diagrams.</Description>
+		<Archive sha1sum="316393951daebd186ba387e1cd6e34160a458c39" type="tarxz">
+			https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz
+		</Archive>
+		<BuildDependencies>
+			<Dependency>swig</Dependency>
+			<Dependency>intltool</Dependency>
+			<Dependency>gtk2-devel</Dependency>
+			<Dependency>libpng-devel</Dependency>
+			<Dependency>libxml2-devel</Dependency>
+			<Dependency>libxslt-devel</Dependency>
+			<Dependency>python-devel</Dependency>
+			<Dependency>docbook-xsl</Dependency>
+			<Dependency>libart_lgpl-devel</Dependency>
+		</BuildDependencies>
+		<Patches>
+			<!-- <Patch level='1'></Patch> -->
+			<Patch level='1'>dia-unregister-import.patch</Patch>
+			<Patch level='1'>isinf.patch</Patch>
+			<Patch level='1'>CVE-2019-19451.patch</Patch>
+		</Patches>
+	</Source>
+
+	<Package>
+		<Name>dia</Name>
+		<RuntimeDependencies>
+			<Dependency>gtk2</Dependency>
+			<Dependency>pango</Dependency>
+			<Dependency>cairo</Dependency>
+			<Dependency>libart_lgpl</Dependency>
+		</RuntimeDependencies>
+		<Files>
+			<Path fileType="executable">/usr/bin</Path>
+			<Path fileType="library">/usr/lib/dia</Path>
+			<Path fileType="data">/usr/share</Path>
+			<Path fileType="data">/usr/share/dia</Path>
+			<Path fileType="data">/usr/share/man/man1</Path>
+			<Path fileType="data">/usr/share/mime-info</Path>
+		</Files>
+	</Package>
+
+	<History>
+		<Update release="1">
+			<Date>2023-03-08</Date>
+			<Version>0.97.3</Version>
+			<Comment>First build.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
+	</History>
+</PISI>

programming/library/cpp-utilities/actions.py

@@ -4,28 +4,21 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools, cmaketools
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
 
 i = ''.join([
     ' -DCMAKE_BUILD_TYPE=Release',
     ' -DBUILD_SHARED_LIBS=ON',
     ' -DUSE_STANDARD_FILESYSTEM=ON',
-    ' -DFORCE_BOOST_IOSTREAMS_FOR_NATIVE_FILE_BUFFER=ON -L '
+    ' -DFORCE_BOOST_IOSTREAMS_FOR_NATIVE_FILE_BUFFER=ON',
+    ' -B_build -G Ninja -L '
     ])
 
 def setup():
-	cmaketools.configure("-B_build %s" % i)
+	cmaketools.configure(i)
 
 def build():
-	shelltools.cd("_build")
+	mesontools.build("-C _build")
-	cmaketools.make()
 
 def install():
-	shelltools.cd("_build")
+	mesontools.install("-C _build")
-	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-	pisitools.dodoc("../LICENSE", "../README.md")
-

programming/library/cpp-utilities/pspec.xml

@@ -13,11 +13,12 @@
 		<PartOf>programming.library</PartOf>
 		<Summary>Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities.</Summary>
 		<Description>Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities.</Description>
-		<Archive sha1sum="d05f4324913726326d56a1724472f3d34d0e9908" type="targz">
+		<Archive sha1sum="2e0b3a64981ffc8afff22d0b71bca1804336e230" type="targz">
-			https://github.com/Martchus/cpp-utilities/archive/refs/tags/v5.20.0.tar.gz
+			https://github.com/Martchus/cpp-utilities/archive/refs/tags/v5.21.0.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
+			<Dependency>ninja</Dependency>
 			<Dependency>doxygen</Dependency>
 			<Dependency>boost-devel</Dependency>
 			<Dependency>cppunit-devel</Dependency>
@@ -45,11 +46,18 @@
 		<Files>
 			<Path fileType="header">/usr/include</Path>
 			<Path fileType="library">/usr/lib/pkgconfig</Path>
-			<Path fileType="data">/usr/share/c++-utilities</Path>
+			<Path fileType="data">/usr/share/c++utilities</Path>
 		</Files>
 	</Package>
 
 	<History>
+		<Update release="8">
+			<Date>2023-03-08</Date>
+			<Version>5.21.0</Version>
+			<Comment>Version bump</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="7">
 			<Date>2023-02-02</Date>
 			<Version>5.20.0</Version>

programming/library/qtutilities/actions.py

@@ -4,28 +4,21 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools, cmaketools
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
 
 j = ''.join([
     ' -DCMAKE_BUILD_TYPE=Release',
     ' -DBUILD_SHARED_LIBS=ON',
     ' -DQT_PACKAGE_PREFIX=Qt6',
-    ' -DDISABLE_DEPRECATED_QT_FEATURES=ON -L '
+    ' -DDISABLE_DEPRECATED_QT_FEATURES=ON',
+    ' -B_build -G Ninja -L '
     ])
 
 def setup():
-	cmaketools.configure("-B_build %s" % j)
+	cmaketools.configure(j)
 
 def build():
-	shelltools.cd("_build")
+	mesontools.build("-C _build")
-	cmaketools.make()
 
 def install():
-	shelltools.cd("_build")
+	mesontools.install("-C _build")
-	cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-	pisitools.dodoc("../LICENSE", "../README.md")
-

programming/library/qtutilities/pspec.xml

@@ -13,11 +13,12 @@
 		<PartOf>programming.library</PartOf>
 		<Summary> Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models.</Summary>
 		<Description> Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models.</Description>
-		<Archive sha1sum="b12a5787de3d7abc595e332de731f44ccbc37041" type="targz">
+		<Archive sha1sum="8c39e50c1de5fb2efef4d0bb1044427309a4267d" type="targz">
-			https://github.com/Martchus/qtutilities/archive/refs/tags/v6.10.0.tar.gz
+			https://github.com/Martchus/qtutilities/archive/refs/tags/v6.11.0.tar.gz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>cmake</Dependency>
+			<Dependency>ninja</Dependency>
 			<Dependency>doxygen</Dependency>
 			<Dependency>qt6-linguist</Dependency>
 			<Dependency>qt6-base-devel</Dependency>
@@ -53,6 +54,13 @@
 	</Package>
 
 	<History>
+		<Update release="8">
+			<Date>2023-03-08</Date>
+			<Version>6.11.0</Version>
+			<Comment>Version bump</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="7">
 			<Date>2023-02-02</Date>
 			<Version>6.10.0</Version>