From feefa8eae296d7ac9a89cecc44ae3035e94f832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 7 Aug 2015 16:36:55 +0300 Subject: [PATCH 1/7] add dbus-config in sddm --- .../sddm/files/sddm-0.11.0-dbus-config.patch | 46 +++++++++++++++++++ desktop/kde/plasma/sddm/pspec.xml | 13 +++--- 2 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch diff --git a/desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch b/desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch new file mode 100644 index 0000000000..c13c2bd79c --- /dev/null +++ b/desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch @@ -0,0 +1,46 @@ +From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +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 + diff --git a/desktop/kde/plasma/sddm/pspec.xml b/desktop/kde/plasma/sddm/pspec.xml index cbf9958dfb..ba1a9d651a 100755 --- a/desktop/kde/plasma/sddm/pspec.xml +++ b/desktop/kde/plasma/sddm/pspec.xml @@ -26,6 +26,7 @@ cmake + sddm-0.11.0-dbus-config.patch sddm_upstream.patch sddm-0.10.0-upower.patch sddm-0.11.0-consolekit.patch @@ -36,17 +37,17 @@ sddm qt5-base - qt5-declarative + qt5-declarative libgcc libxcb - /etc + /etc /usr/share - /usr/bin - /usr/lib/qt5 - /usr/lib - /usr/share/man + /usr/bin + /usr/lib/qt5 + /usr/lib + /usr/share/man /usr/share/doc From a7c65661cbb2a7e8736c4496fd3af7ba41d21a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 10 Aug 2015 21:43:36 +0300 Subject: [PATCH 2/7] libnih and cgmanager in main --- programming/library/libnih/actions.py | 18 ++++++ programming/library/libnih/pspec.xml | 56 ++++++++++++++++ programming/library/libnih/translations.xml | 8 +++ util/admin/cgmanager/actions.py | 21 ++++++ util/admin/cgmanager/pspec.xml | 71 +++++++++++++++++++++ util/admin/cgmanager/translations.xml | 8 +++ 6 files changed, 182 insertions(+) create mode 100755 programming/library/libnih/actions.py create mode 100755 programming/library/libnih/pspec.xml create mode 100755 programming/library/libnih/translations.xml create mode 100755 util/admin/cgmanager/actions.py create mode 100755 util/admin/cgmanager/pspec.xml create mode 100755 util/admin/cgmanager/translations.xml diff --git a/programming/library/libnih/actions.py b/programming/library/libnih/actions.py new file mode 100755 index 0000000000..340b54ede9 --- /dev/null +++ b/programming/library/libnih/actions.py @@ -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()) diff --git a/programming/library/libnih/pspec.xml b/programming/library/libnih/pspec.xml new file mode 100755 index 0000000000..3ba44fbdd1 --- /dev/null +++ b/programming/library/libnih/pspec.xml @@ -0,0 +1,56 @@ + + + + + libnih + https://launchpad.net/libnih + + Aydın Demirel + aydin.demirel@pisilinux.org + + GPL + app:library + Small library for C application development + Small library for C application development. + https://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz + + dbus-devel + expat-devel + + + + + libnih + + dbus + expat + + + /usr/bin + /usr/share/man + /usr/share/aclocal + /usr/lib/* + + + + libnih-devel + + libnih + dbus-devel + expat-devel + + + /usr/include + + + + + + 2014-06-27 + 1.0.3 + First release + Aydın Demirel + aydin.demirel@pisilinux.org + + + diff --git a/programming/library/libnih/translations.xml b/programming/library/libnih/translations.xml new file mode 100755 index 0000000000..5a7651463f --- /dev/null +++ b/programming/library/libnih/translations.xml @@ -0,0 +1,8 @@ + + + + libnih + C uygulama geliştirme için küçük bir kütüphane + C uygulama geliştirme için küçük bir kütüphane. + + diff --git a/util/admin/cgmanager/actions.py b/util/admin/cgmanager/actions.py new file mode 100755 index 0000000000..80b3d73272 --- /dev/null +++ b/util/admin/cgmanager/actions.py @@ -0,0 +1,21 @@ +#!/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") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/util/admin/cgmanager/pspec.xml b/util/admin/cgmanager/pspec.xml new file mode 100755 index 0000000000..166839bfc6 --- /dev/null +++ b/util/admin/cgmanager/pspec.xml @@ -0,0 +1,71 @@ + + + + + cgmanager + https://github.com/lxc/cgmanager + + Aydın Demirel + aydin.demirel@pisilinux.org + + GPL + app:console + Central cgroup management daemon + CGManager is a central privileged daemon that manages all your cgroups for you through a simple DBus API. + https://github.com/lxc/cgmanager/archive/v0.38.tar.gz + + libnih-devel + pam-devel + + + + + cgmanager + + libnih + pam + dbus + + + /usr/bin + /lib/security + /usr/share/man + /usr/share/cgmanager + /usr/lib/* + + + + cgmanager-devel + + cgmanager + libnih + + + /usr/include + + + + + + 2015-08-10 + 0.38 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-02-12 + 0.36 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-06-27 + 0.23 + First release + Aydın Demirel + aydin.demirel@pisilinux.org + + + diff --git a/util/admin/cgmanager/translations.xml b/util/admin/cgmanager/translations.xml new file mode 100755 index 0000000000..f5c9cbb320 --- /dev/null +++ b/util/admin/cgmanager/translations.xml @@ -0,0 +1,8 @@ + + + + cgmanager + Merkezi cgroup yönetimi uygulamacığı + CGManager basit bir DBUS api üzerinden sizin için tüm cgruplarınızı yöneten merkezi ayrıcalıklı bir uygulamacıktır. + + From f041674da880d1874fc275d941064acd9455125a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 10 Aug 2015 21:50:58 +0300 Subject: [PATCH 3/7] fix cgmanager --- util/admin/cgmanager/actions.py | 4 +++- util/admin/cgmanager/pspec.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/util/admin/cgmanager/actions.py b/util/admin/cgmanager/actions.py index 80b3d73272..47320f4a1a 100755 --- a/util/admin/cgmanager/actions.py +++ b/util/admin/cgmanager/actions.py @@ -12,7 +12,9 @@ def setup(): shelltools.system("./bootstrap.sh") autotools.configure("--sbindir=/usr/bin \ - --prefix=/usr") + --prefix=/usr \ + --disable-static \ + --with-distro=pardus") def build(): autotools.make() diff --git a/util/admin/cgmanager/pspec.xml b/util/admin/cgmanager/pspec.xml index 166839bfc6..079d957d06 100755 --- a/util/admin/cgmanager/pspec.xml +++ b/util/admin/cgmanager/pspec.xml @@ -42,6 +42,7 @@ /usr/include + /usr/lib/pkgconfig From 55c5130b9055bcbea980d11f7694080c3610d33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 10 Aug 2015 21:56:33 +0300 Subject: [PATCH 4/7] opps conflicts... --- util/admin/cgmanager/pspec.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/admin/cgmanager/pspec.xml b/util/admin/cgmanager/pspec.xml index 079d957d06..393ff1fddf 100755 --- a/util/admin/cgmanager/pspec.xml +++ b/util/admin/cgmanager/pspec.xml @@ -31,7 +31,7 @@ /lib/security /usr/share/man /usr/share/cgmanager - /usr/lib/* + /usr/lib/libcgmanager* From 03d7594fb806192ce1cd14062f155710b256c85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 10 Aug 2015 22:02:01 +0300 Subject: [PATCH 5/7] ConsoleKit-1.0.0 with new deps libnih and cgmanager --- system/auth/ConsoleKit/pspec.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/system/auth/ConsoleKit/pspec.xml b/system/auth/ConsoleKit/pspec.xml index a417ab81a8..8b81691ca4 100644 --- a/system/auth/ConsoleKit/pspec.xml +++ b/system/auth/ConsoleKit/pspec.xml @@ -12,7 +12,7 @@ library A framework for defining and tracking users, login sessions, and seats 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). - https://github.com/ConsoleKit2/ConsoleKit2/releases/download/0.9.5/ConsoleKit2-0.9.5.tar.bz2 + https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.0.0/ConsoleKit2-1.0.0.tar.bz2 acl-devel pam-devel @@ -21,6 +21,8 @@ zlib-devel glib2-devel libX11-devel + libnih-devel + cgmanager-devel polkit-devel libxslt xmlto @@ -37,6 +39,8 @@ zlib glib2 libX11 + libnih + cgmanager polkit eudev @@ -78,6 +82,13 @@ + + 2015-08-10 + 1.0.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-20 0.9.5 From 5b9d1fa1c1f48374c95a80a4042663c6dffb4a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 11 Aug 2015 09:45:43 +0300 Subject: [PATCH 6/7] cairo fix circle dep, libcroco add to main --- desktop/gnome/base/libcroco/pspec.xml | 3 ++- desktop/toolkit/gtk/cairo/pspec.xml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/gnome/base/libcroco/pspec.xml b/desktop/gnome/base/libcroco/pspec.xml index f8535571b6..14ce1726e0 100644 --- a/desktop/gnome/base/libcroco/pspec.xml +++ b/desktop/gnome/base/libcroco/pspec.xml @@ -15,6 +15,7 @@ mirrors://gnome/libcroco/0.6/libcroco-0.6.8.tar.xz libxml2-devel + glib2-devel multilib.patch @@ -70,7 +71,7 @@ - 2014-06-14 + 2014-08-11 0.6.8 Release bump. Serdar Soytetir diff --git a/desktop/toolkit/gtk/cairo/pspec.xml b/desktop/toolkit/gtk/cairo/pspec.xml index 2041c29f53..dbb1ab21bd 100644 --- a/desktop/toolkit/gtk/cairo/pspec.xml +++ b/desktop/toolkit/gtk/cairo/pspec.xml @@ -22,7 +22,6 @@ libpng-devel libxcb-devel freetype-devel - libgcc expat-devel fontconfig-devel libXrender-devel @@ -31,7 +30,7 @@ libXext-devel mesa-devel - librsvg-devel + DirectFB-devel valgrind