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

Merge pull request #170 from ertugerata/master

Browse Source 
plasma part 2, qt5-phonon fixed
This commit is contained in:
Ertuğrul Erata
2015-07-29 11:01:01 +03:00
parent 039f7c9e07 0d8d16efd7
commit e2a264e046
12 changed files with 200 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/phonon/qt5-phonon/actions.py
+5 -2
View File
@@ -9,10 +9,13 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
kde5.configure("-DPHONON_BUILD_PHONON4QT5=ON \ kde5.configure("-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
-DPHONON_BUILD_PHONON4QT5=ON \ -DPHONON_BUILD_PHONON4QT5=ON \
-DCMAKE_INSTALL_LIBDIR=/usr/lib/qt5") -D__KDE_HAVE_GCC_VISIBILITY=NO \
-DCMAKE_INSTALL_LIBDIR=lib")
def build(): def build():
kde5.make() kde5.make()
desktop/kde/phonon/qt5-phonon/files/qt-5.4.2.patch
+23
View File
@@ -0,0 +1,23 @@
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Thu, 28 May 2015 15:56:47 +0000
Subject: Yet another _include_dirs fix
X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
---
Yet another _include_dirs fix
The variable is set as a definition, so mark it as such
---
--- a/cmake/FindPhononInternal.cmake
+++ b/cmake/FindPhononInternal.cmake
@@ -409,7 +409,7 @@
file(WRITE "${_source_file}" "${_source}")
set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
if(NOT _compile_result)
message("${_compile_output_var}")
desktop/kde/phonon/qt5-phonon/pspec.xml
+3
View File
@@ -24,6 +24,9 @@
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<!--Dependency>xine-lib-devel</Dependency--> <!--Dependency>xine-lib-devel</Dependency-->
</BuildDependencies> </BuildDependencies>
<Patches>
<Patch>qt-5.4.2.patch</Patch>
</Patches>
</Source> </Source>
<Package> <Package>
desktop/kde/plasma/khelpcenter/actions.py
+1 -1
View File
@@ -8,7 +8,7 @@ from pisi.actionsapi import kde5
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
def setup(): def setup():
kde5.configure() kde5.configure("-DPhonon4Qt5_DIR=/usr/lib/qt5/cmake/phonon4qt5")
def build(): def build():
kde5.make() kde5.make()
desktop/kde/plasma/khelpcenter/pspec.xml
+8 -3
View File
@@ -16,14 +16,19 @@
<Archive sha1sum="33c22a849af441582686a3fde9fc96d9dc2b6d5c" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz</Archive> <Archive sha1sum="33c22a849af441582686a3fde9fc96d9dc2b6d5c" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency> <Dependency>libdbusmenu-qt-devel</Dependency>
<Dependency>qt5-libdbusmenu-devel</Dependency>
<Dependency>kinit-devel</Dependency> <Dependency>kinit-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kcmutils-devel</Dependency> <Dependency>kcmutils-devel</Dependency>
<Dependency>khtml-devel</Dependency> <Dependency>khtml-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>kemoticons-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency>kdesignerplugin</Dependency>
<Dependency>kdelibs4-support-devel</Dependency> <Dependency>kdelibs4-support-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
desktop/kde/plasma/kmenuedit/pspec.xml
+20 -2
View File
@@ -17,9 +17,27 @@
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>kdoctools-devel</Dependency> <Dependency>kdoctools-devel</Dependency>
<Dependency>libgcc</Dependency> <Dependency>kconfig-devel</Dependency>
<Dependency>kservice-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kdbusaddons-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>sonnet-devel</Dependency>
<Dependency>kdesignerplugin</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kinit-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency>kemoticons-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>python3</Dependency> <Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
desktop/kde/plasma/kscreen/pspec.xml
+6 -2
View File
@@ -17,10 +17,14 @@
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-graphicaleffects</Dependency> <Dependency>qt5-graphicaleffects</Dependency>
<Dependency>python3</Dependency> <Dependency>qt5-declarative-devel</Dependency>
<Dependency>libgcc</Dependency> <Dependency>kglobalaccel-devel</Dependency>
<Dependency>libkscreen-devel</Dependency>
<Dependency>kdoctools-devel</Dependency> <Dependency>kdoctools-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
desktop/kde/plasma/kwayland/pspec.xml
+7 -3
View File
@@ -15,17 +15,19 @@
<Archive sha1sum="d2d75aef18fbb77b26c2a641ab70d0937497ce39" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kwayland-5.3.2.tar.xz</Archive> <Archive sha1sum="d2d75aef18fbb77b26c2a641ab70d0937497ce39" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kwayland-5.3.2.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>wayland-devel</Dependency> <Dependency>wayland-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>kwayland</Name> <Name>kwayland</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>mesa</Dependency>
<Dependency>wayland-client</Dependency> <Dependency>wayland-client</Dependency>
<Dependency>wayland-server</Dependency> <Dependency>wayland-server</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
@@ -38,6 +40,8 @@
<Name>kwayland-devel</Name> <Name>kwayland-devel</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>wayland-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency release="current">kwayland</Dependency> <Dependency release="current">kwayland</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
desktop/kde/plasma/libkscreen/pspec.xml
+3
View File
@@ -25,6 +25,7 @@
<Dependency>libXcursor-devel</Dependency> <Dependency>libXcursor-devel</Dependency>
<Dependency>libXrandr-devel</Dependency> <Dependency>libXrandr-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -47,7 +48,9 @@
<Name>libkscreen-devel</Name> <Name>libkscreen-devel</Name>
<Summary>Development files for libkscreen</Summary> <Summary>Development files for libkscreen</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libxcb-devel</Dependency>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency release="current">libkscreen</Dependency> <Dependency release="current">libkscreen</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
desktop/kde/plasma/libksysguard/pspec.xml
+20 -17
View File
@@ -16,12 +16,15 @@
<Archive sha1sum="062ba33ebf09a41afe30ced2ef3e5552f0378806" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz</Archive> <Archive sha1sum="062ba33ebf09a41afe30ced2ef3e5552f0378806" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency> <Dependency>qt5-script-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>kdoctools-devel</Dependency> <Dependency>kdoctools-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libX11-devel</Dependency> <Dependency>libX11-devel</Dependency>
<Dependency>libXres-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch level="1">libksysguard_kauth.diff</Patch> --> <!--<Patch level="1">libksysguard_kauth.diff</Patch> -->
@@ -32,8 +35,8 @@
<Name>libksysguard</Name> <Name>libksysguard</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>qt5-base</Dependency> <Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libX11</Dependency> <Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>libXres</Dependency> <Dependency>libXres</Dependency>
<Dependency>qt5-webkit</Dependency> <Dependency>qt5-webkit</Dependency>
@@ -44,8 +47,8 @@
<Dependency>kconfig</Dependency> <Dependency>kconfig</Dependency>
<Dependency>kauth</Dependency> <Dependency>kauth</Dependency>
<Dependency>kcoreaddons</Dependency> <Dependency>kcoreaddons</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>ki18n</Dependency> <Dependency>ki18n</Dependency>
<Dependency>kdelibs4-support</Dependency><!--fazla-->
<Dependency>plasma-framework</Dependency> <Dependency>plasma-framework</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -56,32 +59,32 @@
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
<Replaces>
<Package>kde-workspace</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace</Package>
</Conflicts>
</Package> </Package>
<Package> <Package>
<Name>libksysguard-devel</Name> <Name>libksysguard-devel</Name>
<Summary>Development files for libksysguard</Summary> <Summary>Development files for libksysguard</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency release="current">libksysguard</Dependency> <Dependency release="current">libksysguard</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libXres-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kauth-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path> <Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path> <Path fileType="config">/usr/lib/pkgconfig</Path>
</Files> </Files>
<Replaces>
<Package>kde-workspace-devel</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace-devel</Package>
</Conflicts>
</Package> </Package>
<History> <History>
science/mathematics/cln/pspec.xml
+11 -2
View File
@@ -12,9 +12,9 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>A class library (C++) for numbers</Summary> <Summary>A class library (C++) for numbers</Summary>
<Description>cln is a library for efficient computations with all kinds of numbers in arbitrary precision.</Description> <Description>cln is a library for efficient computations with all kinds of numbers in arbitrary precision.</Description>
<Archive sha1sum="11c56780eb83ed54f2ad1ecef7f0dc0f609c426d" type="tarbz2">http://www.ginac.de/CLN/cln-1.3.3.tar.bz2</Archive> <Archive sha1sum="76f73071236ead72ba5c9ee892f29ca24e557b8c" type="tarbz2">http://www.ginac.de/CLN/cln-1.3.4.tar.bz2</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gmp</Dependency> <Dependency>gmp-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -22,6 +22,7 @@
<Name>cln</Name> <Name>cln</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gmp</Dependency> <Dependency>gmp</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
@@ -37,6 +38,7 @@
<Summary>Development files for cln</Summary> <Summary>Development files for cln</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">cln</Dependency> <Dependency release="current">cln</Dependency>
<Dependency>gmp-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
@@ -45,6 +47,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2015-07-29</Date>
<Version>1.3.4</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2014-06-14</Date> <Date>2014-06-14</Date>
<Version>1.3.3</Version> <Version>1.3.3</Version>
science/mathematics/libqalculate/pspec.xml
+10 -2
View File
@@ -15,7 +15,11 @@
<Archive sha1sum="c15f7f3a97995decf62cc964956fc1e374ecd78c" type="targz">mirrors://sourceforge/qalculate/libqalculate-0.9.7.tar.gz</Archive> <Archive sha1sum="c15f7f3a97995decf62cc964956fc1e374ecd78c" type="targz">mirrors://sourceforge/qalculate/libqalculate-0.9.7.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cln-devel</Dependency> <Dependency>cln-devel</Dependency>
<Dependency>gmp</Dependency> <Dependency>gmp-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>intltool</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">libqalculate-0.9.6-check-fix.patch</Patch> <Patch level="1">libqalculate-0.9.6-check-fix.patch</Patch>
@@ -27,7 +31,9 @@
<Name>libqalculate</Name> <Name>libqalculate</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>cln</Dependency> <Dependency>cln</Dependency>
<Dependency>gmp</Dependency> <Dependency>libxml2</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
@@ -44,6 +50,8 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">libqalculate</Dependency> <Dependency release="current">libqalculate</Dependency>
<Dependency>cln-devel</Dependency> <Dependency>cln-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>