Merge pull request #8797 from blue-devil/master

geda:upgrade

science/electronics/geda/actions.py

@@ -4,20 +4,40 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
+from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
-from pisi.actionsapi import get
 
 def setup():
-    #shelltools.system("./autogen.sh")
+    options = ''.join([
-    autotools.autoreconf("-vfi")
+              '-Wno-unused-result ',
+              '-Wno-format-overflow ',
+              '-Wno-deprecated-declarations'
+              ])
+
+    # gamin's optional-ness is overstated
+    shelltools.system("sed -i 's|^.*<fam.h>|//&|' gschem/src/gschem_change_notification.c")
+    shelltools.system("sed -i 's| enum FAMCodes | int |' gschem/src/gschem_change_notification.c")
+    #autotools.autoreconf("-vfi")
+    # xorn uses python2 instead of python, shebang problems
+    shelltools.export("PYTHON_CFLAGS", "-I/usr/include/python2.7/")
+    shelltools.export("PYTHON_LIBS", "-lpython2.7")
+    # to fix cannot find libguile.h error
+    shelltools.export("GUILE_CFLAGS", "-I/usr/include/guile/2.2/")
+    shelltools.export("GUILE_LIBS", "-lguile-2.2")
+    
+    pisitools.cflags.add("%s" % options)
     autotools.configure("--prefix=/usr \
+                         --disable-rpath \
+                         --without-libfam \
                          --docdir=/usr/share/doc \
                          --localedir=/usr/share/locale \
                          --disable-update-xdg-database")
     
+    # fix unused direct dependency analysis
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    pisitools.dosed("xorn/libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()
@@ -25,4 +45,4 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("AUTHORS", "COPYING", "README")
+    pisitools.dodoc("COPYING*", "README")

science/electronics/geda/pspec.xml

@@ -1,69 +1,64 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>geda</Name>
-        <Homepage>http://wiki.geda-project.org/geda:download#download</Homepage>
+        <Homepage>http://geda-project.org/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
+        <PartOf>science.electronics</PartOf>
         <License>GPLv2</License>
         <IsA>app:gui</IsA>
-        <Summary>The gEDA project has produced and continues working on a full GPL'd suite and toolkit of Electronic Design Automation tools.</Summary>
+        <Summary>gEDA contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project.</Summary>
         <Description>The gEDA project has produced and continues working on a full GPL'd suite and toolkit of Electronic Design Automation tools.</Description>
-        <Archive sha1sum="c61edc04997fc12398534a346dac32d8fcdabcc1" type="targz">http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz</Archive>
+        <Archive sha1sum="aa8e3901fc439440e9b5e847734ecdc6e99e5fe8" type="targz">http://ftp.geda-project.org/geda-gaf/stable/v1.10/1.10.0/geda-gaf-1.10.0.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency>cython</Dependency>
             <Dependency>flex</Dependency>
             <Dependency>gawk</Dependency>
-            <Dependency>groff</Dependency>
             <Dependency>doxygen</Dependency>
+            <Dependency>pkgconfig</Dependency>
+            <Dependency>gtk2-devel</Dependency>
             <Dependency>guile-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
-            <Dependency>gtk2-devel</Dependency>
-            <Dependency>glibc-devel</Dependency>
-            <Dependency>pkgconfig</Dependency>
-            <Dependency>gettext-devel</Dependency>
             <Dependency>python-devel</Dependency>
-            <Dependency>shared-mime-info</Dependency>
-            <Dependency>desktop-file-utils</Dependency>
-            <Dependency>gobject-introspection-devel</Dependency>
-            <Dependency>python-pygobject-devel</Dependency>
         </BuildDependencies>
     </Source>
+
     <Package>
         <Name>geda</Name>
          <RuntimeDependencies>
             <Dependency>gtk2</Dependency>
             <Dependency>cairo</Dependency>
-            <Dependency>glib2</Dependency>
             <Dependency>guile</Dependency>
+            <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>gdk-pixbuf</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/usr/share</Path>
-            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/usr/share/gEDA</Path>
-            <Path fileType="data">/usr/share/icons</Path>
-            <Path fileType="info">/usr/share/info</Path>
-            <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/gEDA</Path>
+            <Path fileType="info">/usr/share/info</Path>
             <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/icons</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
+
     <Package>
         <Name>geda-devel</Name>
         <Summary>Development files for geda</Summary>
         <RuntimeDependencies>
-            <Dependency version="current">geda</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>guile-devel</Dependency>
             <Dependency>gdk-pixbuf-devel</Dependency>
+            <Dependency version="current">geda</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -72,6 +67,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2020-09-29</Date>
+            <Version>1.10.0</Version>
+            <Comment>Minor version bump.</Comment>
+            <Name>Blue Devil</Name>
+            <Email>bluedevil@sctzine.com</Email>
+        </Update>
         <Update release="2">
             <Date>2018-09-16</Date>
             <Version>1.8.2</Version>

science/electronics/geda/translations.xml

@@ -2,7 +2,13 @@
 <PISI>
     <Source>
         <Name>geda</Name>
-        <Summary xml:lang="tr">The gEDA project has produced and continues working on a full GPL'd suite and toolkit of Electronic Design Automation tools.</Summary>
+        <Summary xml:lang="tr">GEDA, GPL Elektronik Tasarım Otomasyon Araçları.</Summary>
-        <Description xml:lang="tr">The gEDA project has produced and continues working on a full GPL'd suite and toolkit of Electronic Design Automation tools.</Description>
+        <Description xml:lang="tr">GEDA projesi, GPL lısansı altında Elektronik Tasarım Otomasyon Araçları ve geliştirme başlıkları içerir.</Description>
     </Source>
+
+    <Package>
+        <Name>geda-devel</Name>
+        <Summary xml:lang="tr">geda için geliştirme dosyaları</Summary>
+        <Description xml:lang="tr">geda-devel, geda için geliştirme dosyalarını içerir.</Description>
+    </Package>
 </PISI>