[111503] trunk/dports/textproc/stardict

[ryandesign at macports.org]

Revision: 111503
          https://trac.macports.org/changeset/111503
Author:   ryandesign at macports.org
Date:     2013-09-23 21:24:24 -0700 (Mon, 23 Sep 2013)
Log Message:
-----------
stardict: update to 3.0.4 and disable tools because they require MySQL (#34516); blacklist clang which fails to compile (#34517)

Modified Paths:
--------------
    trunk/dports/textproc/stardict/Portfile

Added Paths:
-----------
    trunk/dports/textproc/stardict/files/patch-zlib-1.2.6.diff

Removed Paths:
-------------
    trunk/dports/textproc/stardict/files/patch-glib-2.32.diff

Modified: trunk/dports/textproc/stardict/Portfile
===================================================================
--- trunk/dports/textproc/stardict/Portfile	2013-09-24 04:02:34 UTC (rev 111502)
+++ trunk/dports/textproc/stardict/Portfile	2013-09-24 04:24:24 UTC (rev 111503)
@@ -3,40 +3,51 @@
 PortSystem 1.0
 
 name		stardict
-version		3.0.2
-revision    1
+version		3.0.4
 categories	textproc
 maintainers	gmail.com:alexandernx
 platforms	darwin
+license		GPL-3+
+
 description	A full featured gtk2 dictionary
 long_description \
 	Very nice gnome dictionary. \
 	Can handle both local and web dictionaries. \
 	Though it needs a handful of gnome libraries for \
 	installation.
-#I changed the portfile so by default it builds stardict without gnome support.
 
-homepage	http://stardict.sf.net
-master_sites	sourceforge
+homepage	http://code.google.com/p/stardict-3/
+master_sites	googlecode:stardict-3
 use_bzip2	yes
-checksums	md5 329cc21228cd77f6ae8ae2a1ea6972eb \
-            sha1 301875657cd39b5f25e5933ece22936a28db1230 \
-            rmd160 5b3372447b5a16a036946a1985508de73dff1350
+
+checksums	rmd160  78f20b2092006951f35497b804b176b9c2a15195 \
+		sha256  c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8
+
 depends_build	port:pkgconfig \
 		port:intltool \
 		port:gnome-doc-utils
-depends_lib	port:gtk2 \
+
+depends_lib	path:lib/pkgconfig/glib-2.0.pc:glib2 \
+		port:gtk2 \
 		port:popt \
 		port:p5.12-xml-parser
 
-patchfiles	patch-glib-2.32.diff
+patchfiles	patch-zlib-1.2.6.diff
 
+# t_lookupdata.cpp:41:30: error: variable length array of non-POD element type 'std::vector<gchar *>'
+# http://code.google.com/p/stardict-3/issues/detail?id=58
+compiler.blacklist *clang*
+
 configure.args	--disable-gnome-support \
 		--disable-spell \
 		--disable-gucharmap \
 		--disable-festival \
-		--disable-espeak
+		--disable-espeak \
+		--disable-tools
 
+# Undefined symbols "_g_module_close", "_g_module_open", "_g_module_symbol"
+configure.libs	-lgmodule-2.0
+
 variant gnome description {Add Gnome support} {
 #Should be more stable slower and with gnome deps.
 configure.args-delete	--disable-gnome-support

Deleted: trunk/dports/textproc/stardict/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/textproc/stardict/files/patch-glib-2.32.diff	2013-09-24 04:02:34 UTC (rev 111502)
+++ trunk/dports/textproc/stardict/files/patch-glib-2.32.diff	2013-09-24 04:24:24 UTC (rev 111503)
@@ -1,11 +0,0 @@
---- src/tomboykeybinder.h.orig	2010-10-05 03:28:15.000000000 -0500
-+++ src/tomboykeybinder.h	2012-05-19 15:26:13.000000000 -0500
-@@ -2,7 +2,7 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 

Added: trunk/dports/textproc/stardict/files/patch-zlib-1.2.6.diff
===================================================================
--- trunk/dports/textproc/stardict/files/patch-zlib-1.2.6.diff	                        (rev 0)
+++ trunk/dports/textproc/stardict/files/patch-zlib-1.2.6.diff	2013-09-24 04:24:24 UTC (rev 111503)
@@ -0,0 +1,23 @@
+http://code.google.com/p/stardict-3/issues/detail?id=31
+--- lib/src/libcommon.cpp.orig	2012-01-13 00:21:34.000000000 -0600
++++ lib/src/libcommon.cpp	2013-09-23 22:51:30.000000000 -0500
+@@ -599,7 +599,7 @@
+ 
+ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ {
+-	zip::gzFile in(gzopen(arch_file_name, "rb"));
++	zip::gzFileWrapper in(gzopen(arch_file_name, "rb"));
+ 	if(!in) {
+ 		g_critical("Unable to open archive file: %s.", arch_file_name);
+ 		return EXIT_FAILURE;
+--- lib/src/libcommon.h.orig	2012-01-13 00:21:34.000000000 -0600
++++ lib/src/libcommon.h	2013-09-23 22:51:32.000000000 -0500
+@@ -188,7 +188,7 @@
+ }
+ 
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<struct gzFile_s, struct gzFile_s *, int, gzclose> gzFileWrapper;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130923/d0906d70/attachment-0001.html>