diff options
| author |   Martin Väth <martin@mvath.de> | 2012-04-15 21:00:18 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:47:36 +0200 |
| commit | bd582bfb4b4f1b38ed7effb0e65353f9bae30f9c (patch) | |
| tree | 27fca8ca6840a4fc125774621d98490fead6f32f /app-text/stardict | |
| parent | Add requestpolicy ebuild (diff) | |
| download | mv-bd582bfb4b4f1b38ed7effb0e65353f9bae30f9c.tar.gz mv-bd582bfb4b4f1b38ed7effb0e65353f9bae30f9c.tar.bz2 mv-bd582bfb4b4f1b38ed7effb0e65353f9bae30f9c.zip | |
Add base. Fix stardict compilation
Diffstat (limited to 'app-text/stardict')
| -rw-r--r-- | app-text/stardict/ChangeLog | 3 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch | 39 | ||||
| -rw-r--r-- | app-text/stardict/stardict-3.0.3-r2.ebuild | 17 |
3 files changed, 52 insertions, 7 deletions
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog index 2a3fde09..59d83c0b 100644 --- a/app-text/stardict/ChangeLog +++ b/app-text/stardict/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header $ + 15 Apr 2012; Martin Väth <martin@mvath.de> + Inherit base. Add zlib compatibility patch from main tree. + 24 Jan 2012; Martin Väth <martin@mvath.de> Copy from tree to make dependencies for dependencies for help optional. Clean old ChangeLog diff --git a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch new file mode 100644 index 00000000..6a320bd4 --- /dev/null +++ b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/401887 + +diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp +index 16770a3..a4299e7 100644 +--- a/lib/src/libcommon.cpp ++++ b/lib/src/libcommon.cpp +@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name) + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path) + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h +index 10f13b4..bdcbf2f 100644 +--- a/lib/src/libcommon.h ++++ b/lib/src/libcommon.h +@@ -187,8 +187,9 @@ namespace clib { + typedef ResourceWrapper<FILE, FILE*, int, fclose> File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper<void, void*, int, gzclose> gzFile; ++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/app-text/stardict/stardict-3.0.3-r2.ebuild b/app-text/stardict/stardict-3.0.3-r2.ebuild index 66e56bd1..7abaad65 100644 --- a/app-text/stardict/stardict-3.0.3-r2.ebuild +++ b/app-text/stardict/stardict-3.0.3-r2.ebuild @@ -13,7 +13,7 @@ EAPI=4 GNOME2_LA_PUNT=yes GCONF_DEBUG=no -inherit eutils gnome2 autotools +inherit base eutils gnome2 autotools DESCRIPTION="A international dictionary supporting fuzzy and glob style matching" HOMEPAGE="http://code.google.com/p/stardict-3/" @@ -72,13 +72,16 @@ pkg_setup() { --disable-schemas-install" } +PATCHES=( + "${FILESDIR}/${P}-correct-glib-include.patch" + "${FILESDIR}/${P}-entry.patch" + "${FILESDIR}/${P}-gcc46.patch" + "${FILESDIR}/${P}-compositelookup_cpp.patch" + "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}/${P}-zlib-1.2.5.2.patch" +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-correct-glib-include.patch \ - "${FILESDIR}"/${P}-entry.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-compositelookup_cpp.patch \ - "${FILESDIR}"/${P}-overflow.patch + base_src_prepare if ! use gnome then sed -i \ -e "s/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/" \ |