Sat May 3 07:14:45 2014 UTC ()
Change to upstream way used in other places.
Note reported to upstream as Issue#3.


(obache)
diff -r1.2 -r1.3 pkgsrc/converters/pyzy/distinfo
diff -r1.1 -r1.2 pkgsrc/converters/pyzy/patches/patch-src_Database.h
cvs diff -r1.2 -r1.3 pkgsrc/converters/pyzy/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/pyzy/distinfo 2013/11/22 15:43:05 1.2
+++ pkgsrc/converters/pyzy/distinfo 2014/05/03 07:14:45 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.2 2013/11/22 15:43:05 dholland Exp $ 1$NetBSD: distinfo,v 1.3 2014/05/03 07:14:45 obache Exp $
2 2
3SHA1 (pyzy-0.1.0.tar.gz) = ffe67a455a537c8ed8a0d138eb014945cd982927 3SHA1 (pyzy-0.1.0.tar.gz) = ffe67a455a537c8ed8a0d138eb014945cd982927
4RMD160 (pyzy-0.1.0.tar.gz) = 26cf64a977b030456bd74cca40fc9c9f476f7b7d 4RMD160 (pyzy-0.1.0.tar.gz) = 26cf64a977b030456bd74cca40fc9c9f476f7b7d
5Size (pyzy-0.1.0.tar.gz) = 1571946 bytes 5Size (pyzy-0.1.0.tar.gz) = 1571946 bytes
6SHA1 (pyzy-database-1.0.0.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe 6SHA1 (pyzy-database-1.0.0.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe
7RMD160 (pyzy-database-1.0.0.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de 7RMD160 (pyzy-database-1.0.0.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de
8Size (pyzy-database-1.0.0.tar.bz2) = 9977983 bytes 8Size (pyzy-database-1.0.0.tar.bz2) = 9977983 bytes
9SHA1 (patch-src_Database.h) = a35156bb6f7804ab2f7fcdd3c1d2fbaa39115b3b 9SHA1 (patch-src_Database.h) = 93615161afee7614899a8a7248b46a355de75de2
cvs diff -r1.1 -r1.2 pkgsrc/converters/pyzy/patches/patch-src_Database.h (expand / switch to unified diff)

--- pkgsrc/converters/pyzy/patches/patch-src_Database.h 2013/11/22 15:43:05 1.1
+++ pkgsrc/converters/pyzy/patches/patch-src_Database.h 2014/05/03 07:14:45 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-src_Database.h,v 1.1 2013/11/22 15:43:05 dholland Exp $ 1$NetBSD: patch-src_Database.h,v 1.2 2014/05/03 07:14:45 obache Exp $
2 2
3Work around C++ build error with gcc 4.5. 3* resolve ambiguous operator, changed to same way used in other place.
 4 http://code.google.com/p/pyzy/issues/detail?id=3
4 5
5--- src/Database.h.orig 2012-07-13 02:46:33.000000000 +0000 6--- src/Database.h.orig 2012-07-13 02:46:33.000000000 +0000
6+++ src/Database.h 7+++ src/Database.h
7@@ -79,7 +79,7 @@ public: 8@@ -79,7 +79,7 @@ public:
8 static void finalize (void); 9 static void finalize (void);
9 static Database & instance (void) 10 static Database & instance (void)
10 { 11 {
11- if (m_instance == NULL) { 12- if (m_instance == NULL) {
12+ if (!m_instance) { 13+ if (m_instance.get () == NULL) {
13 g_error ("Error: Please call InputContext::init () !"); 14 g_error ("Error: Please call InputContext::init () !");
14 } 15 }
15 return *m_instance; 16 return *m_instance;