* [gentoo-commits] repo/gentoo:master commit in: x11-libs/guile-gtk/, x11-libs/guile-gtk/files/
@ 2019-09-01 19:07 Matt Turner
0 siblings, 0 replies; only message in thread
From: Matt Turner @ 2019-09-01 19:07 UTC (permalink / raw
To: gentoo-commits
commit: f19459be6bf57a4dae7e3148037f104fc9eca7ed
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 19:01:05 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 19:06:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19459be
x11-libs/guile-gtk: Remove
Closes: https://bugs.gentoo.org/641864
Closes: https://bugs.gentoo.org/647536
Closes: https://bugs.gentoo.org/688244
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/guile-gtk/Manifest | 1 -
x11-libs/guile-gtk/files/2.1-brokentest.patch | 33 ------------
x11-libs/guile-gtk/files/2.1-prll-install.patch | 13 -----
.../guile-gtk/files/2.1_migrate_gh_functions.patch | 60 ----------------------
.../files/guile-gtk-2.0-g-object-ref.diff | 45 ----------------
x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild | 46 -----------------
x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild | 48 -----------------
x11-libs/guile-gtk/metadata.xml | 11 ----
8 files changed, 257 deletions(-)
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
deleted file mode 100644
index 744250d0579..00000000000
--- a/x11-libs/guile-gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST guile-gtk-2.1.tar.gz 781985 BLAKE2B b3387ef9ac79935fa9cf2b7d35f4012dc0748ecbade131b2c73d8d4513d90f84164ec3f196fafda8ba77abfd2a0b8dadf9dbc0118281fc06db0a36d2f533592a SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
deleted file mode 100644
index ecba95174e0..00000000000
--- a/x11-libs/guile-gtk/files/2.1-brokentest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index b00fc29ca34..00000000000
--- a/x11-libs/guile-gtk/files/2.1-prll-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 5a194874f15..00000000000
--- a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index bd582117f62..00000000000
--- a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
deleted file mode 100644
index 0b766606e53..00000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 ~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
deleted file mode 100644
index 66fb90b3a5a..00000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 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 ~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
deleted file mode 100644
index fe1bacfb130..00000000000
--- a/x11-libs/guile-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-01 19:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-01 19:07 [gentoo-commits] repo/gentoo:master commit in: x11-libs/guile-gtk/, x11-libs/guile-gtk/files/ Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox