Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #178 from ayhanyalcinsoy/master

Browse Source 
plasma-nm:fixed build dep
This commit is contained in:
Ertuğrul Erata
2015-07-30 16:41:29 +03:00
parent c9b8259604 783d5198cb
commit cd930c2eda
7 changed files with 200 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/plasma/milou/pspec.xml
+6 -5
View File
@@ -18,7 +18,7 @@
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>python3</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>kdeclarative-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
@@ -27,7 +27,8 @@
<Dependency>kconfig-devel</Dependency>
<Dependency>kservice-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
</Source>
@@ -37,10 +38,10 @@
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>krunner</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kservice</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kcoreaddons</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share</Path>
@@ -66,6 +67,6 @@
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</Update>
</History>
</PISI>
desktop/kde/plasma/plasma-nm/actions.py
+5 -1
View File
@@ -8,7 +8,11 @@ from pisi.actionsapi import kde5
from pisi.actionsapi import pisitools
def setup():
kde5.configure()
kde5.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DLIB_INSTALL_DIR=lib \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-DBUILD_TESTING=OFF")
def build():
kde5.make()
desktop/kde/plasma/plasma-nm/pspec.xml
+18 -7
View File
@@ -16,16 +16,27 @@
<Archive sha1sum="56efbed82939efc7e856d27128ca3a9b713b6144" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>networkmanager-qt-devel</Dependency>
<Dependency>modemmanager-qt-devel</Dependency>
<Dependency>ModemManager-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>python3</Dependency>
<Dependency>openconnect-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>NetworkManager-devel</Dependency>
<Dependency>mobile-broadband-provider-info</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qt5-quick1-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>kdesignerplugin</Dependency>
<Dependency>kinit-devel</Dependency>
<Dependency>kemoticons-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
</Source>
@@ -33,7 +44,7 @@
<Name>plasma-nm</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>openconnect</Dependency>
<Dependency>kio</Dependency>
<Dependency>networkmanager-qt</Dependency>
@@ -59,17 +70,17 @@
<Files>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Files>
<Replaces>
<Package>kde-workspace</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace</Package>
</Conflicts>
</Conflicts>
</Package>
<History>
<Update release="2">
@@ -86,6 +97,6 @@
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
network/connection/openconnect/actions.py
+20
View File
@@ -0,0 +1,20 @@
# -*- 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 get
def setup():
autotools.autoreconf("-fi")
autotools.configure("--with-vpnc-script=/etc/vpnc/vpnc-script")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING*")
network/connection/openconnect/files/configure.ac.patch
+31
View File
@@ -0,0 +1,31 @@
diff -Nuar openconnect-5.01.old/configure.ac openconnect-5.01/configure.ac
--- openconnect-5.01.old/configure.ac 2013-06-01 23:21:19.000000000 +0300
+++ openconnect-5.01/configure.ac 2013-07-05 23:52:18.035160836 +0300
@@ -328,19 +328,6 @@
AC_CHECK_FUNC(gnutls_pkcs11_add_provider,
[PKG_CHECK_MODULES(P11KIT, p11-kit-1, [AC_DEFINE(HAVE_P11KIT)
AC_SUBST(P11KIT_PC, p11-kit-1)], [:])], [])
- LIBS="$oldlibs -ltspi"
- AC_MSG_CHECKING([for tss library])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
- #include <trousers/tss.h>
- #include <trousers/trousers.h>],[
- int err = Tspi_Context_Create((void *)0);
- Trspi_Error_String(err);])],
- [AC_MSG_RESULT(yes)
- AC_SUBST([TSS_LIBS], [-ltspi])
- AC_SUBST([TSS_CFLAGS], [])
- AC_DEFINE(HAVE_TROUSERS, 1)],
- [AC_MSG_RESULT(no)])
- LIBS="$oldlibs"
CFLAGS="$oldcflags"
fi
if test "$with_openssl" = "yes" || test "$with_openssl" = "" || test "$ssl_library" = "both"; then
@@ -474,6 +461,7 @@
AM_CONDITIONAL(HAVE_SYMBOL_VERSIONING, [test "${symvers}" != "no"])
PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+PKG_CHECK_MODULES(ZLIB, zlib)
PKG_CHECK_MODULES(ZLIB, zlib, [AC_SUBST(ZLIB_PC, [zlib])],
[oldLIBS="$LIBS"
network/connection/openconnect/pspec.xml
+107
View File
@@ -0,0 +1,107 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>openconnect</Name>
<Homepage>http://www.infradead.org/openconnect.html</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2+</License>
<IsA>app:console</IsA>
<Summary>A client for Cisco's AnyConnect VPN, which uses HTTPS and DTLS protocols</Summary>
<Description>openconnect provides the core HTTP and authentication support from the OpenConnect VPN client, to be used by GUI authentication dialogs for NetworkManager etc.</Description>
<Archive sha1sum="2351408693aab0c6bc97d37e68b4a869fbb217ed" type="targz">ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz</Archive>
<BuildDependencies>
<!--<Dependency>libtomcrypt</Dependency>-->
<!--<Dependency>stoken-devel</Dependency>-->
<!--<Dependency>libproxy-devel</Dependency>-->
<Dependency>intltool</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<!--<Dependency>gnutls-devel</Dependency>-->
<!--<Dependency>p11-kit-devel</Dependency>-->
</BuildDependencies>
<Patches>
<!--<Patch level="1">configure.ac.patch</Patch>-->
</Patches>
</Source>
<Package>
<Name>openconnect</Name>
<RuntimeDependencies>
<Dependency>zlib</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/openconnect</Path>
<Path fileType="man">/usr/share/man/man8</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="library">/usr/lib</Path>
</Files>
</Package>
<Package>
<Name>openconnect-devel</Name>
<Summary>Development files and headers for openconnect</Summary>
<RuntimeDependencies>
<!--<Dependency>stoken</Dependency>-->
<Dependency release="current">openconnect</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2015-07-30</Date>
<Version>7.06</Version>
<Comment>Version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-03-09</Date>
<Version>5.01</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-07-29</Date>
<Version>5.01</Version>
<Comment>Dep Fixed</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-05</Date>
<Version>5.01</Version>
<Comment>fix remove dep.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2013-07-04</Date>
<Version>5.01</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-08-28</Date>
<Version>4.06</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
network/connection/openconnect/translations.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>openconnect</Name>
<Summary xml:lang="tr">Cisco AnyConnect VPN için HTTP ve DTLS protokollerini kullanan istemci</Summary>
<Description xml:lang="tr">openconnect, NetworkManager gibi grafik arayüz yoluyla kimlik doğrulama yapan araçlar için OpenConnect VPN kimlik doğrulama desteği sunan bir araç ve kitaplıktır.</Description>
</Source>
<Package>
<Name>openconnect-devel</Name>
<Summary xml:lang="tr">openconnect için geliştirme dosyaları ve başlıkları</Summary>
</Package>
</PISI>