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
-
-
-