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

Merge pull request #10358 from ayhanyalcinsoy/master

Browse Source 
pds v.bump to 2.1.2
This commit is contained in:
Dr. Ayhan YALÇINSOY
2022-06-03 23:53:00 +03:00
committed by GitHub
parent 3bca672d73 88e8ae4933
commit b1f6015255
8 changed files with 179 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/pisilinux/history-manager/pspec.xml
+10 -2
View File
@@ -10,9 +10,10 @@
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Summary>KDE5 port of History Manager Tool</Summary>
<Icon>search</Icon>
<Summary>History Manager Tool for pisi</Summary>
<Description>History manager is a graphical interface to pisi snapshot facilities.</Description>
<Archive sha1sum="602700f5b03a81b503a8df177193693c2e3a4857" type="targz">https://github.com/PisiLinuxNew/history-manager/archive/0.2.8.1.tar.gz</Archive>
<Archive sha1sum="647b6615c54f00b593aa3ed9a0d4e9c1c03d958e" type="targz">https://github.com/PisiLinuxNew/history-manager/archive/refs/tags/history-manager-0.2.9.tar.gz</Archive>
<BuildDependencies>
<Dependency>python-qt5-devel</Dependency>
<Dependency>pypolkit</Dependency>
@@ -40,6 +41,13 @@
</Package>
<History>
<Update release="7">
<Date>2022-06-01</Date>
<Version>0.2.9</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2020-03-18</Date>
<Version>0.2.8.1b</Version>
desktop/pisilinux/package-manager/pspec.xml
+11 -2
View File
@@ -10,9 +10,10 @@
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Icon>package-manager</Icon>
<Summary>PiSi graphical user interface</Summary>
<Description>Package Manager is PiSi's easy-to-use graphical user interface.</Description>
<Archive sha1sum="e5f9b225fff93ac01adaef82a064184e01198311" type="targz">https://github.com/PisiLinuxNew/package-manager/archive/refs/tags/Pm4.2.7.1.tar.gz</Archive>
<Archive sha1sum="ad02a0eb287c3f9aa3873d8b1adaedd85b57636f" type="targz">https://github.com/PisiLinuxNew/package-manager/archive/refs/tags/PM.4.2.7.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>docutils</Dependency>
<Dependency>python-docutils</Dependency>
@@ -22,7 +23,7 @@
<Dependency>qt5-linguist</Dependency>
</BuildDependencies>
<Patches>
<Patch>update_button_fixed.patch</Patch>
<!--Patch>fixed_icons_of_packages.patch</Patch-->
</Patches>
</Source>
@@ -34,6 +35,7 @@
<!-- <Dependency>python-appinfo</Dependency> -->
<Dependency>python-sip</Dependency>
<Dependency>pisilinux-desktop-services</Dependency>
<Dependency>iconcan</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -47,6 +49,13 @@
</Package>
<History>
<Update release="25">
<Date>2022-06-03</Date>
<Version>4.2.7.2</Version>
<Comment>some improvements</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="24">
<Date>2022-05-24</Date>
<Version>4.2.7.1</Version>
desktop/pisilinux/pisilinux-desktop-services/files/desktop.patch
-24
View File
@@ -1,24 +0,0 @@
diff -Nuar a/pds/environments.py b/pds/environments.py
--- a/pds/environments.py 2017-08-30 19:34:22.000000000 +0300
+++ b/pds/environments.py 2018-10-02 14:50:09.075085646 +0300
@@ -30,7 +30,7 @@
# kde5 için sınıfı düzenlenecek ve kde5 için bilgiler istenecek!!!
class Kde5(DefaultDe):
Name = 'kde'
- SessionTypes = ('/usr/share/xsessions/plasma-mediacenter')
+ SessionTypes = ('/usr/share/xsessions/plasma')
Version = '5'
VersionKey = 'KDE_SESSION_VERSION'
ConfigPath = ('$HOME/.config/', '$HOME/.config5/')
diff -Nuar a/pds/environments.py b/pds/environments.py
--- a/pds/environments.py 2017-08-30 19:34:22.000000000 +0300
+++ b/pds/environments.py 2018-10-21 22:44:52.389522233 +0300
@@ -33,7 +33,7 @@
SessionTypes = ('/usr/share/xsessions/plasma-mediacenter')
Version = '5'
VersionKey = 'KDE_SESSION_VERSION'
- ConfigPath = ('$HOME/.config/', '$HOME/.config5/')
+ ConfigPath = ('$HOME/.config/', '$HOME/.config/')
ConfigFile = 'kdeglobals'
ConfigType = 'ini'
#ConfigBin = 'kde4-config'
desktop/pisilinux/pisilinux-desktop-services/files/environment.patch
-11
View File
@@ -1,11 +0,0 @@
--- pds-2.0.0.orig/pds/environments.py 2016-03-02 11:27:31.000000000 +0200
+++ pds-2.0.0/pds/environments.py 2016-06-03 15:42:26.860036236 +0300
@@ -33,7 +33,7 @@
SessionTypes = ('/usr/share/xsessions/plasma-mediacenter')
Version = '5'
VersionKey = 'KDE_SESSION_VERSION'
- ConfigPath = ('$HOME/.local5/', '$HOME/.kde4/')
+ ConfigPath = ('$HOME/.local/', '$HOME/.kde/')
ConfigFile = 'share/config/kdeglobals'
ConfigType = 'ini'
#ConfigBin = 'kde4-config'
desktop/pisilinux/pisilinux-desktop-services/files/fixed_icons_path.patch
+146
View File
@@ -0,0 +1,146 @@
diff -Nuar a/pds/environments.py b/pds/environments.py
--- a/pds/environments.py 2021-05-21 12:07:38.000000000 +0300
+++ b/pds/environments.py 2022-05-27 10:36:13.953911000 +0300
@@ -30,53 +30,15 @@
# kde5 için sınıfı düzenlenecek ve kde5 için bilgiler istenecek!!!
class Kde5(DefaultDe):
Name = 'kde'
- SessionTypes = ('/usr/share/xsessions/plasma-mediacenter')
+ SessionTypes = ('/usr/share/xsessions/plasma')
Version = '5'
VersionKey = 'KDE_SESSION_VERSION'
- ConfigPath = ('$HOME/.config/', '$HOME/.config5/')
+ ConfigPath = ('$HOME/.config/', '$HOME/.config/')
ConfigFile = 'kdeglobals'
ConfigType = 'ini'
- #ConfigBin = 'kde4-config'
- #DefaultIconFile = '/usr/share/icons/default.kde4'
DefaultConfigPath = '$HOME/.config/kdeglobals'
DefaultIconTheme = 'breeze' # breeze simge teması svg dosyalarından oluşuyor pds png uzantılı dosyalar açıyor
IconKey = 'Icons/Theme'
- #try:
- # from PyKDE4 import kdecore, kdeui
- # i18n = kdecore.i18n
- #except:
- # pass
-
-
-class Kde4(DefaultDe):
- Name = 'kde'
- SessionTypes = ('kde-plasma')
- Version = '4'
- VersionKey = 'KDE_SESSION_VERSION'
- ConfigPath = ('$HOME/.kde4/', '$HOME/.kde/')
- ConfigFile = 'share/config/kdeglobals'
- ConfigType = 'ini'
- ConfigBin = 'kde4-config'
- DefaultIconFile = '/usr/share/icons/default.kde4'
- DefaultIconTheme = 'oxygen'
- IconKey = 'Icons/Theme'
- #try:
- # from PyKDE4 import kdecore, kdeui
- # i18n = kdecore.i18n
- #except:
- # pass
-
-class Kde3(DefaultDe):
- Name = 'kde'
- Version = '3.5'
- ConfigPath = '$HOME/.kde/'
- ConfigFile = 'share/config/kdeglobals'
- ConfigType = 'ini'
- ConfigBin = 'kde-config'
- DefaultIconFile = '/usr/share/icons/default.kde'
- DefaultIconTheme = 'crystalsvg'
- IconKey = 'Icons/Theme'
- ExtraDirs = 'KDEDIRS'
class Xfce(DefaultDe):
Name = 'xfce'
@@ -107,6 +69,15 @@
IconKey = 'theme/name'
DefaultIconFile = '/usr/share/lxde/images/pisilinuxLogo.png'
+class LxQt(DefaultDe):
+ Name = 'LxQt'
+ Version = '1.1'
+ ConfigPath = '$HOME/.config/lxqt'
+ ConfigFile = ''
+ ConfigType = None
+ DefaultIconTheme = 'damadamas'
+ IconKey = 'theme/name'
+
class Fluxbox(DefaultDe):
Name = 'fluxbox'
Version = '1.3.1'
@@ -127,16 +98,32 @@
class Gnome3(DefaultDe):
Name = 'gnome3'
SessionTypes = ('gnome-shell')
- Version = '3.0'
- ConfigPath = '$HOME/.gnome2'
+ Version = '41.3'
+ ConfigPath = '$HOME/.gconf'
ConfigFile = ''
ConfigType = None
- DefaultIconTheme = 'oxygen'
+ DefaultIconTheme = 'adwaita'
class Mate(DefaultDe):
Name = 'mate'
- Version = '1.61'
+ Version = '1.25'
ConfigPath = '$HOME/.config/mate'
ConfigFile = ''
ConfigType = None
- DefaultIconTheme = 'matefaenza'
+ DefaultIconTheme = 'mate'
+
+class Lumina(DefaultDe):
+ Name = 'lumina'
+ Version = '1.6'
+ ConfigPath = '$HOME/.config/lumina'
+ ConfigFile = ''
+ ConfigType = None
+ DefaultIconTheme = 'adwaita'
+
+class Cinnamon(DefaultDe):
+ Name = 'cinnamon'
+ Version = '5.2'
+ ConfigPath = '$HOME/.config/cinnamon'
+ ConfigFile = ''
+ ConfigType = None
+ DefaultIconTheme = 'adwaita'
diff -Nuar a/pds/__init__.py b/pds/__init__.py
--- a/pds/__init__.py 2021-05-21 12:07:38.000000000 +0300
+++ b/pds/__init__.py 2022-05-27 10:37:09.328910000 +0300
@@ -32,7 +32,7 @@
class Pds:
- SupportedDesktops = (DefaultDe, Kde5, Kde4, Kde3, Xfce, Enlightenment, LXDE,
+ SupportedDesktops = (DefaultDe, Kde5, Xfce, Enlightenment, LXDE, LxQt, Lumina, Cinnamon,
Fluxbox, Gnome, Gnome3, Mate)
def __init__(self, catalogName='', debug=False):
@@ -158,7 +158,7 @@
elif v[1] == 'DESKTOP':
env = v[0].lower()
break
- elif env == 'default' or env == 'gnome':
+ elif env == 'default' or env == 'Gnome':
session = readfile('/etc/default/desktop', DefaultDe.Name)
env = session.split('=')[1].strip()
for de in Pds.SupportedDesktops:
diff -Nuar a/pds/qiconloader.py b/pds/qiconloader.py
--- a/pds/qiconloader.py 2021-05-21 12:07:38.000000000 +0300
+++ b/pds/qiconloader.py 2022-05-27 09:41:00.436983000 +0300
@@ -81,7 +81,7 @@
logging.debug('Icon Dirs : %s' % ','.join(self.iconDirs))
self.themeIndex = self.readThemeIndex(self.themeName)
- self.extraIcons = ['/usr/share/pixmaps']
+ self.extraIcons = ['/usr/share/pixmaps', '/usr/share/pixmaps/icons']
self.updateAvailableIcons()
desktop/pisilinux/pisilinux-desktop-services/files/gnome.patch
-12
View File
@@ -1,12 +0,0 @@
diff -Nuar a/pds/__init__.py b/pds/__init__.py
--- a/pds/__init__.py 2021-05-21 12:07:38.000000000 +0300
+++ b/pds/__init__.py 2021-06-08 23:04:07.126974303 +0300
@@ -158,7 +158,7 @@
elif v[1] == 'DESKTOP':
env = v[0].lower()
break
- elif env == 'default' or env == 'gnome':
+ elif env == 'default' or env == 'Gnome':
session = readfile('/etc/default/desktop', DefaultDe.Name)
env = session.split('=')[1].strip()
for de in Pds.SupportedDesktops:
desktop/pisilinux/pisilinux-desktop-services/pspec.xml
+11 -3
View File
@@ -10,15 +10,16 @@
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Icon>library</Icon>
<Summary>Pisi Linux Desktop Services</Summary>
<Description>pisilinux-desktop-services is a wrapper python module for integrating various desktop environments using PyQt.</Description>
<Archive sha1sum="71c453669d0ae9e826921294f2c29800e129eb91" type="targz">https://github.com/PisiLinuxNew/pds/archive/pds-2.1.1.tar.gz</Archive>
<Archive sha1sum="998c76993be911d341faef0c161cdb5612e28caf" type="targz">https://github.com/PisiLinuxNew/pds/archive/refs/tags/pds-2.1.2.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.7.1">python-qt5-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">desktop.patch</Patch>
<Patch level="1">gnome.patch</Patch>
<!--Patch level="1">desktop.patch</Patch>
<Patch level="1">gnome.patch</Patch-->
</Patches>
</Source>
@@ -34,6 +35,13 @@
</Package>
<History>
<Update release="11">
<Date>2022-06-03</Date>
<Version>2.1.2</Version>
<Comment>Version Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2021-06-08</Date>
<Version>2.1.1</Version>
desktop/pisilinux/service-manager/pspec.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<Dependency>python-qt5-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">Icons_display_fix.patch</Patch>
<!--Patch level="1">Icons_display_fix.patch</Patch-->
</Patches>
</Source>