forked from hasufell/hasufell-repository
		
	blink: version bump to 4.0.0
This commit is contained in:
		
							parent
							
								
									6ccc96c19c
								
							
						
					
					
						commit
						e7709635e1
					
				@ -2,8 +2,8 @@
 | 
			
		||||
# Distributed under the terms of the GNU General Public License v2
 | 
			
		||||
 | 
			
		||||
require desktop-utils gtk-icon-cache
 | 
			
		||||
require setup-py [ import=distutils blacklist="3" multibuild=false ]
 | 
			
		||||
require github [ user="AGProjects" pn="blink-qt" tag="release-${PV}" ]
 | 
			
		||||
require setup-py [ import=distutils blacklist="2" multibuild=false ]
 | 
			
		||||
require github [ user="AGProjects" pn="blink-qt" tag="${PV}" ]
 | 
			
		||||
 | 
			
		||||
SUMMARY="A state of the art, easy to use SIP client"
 | 
			
		||||
HOMEPAGE="http://iCanBlink.com"
 | 
			
		||||
@ -22,17 +22,16 @@ DEPENDENCIES="
 | 
			
		||||
        dev-python/PyQt5[>=5.0][webkit][python_abis:*(-)?]
 | 
			
		||||
        dev-python/google-api-python-client[python_abis:*(-)?]
 | 
			
		||||
        dev-python/lxml[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-cjson[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-dateutil[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-eventlib[python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
 | 
			
		||||
        dev-python/python-sipsimple[>=4.0.1][python_abis:*(-)?]
 | 
			
		||||
        dev-python/zopeinterface[python_abis:*(-)?]
 | 
			
		||||
        net-twisted/Twisted[python_abis:*(-)?]
 | 
			
		||||
"
 | 
			
		||||
 | 
			
		||||
DEFAULT_SRC_PREPARE_PATCHES=(
 | 
			
		||||
    "${FILES}/${PNV}-data-path.patch"
 | 
			
		||||
    "${FILES}/${PN}-data-path.patch"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
src_install() {
 | 
			
		||||
@ -3,14 +3,17 @@ Date: Tue Sep  8 10:10:18 UTC 2015
 | 
			
		||||
Subject: Fix data path fallback
 | 
			
		||||
Upstream: no, correct fix pending since 'sys.prefix' is broken in exherbo
 | 
			
		||||
 | 
			
		||||
--- blink-1.4.1/blink/resources.py
 | 
			
		||||
+++ blink-1.4.1/blink/resources.py
 | 
			
		||||
@@ -71,7 +71,7 @@
 | 
			
		||||
             if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
 | 
			
		||||
                 cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())
 | 
			
		||||
 | 
			
		||||
diff --git a/blink/resources.py b/blink/resources.py
 | 
			
		||||
index e981ed8..f1f4f5c 100644
 | 
			
		||||
--- a/blink/resources.py
 | 
			
		||||
+++ b/blink/resources.py
 | 
			
		||||
@@ -81,7 +81,7 @@ class Resources(object):
 | 
			
		||||
             elif os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
 | 
			
		||||
                 cls._cached_directory = os.path.join(application_directory, 'resources')
 | 
			
		||||
             else:
 | 
			
		||||
-                cls._cached_directory = os.path.join(application_directory, 'share', 'blink').decode(sys.getfilesystemencoding())
 | 
			
		||||
+                cls._cached_directory = os.path.join('/usr', 'share', 'blink').decode(sys.getfilesystemencoding())
 | 
			
		||||
-                cls._cached_directory = os.path.join(application_directory, 'share', 'blink')
 | 
			
		||||
+                cls._cached_directory = os.path.join('/usr', 'share', 'blink')
 | 
			
		||||
         return DirectoryContextManager(cls._cached_directory)
 | 
			
		||||
 
 | 
			
		||||
     @classmethod
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user