pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/gramps3 -make it work with Python-2.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/bf1791f641cc
branches: trunk
changeset: 543847:bf1791f641cc
user: drochner <drochner%pkgsrc.org@localhost>
date: Mon Jun 23 15:44:14 2008 +0000
description:
-make it work with Python-2.4
-remove obsolete dependency on GConf2
-register desktop file
bump PKGREVISION
approved by gdt
diffstat:
databases/gramps3/MESSAGE | 7 -------
databases/gramps3/Makefile | 12 +++++-------
databases/gramps3/distinfo | 5 ++++-
databases/gramps3/patches/patch-ba | 13 +++++++++++++
databases/gramps3/patches/patch-bb | 13 +++++++++++++
databases/gramps3/patches/patch-bc | 20 ++++++++++++++++++++
6 files changed, 55 insertions(+), 15 deletions(-)
diffs (132 lines):
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/MESSAGE
--- a/databases/gramps3/MESSAGE Mon Jun 23 15:16:22 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD$
-
-To enable creation of graphs using the GraphViz engine, install the
-graphics/graphviz package.
-
-===========================================================================
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/Makefile
--- a/databases/gramps3/Makefile Mon Jun 23 15:16:22 2008 +0000
+++ b/databases/gramps3/Makefile Mon Jun 23 15:44:14 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/23 15:44:14 drochner Exp $
#
DISTNAME= gramps-3.0.1
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
@@ -19,8 +20,6 @@
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-# XXX Handle desktop file specially?
-
# XXX Why?
CONFIGURE_ARGS+= --disable-mime-install
# XXX Why?
@@ -28,12 +27,12 @@
# XXX Needed still?
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED= 25
+PYTHON_VERSIONS_ACCEPTED= 25 24
## Dependencies are confusing:
# From README
# required:
-# Python 2.5 or greater
+# Python 2.5 or greater (works with 2.4 after minor modifications)
# PyGTK2 2.10 or greater
# Python Glade bindings (bogus; included in pygtk2)
# librsvg2 (svg icon view)
@@ -61,8 +60,7 @@
.include "../../x11/py-gnome2/buildlink3.mk"
# XXX Why, if we disable mime install?
.include "../../databases/shared-mime-info/mimedb.mk"
-# XXX Why, if this was dropped?
-.include "../../devel/GConf/schemas.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/distinfo
--- a/databases/gramps3/distinfo Mon Jun 23 15:16:22 2008 +0000
+++ b/databases/gramps3/distinfo Mon Jun 23 15:44:14 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/06/18 22:21:12 gdt Exp $
+$NetBSD: distinfo,v 1.2 2008/06/23 15:44:14 drochner Exp $
SHA1 (gramps-3.0.1.tar.gz) = 371ffba136fe596a3a1a853cd63fd8cd68d0d02b
RMD160 (gramps-3.0.1.tar.gz) = a76e88bc51e50ae52440cde0779e5b04657a8524
@@ -9,3 +9,6 @@
SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12
SHA1 (patch-ae) = c7ff88174e0823cde52ebbdc47e847ef54f90493
SHA1 (patch-af) = fca8975e8db9841b23065a52b90e92a958077021
+SHA1 (patch-ba) = 5e64b42eda21faec1fdd5fdd1020f5e73eea73ea
+SHA1 (patch-bb) = 74f6c13b93618ba7e6d80ca0560f950da4ee476d
+SHA1 (patch-bc) = 0f42bdec326945b1cc48ee120bc744be85b176ef
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gramps3/patches/patch-ba Mon Jun 23 15:44:14 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- src/gramps.py.orig 2008-05-17 22:15:36.000000000 +0200
++++ src/gramps.py
+@@ -94,7 +94,7 @@ gettext.install("gramps",loc,unicode=1)
+ #
+ #-------------------------------------------------------------------------
+
+-MIN_PYTHON_VERSION = (2, 5, 0, '', 0)
++MIN_PYTHON_VERSION = (2, 4, 0, '', 0)
+ if not sys.version_info >= MIN_PYTHON_VERSION :
+ print gettext.gettext("Your Python version does not meet the "
+ "requirements. At least python %d.%d.%d is needed to"
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gramps3/patches/patch-bb Mon Jun 23 15:44:14 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- src/plugins/all_relations.py.orig 2008-05-17 22:14:56.000000000 +0200
++++ src/plugins/all_relations.py
+@@ -47,7 +47,7 @@ def run(database, document, person):
+ report = AllRelReport(database, document, person)
+ report.run()
+
+-class AllRelReport():
++class AllRelReport:
+ """
+ Obtains all relationships, displays the relations, and in details, the
+ relation path
diff -r e018cc0571e5 -r bf1791f641cc databases/gramps3/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gramps3/patches/patch-bc Mon Jun 23 15:44:14 2008 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-bc,v 1.1 2008/06/23 15:44:14 drochner Exp $
+
+--- configure.orig 2008-05-17 22:33:13.000000000 +0200
++++ configure
+@@ -6289,12 +6289,12 @@ echo "${ECHO_T}$LINGUAS" >&6; }
+
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+- { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.5" >&5
+-echo $ECHO_N "checking whether $PYTHON version >= 2.5... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
++echo $ECHO_N "checking whether $PYTHON version >= 2.4... $ECHO_C" >&6; }
+ prog="import sys, string
+ # split strings by '.' and convert to numeric. Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+-minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
++minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+ minverhex = 0
+ for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
+ sys.exit(sys.hexversion < minverhex)"
Home |
Main Index |
Thread Index |
Old Index