diff options
author | Akinori Hattori <hattya@gentoo.org> | 2011-11-27 08:05:49 +0000 |
---|---|---|
committer | Akinori Hattori <hattya@gentoo.org> | 2011-11-27 08:05:49 +0000 |
commit | fec5de5a297c1ac8d8941b5f0ca851069fa1f2f4 (patch) | |
tree | f99debf9e5e4af7510b1d3f1a6cb05b14350a3e0 /dev-scheme | |
parent | Update to EAPI 4, respect CFLAGS (bug #241988), restrict test phase (bug #320... (diff) | |
download | historical-fec5de5a297c1ac8d8941b5f0ca851069fa1f2f4.tar.gz historical-fec5de5a297c1ac8d8941b5f0ca851069fa1f2f4.tar.bz2 historical-fec5de5a297c1ac8d8941b5f0ca851069fa1f2f4.zip |
new upstream snapshot. fixes bug #239821.
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'dev-scheme')
-rw-r--r-- | dev-scheme/gauche-gtk/ChangeLog | 9 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/Manifest | 19 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff | 71 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff | 11 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff | 23 | ||||
-rw-r--r-- | dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild | 81 |
6 files changed, 200 insertions, 14 deletions
diff --git a/dev-scheme/gauche-gtk/ChangeLog b/dev-scheme/gauche-gtk/ChangeLog index 30491467f6f6..9080839b86ce 100644 --- a/dev-scheme/gauche-gtk/ChangeLog +++ b/dev-scheme/gauche-gtk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-scheme/gauche-gtk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/ChangeLog,v 1.13 2011/03/29 12:19:38 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/ChangeLog,v 1.14 2011/11/27 08:05:49 hattya Exp $ + +*gauche-gtk-0.6_pre1 (27 Nov 2011) + + 27 Nov 2011; Akinori Hattori <hattya@gentoo.org> + +files/gauche-gtk-gtk-lib.hints.diff, +files/gauche-gtk-h2s-cpp.diff, + +files/gauche-gtk-h2s-gdk-pixbuf.diff, +gauche-gtk-0.6_pre1.ebuild: + new upstream snapshot. fixes bug #239821. 29 Mar 2011; Christoph Mende <angelos@gentoo.org> gauche-gtk-0.4.1.ebuild: Fixed slot deps diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest index c56f395d56b4..b8cca3a730d4 100644 --- a/dev-scheme/gauche-gtk/Manifest +++ b/dev-scheme/gauche-gtk/Manifest @@ -1,17 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX gauche-gtk-0.4.1-gtk+-2.8.diff 932 RMD160 05cb3c74d47ef5d238d209d093daf2660f2d84a9 SHA1 95f8e3720c300f5f96bb98ac9f730fc78fed0457 SHA256 faf3b430dcfd33d3b8582652e5da566f2339e26da1190b9b1b4d16b3e87e62a4 +AUX gauche-gtk-gtk-lib.hints.diff 3208 RMD160 20c42aa736789fbd1d5df790d7430bb90e60ea6f SHA1 5bc7b674449bd39764309e30a4ca56a04de762d0 SHA256 676485bb19b4e5fb5e2b0f2b9e61ec3179f158287e334d3d853fd97c668c2666 +AUX gauche-gtk-h2s-cpp.diff 472 RMD160 1448eadb61558e461a0d8940f9837c33cae3f836 SHA1 cf747ed406f65874e945584244dfc30f638edad7 SHA256 c38734dc72a138bf4ebe0b1d2b2a03b49a5da2d265711d7eacd50d2358a99520 +AUX gauche-gtk-h2s-gdk-pixbuf.diff 778 RMD160 079181fe86a9f2ef50abe23287a08c2b47865138 SHA1 c52c265d54dde1b8af83b94e470b5b9ffd912746 SHA256 78140ec1836e0d8d473eecd96e1de38f905e63483c19860fc835a2ea95f1523a DIST Gauche-gtk-0.4.1.tgz 324945 RMD160 8ee51c2444505dfe6bc70d18f244c510f0c2bcfc SHA1 46a8380f318b4acfc012c2c861de21cbdf4ef157 SHA256 5f600214b04ce4090ca6aa63f9344a0c6ec9a2462e4106b53a7a44514d4a73db +DIST Gauche-gtk-0.6_pre1.tar.gz 203261 RMD160 81e197a79cc27cb456aad4eb221e99bb1c7f3992 SHA1 5662e958711dbb2f62ba50cbb5625e17723e27fb SHA256 cfe38221217519d3e6fe9bca6168938abe4801ec1a79a73f2f1b441cdc47dc0b EBUILD gauche-gtk-0.4.1.ebuild 1691 RMD160 74ea7b6ed9806a9b82d191124ffe10a55925e2cf SHA1 3dfdbf4f58422ce880f86574a2eb63168c32fa2a SHA256 4621986a5b690a99f78f7079f3bcc03182603e062a9e15fd0da7738bbdf2c766 -MISC ChangeLog 3240 RMD160 34e13427d467293908321d6f986de5868d146635 SHA1 97a0c029fbec5cc3b4dcd987ea1d3d26faaefdac SHA256 3a305aa8926d5f4abbd64c18e48b1e313abb9eced0a041734b5cd016d3bce910 +EBUILD gauche-gtk-0.6_pre1.ebuild 1662 RMD160 46e02f404b1ec28462ad1782e443d48a92c95f00 SHA1 7fe7acd5c73a9c89de00fd49a4112d64921464ab SHA256 07acaf3712b71fe8a4f6f77cf6f6512f9d98bd6c4acc027adaba348a09e2c30a +MISC ChangeLog 3513 RMD160 e62632a19d5cf5495b9e84feb48859dfa73f5ed2 SHA1 589b622ba23e9c88f34f3b3135ecaf264a4baf5e SHA256 4e055f1755225d29c45bf395ab630bcc7686d11076dfd2e76800e419cdc2c44c MISC metadata.xml 354 RMD160 175bf7c3bfd685237e7e90dbe2a24d62e7b434b8 SHA1 e3b39cfb9716c6c5f34578d71ba1ed71e047b8f2 SHA256 4d78e26495106cd2a30d4bcef767244e956d2071ad632975a1705f0bc8e8946f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iJwEAQEIAAYFAk59mOMACgkQfXuS5UK5QB198QP/UGthn38+8jmkarL1GZlSR3yx -YvRXYXaLfXd3/ovzEw5WMoefvLewzs/396TOAt6uhwIApp6gxYsAohWPax4VYhjh -9Srvu/Ca9miRPwFBkkp6ein3NCNgbEY1skYFVSFNa528Ng6MJV0z5CEncT/t05h7 -gers4X5+f1XkNuSSBdk= -=avTz ------END PGP SIGNATURE----- diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff new file mode 100644 index 000000000000..be54ee550ba7 --- /dev/null +++ b/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff @@ -0,0 +1,71 @@ +--- a/src/gtk-lib.hints ++++ b/src/gtk-lib.hints +@@ -527,8 +527,10 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));" + (add-mixin! "Scm_GtkEditableClass" "Scm_GtkCellEditableClass")) + + ;; we can't free the return value of gtk_entry_get_text. +-(define-cproc gtk-entry-get-text (entry::<gtk-entry>) +- "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));") ++(define-cproc-fix gtk-entry-get-text ++ (fix-arguments! '(entry::<gtk-entry>)) ++ (fix-body! ++ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_entry_get_text(entry)));")) + + ;;================================================================== + ;; gtkfilesel.h +@@ -539,8 +541,10 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));" + ;; gtk_file_selection_get_filename returns mbstr encoded by the current + ;; locale. We canonicalize it to utf8. The Scheme glue code converts + ;; it to Gauche's internal encoding. +-(define-cproc gtk-file-selection-get-filename (sel::<gtk-file-selection>) +- "const gchar *fn_mb = gtk_file_selection_get_filename(sel); ++(define-cproc-fix gtk-file-selection-get-filename ++ (fix-arguments! '(sel::<gtk-file-selection>)) ++ (fix-body! ++ "const gchar *fn_mb = gtk_file_selection_get_filename(sel); + gchar *fn_utf8 = g_filename_to_utf8(fn_mb, -1, NULL, NULL, NULL); + if (fn_utf8 == NULL) { + Scm_Error(\"got a filename including multibyte chars which can't be converted to UTF8: %s\", fn_mb); +@@ -549,7 +553,7 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));" + SCM_RETURN(SCM_MAKE_STR_COPYING(fn_utf8)); + #else + SCM_RETURN(Scm_MakeString(fn_utf8, -1, -1, SCM_MAKSTR_COPYING|SCM_MAKSTR_INCOMPLETE)); +-#endif") ++#endif")) + + (define-cproc gtk-file-selection-get-selections (sel::<gtk-file-selection>) + "gchar **fns_mb = gtk_file_selection_get_selections(sel); +@@ -609,10 +613,14 @@ SCM_RETURN(Scm_Values2(Scm_MakeInteger(n_properties), h));" + (input-file "gtklabel.h") + + ;; Memory is owned by the widget so we don't need to free them. +-(define-cproc gtk-label-get-text (label::<gtk-label>) +- "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_text(label)));") +-(define-cproc gtk-label-get-label (label::<gtk-label>) +- "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));") ++(define-cproc-fix gtk-label-get-text ++ (fix-arguments! '(label::<gtk-label>)) ++ (fix-body! ++ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_text(label)));")) ++(define-cproc-fix gtk-label-get-label ++ (fix-arguments! '(label::<gtk-label>)) ++ (fix-body! ++ "SCM_RETURN(SCM_MAKE_STR_COPYING(gtk_label_get_label(label)));")) + + (define-cproc-fix gtk-label-get-seleciton-bounds + (fix-arguments! '(label::<gtk-label>)) +@@ -1121,9 +1129,11 @@ return SCM_MAKE_STR_COPYING((char*)string);")) + + (input-file "gtkprogressbar.h") + +-(define-cproc gtk-progress-bar-get-text (pbar::<gtk-progress-bar>) +- "gchar *g = gtk_progress_bar_get_text(pbar); +- SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));") ++(define-cproc-fix gtk-progress-bar-get-text ++ (fix-arguments! '(pbar::<gtk-progress-bar>)) ++ (fix-body! ++ "gchar *g = gtk_progress_bar_get_text(pbar); ++ SCM_RETURN(SCM_MAKE_STR_COPYING_SAFELY(g));")) + + ;;================================================================== + ;; gtkradiobutton diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff new file mode 100644 index 000000000000..081c83df1fe5 --- /dev/null +++ b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff @@ -0,0 +1,11 @@ +--- a/lib/h2s/parse.scm ++++ b/lib/h2s/parse.scm +@@ -329,6 +329,8 @@ + (#/^\}\s*([\w_]+)/ (#f name) (make-enum name (reverse enums))) ; -----> + ;; empty line: + (#/^\s*$/ () (loop (read-line) enums)) ++ ;; preprocessor directive: ++ (#/^\s*#\s*\w+/ () (loop (read-line) enums)) + ;; + (test has-comment? (skip-comment line (cut loop <> enums) err-eof)) ; what if?: new_value, /* boring comment*/ + (#/\s+([\w_]+),?/ (#f enum) diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff new file mode 100644 index 000000000000..9e8bbcf6e72d --- /dev/null +++ b/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff @@ -0,0 +1,23 @@ +--- a/src/h2s-gtk.scm ++++ b/src/h2s-gtk.scm +@@ -50,6 +50,11 @@ + (define pango-directory + (find-header-dir #`"pango-,|pango-version|/pango/pango.h" + *header-search-paths*)) ++(define gdk-pixbuf-directory ++ (guard (e [(<error> e) ++ gtk-directory]) ++ (find-header-dir #`"gdk-pixbuf-,|gtk-version|/gdk-pixbuf/gdk-pixbuf.h" ++ *header-search-paths* ))) + + + (define (parse-gdk) +@@ -64,7 +69,7 @@ + (call-with-input-file "PANGOFILES" port->string-list))) + + (define (parse-gdk-pixbuf) +- (parse-headers #`",|gtk-directory|/gdk-pixbuf" ++ (parse-headers #`",|gdk-pixbuf-directory|/gdk-pixbuf" + (call-with-input-file "GDKPIXBUFFILES" port->string-list))) + + ;; defaults for the gauche-gtk package: diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild new file mode 100644 index 000000000000..52ae52d31bce --- /dev/null +++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild,v 1.1 2011/11/27 08:05:49 hattya Exp $ + +EAPI="4" + +inherit autotools eutils + +MY_P="${P/g/G}" +MY_PN="${PN/g/G}2" +PV_COMMIT="598828842a339a44c32ab8c16f5f9a77f3c1c799" + +DESCRIPTION="GTK2 binding for Gauche" +HOMEPAGE="http://practical-scheme.net/gauche/" +SRC_URI="https://github.com/shirok/${MY_PN}/tarball/${PV_COMMIT} -> ${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="examples glgd nls opengl" +RESTRICT="test" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" +RDEPEND="x11-libs/gtk+:2 + dev-scheme/gauche + opengl? ( + x11-libs/gtkglext + dev-scheme/gauche-gl + )" +S="${WORKDIR}/shirok-${MY_PN}-${PV_COMMIT:0:7}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-h2s-gdk-pixbuf.diff + epatch "${FILESDIR}"/${PN}-gtk-lib.hints.diff + epatch "${FILESDIR}"/${PN}-h2s-cpp.diff + eautoconf +} + +src_configure() { + local myconf + if use opengl; then + if use glgd; then + myconf="--enable-glgd" + if use nls; then + myconf="${myconf}-pango" + fi + else + myconf="--enable-gtkgl" + fi + fi + + econf ${myconf} +} + +src_compile() { + emake stubs + emake +} + +src_install() { + emake DESTDIR="${D}" install + dodoc ChangeLog README + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples + dodoc examples/*.scm + # install gtk-tutorial + docinto examples/gtk-tutorial + dodoc examples/gtk-tutorial/* + if use opengl; then + # install gtkglext + dodoc -r examples/gtkglext + if use glgd; then + # install glgd + dodoc -r examples/glgd + fi + fi + fi +} |