[csw-devel] SF.net SVN: gar:[22092] csw/mgar/pkg/lang-python/calibre/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Wed Oct 2 10:59:09 CEST 2013
Revision: 22092
http://gar.svn.sourceforge.net/gar/?rev=22092&view=rev
Author: pfelecan
Date: 2013-10-02 08:59:08 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
lang-python/calibre/trunk: previous 2 commits where incorrect and/or incomplete
Modified Paths:
--------------
csw/mgar/pkg/lang-python/calibre/trunk/Makefile
csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch
Modified: csw/mgar/pkg/lang-python/calibre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 08:52:08 UTC (rev 22091)
+++ csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 08:59:08 UTC (rev 22092)
@@ -54,22 +54,26 @@
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibchm0
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtdbus4
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtcore4
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibmagickwand6q16hdri1
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibz1
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicui18n51
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpython2-7-1-0
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtgui4
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtsvg4
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicuuc51
-RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpodofo0-9-1
-RUNTIME_DEP_PKGS_CSWcalibre = CSWxdg-utils
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibchm0
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtdbus4
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibmagickwand6q16hdri1
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicui18n51
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpython2-7-1-0
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpodofo0-9-1
+RUNTIME_DEP_PKGS_CSWcalibre += CSWxdg-utils
CHECKPKG_OVERRIDES_CSWcalibre += surplus-dependency|CSWxdg-utils
+# I let the /usr/share as a fallback; /opt/csw/share is first anyway:
+CHECKPKG_OVERRIDES_CSWcalibre += file-with-bad-content|/usr/share|root/opt/csw/lib/calibre/calibre/linux.py
+CHECKPKG_OVERRIDES_CSWcalibre += file-with-bad-content|/usr/share|root/opt/csw/lib/calibre/calibre/utils/fonts/scanner.py
+
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch
===================================================================
--- csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch 2013-10-02 08:52:08 UTC (rev 22091)
+++ csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch 2013-10-02 08:59:08 UTC (rev 22092)
@@ -1,14 +1,38 @@
-From 6a605c24c3a27678541e9ffa76aff78a03cb2a9e Mon Sep 17 00:00:00 2001
+From 85e24e781d10c073c2b48e75e6e5bdcf04c1f365 Mon Sep 17 00:00:00 2001
From: Peter Felecan <pfelecan at opencsw.org>
-Date: Wed, 2 Oct 2013 09:46:08 +0200
+Date: Wed, 2 Oct 2013 10:50:45 +0200
Subject: [PATCH] introduce CSW prefix in some paths
---
+ src/calibre/devices/kobo/driver.py | 4 ++--
src/calibre/ebooks/lrf/fonts/__init__.py | 2 +-
src/calibre/linux.py | 6 +++---
src/calibre/utils/fonts/scanner.py | 3 +--
- 3 files changed, 5 insertions(+), 6 deletions(-)
+ src/unrar/pathfn.cpp | 2 +-
+ 5 files changed, 8 insertions(+), 9 deletions(-)
+diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
+index cb325ef..38f7d34 100644
+--- a/src/calibre/devices/kobo/driver.py
++++ b/src/calibre/devices/kobo/driver.py
+@@ -314,7 +314,7 @@ class KOBO(USBMS):
+ changed = False
+ for i, row in enumerate(cursor):
+ # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...'))
+- if not hasattr(row[3], 'startswith') or row[3].startswith("file:///usr/local/Kobo/help/"):
++ if not hasattr(row[3], 'startswith') or row[3].startswith("file:///opt/csw/share/Kobo/help/"):
+ # These are internal to the Kobo device and do not exist
+ continue
+ path = self.path_from_contentid(row[3], row[5], row[4], oncard)
+@@ -1706,7 +1706,7 @@ class KOBOTOUCH(KOBO):
+ debug_print("KoboTouch:books - looping on database - row=%d" % i)
+ debug_print("KoboTouch:books - title='%s'"%row[0], "authors=", row[1])
+ debug_print("KoboTouch:books - row=", row)
+- if not hasattr(row[3], 'startswith') or row[3].lower().startswith("file:///usr/local/kobo/help/") or row[3].lower().startswith("/usr/local/kobo/help/"):
++ if not hasattr(row[3], 'startswith') or row[3].lower().startswith("file:///opt/csw/share/kobo/help/") or row[3].lower().startswith("/opt/csw/share/kobo/help/"):
+ # These are internal to the Kobo device and do not exist
+ continue
+ externalId = None if row[15] and len(row[15]) == 0 else row[15]
diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py
index 3f16936..13a4507 100644
--- a/src/calibre/ebooks/lrf/fonts/__init__.py
@@ -61,6 +85,19 @@
os.path.expanduser('~/.local/share/fonts'),
os.path.expanduser('~/.fonts')
]
+diff --git a/src/unrar/pathfn.cpp b/src/unrar/pathfn.cpp
+index b9244cd..be3a421 100644
+--- a/src/unrar/pathfn.cpp
++++ b/src/unrar/pathfn.cpp
+@@ -448,7 +448,7 @@ bool EnumConfigPaths(char *Path,int Number)
+ return(true);
+ #elif defined(_UNIX)
+ static const char *AltPath[]={
+- "/etc","/etc/rar","/usr/lib","/usr/local/lib","/usr/local/etc"
++ "/opt/csw/lib", "/opt/csw/etc", "/etc","/etc/rar","/usr/lib"
+ };
+ if (Number==0)
+ {
--
1.8.3.4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list