diff options
Diffstat (limited to 'x11-libs/guile-gtk')
| -rw-r--r-- | x11-libs/guile-gtk/Manifest | 10 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/files/2.1-brokentest.patch | 33 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/files/2.1-prll-install.patch | 13 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch | 60 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff | 45 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild | 46 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild | 48 | ||||
| -rw-r--r-- | x11-libs/guile-gtk/metadata.xml | 11 |
8 files changed, 266 insertions, 0 deletions
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest new file mode 100644 index 000000000000..1b8f2fb938cb --- /dev/null +++ b/x11-libs/guile-gtk/Manifest @@ -0,0 +1,10 @@ +AUX 2.1-brokentest.patch 1029 SHA256 6aa51463c7f0f966c8a7668877fc1199b6ed85187be21811ca3c84ca42c029c1 SHA512 e398ba38b19a2076a0974da3b8c2a038fe7b49e59cf187e20eb33df1bc74f6d34afcec5ffac5b288ed59b0f131a2a30254e248b6c63ff10cbf9107005ca56625 WHIRLPOOL 8cc58c4482cd44cbcaa83c4003f6eab286d6fb8a48e96510fba60cbbdf16afc4b52aca0ba330b73c10fd1be703b448f17457e2b6574ff80a4e4c83e070b0dd31 +AUX 2.1-prll-install.patch 421 SHA256 9f2aa837ee4cae17e703e4367179e64e69c0759f601ad3acd74431222e420b0d SHA512 ff30ed5edb3a9a2bfde6b480b2bbf2d8487cfe6583f73bbefb35e434b37e727037005e6e11e91aa115fcc75ed558883e36aa64d46f34d9ab40a94792eb201e10 WHIRLPOOL bb12b45f907f87c6d030a5562053d116191c9f8a50b37b85fb8b83d85a84a27891b9fc2db28de27c4ac296639051e8ea9b8cb5dd9f235d3c998cd1b983fd546b +AUX 2.1_migrate_gh_functions.patch 1872 SHA256 185c7e62e9082dcb130bb78d5d7e0b1e72836b93d5bda42559121dfa095045e6 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8 WHIRLPOOL 04953cdb2487216affabfec307b97ac281c192f0bef5d1f45ba245b6152dde96aecc5452bbb88816a124d7d1c1a3e4ab39d48f12e43450b99d55c98691c3a71c +AUX guile-gtk-2.0-g-object-ref.diff 1239 SHA256 fb68d90e21c8d7fb2b73c55a068b5528ae56c82336b200012f97b8abe56242fc SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513 WHIRLPOOL c44bca7a1f82d0c0331611f8aa6711d1e12efa84279e36ae4512e9829b7ce09f8efce9b49e8411fda148969ab0de3e622cfdcd107b21f39e3c6eb60700dc168c +DIST guile-gtk-2.1.tar.gz 781985 SHA256 9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7 WHIRLPOOL 6e14158951fa307fedc20f8956ecb1eefc7e1b2c3f5d0b3505060ceb709efd51a40e5931c4e05877b7ce35498ebe1fa06526859efc00b09e9c46bb7b8661a4c5 +EBUILD guile-gtk-2.1-r2.ebuild 941 SHA256 6165ce921c66e74fbe21363678077bcecc332b580a3a97e40132582a99581137 SHA512 2b5d98ae19552633d99090448fce793cabe09f7303c09f28b953dc21f8bd23ed369c1ce75acdb08263f2799adf9eb7265b241946faa0a5d5e4b6edd055f81014 WHIRLPOOL f0448ced4d2e8f282b3a26ef1286f55b82524978338287e6913702739e3c2a7b9a95ff12cf29d47b5bed9e063d4e50798cb1107c5425ed7e5b135cf030a7a37b +EBUILD guile-gtk-2.1-r3.ebuild 1008 SHA256 316349b43a40ff14e9aee8c6bbd965aed6d18fc8eb18916774c10a687e8e0d2d SHA512 8a697172fa7b3bbc321ce0b3dc541edbeef06d7d3e08b555c2feca9beef6997b072a2481885f0ea2c16e8cedd357f336042302e4870edee2fc00316459091dc5 WHIRLPOOL 63346ec91211b23d35460e8f4ed64d57e53ddbbaf71c9fdfee3131e603e83e2111bf2aff7de133310a8bf2db5aae1806a3d2c1fc54c84b5f860918c2d98a8f8c +MISC ChangeLog 3869 SHA256 2b3147bd1d0ae65dc3e0b5b8266276bce14773f0f1b148e0e171d276f001553c SHA512 54a204ed9953ea997c8fdea7f236f5fc169b856115a9babb6d5082ed4dbe133bf06276bb34c1f07466fbb55a8526f358e167339c40c44233289d960ed7eac15b WHIRLPOOL c1b766d2bc862d1bf15770de4fe23243fe7281e5c1df801c135837d699022574162f97aa2dc45735f50d02829e063441a522c9764a8a2f9c43fdf64be2b06617 +MISC ChangeLog-2015 6194 SHA256 bf4d111ba6115fed024af1c89e44ae70604dc8668b3b760a0080169e3a84be68 SHA512 72e70e221342910ac3c857e7c8c3235d9ef9a7dd0247aa20d5e255769e9466f3438911988bd0e109aed6553c38404973ca1f0c70dbff649c427b24fc1e323a7d WHIRLPOOL 06df81750001ed0aa414bea92ff009e95bf1335a23e03b8edf68ff45076a689ddd27923f7fb4b317ef44513d04aa32b30bc00c3a7901ce56c35d6a5386b66283 +MISC metadata.xml 384 SHA256 89b17a71f881aa6940f56ffa6541025aa8927ab2998a3d48ce734171ed1361e4 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77 WHIRLPOOL f7803ed8a217e73be0279d742c1598e95fef40cdca9af5d929abff517f9a8352b25470409bca57f1985ba282657ce46270c1b185ecad6b233b7b14fc2961210d diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch new file mode 100644 index 000000000000..ecba95174e0c --- /dev/null +++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch @@ -0,0 +1,33 @@ +diff --git a/tests/gdk.scm b/tests/gdk.scm +index 6e08f9f..6b01e83 100644 +--- a/tests/gdk.scm ++++ b/tests/gdk.scm +@@ -1102,28 +1102,6 @@ + (got (exact-positive-integer? (gdk-screen-height-mm)))) + (test "gdk-screen-height-mm" #f want got)))) + +-;; +-;; gdk-selection-property-get +-;; +- +-(malloced-steady ;; with nothing ever requested +- (lambda () +- (let* ((win sample-win) +- (want '(#f NONE 0)) +- (got (gdk-selection-property-get win))) +- (test "gdk-selection-property-get" sample-win want got)))) +- +-(malloced-steady ;; on a destroyed window +- (lambda () +- (let* ((win (gdk-window-new #f 100 100 '() 'input-output 'toplevel)) +- (want '(#f NONE 0)) +- (got (begin +- (gdk-window-destroy win) +- (gdk-selection-property-get win)))) +- ;; final free()s only take place under the main loop, so need this to +- ;; satisfy `malloced-steady +- (gtk-main-iteration-do #f) +- (test "gdk-selection-property-get" (list "destroyed win" win) want got)))) + + ;; + ;; gdk-text-extents diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch new file mode 100644 index 000000000000..b00fc29ca34a --- /dev/null +++ b/x11-libs/guile-gtk/files/2.1-prll-install.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 822a170..37f43b5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs + defsdir = $(datadir)/guile-gtk/ + defs_DATA = $(gtkdefs) $(gdkdefs) + +-install-exec-local: ++install-exec-hook: + rm -f $(DESTDIR)$(bindir)/build-guile-gtk + rm -f $(DESTDIR)$(bindir)/guile-gtk + ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk diff --git a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch new file mode 100644 index 000000000000..5a194874f155 --- /dev/null +++ b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch @@ -0,0 +1,60 @@ +diff -ur guile-gtk-2.1.orig/glade/glade-support.c guile-gtk-2.1/glade/glade-support.c +--- guile-gtk-2.1.orig/glade/glade-support.c 2016-08-12 12:00:45.894290499 -0600 ++++ guile-gtk-2.1/glade/glade-support.c 2016-08-12 12:02:33.186666585 -0600 +@@ -17,7 +17,6 @@ + + #include <glade/glade-xml.h> + #include <libguile.h> +-#include <guile/gh.h> + + #include "config.h" + #include "guile-gtk.h" +@@ -83,7 +82,7 @@ + sgtk_protshell *protshell; + GClosure *closure; + +- cb = scm_internal_cwdr ((scm_t_catch_body) gh_eval_str, (char*) handler_name, ++ cb = scm_internal_cwdr ((scm_t_catch_body) scm_c_eval_string, (char*) handler_name, + scm_handle_by_message_noexit, "glade", + &stack_item); + +diff -ur guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c guile-gtk-2.1/gtk-gl/gdk-gl-support.c +--- guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c 2016-08-12 12:00:45.894290499 -0600 ++++ guile-gtk-2.1/gtk-gl/gdk-gl-support.c 2016-08-12 12:02:19.530121760 -0600 +@@ -19,7 +19,6 @@ + #include <gtkgl/gdkgl.h> + + #include <libguile.h> +-#include <guile/gh.h> + + typedef struct { + char* name; +@@ -100,7 +99,7 @@ + if (! SCM_INUMP (s_value)) + goto error; + +- *aptr++ = gh_scm2int (s_value); ++ *aptr++ = scm_to_int (s_value); + } + } + } +diff -ur guile-gtk-2.1.orig/guile-gtk.c guile-gtk-2.1/guile-gtk.c +--- guile-gtk-2.1.orig/guile-gtk.c 2016-08-12 12:00:45.890957197 -0600 ++++ guile-gtk-2.1/guile-gtk.c 2016-08-12 12:01:59.346968496 -0600 +@@ -28,7 +28,6 @@ + #include <gdk/gdkx.h> + + #include <libguile.h> +-#include <guile/gh.h> + #include <libguile/dynl.h> + #include <libguile/tags.h> + +@@ -2196,7 +2195,7 @@ + #if 0 + /* Gone in Gtk 2 */ + case GTK_TYPE_CALLBACK: +- return gh_procedure_p (obj); ++ return scm_is_true (scm_procedure_p (obj)); + #endif + case G_TYPE_OBJECT: + return sgtk_is_a_gtkobj (type, obj); diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff new file mode 100644 index 000000000000..bd582117f621 --- /dev/null +++ b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff @@ -0,0 +1,45 @@ +--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs ++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs +@@ -22,14 +22,14 @@ + ;--- Types ... -------------------------------------------------------- + + (define-struct GdkGLContext +- (copy gdk_gl_context_ref) +- (free gdk_gl_context_unref) ++ (copy g_object_ref) ++ (free g_object_unref) + (size "0") + (canonical-name "Gdk" "GL" "Context")) + + (define-struct GdkGLPixmap +- (copy gdk_gl_pixmap_ref) +- (free gdk_gl_pixmap_unref) ++ (copy g_object_ref) ++ (free g_object_unref) + (size "0") + (canonical-name "Gdk" "GL" "Pixmap")) + +--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c ++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c +@@ -83,8 +83,8 @@ + + sgtk_boxed_info sgtk_gdk_gl_context_info = { + { "GdkGLContext", GTK_TYPE_BOXED, NULL }, +- (void *(*)(void*))gdk_gl_context_ref, +- (void (*)(void*))gdk_gl_context_unref, ++ (void *(*)(void*))g_object_ref, ++ (void (*)(void*))g_object_unref, + (void (*)(SCM)) NULL, + 0 + }; +@@ -100,8 +100,8 @@ + + sgtk_boxed_info sgtk_gdk_gl_pixmap_info = { + { "GdkGLPixmap", GTK_TYPE_BOXED, NULL }, +- (void *(*)(void*))gdk_gl_pixmap_ref, +- (void (*)(void*))gdk_gl_pixmap_unref, ++ (void *(*)(void*))g_object_ref, ++ (void (*)(void*))g_object_unref, + (void (*)(SCM)) NULL, + 0 + }; diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild new file mode 100644 index 000000000000..d22ebfa6bb27 --- /dev/null +++ b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils virtualx + +DESCRIPTION="GTK+ bindings for guile" +HOMEPAGE="https://www.gnu.org/software/guile-gtk/" +SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + dev-scheme/guile:12[deprecated(+)] + x11-libs/gtk+:2 + gnome-base/libglade:2.0 + >=x11-libs/gtkglarea-1.90:2" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0-g-object-ref.diff + "${FILESDIR}"/${PV}-prll-install.patch + "${FILESDIR}"/${PV}-brokentest.patch +) + +src_prepare() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + autotools-utils_src_prepare +} + +src_test() { + cd "${BUILD_DIR}" || die + Xemake check +} + +src_install() { + autotools-utils_src_install + insinto /usr/share/doc/${PF}/ + doins -r examples +} diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild new file mode 100644 index 000000000000..8e7ec2669b51 --- /dev/null +++ b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +WANT_AUTOMAKE=1.9 + +inherit autotools-utils virtualx + +DESCRIPTION="GTK+ bindings for guile" +HOMEPAGE="https://www.gnu.org/software/guile-gtk/" +SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=dev-scheme/guile-2[deprecated(+)] + x11-libs/gtk+:2 + gnome-base/libglade:2.0 + >=x11-libs/gtkglarea-1.90:2" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0-g-object-ref.diff + "${FILESDIR}"/${PV}-prll-install.patch + "${FILESDIR}"/${PV}-brokentest.patch + "${FILESDIR}"/${PV}_migrate_gh_functions.patch +) + +src_prepare() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + autotools-utils_src_prepare +} + +src_test() { + cd "${BUILD_DIR}" || die + Xemake check +} + +src_install() { + autotools-utils_src_install + insinto /usr/share/doc/${PF}/ + doins -r examples +} diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml new file mode 100644 index 000000000000..fe1bacfb1309 --- /dev/null +++ b/x11-libs/guile-gtk/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>scheme@gentoo.org</email> + <name>Gentoo Scheme Project</name> + </maintainer> + <longdescription lang="en"> +The guile-gtk project brings the power of Scheme to your graphical application. + </longdescription> +</pkgmetadata> |