Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
Ertuğrul Erata
@@ -13,7 +13,7 @@
|
||||
<IsA>service</IsA>
|
||||
<Summary>Apache web server</Summary>
|
||||
<Description>Apache HTTP Server is a free software/open source web server for Unix-like systems, Microsoft Windows, Novell NetWare and other operating systems. Apache is notable for playing a key role in the initial growth of the World Wide Web, and continues to be the most popular web server in use, serving as the de facto reference platform against which other web servers are designed and judged.</Description>
|
||||
<Archive sha1sum="bd6d138c31c109297da2346c6e7b93b9283993d2" type="tarbz2">http://archive.apache.org/dist/httpd/httpd-2.4.25.tar.bz2</Archive>
|
||||
<Archive sha1sum="d99137fe45c6267653350f888bf745a3d242ddbe" type="tarbz2">http://archive.apache.org/dist/httpd/httpd-2.4.29.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>apr-devel</Dependency>
|
||||
<Dependency>nss-devel</Dependency>
|
||||
@@ -57,11 +57,11 @@
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="data">/lib/systemd/system</Path>
|
||||
<Path fileType="data">/usr/share/dbus-1/services/apache.service</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<!-- systemd service file -->
|
||||
<AdditionalFile target="/lib/systemd/system/apache.service" permission="0644" owner="root">apache.service</AdditionalFile>
|
||||
<AdditionalFile target="/usr/share/dbus-1/services/apache.service" permission="0644" owner="root">apache.service</AdditionalFile>
|
||||
<!-- Init script & configuration -->
|
||||
<AdditionalFile target="/etc/conf.d/apache2" permission="0644" owner="root">apache2.confd</AdditionalFile>
|
||||
<!-- HTTPD configuration -->
|
||||
@@ -91,6 +91,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2018-05-17</Date>
|
||||
<Version>2.4.29</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2017-03-19</Date>
|
||||
<Version>2.4.25</Version>
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
diff -Nuar a/libpisiyap/templates/pspec.py b/libpisiyap/templates/pspec.py
|
||||
--- a/libpisiyap/templates/pspec.py 2016-05-16 15:49:45.000000000 +0300
|
||||
+++ b/libpisiyap/templates/pspec.py 2018-05-16 23:27:49.323840586 +0300
|
||||
@@ -77,7 +77,20 @@
|
||||
</Provides>
|
||||
-->
|
||||
</Package>
|
||||
-
|
||||
+ <!--
|
||||
+ <Package>
|
||||
+ <Name>%(packageName)s-devel</Name>
|
||||
+ <Summary>Development files for %(packageName)s</Summary>
|
||||
+ <RuntimeDependencies>
|
||||
+ <Dependency release="current">%(packageName)s</Dependency>
|
||||
+ </RuntimeDependencies>
|
||||
+ <Files>
|
||||
+ <Path fileType="header">/usr/include</Path>
|
||||
+ <Path fileType="data">/usr/lib/cmake</Path>
|
||||
+ <Path fileType="library">/usr/lib/pkgconfig</Path>
|
||||
+ </Files>
|
||||
+ </Package>
|
||||
+ -->
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>%(date)s</Date>
|
||||
@@ -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")
|
||||
+'''
|
||||
@@ -20,7 +20,11 @@
|
||||
<Dependency>python-qt5-devel</Dependency>
|
||||
<Dependency>python-setuptools</Dependency>
|
||||
<Dependency>qt5-linguist</Dependency>
|
||||
</BuildDependencies>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>devel-package.patch</Patch>
|
||||
<Patch>meson_tools.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -55,6 +59,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2018-05-16</Date>
|
||||
<Version>0.7b</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2017-06-21</Date>
|
||||
<Version>0.7b</Version>
|
||||
|
||||
Reference in New Issue
Block a user