summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorobache <obache>2014-05-03 07:14:45 +0000
committerobache <obache>2014-05-03 07:14:45 +0000
commitc6f401434e0e24ecf2f6d8e71c124f67e2566031 (patch)
tree7c1eb151f61706a71593c78c4301125375bf80e8 /converters
parentc625840a78999f29a81a1dfa530398bbb687436e (diff)
downloadpkgsrc-c6f401434e0e24ecf2f6d8e71c124f67e2566031.tar.gz
Change to upstream way used in other places.
Note reported to upstream as Issue#3.
Diffstat (limited to 'converters')
-rw-r--r--converters/pyzy/distinfo4
-rw-r--r--converters/pyzy/patches/patch-src_Database.h7
2 files changed, 6 insertions, 5 deletions
diff --git a/converters/pyzy/distinfo b/converters/pyzy/distinfo
index a530eb558de..db002314337 100644
--- a/converters/pyzy/distinfo
+++ b/converters/pyzy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/11/22 15:43:05 dholland Exp $
+$NetBSD: distinfo,v 1.3 2014/05/03 07:14:45 obache Exp $
SHA1 (pyzy-0.1.0.tar.gz) = ffe67a455a537c8ed8a0d138eb014945cd982927
RMD160 (pyzy-0.1.0.tar.gz) = 26cf64a977b030456bd74cca40fc9c9f476f7b7d
@@ -6,4 +6,4 @@ Size (pyzy-0.1.0.tar.gz) = 1571946 bytes
SHA1 (pyzy-database-1.0.0.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe
RMD160 (pyzy-database-1.0.0.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de
Size (pyzy-database-1.0.0.tar.bz2) = 9977983 bytes
-SHA1 (patch-src_Database.h) = a35156bb6f7804ab2f7fcdd3c1d2fbaa39115b3b
+SHA1 (patch-src_Database.h) = 93615161afee7614899a8a7248b46a355de75de2
diff --git a/converters/pyzy/patches/patch-src_Database.h b/converters/pyzy/patches/patch-src_Database.h
index 186aadb1c2a..4382d62adc0 100644
--- a/converters/pyzy/patches/patch-src_Database.h
+++ b/converters/pyzy/patches/patch-src_Database.h
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_Database.h,v 1.1 2013/11/22 15:43:05 dholland Exp $
+$NetBSD: patch-src_Database.h,v 1.2 2014/05/03 07:14:45 obache Exp $
-Work around C++ build error with gcc 4.5.
+* resolve ambiguous operator, changed to same way used in other place.
+ http://code.google.com/p/pyzy/issues/detail?id=3
--- src/Database.h.orig 2012-07-13 02:46:33.000000000 +0000
+++ src/Database.h
@@ -9,7 +10,7 @@ Work around C++ build error with gcc 4.5.
static Database & instance (void)
{
- if (m_instance == NULL) {
-+ if (!m_instance) {
++ if (m_instance.get () == NULL) {
g_error ("Error: Please call InputContext::init () !");
}
return *m_instance;