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

graphviz, dia
This commit is contained in:
Rmys
2023-03-09 22:59:34 +03:00
committed by GitHub
11 changed files with 125 additions and 219 deletions
+16 -16
View File
@@ -2,28 +2,28 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Licensed under the GNU General Public License, version 3. # 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 autotools, pisitools, get
from pisi.actionsapi import pisitools
i = ''.join([
' --with-python',
' --with-swig',
' --disable-nls',
' --disable-gnome',
' --disable-static '
' --disable-hardbooks',
])
def setup(): def setup():
pisitools.cxxflags.add("-fpermissive") #pisitools.dosed("Makefile.in", "samples po sheets", "samples sheets")
pisitools.dosed("plug-ins/postscript/diapsft2renderer.c", "freetype/ftglyph.h", "freetype2/ftglyph.h") autotools.configure(i)
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 ")
def build(): def build():
autotools.make() autotools.make()
def install(): def install():
autotools.install() autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.remove("/usr/share/icons/hicolor/icon-theme.cache") pisitools.removeDir("/usr/share/man/fr")
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README") pisitools.dodoc("AUTHORS", "MAINTAINERS", "NEWS", "THANKS")
+88 -97
View File
@@ -1,102 +1,93 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>dia</Name> <Name>dia</Name>
<Homepage>https://live.gnome.org/Dia</Homepage> <Homepage>http://wiki.gnome.org/Apps/Dia</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>GPLv3</License> <License>GPL-2</License>
<PartOf>multimedia.graphics</PartOf> <IsA>app:gui</IsA>
<Icon>dia</Icon> <PartOf>multimedia.graphics</PartOf>
<IsA>app:gui</IsA> <Summary>Versatile diagramming tool.</Summary>
<Summary>Diagram editor</Summary> <Description>Dia is a program for drawing diagrams.</Description>
<Description>Dia is a GTK+ based diagram creation program for GNU/Linux,</Description> <Archive sha1sum="316393951daebd186ba387e1cd6e34160a458c39" type="tarxz">
<Archive sha1sum="316393951daebd186ba387e1cd6e34160a458c39" type="tarxz">http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz</Archive> https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz
<BuildDependencies> </Archive>
<Dependency>intltool</Dependency> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>swig</Dependency>
<Dependency>cairo-devel</Dependency> <Dependency>intltool</Dependency>
<Dependency>python-devel</Dependency> <Dependency>gtk2-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>freetype-devel</Dependency> <Dependency>libxml2-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency> <Dependency>libxslt-devel</Dependency>
<Dependency>gtk2-devel</Dependency> <Dependency>python-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>docbook-xsl</Dependency>
<Dependency>pango-devel</Dependency> <Dependency>libart_lgpl-devel</Dependency>
<Dependency>libxml2-devel</Dependency> </BuildDependencies>
<Dependency>libpng-devel</Dependency> <Patches>
<Dependency>libart_lgpl-devel</Dependency> <!-- <Patch level='1'></Patch> -->
<Dependency>atk-devel</Dependency> <Patch level='1'>dia-unregister-import.patch</Patch>
<Dependency>docbook-xsl</Dependency> <Patch level='1'>isinf.patch</Patch>
<Dependency>perl-XML-Parser</Dependency> <Patch level='1'>CVE-2019-19451.patch</Patch>
<Dependency>libxslt-devel</Dependency> </Patches>
<Dependency>fontconfig-devel</Dependency> </Source>
</BuildDependencies>
</Source>
<Package> <Package>
<Name>dia</Name> <Name>dia</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>python</Dependency> <Dependency>gtk2</Dependency>
<Dependency>zlib</Dependency> <Dependency>pango</Dependency>
<Dependency>freetype</Dependency> <Dependency>cairo</Dependency>
<Dependency>cairo</Dependency> <Dependency>libart_lgpl</Dependency>
<Dependency>gdk-pixbuf</Dependency> </RuntimeDependencies>
<Dependency>gtk2</Dependency> <Files>
<Dependency>pango</Dependency> <Path fileType="executable">/usr/bin</Path>
<Dependency>libxml2</Dependency> <Path fileType="library">/usr/lib/dia</Path>
<Dependency>libpng</Dependency> <Path fileType="data">/usr/share</Path>
<Dependency>libart_lgpl</Dependency> <Path fileType="data">/usr/share/dia</Path>
<Dependency>atk</Dependency> <Path fileType="data">/usr/share/man/man1</Path>
<Dependency>libxslt</Dependency> <Path fileType="data">/usr/share/mime-info</Path>
<Dependency>fontconfig</Dependency> </Files>
<Dependency>glib2</Dependency> </Package>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/dia</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="data">/usr/share/oaf</Path>
<Path fileType="data">/usr/share/dia</Path>
<Path fileType="data">/usr/share/mime-info</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="doc">/usr/share/man</Path>
</Files>
</Package>
<History> <History>
<Update release="4"> <Update release="5">
<Date>2020-03-05</Date> <Date>2023-03-09</Date>
<Version>0.97.3</Version> <Version>0.97.3</Version>
<Comment>Rebuild with new toolchain</Comment> <Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name> <Name>fury</Name>
<Email>muscnsl@pisilinux.org</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="3"> <Update release="4">
<Date>2018-08-05</Date> <Date>2020-03-05</Date>
<Version>0.97.3</Version> <Version>0.97.3</Version>
<Comment>Rebuild with new toolchain</Comment> <Comment>Rebuild with new toolchain</Comment>
<Name>Stefan Gronewold</Name> <Name>Mustafa Cinasal</Name>
<Email>groni@pisilinux.org</Email> <Email>muscnsl@pisilinux.org</Email>
</Update> </Update>
<Update release="2"> <Update release="3">
<Date>2017-04-15</Date> <Date>2018-08-05</Date>
<Version>0.97.3</Version> <Version>0.97.3</Version>
<Comment>Rebuild with new toolchain</Comment> <Comment>Rebuild with new toolchain</Comment>
<Name>Stefan Gronewold</Name> <Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email> <Email>groni@pisilinux.org</Email>
</Update> </Update>
<Update release="1"> <Update release="2">
<Date>2016-12-07</Date> <Date>2017-04-15</Date>
<Version>0.97.3</Version> <Version>0.97.3</Version>
<Comment>First Release</Comment> <Comment>Rebuild with new toolchain</Comment>
<Name>Stefan Gronewold</Name> <Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email> <Email>groni@pisilinux.org</Email>
</Update> </Update>
</History> <Update release="1">
<Date>2016-12-07</Date>
<Version>0.97.3</Version>
<Comment>First Release</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI> </PISI>
+5 -5
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<PISI> <PISI>
<Source> <Source>
<Name>dia</Name> <Name>dia</Name>
<Summary xml:lang="tr">Diyagram editörü.</Summary> <Summary xml:lang="tr">Diyagram editörü.</Summary>
<Description xml:lang="tr">Dia, GTK tabanlı diyagram çizme ve düzenleme programıdır.</Description> <Description xml:lang="tr">Dia, GTK tabanlı diyagram çizme ve düzenleme programıdır.</Description>
</Source> </Source>
</PISI> </PISI>
+9 -2
View File
@@ -12,8 +12,8 @@
<IsA>app</IsA> <IsA>app</IsA>
<Summary>Open source graph drawing software.</Summary> <Summary>Open source graph drawing software.</Summary>
<Description>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.</Description> <Description>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.</Description>
<Archive sha1sum="300872bdc5d5a7fd98d25195be09957465a2a243" type="tarxz"> <Archive sha1sum="24999d7c3995f1f3ccfbfabe357cee86dce7a4f8" type="tarxz">
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
</Archive> </Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>swig</Dependency> <Dependency>swig</Dependency>
@@ -93,6 +93,13 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2023-03-09</Date>
<Version>7.1.0</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2023-01-08</Date> <Date>2023-01-08</Date>
<Version>7.0.6</Version> <Version>7.0.6</Version>
-29
View File
@@ -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")
-65
View File
@@ -1,65 +0,0 @@
<?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>
+4 -4
View File
@@ -13,11 +13,11 @@ j = ''.join([
' -DENABLE_SYSTEMD=OFF', ' -DENABLE_SYSTEMD=OFF',
' -DAPP_CONFIG_DIRECTORY=/etc/clamav', ' -DAPP_CONFIG_DIRECTORY=/etc/clamav',
' -DDATABASE_DIRECTORY=/var/lib/clamav', ' -DDATABASE_DIRECTORY=/var/lib/clamav',
' -G Ninja', ' -B_build -G Ninja -L '
' -B_build -L '
]) ])
def setup(): def setup():
shelltools.export("CFLAGS", "%s -I/usr/include/iconv " % get.CFLAGS())
cmaketools.configure(j) cmaketools.configure(j)
def build(): def build():
@@ -25,8 +25,8 @@ def build():
def check(): def check():
# failed utf16 to utf8 converting # failed utf16 to utf8 converting
pass #pass
#mesontools.build("-C _build test") mesontools.build("-C _build test")
def install(): def install():
mesontools.install("-C _build install") mesontools.install("-C _build install")
+3 -1
View File
@@ -29,6 +29,7 @@
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>libxml2-devel</Dependency> <Dependency>libxml2-devel</Dependency>
<Dependency>libpcre2-devel</Dependency> <Dependency>libpcre2-devel</Dependency>
<Dependency>libiconv-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">daemon_confs.patch</Patch> <Patch level="1">daemon_confs.patch</Patch>
@@ -47,6 +48,7 @@
<Dependency>ncurses</Dependency> <Dependency>ncurses</Dependency>
<Dependency>openssl</Dependency> <Dependency>openssl</Dependency>
<Dependency>libpcre2</Dependency> <Dependency>libpcre2</Dependency>
<Dependency>libiconv</Dependency>
<!-- <Dependency>libmilter</Dependency> --> <!-- <Dependency>libmilter</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -101,7 +103,7 @@
<History> <History>
<Update release="6"> <Update release="6">
<Date>2023-02-24</Date> <Date>2023-03-09</Date>
<Version>1.0.1</Version> <Version>1.0.1</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>fury</Name>