Merge pull request #845 from Rmys/master

xorg-proto:rebuild printproto.pc

system/devel/xorg-proto/actions.py

@@ -1,7 +1,8 @@
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
-#
+
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file http://www.gnu.org/copyleft/gpl.txt
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
@@ -9,20 +10,26 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 def setup():
-    shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.in")
-    shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.am")
+    shelltools.system("sed -i 's|datadir|libdir|g' meson.build")
     
-    autotools.autoreconf("-vif")
-    autotools.configure("--prefix=/usr \
-                         --docdir=/usr/share/doc/xorg-proto")
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+    shelltools.system("meson .. --prefix=/usr --libdir=lib -Dlegacy=true")
     
 def build():
-    autotools.make()
+    shelltools.cd("build")
+    shelltools.system("ninja")
     
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-        
-        
-    pisitools.dodoc("README", "COPYING*", "AUTHORS")
-    pisitools.domove("/usr/share/doc/xorg-proto/COPYING-*o","/usr/share/doc/xorg-proto/COPYING")
+    shelltools.cd("build")
+    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
     
+    shelltools.cd("..")
+    pisitools.dodoc("README", "COPYING*", "AUTHORS")
+    
+    pisitools.remove("/usr/include/X11/extensions/apple*")
+    pisitools.remove("/usr/include/X11/extensions/windows*")
+    pisitools.remove("/usr/share/doc/xorg-proto/COPYING-windowswmproto")
+    pisitools.remove("/usr/share/doc/xorg-proto/COPYING-applewmproto")
+    pisitools.remove("/usr/lib/pkgconfig/applewmproto.pc")
+    pisitools.remove("/usr/lib/pkgconfig/windowswmproto.pc")

system/devel/xorg-proto/pspec.xml

@@ -37,6 +37,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2019-01-06</Date>
+            <Version>2018.4</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2018-09-11</Date>
             <Version>2018.4</Version>