1 |
eva 08/10/19 20:07:20 |
2 |
|
3 |
Added: hamster-applet-2.24.0-python25.patch |
4 |
hamster-applet-2.24.0-gnomevfs.patch |
5 |
Log: |
6 |
initial ebuild, Shamelessly stolen from graaff's overlay. |
7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-extra/hamster-applet/files/hamster-applet-2.24.0-python25.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/hamster-applet/files/hamster-applet-2.24.0-python25.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/hamster-applet/files/hamster-applet-2.24.0-python25.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: hamster-applet-2.24.0-python25.patch |
16 |
=================================================================== |
17 |
diff -Naur hamster-applet-2.24.0.orig/configure.ac hamster-applet-2.24.0/configure.ac |
18 |
--- hamster-applet-2.24.0.orig/configure.ac 2008-09-22 22:20:03.000000000 +0530 |
19 |
+++ hamster-applet-2.24.0/configure.ac 2008-09-26 15:46:37.000000000 +0530 |
20 |
@@ -100,20 +100,38 @@ |
21 |
AC_MSG_RESULT($PYGTK_DEFSDIR) |
22 |
|
23 |
|
24 |
-AC_MSG_CHECKING([for pysqlite2 module]) |
25 |
-if AC_RUN_LOG([DISPLAY= $PYTHON -c ' |
26 |
+if test "x$PYTHON_VERSION" = "x2.5"; then |
27 |
+ AC_MSG_CHECKING([for python sqlite module]) |
28 |
+ if AC_RUN_LOG([DISPLAY= $PYTHON -c ' |
29 |
+try: |
30 |
+ import sqlite3 |
31 |
+except ImportError, e: |
32 |
+ if str(e).find("sqlite3") >= 0: |
33 |
+ raise |
34 |
+except: |
35 |
+ pass |
36 |
+ ']); then |
37 |
+ AC_MSG_RESULT([yes]) |
38 |
+ else |
39 |
+ AC_MSG_RESULT([no]) |
40 |
+ AC_MSG_ERROR([Python 2.5: inbuilt sqlite is required to build hamster]) |
41 |
+ fi |
42 |
+else |
43 |
+ AC_MSG_CHECKING([for pysqlite2 module]) |
44 |
+ if AC_RUN_LOG([DISPLAY= $PYTHON -c ' |
45 |
try: |
46 |
import pysqlite2 |
47 |
except ImportError, e: |
48 |
if str(e).find("pysqlite2") >= 0: |
49 |
- raise |
50 |
+ raise |
51 |
except: |
52 |
pass |
53 |
-']); then |
54 |
- AC_MSG_RESULT([yes]) |
55 |
-else |
56 |
- AC_MSG_RESULT([no]) |
57 |
- AC_MSG_ERROR([pysqlite2 Python module required to build hamster]) |
58 |
+ ']); then |
59 |
+ AC_MSG_RESULT([yes]) |
60 |
+ else |
61 |
+ AC_MSG_RESULT([no]) |
62 |
+ AC_MSG_ERROR([Python 2.4: pysqlite2 module required to build hamster]) |
63 |
+ fi |
64 |
fi |
65 |
|
66 |
|
67 |
diff -Naur hamster-applet-2.24.0.orig/hamster/db.py hamster-applet-2.24.0/hamster/db.py |
68 |
--- hamster-applet-2.24.0.orig/hamster/db.py 2008-09-22 22:20:02.000000000 +0530 |
69 |
+++ hamster-applet-2.24.0/hamster/db.py 2008-09-26 16:05:58.000000000 +0530 |
70 |
@@ -21,7 +21,14 @@ |
71 |
|
72 |
"""separate file for database operations""" |
73 |
|
74 |
-from pysqlite2 import dbapi2 as sqlite |
75 |
+try: |
76 |
+ import sqlite3 as sqlite |
77 |
+except ImportError: |
78 |
+ try: |
79 |
+ from pysqlite2 import dbapi2 as sqlite |
80 |
+ except ImportError: |
81 |
+ print "Error: Neither sqlite3 nor pysqlite2 found" |
82 |
+ raise |
83 |
import os, time |
84 |
import datetime |
85 |
import hamster |
86 |
|
87 |
|
88 |
|
89 |
1.1 gnome-extra/hamster-applet/files/hamster-applet-2.24.0-gnomevfs.patch |
90 |
|
91 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/hamster-applet/files/hamster-applet-2.24.0-gnomevfs.patch?rev=1.1&view=markup |
92 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/hamster-applet/files/hamster-applet-2.24.0-gnomevfs.patch?rev=1.1&content-type=text/plain |
93 |
|
94 |
Index: hamster-applet-2.24.0-gnomevfs.patch |
95 |
=================================================================== |
96 |
diff -Naur hamster-applet-2.24.0/hamster/about.py hamster-applet-2.24.0.new/hamster/about.py |
97 |
--- hamster-applet-2.24.0/hamster/about.py 2008-09-22 22:20:02.000000000 +0530 |
98 |
+++ hamster-applet-2.24.0.new/hamster/about.py 2008-09-29 09:10:13.000000000 +0530 |
99 |
@@ -21,15 +21,15 @@ |
100 |
from os.path import join |
101 |
from hamster import SHARED_DATA_DIR |
102 |
from hamster.defs import VERSION |
103 |
-import gtk, gnomevfs |
104 |
+import gtk |
105 |
import hamster |
106 |
|
107 |
|
108 |
def on_email(about, mail): |
109 |
- gnomevfs.url_show("mailto:%s" % mail) |
110 |
+ gtk.show_uri(gtk.gdk.Screen(), "mailto:%s" % mail, 0L) |
111 |
|
112 |
def on_url(about, link): |
113 |
- gnomevfs.url_show(link) |
114 |
+ gtk.show_uri(gtk.gdk.Screen(), link, 0L) |
115 |
|
116 |
gtk.about_dialog_set_email_hook(on_email) |
117 |
gtk.about_dialog_set_url_hook(on_url) |