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

remove unneeded files

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-04-15 17:25:03 +03:00
parent a2eae96bd5
commit 559cef2d85
7 changed files with 0 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/pisilinux/package-manager/files/appinfo.diff
-48
View File
@@ -1,48 +0,0 @@
diff -Nuar package-manager-4.0.0.orig/src/packagemodel.py package-manager-4.0.0/src/packagemodel.py
--- package-manager-4.0.0.orig/src/packagemodel.py 2013-12-24 23:35:17.000000000 +0200
+++ package-manager-4.0.0/src/packagemodel.py 2014-01-12 16:28:56.483228983 +0200
@@ -47,7 +47,7 @@
if config.USE_APPINFO:
self.appinfo = AppInfoClient()
- self.appinfo.setServer('http://appinfo.pardus.org.tr')
+ self.appinfo.setServer('http://appinfo.pisilinux.org')
if not self.appinfo.initializeLocalDB()[0]:
self.appinfo.checkOutDB()
diff -Nuar package-manager-4.0.0.orig/src/pmutils.py package-manager-4.0.0/src/pmutils.py
--- package-manager-4.0.0.orig/src/pmutils.py 2013-12-24 23:35:16.000000000 +0200
+++ package-manager-4.0.0/src/pmutils.py 2014-01-12 16:29:17.453228944 +0200
@@ -156,7 +156,7 @@
QNetworkProxy.setApplicationProxy(QNetworkProxy())
def network_available():
- return pisi.fetcher.Fetcher('http://appinfo.pardus.org.tr').test()
+ return pisi.fetcher.Fetcher('http://appinfo.pisilinux.org').test()
def parse_proxy(line):
settings = {'domain':None,'user':None,'pass':None,'host':None,'port':None}
diff -Nuar package-manager-4.0.0.orig/src/statemanager.py package-manager-4.0.0/src/statemanager.py
--- package-manager-4.0.0.orig/src/statemanager.py 2013-12-24 23:35:17.000000000 +0200
+++ package-manager-4.0.0/src/statemanager.py 2014-01-12 16:29:49.533228560 +0200
@@ -158,7 +158,7 @@
if config.USE_APPINFO:
if network_available():
if not AppInfoClient().checkOutDB()[0]:
- AppInfoClient().setServer('http://appinfo.pardus.org.tr')
+ AppInfoClient().setServer('http://appinfo.pisilinux.org')
AppInfoClient().checkOutDB()
return True
diff -Nuar package-manager-4.0.0.orig/src/webdialog.py package-manager-4.0.0/src/webdialog.py
--- package-manager-4.0.0.orig/src/webdialog.py 2013-12-24 23:35:17.000000000 +0200
+++ package-manager-4.0.0/src/webdialog.py 2014-01-12 16:30:21.433228258 +0200
@@ -41,7 +41,7 @@
self.registerFunction(IN, lambda: parent.statusBar().hide())
self.registerFunction(FINISHED, lambda: parent.statusBar().setVisible(not self.isVisible()))
- self._as = 'http://appinfo.pardus.org.tr'
+ self._as = 'http://appinfo.pisilinux.org'
self.cancelButton.clicked.connect(self._hide)
self.cancelButton.setIcon(KIcon("cancel"))
desktop/pisilinux/package-manager/files/fix_get_real_paths.patch
-13
View File
@@ -1,13 +0,0 @@
Index: package-manager-3.0.3/src/pmutils.py
===================================================================
--- package-manager-3.0.3.orig/src/pmutils.py
+++ package-manager-3.0.3/src/pmutils.py
@@ -114,7 +114,7 @@ class PM:
def get_real_paths(packages):
# If packages are not from repo or remote, find their absolute paths
- return map(lambda x: x if not x.endswith('pisi') or '://' in x else os.path.abspath(x), packages)
+ return map(lambda x: x if not x.endswith('.pisi') or '://' in x else os.path.abspath(x), packages)
def isAllLocal(packages):
return all(map(lambda x: x.endswith('.pisi') and not '://' in x, packages))
desktop/pisilinux/package-manager/files/package-manager-4.0.0-icon-options-add.patch
-37
View File
@@ -1,37 +0,0 @@
diff -Nuar package-manager-4.0.0-OSmanOS/src/summarydialog.py package-manager-4.0.0/src/summarydialog.py
--- package-manager-4.0.0-OSmanOS/src/summarydialog.py 2013-12-24 23:35:17.000000000 +0200
+++ package-manager-4.0.0/src/summarydialog.py 2014-12-07 19:07:40.849356751 +0200
@@ -80,6 +80,19 @@
for desktopFile in desktopFiles:
self.addApplication(desktopFile)
+
+ def checkIcon(self, iconFileName):
+ extensions = ['png', 'jpg','jpeg', 'svg']
+ pixmapsDir = '/usr/share/pixmaps/'
+ if os.path.isfile(iconFileName) == True:
+ return iconFileName
+ else:
+ for ext in extensions:
+ fname = '%s%s.%s' % (pixmapsDir, iconFileName, ext)
+ if os.path.isfile(fname):
+ return fname
+
+
def addApplication(self, desktopFile):
parser = desktopparser.DesktopParser()
parser.read("/%s" % str(desktopFile))
@@ -89,7 +102,7 @@
if nodisplay == "true" or terminal == "true":
return
- icon = parser.safe_get_locale('Desktop Entry', 'Icon', None)
+ icon = self.checkIcon(parser.safe_get_locale('Desktop Entry', 'Icon', None))
command = parser.safe_get_locale('Desktop Entry', 'Exec', None)
if not command:
return
@@ -117,4 +130,3 @@
def showSummary(self):
if self.hasApplication():
self.show()
-
desktop/pisilinux/package-manager/files/webdialog_ui.patch
-35
View File
@@ -1,35 +0,0 @@
--- ui/webdialog.ui.old 2014-02-13 00:22:36.000000000 +0400
+++ ui/webdialog.ui 2014-02-13 00:10:47.000000000 +0400
@@ -232,15 +232,21 @@
</item>
<item>
<widget class="QPushButton" name="cancelButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>32</width>
+ <width>36</width>
<height>26</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>24</width>
+ <width>36</width>
<height>26</height>
</size>
</property>
@@ -256,7 +262,7 @@
</string>
</property>
<property name="text">
- <string notr="true"/>
+ <string notr="true">X</string>
</property>
<property name="flat">
<bool>true</bool>
desktop/pisilinux/pisilinux-desktop-services/files/environment.patch
-41
View File
@@ -1,41 +0,0 @@
--- pds/environments.py.orig 2011-07-04 16:43:22.000000000 +0300
+++ pds/environments.py 2014-01-13 23:48:50.387199790 +0200
@@ -64,7 +64,7 @@
ConfigPath = '$HOME/.config/xfce4/'
ConfigFile = 'xfconf/xfce-perchannel-xml/xsettings.xml'
ConfigType = 'xml'
- DefaultIconTheme = 'hicolor'
+ DefaultIconTheme = 'Faenza'
DefaultConfigPath = '/etc/xdg/xfce4/%s' % ConfigFile
IconKey = 'IconThemeName'
@@ -74,7 +74,7 @@
ConfigPath = '$HOME/.e/e/'
ConfigFile = 'config/standard/e.cfg'
ConfigType = 'env'
- DefaultIconTheme = 'hicolor'
+ DefaultIconTheme = 'Faenza'
IconKey = 'E_ICON_THEME'
class LXDE(DefaultDe):
@@ -83,9 +83,9 @@
ConfigPath = '$HOME/.config'
ConfigFile = ''
ConfigType = None
- DefaultIconTheme = 'oxygen'
+ DefaultIconTheme = 'Faenza'
IconKey = 'theme/name'
- DefaultIconFile = '/usr/share/icons/lxde_pardus2011_menu.png'
+ DefaultIconFile = '/usr/share/lxde/images/pisilinuxLogo.png'
class Fluxbox(DefaultDe):
Name = 'fluxbox'
@@ -93,7 +93,7 @@
ConfigPath = '$HOME/.config'
ConfigFile = ''
ConfigType = None
- DefaultIconTheme = 'oxygen'
+ DefaultIconTheme = 'Faenza'
class Gnome(DefaultDe):
Name = 'gnome'
desktop/pisilinux/pisilinux-desktop-services/files/mate_support.patch
-59
View File
@@ -1,59 +0,0 @@
diff -aur pds~/environments.py pds/environments.py
--- pds~/environments.py 2014-01-13 22:59:36.000000000 +0100
+++ pds/environments.py 2014-01-28 19:56:31.163320368 +0100
@@ -113,3 +113,10 @@
ConfigType = None
DefaultIconTheme = 'oxygen'
+class Mate(DefaultDe):
+ Name = 'mate'
+ Version = '1.61'
+ ConfigPath = '$HOME/.config/mate'
+ ConfigFile = ''
+ ConfigType = None
+ DefaultIconTheme = 'matefaenza'
diff -aur pds~/__init__.py pds/__init__.py
--- pds~/__init__.py 2011-07-04 12:19:46.000000000 +0200
+++ pds/__init__.py 2014-01-28 22:22:56.729985428 +0100
@@ -14,8 +14,9 @@
# Pardus Desktop Services
from os import path
-from os import getenv
from os import popen
+from os import getenv
+from os import environ
import piksemel
import gettext
@@ -32,7 +33,7 @@
class Pds:
SupportedDesktops = (DefaultDe, Kde4, Kde3, Xfce, Enlightenment, LXDE,
- Fluxbox, Gnome, Gnome3)
+ Fluxbox, Gnome, Gnome3, Mate)
def __init__(self, catalogName='', debug=False):
self._session = None
@@ -148,12 +149,19 @@
def session(self):
if not self._session:
env = getenv('DESKTOP_SESSION')
- if env == 'default' or not env or env == 'gnome':
+ if not env:
+ for var in list(environ.keys()):
+ v = var.split('_')
+ if len(v) < 2: continue
+ elif v[1] == 'DESKTOP':
+ env = v[0].lower()
+ break
+ elif env == 'default' or env == 'gnome':
session = readfile('/etc/default/desktop', DefaultDe.Name)
env = session.split('=')[1].strip()
for de in Pds.SupportedDesktops:
if env:
- if env in de.SessionTypes or env == de.Name:
+ if env in de.SessionTypes or env.lower() == de.Name.lower():
self._session = de
else:
if de.VersionKey:
desktop/pisilinux/pisilinux-desktop-services/pspec.xml
-1
View File
@@ -12,7 +12,6 @@
<IsA>library</IsA>
<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="2cdaa83b77295e7a1a38164b8ee295c5ad13af9a" type="targz">http://source.pisilinux.org/1.0/pds-1.2.6.tar.gz</Archive>-->
<Archive sha1sum="2351a0e61002047309742e3df0c792e7060afbec" type="targz">https://github.com/PisiLinuxNew/pds/archive/2.0.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python-qt5-devel</Dependency>