Djam/cherrytree
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/cherrytree.git synced 2025-02-23 14:22:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix of the installation path

Browse source
This commit is contained in:
Greenray (Victor Nabatov) 2016-11-18 19:52:55 +03:00
parent 5e0793c351
commit 4ac85c1daa
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cherrytree-0.37.6-path.patch Normal file
View file

@ -0,0 +1,56 @@
diff -aru '--exclude=locale' cherrytree-0.37.6.orig/cherrytree cherrytree-0.37.6/cherrytree
--- cherrytree-0.37.6.orig/cherrytree 2016-10-03 01:28:33.000000000 +0300
+++ cherrytree-0.37.6/cherrytree 2016-10-28 16:29:34.740448735 +0300
@@ -42,7 +42,7 @@
MODULES_PATH = os.path.join(SCRIPT_DIR, 'modules')
else:
# installed
- SHARE_PATH = os.path.join(os.path.dirname(SCRIPT_DIR), 'share')
+ SHARE_PATH = os.path.join(os.path.dirname(SCRIPT_DIR), 'lib/python2.7/site-packages')
MODULES_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'modules')
__builtin__.SHARE_PATH = SHARE_PATH
sys.path.insert(0, MODULES_PATH)
diff -aru '--exclude=locale' cherrytree-0.37.6.orig/modules/cons.py cherrytree-0.37.6/modules/cons.py
--- cherrytree-0.37.6.orig/modules/cons.py 2016-10-25 01:37:03.000000000 +0300
+++ cherrytree-0.37.6/modules/cons.py 2016-11-17 22:49:23.560031470 +0300
@@ -45,13 +45,12 @@
if SHARE_PATH == os.path.dirname(MODULES_PATH):
GLADE_PATH = os.path.join(SHARE_PATH, "glade/")
SPECS_PATH = os.path.join(SHARE_PATH, 'language-specs/')
- LOCALE_PATH = os.path.join(SHARE_PATH, 'locale/')
if os.path.isfile(os.path.join(SHARE_PATH, 'config.cfg')):
CONFIG_DIR = SHARE_PATH
else:
GLADE_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'glade/')
SPECS_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'language-specs')
- LOCALE_PATH = os.path.join(SHARE_PATH, 'locale')
+LOCALE_PATH = '/usr/share/locale/'
CONFIG_PATH = os.path.join(CONFIG_DIR, 'config.cfg')
LANG_PATH = os.path.join(CONFIG_DIR, 'lang')
IMG_PATH = os.path.join(CONFIG_DIR, 'img_tmp.png')
diff -aru '--exclude=locale' cherrytree-0.37.6.orig/setup.py cherrytree-0.37.6/setup.py
--- cherrytree-0.37.6.orig/setup.py 2016-01-08 22:50:50.000000000 +0300
+++ cherrytree-0.37.6/setup.py 2016-11-15 13:00:45.692233286 +0300
@@ -185,12 +185,12 @@
author = "Giuseppe Penone",
author_email = "giuspen@gmail.com",
url = "http://www.giuspen.com/cherrytree/",
- license = "GPL",
+ license = "GPLv3+",
data_files = [
("share/icons/hicolor/scalable/apps", ["glade/svg/cherrytree.svg"] ),
- ("share/cherrytree/glade", glob.glob("glade/*.*") ),
- ("share/cherrytree/language-specs", glob.glob("language-specs/*.lang") ),
- ("share/cherrytree/modules", glob.glob("modules/*.py") ),
+ ("lib/python2.7/site-packages/cherrytree/glade", glob.glob("glade/*.*") ),
+ ("lib/python2.7/site-packages/cherrytree/language-specs", glob.glob("language-specs/*.lang") ),
+ ("lib/python2.7/site-packages/cherrytree/modules", glob.glob("modules/*") ),
("share/mime/packages", ["linux/cherrytree.xml"]),
("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]),
("share/application-registry", ["linux/cherrytree.applications"]),
@@ -205,4 +205,4 @@
},
distclass=CherryTreeDist
)
- subprocess.call("update-desktop-database")
+# subprocess.call("update-desktop-database")