diff options
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/gauche-gtk/Manifest | 2 | ||||
| -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 | 28 |
5 files changed, 14 insertions, 121 deletions
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest index 8e7e1d5eab66..d79dc8a956a0 100644 --- a/dev-scheme/gauche-gtk/Manifest +++ b/dev-scheme/gauche-gtk/Manifest @@ -1 +1 @@ -DIST Gauche-gtk-0.6_pre1.tar.gz 203261 BLAKE2B c0b29dcafcff600faf4ad3236eb15ec86867cc6ea0ea218f1f4a57b2757cbcb16686815633de2787afff9ab36e4079f13f242c1a357f6e8e832faaddc66b3fe8 SHA512 150d9169f893ab4ca80956aab93523cf8d9a5e831f7ba4f577314fa6fac72910238cbb5f375fa6b265b3b6a013bba2674c37c8219c391dd212d52267e2360bb3 +DIST Gauche-gtk-0.6_pre1.tar.gz 205235 BLAKE2B 90f2c69c7521817fd81bee007618fe35c6a20678812139f2f99964cccb953e6ceaa301886a703702ac67184526d5cb3d24db786ef0869f54490acbcb6e3745f3 SHA512 5d47af94f3683c25787bb31b2b077ab5526f84e67db49b95a04d59ee57d1249a9b6666a9223305fe47597a2fa77a6e8d81507a05b1a83a4a76ac5f867738f228 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 deleted file mode 100644 index be54ee550ba7..000000000000 --- a/dev-scheme/gauche-gtk/files/gauche-gtk-gtk-lib.hints.diff +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 deleted file mode 100644 index 081c83df1fe5..000000000000 --- a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-cpp.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 9e8bbcf6e72d..000000000000 --- a/dev-scheme/gauche-gtk/files/gauche-gtk-h2s-gdk-pixbuf.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 index 8556de388b66..258e582076d3 100644 --- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild +++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="6" -inherit autotools eutils +inherit autotools vcs-snapshot MY_P="${P/g/G}" MY_PN="${PN/g/G}2" -PV_COMMIT="598828842a339a44c32ab8c16f5f9a77f3c1c799" +PV_COMMIT="6fca535f7bb950f81db066bd1afdca9d55e9b460" 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" +SRC_URI="https://github.com/shirok/${MY_PN}/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -27,29 +27,28 @@ RDEPEND="x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/gauche-gl )" -S="${WORKDIR}/shirok-${MY_PN}-${PV_COMMIT:0:7}" +S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}"/${PN}-h2s-gdk-pixbuf.diff - epatch "${FILESDIR}"/${PN}-gtk-lib.hints.diff - epatch "${FILESDIR}"/${PN}-h2s-cpp.diff + default eautoconf } src_configure() { - local myconf + local myconf=() if use opengl; then if use glgd; then - myconf="--enable-glgd" if use nls; then - myconf="${myconf}-pango" + myconf+=( --enable-glgd-pango ) + else + myconf+=( --enable-glgd ) fi else - myconf="--enable-gtkgl" + myconf+=( --enable-gtkgl ) fi fi - econf ${myconf} + econf "${myconf[@]}" } src_compile() { @@ -58,8 +57,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog README + default if use examples; then docompress -x /usr/share/doc/${PF}/examples |