From 2009f47d35eb8a3205749001350bbc6177892158 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 6 Jan 2019 22:39:13 +0300 Subject: [PATCH] xorg-proto:rebuild printproto.pc --- system/devel/xorg-proto/actions.py | 33 ++++++++++++++++++------------ system/devel/xorg-proto/pspec.xml | 7 +++++++ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/system/devel/xorg-proto/actions.py b/system/devel/xorg-proto/actions.py index 5f557ae9..a8ca4f5b 100644 --- a/system/devel/xorg-proto/actions.py +++ b/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") diff --git a/system/devel/xorg-proto/pspec.xml b/system/devel/xorg-proto/pspec.xml index f306d0b1..1bc48863 100644 --- a/system/devel/xorg-proto/pspec.xml +++ b/system/devel/xorg-proto/pspec.xml @@ -37,6 +37,13 @@ + + 2019-01-06 + 2018.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2018-09-11 2018.4