Merge pull request #9328 from friberk/master

Added lightdm and onboard & fixed flatpak
This commit is contained in:
Rmys
2021-04-30 00:38:16 +03:00
committed by GitHub
23 changed files with 255779 additions and 254835 deletions
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
def build():
pythonmodules.compile(pyVer = '3')
def install():
pythonmodules.install(pyVer = '3')
@@ -0,0 +1,66 @@
From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 13 Jul 2017 09:01:04 -0700
Subject: [PATCH] pypredict/lm: Define error API if platform does not have it
error() API is not implemented across all libcs on linux
e.g. musl does not provide it.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Onboard/pypredict/lm/lm.cpp | 1 -
Onboard/pypredict/lm/lm.h | 13 +++++++++++++
Onboard/pypredict/lm/lm_dynamic.cpp | 2 --
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp
index 2e64296..37ae241 100644
--- a/Onboard/pypredict/lm/lm.cpp
+++ b/Onboard/pypredict/lm/lm.cpp
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <error.h>
#include <algorithm>
#include <cmath>
#include <string>
diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h
index ed4164a..b8b63ee 100644
--- a/Onboard/pypredict/lm/lm.h
+++ b/Onboard/pypredict/lm/lm.h
@@ -32,6 +32,19 @@
#include <algorithm>
#include <string>
+#if defined(HAVE_ERROR_H)
+#include <error.h>
+#else
+#include <err.h>
+#define _onboard_error(S, E, F, ...) do { \
+ if (E) \
+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
+ else \
+ err(S, F, ##__VA_ARGS__); \
+} while(0)
+
+#define error _onboard_error
+#endif
// break into debugger
// step twice to come back out of the raise() call into known code
diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp
index 7c62824..e7c7f40 100644
--- a/Onboard/pypredict/lm/lm_dynamic.cpp
+++ b/Onboard/pypredict/lm/lm_dynamic.cpp
@@ -17,8 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <error.h>
-
#include "lm_dynamic.h"
using namespace std;
--
2.13.2
+76
View File
@@ -0,0 +1,76 @@
<PISI>
<Source>
<Name>onboard</Name>
<Homepage>https://launchpad.net/onboard</Homepage>
<Packager>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Packager>
<License>GPLv3</License>
<Summary>On-screen keyboard useful on tablet PCs or for mobility impaired users</Summary>
<Description>On-screen keyboard useful on tablet PCs or for mobility impaired users</Description>
<BuildDependencies>
<Dependency>intltool</Dependency>
<Dependency>eudev-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
<Dependency>dconf-devel</Dependency>
<Dependency>dbus-python</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>hunspell-devel</Dependency>
<Dependency>iso-codes-devel</Dependency>
<Dependency>libcanberra-devel</Dependency>
<Dependency>libxkbfile-devel</Dependency>
<Dependency>python-cairo-devel</Dependency>
<Dependency>python-pygobject-devel</Dependency>
<Dependency>python3-distutils-extra</Dependency>
</BuildDependencies>
<Archive sha1sum="5e6780b2bfdfdb651d584161f761325e63ad0448" type="targz">https://launchpad.net/onboard/1.4/1.4.1/+download/onboard-1.4.1.tar.gz</Archive>
<Patches>
<Patch level="1">00-Fix-build-with-musl.patch</Patch>
</Patches>
</Source>
<Package>
<Name>onboard</Name>
<Summary>On-screen keyboard useful on tablet PCs or for mobility impaired users</Summary>
<RuntimeDependencies>
<Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency>
<Dependency>dconf</Dependency>
<Dependency>eudev</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libXi</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>libxkbfile</Dependency>
<Dependency>libcanberra</Dependency>
<Dependency>hunspell</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/glib-2.0</Path>
<Path fileType="data">/usr/share/gnome-shell</Path>
<Path fileType="man">/usr/share/help</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/onboard</Path>
<Path fileType="data">/usr/share/sounds</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-04-25</Date>
<Version>1.4.1</Version>
<Comment>First release</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,30 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.system("NOCONFIGURE=1 ./autogen.sh")
autotools.configure(" --prefix=/usr \
--libexecdir=/usr/lib/lightdm \
--sbindir=/usr/bin \
--sysconfdir=/etc \
--with-libxklavier \
--enable-kill-on-sigterm \
--disable-libido \
--disable-libindicator \
--disable-static \
--with-gtk3 \
--enable-nls")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
@@ -0,0 +1,54 @@
<PISI>
<Source>
<Name>lightdm-gtk-greeter</Name>
<Homepage>https://github.com/Xubuntu/lightdm-gtk-greeter</Homepage>
<Packager>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Summary>Login screen using the LightDM framework.</Summary>
<Description>Login screen using the LightDM framework.</Description>
<Archive sha1sum="496eef33630a19451e39d879d5f6ad746e7b8a05" type="targz">https://github.com/Xubuntu/lightdm-gtk-greeter/archive/refs/tags/lightdm-gtk-greeter-2.0.8.tar.gz</Archive>
<BuildDependencies>
<Dependency>gtk3-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>libxklavier-devel</Dependency>
<Dependency>exo-devel</Dependency>
<Dependency>xfce4-dev-tools</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>lightdm-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>lightdm-gtk-greeter</Name>
<RuntimeDependencies>
<Dependency>lightdm</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libxklavier</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/lightdm-gtk-greeter</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-04-20</Date>
<Version>2.0.8</Version>
<Comment>First release</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
</History>
</PISI>
+31
View File
@@ -0,0 +1,31 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
def setup():
# shelltools.export("MOC5", "moc-qt5")
autotools.configure("--prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc \
--sbindir=/usr/bin \
--libexecdir=/usr/libexec/ \
--disable-static \
--disable-tests \
--enable-liblightdm-qt5 \
--with-greeter-user=lightdm \
--with-greeter-session=pisi-lightdm-greeter")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+47
View File
@@ -0,0 +1,47 @@
#!/usr/bin/python
import os, re
OUR_ID = 620
OUR_NAME = "lightdm"
OUR_DESC = "LightDM"
Cache = "/var/cache/lightdm"
Libdir = "/var/lib/lightdm-data"
Libdir1 = "/var/lib/lightdm"
Logdir = "/var/log/lightdm"
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
try:
os.system ("groupadd -g %d %s" % (OUR_ID, OUR_NAME))
os.system ("useradd -m -d /var/lib/lightdm -r -s /bin/false -u %d -g %d %s -c %s" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC))
except:
pass
if not os.path.exists(Cache):
os.makedirs(Cache, mode=0755)
if not os.path.exists(Libdir):
os.makedirs(Libdir, mode=0770)
os.system("chown -R lightdm:lightdm /var/lib/lightdm-data")
if not os.path.exists(Libdir1):
os.makedirs(Libdir1, mode=0770)
os.system("chown -R lightdm:lightdm /var/lib/lightdm")
if not os.path.exists(Logdir):
os.makedirs(Logdir, mode=0711)
os.system("/bin/chgrp -R lightdm /var/log/lightdm")
os.system("chmod +t /var/{cache/lightdm,lib/lightdm{,-data}}")
def postRemove():
try:
os.system ("userdel %s" % OUR_NAME)
os.system ("groupdel %s" % OUR_NAME)
except:
pass
+32
View File
@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
from comar.service import *
import os
serviceType="server"
serviceDesc=_({"en": "lightdm Server",
"tr": "lightdm Sunucusu"})
serviceDefault="on"
PIDFILE="/run/lightdm.pid"
DAEMON="/usr/bin/lightdm"
@synchronized
def start():
startService(command=DAEMON,
pidfile=PIDFILE,
detach=True,
donotify=True)
@synchronized
def stop():
stopService(pidfile=PIDFILE,
donotify=True)
try:
os.unlink(PIDFILE)
except OSError:
pass
def status():
return isServiceRunning(PIDFILE)
+13
View File
@@ -0,0 +1,13 @@
#%PAM-1.0
auth include system-auth
auth required pam_nologin.so
account include system-auth
password include system-auth
session include system-auth
session optional pam_console.so
session optional pam_polkit_console.so
@@ -0,0 +1,13 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth [success=1 default=ignore] pam_succeed_if.so user ingroup autologin
auth required pam_unix.so
auth required pam_permit.so
-auth optional pam_gnome_keyring.so
account include system-local-login
password include system-local-login
session include system-local-login
-session optional pam_gnome_keyring.so auto_start
@@ -0,0 +1,32 @@
diff -Nuar a/data/lightdm.conf b/data/lightdm.conf
--- a/data/lightdm.conf 2021-04-29 15:59:46.714211010 +0300
+++ b/data/lightdm.conf 2021-04-29 16:01:37.594219160 +0300
@@ -99,7 +99,7 @@
#xdmcp-manager=
#xdmcp-port=177
#xdmcp-key=
-#greeter-session=example-gtk-gnome
+greeter-session=pisi-lightdm-greeter
#greeter-hide-users=false
#greeter-allow-guest=true
#greeter-show-manual-login=false
@@ -108,7 +108,7 @@
#allow-user-switching=true
#allow-guest=true
#guest-session=
-#session-wrapper=lightdm-session
+session-wrapper=/usr/bin/wrapper
#greeter-wrapper=
#guest-wrapper=
#display-setup-script=
diff -Nuar a/data/users.conf b/data/users.conf
--- a/data/users.conf 2021-04-29 16:00:22.690213654 +0300
+++ b/data/users.conf 2021-04-29 16:01:45.322219728 +0300
@@ -9,6 +9,6 @@
# hidden-shells = Shells that indicate a user cannot login
#
[UserList]
-minimum-uid=500
+minimum-uid=1000
hidden-users=nobody nobody4 noaccess
hidden-shells=/bin/false /usr/sbin/nologin /sbin/nologin
+15
View File
@@ -0,0 +1,15 @@
polkit.addRule(function(action, subject) {
if (subject.user == "lightdm") {
polkit.log("action=" + action);
polkit.log("subject=" + subject);
if (action.id.indexOf("org.freedesktop.login1.") == 0) {
return polkit.Result.YES;
}
if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
return polkit.Result.YES;
}
if (action.id.indexOf("org.freedesktop.upower.") == 0) {
return polkit.Result.YES;
}
}
});
@@ -0,0 +1 @@
d /run/lightdm 0711 lightdm lightdm
+3
View File
@@ -0,0 +1,3 @@
#!/bin/bash
export PATH=/usr/local/sbin/:/usr/sbin/:/sbin/:/usr/local/bin/:/usr/bin/:/bin/ && exec $*
+134
View File
@@ -0,0 +1,134 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lightdm</Name>
<Homepage>https://github.com/CanonicalLtd/lightdm</Homepage>
<Packager>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Packager>
<License>GPL2</License>
<IsA>app</IsA>
<Summary>LightDM is a cross-desktop display manager.</Summary>
<Description>LightDM is a cross-desktop display manager.</Description>
<Archive type="tarxz" sha1sum="d91966f79f173825ac8bb51973842f9fb6c9ef1b">https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>itstool</Dependency>
<Dependency>intltool</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>libxklavier-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>libXdmcp-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">lightdm-default-config.patch</Patch>
</Patches>
</Source>
<Package>
<Name>lightdm</Name>
<Conflicts>
<!--Package>lxdm</Package-->
<Package>sddm</Package>
</Conflicts>
<RuntimeDependencies>
<Dependency>pam</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>libXdmcp</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency>libxklavier</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/liblightdm-gobject-1.so*</Path>
<Path fileType="library">/usr/libexec</Path>
<Path fileType="library">/usr/lib/tmpfiles.d</Path>
<Path fileType="library">/usr/lib/girepository-1.0</Path>
<Path fileType="data">/usr/share/accountsservice</Path>
<Path fileType="data">/usr/share/bash-completion</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="doc">/usr/share/gtk-doc</Path>
<Path fileType="man">/usr/share/help</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/polkit-1</Path>
<Path fileType="data">/usr/share/vala</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/tmpfiles.d/lightdm.conf">lightdm.tmpfiles</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/pam.d/lightdm">lightdm</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/bin/wrapper">wrapper</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="service.py">System.Service</COMAR>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
</Package>
<Package>
<Name>lightdm-devel</Name>
<Summary>LightDM is a cross-desktop display manager.</Summary>
<RuntimeDependencies>
<Dependency release="current">lightdm</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libxklavier-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/lightdm-gobject-1</Path>
<Path fileType="library">/usr/lib/pkgconfig/liblightdm-gobject-1.pc</Path>
<Path fileType="data">/usr/share/gir-1.0</Path>
</Files>
</Package>
<Package>
<Name>liblightdm-qt5</Name>
<Summary>Qt5 library for LightDM.</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>lightdm</Dependency>
<Dependency>qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/liblightdm-qt5-3.so*</Path>
</Files>
</Package>
<Package>
<Name>liblightdm-qt5-devel</Name>
<Summary>LightDM is a cross-desktop display manager.</Summary>
<RuntimeDependencies>
<Dependency release="current">liblightdm-qt5</Dependency>
<Dependency>qt5-base-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/lightdm-qt5-3</Path>
<Path fileType="library">/usr/lib/pkgconfig/liblightdm-qt5-3.pc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-04-24</Date>
<Version>1.30.0</Version>
<Comment>First Release</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
</History>
</PISI>
+7
View File
@@ -0,0 +1,7 @@
<PISI>
<Source>
<Name>lightdm</Name>
<Summary xml:lang="tr">LightDM Qt istemci kitaplığı.</Summary>
<Description xml:lang="tr">lightdm, LightDM Qt istemci kitaplıklarını içerir.</Description>
</Source>
</PISI>
+7 -4
View File
@@ -1,7 +1,6 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2018 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
@@ -13,9 +12,13 @@ from pisi.actionsapi import get
def setup():
shelltools.system("NOCONFIGURE=1 ./autogen.sh")
autotools.configure("--with-priv-mode=setuid \
autotools.configure(" --enable-selinux-module=no \
--with-system-bubblewrap \
--disable-static")
--disable-static \
--with-priv-mode=setuid \
--with-profile-dir=/etc/profile.d \
--with-dbus-config-dir=/usr/share/dbus-1/system.d \
--disable-nls")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -25,6 +28,6 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#pisitools.removeDir("/usr/share/selinux")
pisitools.removeDir("/usr/lib/systemd")
pisitools.dodoc("COPYING", "README*", "NEWS")
@@ -0,0 +1,18 @@
#!/usr/bin/python
import os, re
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
try:
os.system("getent group flatpak || /usr/sbin/groupadd -g 93 flatpak")
os.system("getent passwd flatpak || /usr/sbin/useradd -g flatpak -u 93 -d /var/empty -s /bin/false -c 'flatpak User' flatpak")
os.system("/usr/bin/passwd -l flatpak")
except:
pass
def preRemove():
try:
os.system("userdel flatpak")
os.system("groupdel flatpak")
except:
pass
+10
View File
@@ -79,6 +79,9 @@
<AdditionalFile target="/etc/profile.d/flatpak-bindir.sh" permission="0644" owner="root">flatpak-bindir.sh</AdditionalFile>
<AdditionalFile target="/usr/share/flatpak/flathub.flatpakrepo" permission="0644" owner="root">flathub.flatpakrepo</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
</Package>
<Package>
@@ -106,6 +109,13 @@
</Package>
<History>
<Update release="13">
<Date>2021-04-29</Date>
<Version>1.10.2</Version>
<Comment>Fixed flatpak does nothing</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
<Update release="12">
<Date>2021-04-25</Date>
<Version>1.10.2</Version>
+255173 -254829
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
4adea05d7118debb594cd251f64cb44501f390d8
6ec2b4f9b3be75bbfef064a427ce4971c957880a
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
5674c8d9874e0764945d4d999dd038ba3864e164
0d538c49a30c90efb964ebf6f9f99a9551f64c84