Merge pull request #349 from ertugerata/master

oxygen-fonts and fontforge rebuild

desktop/font/fontforge/actions.py

@@ -11,9 +11,11 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import libtools
 from pisi.actionsapi import get
 
+#WorkDir = "fontforge-%s-b" % get.srcVERSION().split('_')[-1]
 
 def setup():
-    #shelltools.system("./bootstrap --force")
+    #pisitools.dosed("configure.ac", "fontforge_package_name", "fontforge")
+    #shelltools.system("./autogen.sh")
 
     autotools.configure()
     
@@ -24,5 +26,5 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.dodoc("AUTHORS", "LICENSE", "COPYING.gplv3")
+    pisitools.dodoc("AUTHORS", "LICENSE")
 

desktop/font/fontforge/pspec.xml

@@ -15,29 +15,46 @@
         <Summary>Font editor and converter</Summary>
         <Description>FontForge is a font editor that lets you create your own postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one format to another. FontForge also has support for many macintosh font formats.</Description>
         <Archive sha1sum="2dd442baee9cd16efb5928bf51cc3d6b9c73d9af" type="targz">https://github.com/fontforge/fontforge/releases/download/20150824/fontforge-20150824.tar.gz</Archive>
-        <Archive sha1sum="efbc7c9d3e95159f5600dc71f9cccb370e46bb94" target="fontforge-20150824.tar.gz" type="targz">http://fontforge.org/cidmaps.tgz</Archive>
+        <Archive sha1sum="efbc7c9d3e95159f5600dc71f9cccb370e46bb94" target="fontforge-20150824" type="targz">http://fontforge.org/cidmaps.tgz</Archive>
         <BuildDependencies>
-            <Dependency>python-devel</Dependency>
+            <Dependency>libjpeg-turbo-devel</Dependency>
-            <Dependency>zlib-devel</Dependency>
-            <Dependency>glib2-devel</Dependency>
-            <Dependency>freetype-devel</Dependency>
-            <Dependency>libxml2-devel</Dependency>
             <Dependency>tiff-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
+            <Dependency>pango-devel</Dependency>
             <Dependency>libpng-devel</Dependency>
+            <Dependency>libXft-devel</Dependency>
+            <Dependency>libXi-devel</Dependency>
+            <Dependency>giflib-devel</Dependency>
+            <Dependency>libspiro-devel</Dependency>
+            <Dependency>xdg-utils</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+            <Dependency>python-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>readline-devel</Dependency>
+            <Dependency>libtool-ltdl</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>fontforge</Name>
         <RuntimeDependencies>
-            <Dependency>libpng</Dependency>
-            <Dependency>tiff</Dependency>
-            <Dependency>python</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>glib2</Dependency>
-            <Dependency>freetype</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libpng</Dependency>
+            <Dependency>python</Dependency>
             <Dependency>libxml2</Dependency>
+            <Dependency>freetype</Dependency>
+            <Dependency>readline</Dependency>
             <Dependency>libtool-ltdl</Dependency>
+            <Dependency>tiff</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>libXi</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>libXft</Dependency>
+            <Dependency>giflib</Dependency>
+            <Dependency>libspiro</Dependency>
+            <Dependency>libjpeg-turbo</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -56,6 +73,9 @@
         <Name>fontforge-devel</Name>
         <Summary>Development files for fontforge</Summary>
         <RuntimeDependencies>
+            <Dependency>tiff-devel</Dependency>
+            <Dependency>pango-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
             <Dependency release="current">fontforge</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -65,12 +85,40 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2015-08-28</Date>
+            <Version>2.0.20150824</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-03-01</Date>
+            <Version>2.0.20140101</Version>
+            <Comment>Rebuild Unused</Comment>
+            <Name>Varol Maksutoğlu</Name>
+            <Email>waroi@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2014-02-01</Date>
+            <Version>2.0.20140101</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-08-02</Date>
+            <Version>20120731</Version>
+            <Comment>Rebuild for RC.</Comment>
+            <Name>Serdar Soytetir</Name>
+            <Email>kaptan@pisilinux.org</Email>
+        </Update>
         <Update release="1">
-            <Date>2015-08-25</Date>
+            <Date>2012-10-25</Date>
-            <Version>20150824</Version>
+            <Version>20120731</Version>
             <Comment>First release</Comment>
-            <Name>Vedat Demir</Name>
+            <Name>Yusuf Aydemir</Name>
-            <Email>vedat@pisilinux.org</Email>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>

desktop/font/oxygen-fonts/actions.py

@@ -5,7 +5,7 @@
 # See the file http://www.gnu.org/licenses/gpl.txt
 
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import cmaketools
+from pisi.actionsapi import get
 from pisi.actionsapi import kde5
 
 def setup():
@@ -17,5 +17,4 @@ def build():
 def install():
     kde5.install()
 
-
     pisitools.dodoc("COPYING-OFL", "README.md")

desktop/font/oxygen-fonts/pspec.xml

@@ -14,17 +14,16 @@
         <Description>Oxygen font family is a desktop / GUI font family for integrated use with KDE.</Description>
         <Archive sha1sum="6336d12705332d95d70fa03e710dc0a87e5be69a" type="tarxz">http://download.kde.org/stable/plasma/5.4.0/oxygen-fonts-5.4.0.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>cmake</Dependency>
             <Dependency>extra-cmake-modules</Dependency> 
-            <Dependency>fontconfig-devel</Dependency>      
+            <Dependency>fontconfig-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>     
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>fontforge</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>oxygen-fonts</Name>
-        <RuntimeDependencies>
-            <Dependency>fontconfig</Dependency>
-        </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share/fonts</Path>
             <Path fileType="doc">/usr/share/doc</Path>