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

Merge branch 'master' of https://github.com/pisilinux/main

Browse Source
This commit is contained in:
groni
2015-08-12 11:26:52 +02:00
parent 0cd4ca8e41 031b831496
commit af00203422
33 changed files with 5274 additions and 104 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>