From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- x11-libs/guile-gtk/Manifest | 8 --- 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, 264 deletions(-) delete mode 100644 x11-libs/guile-gtk/Manifest delete mode 100644 x11-libs/guile-gtk/files/2.1-brokentest.patch delete mode 100644 x11-libs/guile-gtk/files/2.1-prll-install.patch delete mode 100644 x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch delete mode 100644 x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff delete mode 100644 x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild delete mode 100644 x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild delete mode 100644 x11-libs/guile-gtk/metadata.xml (limited to 'x11-libs/guile-gtk') diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest deleted file mode 100644 index a89de6defcd4..000000000000 --- a/x11-libs/guile-gtk/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 2.1-brokentest.patch 1029 BLAKE2B 96336de7d1efcfcff9ba7ac04c00e2972b5aac0051e586c381a24ef45efe62814cf75a34b4634f7812a96342781d6bbc088b889874757977586fc4cf806729a4 SHA512 e398ba38b19a2076a0974da3b8c2a038fe7b49e59cf187e20eb33df1bc74f6d34afcec5ffac5b288ed59b0f131a2a30254e248b6c63ff10cbf9107005ca56625 -AUX 2.1-prll-install.patch 421 BLAKE2B 137bb381668c7540d56f15c8246d79a08c4931b2eaed7828f4b1e0bbecc0e88ad752e639331784cc2b24fcfabea050d374e92d13887587865aeb5029debbd02a SHA512 ff30ed5edb3a9a2bfde6b480b2bbf2d8487cfe6583f73bbefb35e434b37e727037005e6e11e91aa115fcc75ed558883e36aa64d46f34d9ab40a94792eb201e10 -AUX 2.1_migrate_gh_functions.patch 1872 BLAKE2B a82d98508469b3233215f672f15018a32752ca2505bbf414a01382553ea45fcb8b075cec0647198021d165bdc01e4364f7f8f919049a94a15b2861216d2a78e3 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8 -AUX guile-gtk-2.0-g-object-ref.diff 1239 BLAKE2B 8ee7fc847befc089e7e9171c17b5a950b5e930241dccff2bd497909206c54c31f1384b204ed7c3ad4fbda8c0961dba494945609ed1ad7c0f78ee2bb9bee46b29 SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513 -DIST guile-gtk-2.1.tar.gz 781985 BLAKE2B b3387ef9ac79935fa9cf2b7d35f4012dc0748ecbade131b2c73d8d4513d90f84164ec3f196fafda8ba77abfd2a0b8dadf9dbc0118281fc06db0a36d2f533592a SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7 -EBUILD guile-gtk-2.1-r2.ebuild 936 BLAKE2B bf3f7b37cdfac6b5430157311049f38dae49bf290b6401352be2a429437151f9dd1cc12c4b6d0a5c142e29abbbc9c0db16d254966b5bbb78eb851cb528ea47b2 SHA512 b570fe2dc0060f3a03d5c710ad3fc742636f598f9332f711f94291268dc02dbcad090e91b4e3207487a9dd4ddabbce3bd8b1cfeea6729100db4b757f7f119280 -EBUILD guile-gtk-2.1-r3.ebuild 1003 BLAKE2B d0e02f0f57cf6af74526c993c600819398aa2c9738ffcfbed4e43bedd1f36b8051037ad00ad7a89c9dd444c1752f4a4f20bb022d33925d0ee8dff72ded9f4211 SHA512 63203feb3293e955d417cdc6f33e6ff577cfe21ae09cec11cbecd6c5149613de2b451e96ab63d21954ae00f65e0a77776dfe8af4bd77c7ecf571a76dffcfbf8a -MISC metadata.xml 384 BLAKE2B 0825ebf9da828bd733111afeafa845331623c6f61a7a8c396ea594d0cfef2a0fa5a3786e4e4de3709df5e493aae56263548206ebd82296e15fb807e403595022 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77 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 ecba95174e0c..000000000000 --- 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 b00fc29ca34a..000000000000 --- 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 5a194874f155..000000000000 --- 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 - #include --#include - - #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 - - #include --#include - - 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 - - #include --#include - #include - #include - -@@ -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 bd582117f621..000000000000 --- 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 0b766606e53e..000000000000 --- 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 66fb90b3a5a2..000000000000 --- 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 fe1bacfb1309..000000000000 --- a/x11-libs/guile-gtk/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - scheme@gentoo.org - Gentoo Scheme Project - - -The guile-gtk project brings the power of Scheme to your graphical application. - - -- cgit v1.2.3