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

Merge pull request #213 from ertugerata/master

Browse Source 
fix for plasma-desktop
This commit is contained in:
Ertuğrul Erata
2015-08-11 13:00:18 +03:00
parent cd0edfbe45 1426ef8ebe
commit 40c05658ea
13 changed files with 255 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome/base/libcroco/pspec.xml
+2 -1
View File
@@ -15,6 +15,7 @@
<Archive sha1sum="23a5c33a2a86d5e46173234f5fa88ac1e15de035" type="tarxz">mirrors://gnome/libcroco/0.6/libcroco-0.6.8.tar.xz</Archive>
<BuildDependencies>
<Dependency>libxml2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">multilib.patch</Patch>
@@ -70,7 +71,7 @@
<History>
<Update release="3">
<Date>2014-06-14</Date>
<Date>2014-08-11</Date>
<Version>0.6.8</Version>
<Comment>Release bump.</Comment>
<Name>Serdar Soytetir</Name>
desktop/kde/plasma/plasma-workspace/files/kde-env.sh
+1 -1
View File
@@ -12,7 +12,7 @@ export KDE_FULL_SESSION=true
export XDG_DATA_HOME=$HOME/.local5/share
export XDG_CONFIG_HOME=$HOME/.config5
export XDG_CACHE_HOME=$HOME/.cache5
export XDG_RUNTIME_DIR=/tmp/runtime-$USER
#export XDG_RUNTIME_DIR=/tmp/runtime-$USER
#build
export CMAKE_PREFIX_PATH=$KF5:$CMAKE_PREFIX_PATH
#debug
desktop/kde/plasma/plasma-workspace/pspec.xml
+1 -1
View File
@@ -256,7 +256,7 @@
<History>
<Update release="2">
<Date>2015-08-03</Date>
<Date>2015-08-10</Date>
<Version>5.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch
+46
View File
@@ -0,0 +1,46 @@
From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Tue, 14 Apr 2015 10:50:00 +0200
Subject: [PATCH] allow changing the dbus config file name
on some distributions the generic name of the dbus config might be provided
by more than one display manager, so always installing with the generic
name would require distributions to hard-patch the cmake code.
allowing to change it through a cmake cache variable enables distributions
to simply parameterize in their cmake call.
this for example affects Ubuntu where the config would be provided by both
SDDM and LightDM.
---
CMakeLists.txt | 1 +
data/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceed6e..cf21dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession"
set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file")
set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file")
+set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file")
set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory")
# Add subdirectories
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 918892f..335f4e7 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,7 +1,7 @@
install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
-install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME})
install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
--
2.3.6
desktop/kde/plasma/sddm/pspec.xml
+7 -6
View File
@@ -26,6 +26,7 @@
<Dependency>cmake</Dependency>
</BuildDependencies>
<Patches>
<Patch>sddm-0.11.0-dbus-config.patch</Patch>
<Patch>sddm_upstream.patch</Patch>
<Patch>sddm-0.10.0-upower.patch</Patch>
<Patch>sddm-0.11.0-consolekit.patch</Patch>
@@ -36,17 +37,17 @@
<Name>sddm</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxcb</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<AdditionalFiles>
desktop/toolkit/gtk/cairo/pspec.xml
+1 -2
View File
@@ -22,7 +22,6 @@
<Dependency>libpng-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
@@ -31,7 +30,7 @@
<Dependency>libXext-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<!--<Dependency>gtk-doc</Dependency>-->
<Dependency>librsvg-devel</Dependency>
<!--Dependency>librsvg-devel</Dependency--><!--circle dep-->
<Dependency>DirectFB-devel</Dependency>
<Dependency>valgrind</Dependency>
<!--<Dependency>libspectre-devel</Dependency>
programming/library/libnih/actions.py
Executable
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/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 shelltools
from pisi.actionsapi import get
def setup():
autotools.configure()
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
programming/library/libnih/pspec.xml
Executable
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libnih</Name>
<Homepage>https://launchpad.net/libnih</Homepage>
<Packager>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Packager>
<License>GPL</License>
<IsA>app:library</IsA>
<Summary>Small library for C application development</Summary>
<Description>Small library for C application development.</Description>
<Archive sha1sum="db1f3e46a47f8a58f8179ca56f304d1550f41eb0" type="targz">https://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>expat-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libnih</Name>
<RuntimeDependencies>
<Dependency>dbus</Dependency>
<Dependency>expat</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="locale">/usr/share/aclocal</Path>
<Path fileType="library">/usr/lib/*</Path>
</Files>
</Package>
<Package>
<Name>libnih-devel</Name>
<RuntimeDependencies>
<Dependency release="current">libnih</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>expat-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2014-06-27</Date>
<Version>1.0.3</Version>
<Comment>First release</Comment>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Update>
</History>
</PISI>
programming/library/libnih/translations.xml
Executable
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libnih</Name>
<Summary xml:lang="tr">C uygulama geliştirme için küçük bir kütüphane</Summary>
<Description xml:lang="tr">C uygulama geliştirme için küçük bir kütüphane.</Description>
</Source>
</PISI>
system/auth/ConsoleKit/pspec.xml
+12 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>A framework for defining and tracking users, login sessions, and seats</Summary>
<Description>ConsoleKit is a system daemon for tracking what users are logged into the system and how they interact with the computer (e.g. which keyboard and mouse they use).</Description>
<Archive sha1sum="7da8ee17604050844027022e5600d297942530eb" type="tarbz2">https://github.com/ConsoleKit2/ConsoleKit2/releases/download/0.9.5/ConsoleKit2-0.9.5.tar.bz2</Archive>
<Archive sha1sum="bd4d8b90af5846fd35b187920ccd0aa9e0eb35e7" type="tarbz2">https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.0.0/ConsoleKit2-1.0.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>acl-devel</Dependency>
<Dependency>pam-devel</Dependency>
@@ -21,6 +21,8 @@
<Dependency>zlib-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libnih-devel</Dependency>
<Dependency>cgmanager-devel</Dependency>
<Dependency versionFrom="0.113">polkit-devel</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>xmlto</Dependency>
@@ -37,6 +39,8 @@
<Dependency>zlib</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libnih</Dependency>
<Dependency>cgmanager</Dependency>
<Dependency>polkit</Dependency>
<Dependency>eudev</Dependency>
</RuntimeDependencies>
@@ -78,6 +82,13 @@
</Package>
<History>
<Update release="12">
<Date>2015-08-10</Date>
<Version>1.0.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="11">
<Date>2015-07-20</Date>
<Version>0.9.5</Version>
util/admin/cgmanager/actions.py
Executable
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/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 shelltools
from pisi.actionsapi import get
def setup():
shelltools.system("./bootstrap.sh")
autotools.configure("--sbindir=/usr/bin \
--prefix=/usr \
--disable-static \
--with-distro=pardus")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
util/admin/cgmanager/pspec.xml
Executable
+72
View File
@@ -0,0 +1,72 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>cgmanager</Name>
<Homepage>https://github.com/lxc/cgmanager</Homepage>
<Packager>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Packager>
<License>GPL</License>
<IsA>app:console</IsA>
<Summary>Central cgroup management daemon</Summary>
<Description>CGManager is a central privileged daemon that manages all your cgroups for you through a simple DBus API.</Description>
<Archive sha1sum="b260412cbf8fa56707a02e21553e1c36c3e55b59" type="targz">https://github.com/lxc/cgmanager/archive/v0.38.tar.gz</Archive>
<BuildDependencies>
<Dependency>libnih-devel</Dependency>
<Dependency>pam-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>cgmanager</Name>
<RuntimeDependencies>
<Dependency>libnih</Dependency>
<Dependency>pam</Dependency>
<Dependency>dbus</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/lib/security</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/cgmanager</Path>
<Path fileType="library">/usr/lib/libcgmanager*</Path>
</Files>
</Package>
<Package>
<Name>cgmanager-devel</Name>
<RuntimeDependencies>
<Dependency release="current">cgmanager</Dependency>
<Dependency>libnih</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2015-08-10</Date>
<Version>0.38</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2015-02-12</Date>
<Version>0.36</Version>
<Comment>Version bump.</Comment>
<Name>Hakan Yıldız</Name>
<Email>hknyldz93@gmail.com</Email>
</Update>
<Update release="1">
<Date>2014-06-27</Date>
<Version>0.23</Version>
<Comment>First release</Comment>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Update>
</History>
</PISI>
util/admin/cgmanager/translations.xml
Executable
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>cgmanager</Name>
<Summary xml:lang="tr">Merkezi cgroup yönetimi uygulamacığı</Summary>
<Description xml:lang="tr">CGManager basit bir DBUS api üzerinden sizin için tüm cgruplarınızı yöneten merkezi ayrıcalıklı bir uygulamacıktır.</Description>
</Source>
</PISI>