diff --git a/util/admin/pisiyap/files/meson_tools.patch b/util/admin/pisiyap/files/meson_tools.patch new file mode 100644 index 0000000000..61133ca9d9 --- /dev/null +++ b/util/admin/pisiyap/files/meson_tools.patch @@ -0,0 +1,68 @@ +diff -Nuar a/libpisiyap/gui/pisiyapui.py b/libpisiyap/gui/pisiyapui.py +--- a/libpisiyap/gui/pisiyapui.py 2016-05-16 15:49:45.000000000 +0300 ++++ b/libpisiyap/gui/pisiyapui.py 2018-05-17 01:45:14.000000000 +0300 +@@ -315,6 +315,8 @@ + self.gridLayout_9.addWidget(self.pyTools, 2, 3, 1, 1) + self.sconsTools = QRadioButton(self.tab_5) + self.gridLayout_9.addWidget(self.sconsTools, 2, 5, 1, 1) ++ self.mesonTools = QRadioButton(self.tab_5) ++ self.gridLayout_9.addWidget(self.mesonTools, 4, 5, 1, 1) + spacerItem20 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) + self.gridLayout_9.addItem(spacerItem20, 1, 3, 1, 1) + spacerItem21 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) +@@ -504,6 +506,8 @@ + self.pyTools.setText(self.tr("Python Tools")) + self.sconsTools.setToolTip(self.tr("Select this option if the package is built with scons tools")) + self.sconsTools.setText(self.tr("SCons Tools")) ++ self.mesonTools.setToolTip(self.tr("Select this option if the package is built with meson tools")) ++ self.mesonTools.setText(self.tr("Meson Tools")) + self.backBut_3.setText(self.tr("Back")) + self.nextBut_3.setText(self.tr("Next")) + self.pisiyapTab.setTabText(self.pisiyapTab.indexOf(self.tab_5), "actions.py") +diff -Nuar a/libpisiyap/pisiyap.py b/libpisiyap/pisiyap.py +--- a/libpisiyap/pisiyap.py 2016-05-16 15:49:45.000000000 +0300 ++++ b/libpisiyap/pisiyap.py 2018-05-17 01:28:06.000000000 +0300 +@@ -292,6 +292,8 @@ + actionspy = actions.pyTools + elif self.ui.sconsTools.isChecked(): + actionspy = actions.sconsTools ++ elif self.ui.mesonTools.isChecked(): ++ actionspy = actions.mesonTools + + actionsPy = file(os.path.join(packageDir, 'actions.py'), 'w') + actionsPy.write(actionspy) +diff -Nuar a/libpisiyap/templates/actions.py b/libpisiyap/templates/actions.py +--- a/libpisiyap/templates/actions.py 2016-05-16 15:49:45.000000000 +0300 ++++ b/libpisiyap/templates/actions.py 2018-05-17 01:21:05.000000000 +0300 +@@ -175,3 +175,31 @@ + + pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "NEWS", "README") + ''' ++ ++mesonTools = u'''#!/usr/bin/env python ++# -*- coding: utf-8 -*- ++# ++# Licensed under the GNU General Public License, version 3. ++# See the file http://www.gnu.org/licenses/gpl.txt ++ ++from pisi.actionsapi import autotools ++from pisi.actionsapi import pisitools ++from pisi.actionsapi import shelltools ++from pisi.actionsapi import get ++ ++def setup(): ++ shelltools.makedirs("build") ++ shelltools.cd("build") ++ shelltools.system("meson .. --prefix=/usr") ++ ++def build(): ++ shelltools.cd("build") ++ shelltools.system("ninja") ++ ++def install(): ++ shelltools.cd("build") ++ shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) ++ ++ shelltools.cd("..") ++ pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "NEWS", "README") ++'''