Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Gilles Dartiguelongue (eva)" <eva@g.o>
Subject: gentoo-x86 commit in gnome-extra/hamster-applet/files: hamster-applet-2.24.0-python25.patch hamster-applet-2.24.0-gnomevfs.patch
Date: Sun, 19 Oct 2008 20:07:20 +0000
eva         08/10/19 20:07:20

  Added:                hamster-applet-2.24.0-python25.patch
                        hamster-applet-2.24.0-gnomevfs.patch
  Log:
  initial ebuild, Shamelessly stolen from graaff's overlay.
  (Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.1                  gnome-extra/hamster-applet/files/hamster-applet-2.24.0-python25.patch

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
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

Index: hamster-applet-2.24.0-python25.patch
===================================================================
diff -Naur hamster-applet-2.24.0.orig/configure.ac hamster-applet-2.24.0/configure.ac
--- hamster-applet-2.24.0.orig/configure.ac	2008-09-22 22:20:03.000000000 +0530
+++ hamster-applet-2.24.0/configure.ac	2008-09-26 15:46:37.000000000 +0530
@@ -100,20 +100,38 @@
 AC_MSG_RESULT($PYGTK_DEFSDIR)
 
 
-AC_MSG_CHECKING([for pysqlite2 module])
-if AC_RUN_LOG([DISPLAY= $PYTHON -c '
+if test "x$PYTHON_VERSION" = "x2.5"; then
+    AC_MSG_CHECKING([for python sqlite module])
+    if AC_RUN_LOG([DISPLAY= $PYTHON -c '
+try:
+    import sqlite3
+except ImportError, e:
+    if str(e).find("sqlite3") >= 0:
+        raise
+except:
+    pass
+    ']); then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Python 2.5: inbuilt sqlite is required to build hamster])
+    fi
+else
+    AC_MSG_CHECKING([for pysqlite2 module])
+    if AC_RUN_LOG([DISPLAY= $PYTHON -c '
 try:
     import pysqlite2
 except ImportError, e:
     if str(e).find("pysqlite2") >= 0:
-          raise
+        raise
 except:
     pass
-']); then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([pysqlite2 Python module required to build hamster])
+    ']); then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Python 2.4: pysqlite2 module required to build hamster])
+    fi
 fi
 
 
diff -Naur hamster-applet-2.24.0.orig/hamster/db.py hamster-applet-2.24.0/hamster/db.py
--- hamster-applet-2.24.0.orig/hamster/db.py	2008-09-22 22:20:02.000000000 +0530
+++ hamster-applet-2.24.0/hamster/db.py	2008-09-26 16:05:58.000000000 +0530
@@ -21,7 +21,14 @@
 
 """separate file for database operations"""
 
-from pysqlite2 import dbapi2 as sqlite
+try:
+    import sqlite3 as sqlite
+except ImportError:
+    try:
+        from pysqlite2 import dbapi2 as sqlite
+    except ImportError:
+        print "Error: Neither sqlite3 nor pysqlite2 found"
+        raise
 import os, time
 import datetime
 import hamster



1.1                  gnome-extra/hamster-applet/files/hamster-applet-2.24.0-gnomevfs.patch

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
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

Index: hamster-applet-2.24.0-gnomevfs.patch
===================================================================
diff -Naur hamster-applet-2.24.0/hamster/about.py hamster-applet-2.24.0.new/hamster/about.py
--- hamster-applet-2.24.0/hamster/about.py	2008-09-22 22:20:02.000000000 +0530
+++ hamster-applet-2.24.0.new/hamster/about.py	2008-09-29 09:10:13.000000000 +0530
@@ -21,15 +21,15 @@
 from os.path import join
 from hamster import SHARED_DATA_DIR
 from hamster.defs import VERSION
-import gtk, gnomevfs
+import gtk
 import hamster
 
 
 def on_email(about, mail):
-    gnomevfs.url_show("mailto:%s" % mail)
+    gtk.show_uri(gtk.gdk.Screen(), "mailto:%s" % mail, 0L)
 
 def on_url(about, link):
-    gnomevfs.url_show(link)
+    gtk.show_uri(gtk.gdk.Screen(), link, 0L)
 
 gtk.about_dialog_set_email_hook(on_email)
 gtk.about_dialog_set_url_hook(on_url)





Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in gnome-extra/hamster-applet: metadata.xml Manifest hamster-applet-2.24.0.ebuild ChangeLog
Next by thread:
gentoo-x86 commit in gnome-extra/mousetweaks: ChangeLog mousetweaks-2.24.0.ebuild
Previous by date:
gentoo-x86 commit in gnome-extra/hamster-applet: metadata.xml Manifest hamster-applet-2.24.0.ebuild ChangeLog
Next by date:
gentoo-x86 commit in gnome-extra/mousetweaks: ChangeLog mousetweaks-2.24.0.ebuild


Updated Mar 31, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.