Merge pull request #410 from ertugerata/master

kfilemetadata and baloo in main
This commit is contained in:
Ertuğrul Erata
2015-09-13 21:38:05 +03:00
15 changed files with 111 additions and 47 deletions
+41 -34
View File
@@ -13,23 +13,23 @@
<IsA>app:console</IsA>
<Summary>Framework for searching and managing metadata</Summary>
<Description>Baloo is a framework for searching and managing metada</Description>
<Archive sha1sum="6f2c689ab3e6d3550163bd26f3d510054dd6e9ef" type="tarxz">mirrors://kde/stable/frameworks/5.13/baloo-5.13.0.tar.xz</Archive>
<Archive sha1sum="ef74f411a6b2d8d7858b8edf4de9d4306867604e" type="tarxz">mirrors://kde/stable/frameworks/5.14/baloo-5.14.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kdbusaddons-devel</Dependency>
<Dependency>kauth-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kcrash-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kidletime-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>solid-devel</Dependency>
<Dependency versionFrom="5.13">kfilemetadata-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency versionFrom="5.14.0">kcoreaddons-devel</Dependency>
<Dependency versionFrom="5.14.0">kdbusaddons-devel</Dependency>
<Dependency versionFrom="5.14.0">kauth-devel</Dependency>
<Dependency versionFrom="5.14.0">kconfig-devel</Dependency>
<Dependency versionFrom="5.14.0">kcrash-devel</Dependency>
<Dependency versionFrom="5.14.0">ki18n-devel</Dependency>
<Dependency versionFrom="5.14.0">kidletime-devel</Dependency>
<Dependency versionFrom="5.14.0">kio-devel</Dependency>
<Dependency versionFrom="5.14.0">solid-devel</Dependency>
<Dependency versionFrom="5.14.0">kfilemetadata-devel</Dependency>
<Dependency versionFrom="5.14.0">kdoctools-devel</Dependency>
<Dependency>lmdb-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency versionFrom="5.14.0">extra-cmake-modules</Dependency>
</BuildDependencies>
</Source>
@@ -38,17 +38,17 @@
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kdbusaddons</Dependency>
<Dependency>kauth</Dependency>
<Dependency versionFrom="5.14.0">kcoreaddons</Dependency>
<Dependency versionFrom="5.14.0">kdbusaddons</Dependency>
<Dependency versionFrom="5.14.0">kauth</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kcrash</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>kidletime</Dependency>
<Dependency>kio</Dependency>
<Dependency>solid</Dependency>
<Dependency>kfilemetadata</Dependency>
<Dependency versionFrom="5.14.0">kconfig</Dependency>
<Dependency versionFrom="5.14.0">kcrash</Dependency>
<Dependency versionFrom="5.14.0">ki18n</Dependency>
<Dependency versionFrom="5.14.0">kidletime</Dependency>
<Dependency versionFrom="5.14.0">kio</Dependency>
<Dependency versionFrom="5.14.0">solid</Dependency>
<Dependency versionFrom="5.14.0">kfilemetadata</Dependency>
<Dependency>lmdb</Dependency>
</RuntimeDependencies>
<Files>
@@ -69,16 +69,16 @@
<Dependency release="current">baloo</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kdbusaddons-devel</Dependency>
<Dependency>kauth-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kcrash-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kidletime-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>solid-devel</Dependency>
<Dependency>kfilemetadata-devel</Dependency>
<Dependency versionFrom="5.14.0">kcoreaddons-devel</Dependency>
<Dependency versionFrom="5.14.0">kdbusaddons-devel</Dependency>
<Dependency versionFrom="5.14.0">kauth-devel</Dependency>
<Dependency versionFrom="5.14.0">kconfig-devel</Dependency>
<Dependency versionFrom="5.14.0">kcrash-devel</Dependency>
<Dependency versionFrom="5.14.0">ki18n-devel</Dependency>
<Dependency versionFrom="5.14.0">kidletime-devel</Dependency>
<Dependency versionFrom="5.14.0">kio-devel</Dependency>
<Dependency versionFrom="5.14.0">solid-devel</Dependency>
<Dependency versionFrom="5.14.0">kfilemetadata-devel</Dependency>
<Dependency>lmdb-devel</Dependency>
</RuntimeDependencies>
<Files>
@@ -89,6 +89,13 @@
</Package>
<History>
<Update release="4">
<Date>2015-09-13</Date>
<Version>5.14.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2015-08-26</Date>
<Version>5.13</Version>
@@ -111,4 +118,4 @@
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
+16 -10
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA>
<Summary>KDE5 library for extracting meta data from files.</Summary>
<Description>KDE library for extracting meta data from files.</Description>
<Archive sha1sum="29ec6733d6f8e5441bff7b886efcc880696c5137" type="tarxz">http://download.kde.org/stable/frameworks/5.13/kfilemetadata-5.13.0.tar.xz</Archive>
<Archive sha1sum="d959a8ea8ec2e77168662296e75937e9a2445cc9" type="tarxz">http://download.kde.org/stable/frameworks/5.14/kfilemetadata-5.14.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>attr-devel</Dependency>
@@ -22,10 +22,9 @@
<Dependency>ffmpeg-devel</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>poppler-qt5-devel</Dependency>
<Dependency>karchive-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
<Dependency versionFrom="5.14.0">karchive-devel</Dependency>
<Dependency versionFrom="5.14.0">ki18n-devel</Dependency>
<Dependency versionFrom="5.14.0">extra-cmake-modules</Dependency>
</BuildDependencies>
</Source>
@@ -39,8 +38,8 @@
<Dependency>taglib</Dependency>
<Dependency>ffmpeg</Dependency>
<Dependency>poppler-qt5</Dependency>
<Dependency>karchive</Dependency>
<Dependency>ki18n</Dependency>
<Dependency versionFrom="5.14.0">karchive</Dependency>
<Dependency versionFrom="5.14.0">ki18n</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share</Path>
@@ -63,8 +62,8 @@
<Dependency>taglib-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>poppler-qt5-devel</Dependency>
<Dependency>karchive-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency versionFrom="5.14.0">karchive-devel</Dependency>
<Dependency versionFrom="5.14.0">ki18n-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
@@ -74,6 +73,13 @@
</Package>
<History>
<Update release="4">
<Date>2015-09-13</Date>
<Version>5.14.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="3">
<Date>2015-08-26</Date>
<Version>5.13</Version>
@@ -96,4 +102,4 @@
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
+3
View File
@@ -0,0 +1,3 @@
<PISI>
<Name>multimedia.editor</Name>
</PISI>
@@ -0,0 +1,20 @@
Move startx auth files in /tmp so they are removed on reboot.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
The trap patch didn't seem to work on reboot.
---
startx.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: xinit/startx.cpp
===================================================================
--- xinit.orig/startx.cpp
+++ xinit/startx.cpp
@@ -273,7 +273,7 @@
dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
- xserverauthfile=$HOME/.serverauth.$$
+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie
+16
View File
@@ -0,0 +1,16 @@
Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
diff -u xinit.orig/startx.cpp xinit/startx.cpp
--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
@@ -290,9 +290,9 @@
XCOMM now add the same credentials to the client authority file
XCOMM if '$displayname' already exists do not overwrite it as another
XCOMM server man need it. Add them to the '$xserverauthfile' instead.
- for displayname in $authdisplay $hostname$authdisplay; do
+ for displayname in $authdisplay $hostname/unix$authdisplay; do
authcookie=`XAUTH list "$displayname" @@
- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
if [ "z${authcookie}" = "z" ] ; then
XAUTH -q << EOF
add $displayname . $mcookie
+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh
exec /usr/bin/X -nolisten tcp "$@"
+13 -3
View File
@@ -20,7 +20,8 @@
</BuildDependencies>
<Patches>
<!--Patch level="1">xinit-1.0.2-client-session.patch</Patch-->
<Patch level="1">unset-session-cookie.patch</Patch>
<Patch>06_move_serverauthfile_into_tmp.diff</Patch>
<Patch>fs25361.patch</Patch>
</Patches>
</Source>
@@ -29,11 +30,11 @@
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>xorg-app</Dependency>
<Dependency>ConsoleKit</Dependency>
<Dependency>ConsoleKit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/X11/Xresources</Path>
<Path fileType="config">/etc/X11/xinit/xinitrc</Path>
<Path fileType="config">/etc/X11/xinit</Path>
<Path fileType="data">/etc/X11/Xsession.d</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/lib/X11/xinit</Path>
@@ -43,6 +44,8 @@
<AdditionalFiles>
<AdditionalFile owner="root" permission="0755" target="/usr/lib/X11/xinit/Xsession">Xsession</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xinitrc">xinitrc</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/xinit/xserverrc">xserverrc</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xserverrc">xserverrc</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xresources" >Xresources</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-localuser.sh">Xsession.d/localuser.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xdg-runtime-dir.sh">Xsession.d/xdg-runtime-dir.sh</AdditionalFile>
@@ -57,6 +60,13 @@
</Package>
<History>
<Update release="8">
<Date>2015-09-13</Date>
<Version>1.3.4</Version>
<Comment>add patchs.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="7">
<Date>2015-05-10</Date>
<Version>1.3.4</Version>