From f099cfcaf06b3da91c943651077222e6d2030cfe Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Thu, 9 Mar 2023 22:49:08 +0300 Subject: [PATCH 1/3] dia rebuild. --- multimedia/graphics/dia/actions.py | 32 +-- .../graphics}/dia/files/CVE-2019-19451.patch | 0 .../dia/files/dia-unregister-import.patch | 0 .../graphics}/dia/files/isinf.patch | 0 multimedia/graphics/dia/pspec.xml | 185 +++++++++--------- multimedia/graphics/dia/translations.xml | 10 +- office/misc/dia/actions.py | 29 --- office/misc/dia/pspec.xml | 65 ------ 8 files changed, 109 insertions(+), 212 deletions(-) rename {office/misc => multimedia/graphics}/dia/files/CVE-2019-19451.patch (100%) rename {office/misc => multimedia/graphics}/dia/files/dia-unregister-import.patch (100%) rename {office/misc => multimedia/graphics}/dia/files/isinf.patch (100%) delete mode 100644 office/misc/dia/actions.py delete mode 100644 office/misc/dia/pspec.xml diff --git a/multimedia/graphics/dia/actions.py b/multimedia/graphics/dia/actions.py index 572d081898..412b9733c3 100644 --- a/multimedia/graphics/dia/actions.py +++ b/multimedia/graphics/dia/actions.py @@ -2,28 +2,28 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/copyleft/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools +from pisi.actionsapi import autotools, pisitools, get +i = ''.join([ + ' --with-python', + ' --with-swig', + ' --disable-nls', + ' --disable-gnome', + ' --disable-static ' + ' --disable-hardbooks', + ]) def setup(): - pisitools.cxxflags.add("-fpermissive") - pisitools.dosed("plug-ins/postscript/diapsft2renderer.c", "freetype/ftglyph.h", "freetype2/ftglyph.h") - pisitools.dosed("plug-ins/postscript/diapsft2renderer.c", "freetype/ftoutln.h", "freetype2/ftoutln.h") - autotools.configure("--prefix=/usr \ - --with-cairo \ - --with-python \ - --disable-gnome") - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + #pisitools.dosed("Makefile.in", "samples po sheets", "samples sheets") + autotools.configure(i) def build(): - autotools.make() + autotools.make() def install(): - autotools.install() - pisitools.remove("/usr/share/icons/hicolor/icon-theme.cache") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.removeDir("/usr/share/man/fr") - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README") + pisitools.dodoc("AUTHORS", "MAINTAINERS", "NEWS", "THANKS") diff --git a/office/misc/dia/files/CVE-2019-19451.patch b/multimedia/graphics/dia/files/CVE-2019-19451.patch similarity index 100% rename from office/misc/dia/files/CVE-2019-19451.patch rename to multimedia/graphics/dia/files/CVE-2019-19451.patch diff --git a/office/misc/dia/files/dia-unregister-import.patch b/multimedia/graphics/dia/files/dia-unregister-import.patch similarity index 100% rename from office/misc/dia/files/dia-unregister-import.patch rename to multimedia/graphics/dia/files/dia-unregister-import.patch diff --git a/office/misc/dia/files/isinf.patch b/multimedia/graphics/dia/files/isinf.patch similarity index 100% rename from office/misc/dia/files/isinf.patch rename to multimedia/graphics/dia/files/isinf.patch diff --git a/multimedia/graphics/dia/pspec.xml b/multimedia/graphics/dia/pspec.xml index d6f050b25f..2fb86b196a 100644 --- a/multimedia/graphics/dia/pspec.xml +++ b/multimedia/graphics/dia/pspec.xml @@ -1,102 +1,93 @@ - + - - dia - https://live.gnome.org/Dia - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - multimedia.graphics - dia - app:gui - Diagram editor - Dia is a GTK+ based diagram creation program for GNU/Linux, - http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz - - intltool - qt5-base-devel - cairo-devel - python-devel - zlib-devel - freetype-devel - gdk-pixbuf-devel - gtk2-devel - glib2-devel - pango-devel - libxml2-devel - libpng-devel - libart_lgpl-devel - atk-devel - docbook-xsl - perl-XML-Parser - libxslt-devel - fontconfig-devel - - + + dia + http://wiki.gnome.org/Apps/Dia + + PisiLinux Community + admins@pisilinux.org + + GPL-2 + app:gui + multimedia.graphics + Versatile diagramming tool. + Dia is a program for drawing diagrams. + + https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz + + + swig + intltool + gtk2-devel + libpng-devel + libxml2-devel + libxslt-devel + python-devel + docbook-xsl + libart_lgpl-devel + + + + dia-unregister-import.patch + isinf.patch + CVE-2019-19451.patch + + - - dia - - python - zlib - freetype - cairo - gdk-pixbuf - gtk2 - pango - libxml2 - libpng - libart_lgpl - atk - libxslt - fontconfig - glib2 - - - /usr/bin - /usr/lib/dia - /usr/share/applications - /usr/share/icons - /usr/share/oaf - /usr/share/dia - /usr/share/mime-info - /usr/share/locale - /usr/share/doc - /usr/share/man - - + + dia + + gtk2 + pango + cairo + libart_lgpl + + + /usr/bin + /usr/lib/dia + /usr/share + /usr/share/dia + /usr/share/man/man1 + /usr/share/mime-info + + - - - 2020-03-05 - 0.97.3 - Rebuild with new toolchain - Mustafa Cinasal - muscnsl@pisilinux.org - - - 2018-08-05 - 0.97.3 - Rebuild with new toolchain - Stefan Gronewold - groni@pisilinux.org - - - 2017-04-15 - 0.97.3 - Rebuild with new toolchain - Stefan Gronewold - groni@pisilinux.org - - - 2016-12-07 - 0.97.3 - First Release - Stefan Gronewold - groni@pisilinux.org - - + + + 2023-03-09 + 0.97.3 + Rebuild. + fury + uglyside@yandex.ru + + + 2020-03-05 + 0.97.3 + Rebuild with new toolchain + Mustafa Cinasal + muscnsl@pisilinux.org + + + 2018-08-05 + 0.97.3 + Rebuild with new toolchain + Stefan Gronewold + groni@pisilinux.org + + + 2017-04-15 + 0.97.3 + Rebuild with new toolchain + Stefan Gronewold + groni@pisilinux.org + + + 2016-12-07 + 0.97.3 + First Release + Stefan Gronewold + groni@pisilinux.org + + diff --git a/multimedia/graphics/dia/translations.xml b/multimedia/graphics/dia/translations.xml index b10df9103c..89e0e5c24e 100644 --- a/multimedia/graphics/dia/translations.xml +++ b/multimedia/graphics/dia/translations.xml @@ -1,8 +1,8 @@ - - dia - Diyagram editörü. - Dia, GTK tabanlı diyagram çizme ve düzenleme programıdır. - + + dia + Diyagram editörü. + Dia, GTK tabanlı diyagram çizme ve düzenleme programıdır. + diff --git a/office/misc/dia/actions.py b/office/misc/dia/actions.py deleted file mode 100644 index d0b2dda188..0000000000 --- a/office/misc/dia/actions.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/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") diff --git a/office/misc/dia/pspec.xml b/office/misc/dia/pspec.xml deleted file mode 100644 index 6116e36584..0000000000 --- a/office/misc/dia/pspec.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - dia - http://wiki.gnome.org/Apps/Dia - - fury - uglyside@yandex.ru - - GPL-2 - app:gui - office.misc - Versatile diagramming tool. - Dia is a program for drawing diagrams. - - https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz - - - swig - intltool - gtk2-devel - libpng-devel - libxml2-devel - libxslt-devel - python-devel - docbook-xsl - libart_lgpl-devel - - - - dia-unregister-import.patch - isinf.patch - CVE-2019-19451.patch - - - - - dia - - gtk2 - pango - cairo - libart_lgpl - - - /usr/bin - /usr/lib/dia - /usr/share - /usr/share/dia - /usr/share/man/man1 - /usr/share/mime-info - - - - - - 2023-03-08 - 0.97.3 - First build. - fury - uglyside@yandex.ru - - - From cb4b745f70288e54ce0488fcec3bfd7f59b1972a Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Thu, 9 Mar 2023 22:49:51 +0300 Subject: [PATCH 2/3] clamav rebuild. --- util/antivirus/clamav/actions.py | 8 ++++---- util/antivirus/clamav/pspec.xml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/util/antivirus/clamav/actions.py b/util/antivirus/clamav/actions.py index 47804ae28a..41b75c8fff 100644 --- a/util/antivirus/clamav/actions.py +++ b/util/antivirus/clamav/actions.py @@ -13,11 +13,11 @@ j = ''.join([ ' -DENABLE_SYSTEMD=OFF', ' -DAPP_CONFIG_DIRECTORY=/etc/clamav', ' -DDATABASE_DIRECTORY=/var/lib/clamav', - ' -G Ninja', - ' -B_build -L ' + ' -B_build -G Ninja -L ' ]) def setup(): + shelltools.export("CFLAGS", "%s -I/usr/include/iconv " % get.CFLAGS()) cmaketools.configure(j) def build(): @@ -25,8 +25,8 @@ def build(): def check(): # failed utf16 to utf8 converting - pass - #mesontools.build("-C _build test") + #pass + mesontools.build("-C _build test") def install(): mesontools.install("-C _build install") diff --git a/util/antivirus/clamav/pspec.xml b/util/antivirus/clamav/pspec.xml index fece8eea38..b94be2a84e 100644 --- a/util/antivirus/clamav/pspec.xml +++ b/util/antivirus/clamav/pspec.xml @@ -29,6 +29,7 @@ python3-devel libxml2-devel libpcre2-devel + libiconv-devel daemon_confs.patch @@ -47,6 +48,7 @@ ncurses openssl libpcre2 + libiconv @@ -101,7 +103,7 @@ - 2023-02-24 + 2023-03-09 1.0.1 Version bump. fury From b6b0f506b1bceada13f8c011dfc0b32841194deb Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Thu, 9 Mar 2023 22:50:25 +0300 Subject: [PATCH 3/3] graphviz-7.1.0. --- multimedia/graphics/graphviz/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/multimedia/graphics/graphviz/pspec.xml b/multimedia/graphics/graphviz/pspec.xml index a32136f702..496053e65a 100644 --- a/multimedia/graphics/graphviz/pspec.xml +++ b/multimedia/graphics/graphviz/pspec.xml @@ -12,8 +12,8 @@ app Open source graph drawing software. Graphviz is open source graph visualization software which has web and interactive graphical interfaces, and auxiliary tools and libraries. Graphviz has many useful features for diagrams, such as options for colors, fonts, tabular node layouts, line styles, and custom shapes. - - https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.6/graphviz-7.0.6.tar.xz + + https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.1.0/graphviz-7.1.0.tar.xz swig @@ -93,6 +93,13 @@ + + 2023-03-09 + 7.1.0 + Version bump. + fury + uglyside@yandex.ru + 2023-01-08 7.0.6