From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 993AC13835B for ; Fri, 3 Jul 2020 11:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2885E084A; Fri, 3 Jul 2020 11:35:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87D61E084A for ; Fri, 3 Jul 2020 11:35:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D40234F0D7 for ; Fri, 3 Jul 2020 11:35:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 808EC2C8 for ; Fri, 3 Jul 2020 11:35:42 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1593776138.2e77a59b3e0f9f14ba1f20f96ea7fe171d60638a.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/sakura/Manifest x11-terms/sakura/files/sakura-3.1.3-flags.patch x11-terms/sakura/files/sakura-3.6.0-tab-crash.patch x11-terms/sakura/sakura-3.5.0.ebuild x11-terms/sakura/sakura-3.6.0-r1.ebuild X-VCS-Directories: x11-terms/sakura/files/ x11-terms/sakura/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 2e77a59b3e0f9f14ba1f20f96ea7fe171d60638a X-VCS-Branch: master Date: Fri, 3 Jul 2020 11:35:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5ec2158-58a9-4a4f-891d-b35f28799cc2 X-Archives-Hash: 2aa39b593ef6b622b826bb0735e9989a commit: 2e77a59b3e0f9f14ba1f20f96ea7fe171d60638a Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jul 3 11:35:25 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jul 3 11:35:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e77a59b x11-terms/sakura: Old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jeroen Roovers gentoo.org> x11-terms/sakura/Manifest | 2 - x11-terms/sakura/files/sakura-3.1.3-flags.patch | 15 ----- .../sakura/files/sakura-3.6.0-tab-crash.patch | 60 ------------------- x11-terms/sakura/sakura-3.5.0.ebuild | 66 --------------------- x11-terms/sakura/sakura-3.6.0-r1.ebuild | 67 ---------------------- 5 files changed, 210 deletions(-) diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest index 0daa2336936..ee3e5e613e9 100644 --- a/x11-terms/sakura/Manifest +++ b/x11-terms/sakura/Manifest @@ -1,4 +1,2 @@ -DIST sakura-3.5.0.tar.bz2 55432 BLAKE2B 9accd09eac359b64637ff5c318e50e32f5bfa27cf7fb5d4a99c91391e14f145020bd19077e20585b78149e5ac5f281abaf1098dbbaf111e54fd5ad5fbb2f4887 SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e -DIST sakura-3.6.0.tar.bz2 56044 BLAKE2B 746de744ad562c4202acf4cb6803917530bde6edb13799630124e64e3e423ee423770cdebd5f8f42b5c2bd56b8863c82eb2015c65b2f168933c87337026c1313 SHA512 4b9d2c15305a2b9a193031194afc0b50deeb32ae52f8b13967801cd57aa71424d7dedf0a9aedf7470aef8b58d8341c85ae37ef67b941b8b97912eb845c5df08f DIST sakura-3.7.0.tar.gz 64728 BLAKE2B 637d8c9a393fe2823943190ec3c1676d3dd900b574f58fc3f6d61709ac3b70081736f0804c0e7d8ec5a1409cc2651aa1c3bee04a04c5d3df4ac1432fa2a5c41b SHA512 1018ea952d491f68a05ee3b3d8ac70cbfb485687f76224f9a395ff6508e0e75ff58bfd12dcb534c86430da54803a3016619f441d8bd14e496df32f81e00ca72e DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df diff --git a/x11-terms/sakura/files/sakura-3.1.3-flags.patch b/x11-terms/sakura/files/sakura-3.1.3-flags.patch deleted file mode 100644 index 28b72dd694a..00000000000 --- a/x11-terms/sakura/files/sakura-3.1.3-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,12 +35,6 @@ - ADD_DEFINITIONS (-DDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/share\\\") - ADD_DEFINITIONS (-DBUILDTYPE=\\\"${CMAKE_BUILD_TYPE}\\\") - --IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") -- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") --ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug") -- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations") --ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") -- - INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) - LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS}) - LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} m) diff --git a/x11-terms/sakura/files/sakura-3.6.0-tab-crash.patch b/x11-terms/sakura/files/sakura-3.6.0-tab-crash.patch deleted file mode 100644 index 4d1a33e2751..00000000000 --- a/x11-terms/sakura/files/sakura-3.6.0-tab-crash.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/sakura.c -+++ b/src/sakura.c -@@ -339,6 +339,7 @@ - bool label_set_byuser; - GtkBorder padding; /* inner-property data */ - int colorset; -+ gulong exit_handler_id; - }; - - -@@ -984,31 +985,6 @@ - if (npages==1) { - sakura_config_done(); - } -- -- /* Workaround for libvte strange behaviour. There is not child-exited signal for -- the last terminal, so we need to kill it here. Check with libvte authors about -- child-exited/eof signals */ -- if (gtk_notebook_get_current_page(GTK_NOTEBOOK(sakura.notebook))==0) { -- -- term = sakura_get_page_term(sakura, 0); -- -- if (option_hold==TRUE) { -- SAY("hold option has been activated"); -- return; -- } -- -- //SAY("waiting for terminal pid (in eof) %d", term->pid); -- //waitpid(term->pid, &status, WNOHANG); -- /* TODO: check wait return */ -- /* Child should be automatically reaped because we don't use G_SPAWN_DO_NOT_REAP_CHILD flag */ -- g_spawn_close_pid(term->pid); -- -- sakura_del_tab(0); -- -- npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook)); -- if (npages==0) -- sakura_destroy(); -- } - } - - /* This handler is called when window title changes, and is used to change window and notebook pages titles */ -@@ -3167,7 +3143,7 @@ - g_signal_connect(G_OBJECT(term->vte), "bell", G_CALLBACK(sakura_beep), NULL); - g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL); - g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL); -- g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL); -+ term->exit_handler_id = g_signal_connect(G_OBJECT(term->vte), "child-exited", G_CALLBACK(sakura_child_exited), NULL); - g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL); - g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL); - g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu); -@@ -3366,6 +3342,7 @@ - } - - gtk_widget_hide(term->hbox); -+ g_signal_handler_disconnect (term->vte, term->exit_handler_id); - gtk_notebook_remove_page(GTK_NOTEBOOK(sakura.notebook), page); - - /* Find the next page, if it exists, and grab focus */ - diff --git a/x11-terms/sakura/sakura-3.5.0.ebuild b/x11-terms/sakura/sakura-3.5.0.ebuild deleted file mode 100644 index f6929701281..00000000000 --- a/x11-terms/sakura/sakura-3.5.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils flag-o-matic gnome2-utils xdg-utils - -DESCRIPTION="sakura is a terminal emulator based on GTK and VTE" -HOMEPAGE="http://www.pleyades.net/david/projects/sakura/" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.20:2 - x11-libs/gtk+:3[X] - x11-libs/libX11 - x11-libs/vte:2.91 -" -DEPEND=" - ${RDEPEND} - >=dev-lang/perl-5.10.1 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.3-flags.patch -) - -DOCS=( - AUTHORS -) - -src_prepare() { - sed -i "/FILES INSTALL/d" CMakeLists.txt || die - - strip-linguas -i po/ - local lingua - for lingua in po/*.po; do - lingua="${lingua/po\/}" - lingua="${lingua/.po}" - if ! has ${lingua} ${LINGUAS}; then - rm po/${lingua}.po || die - fi - done - - cmake-utils_src_prepare - # sakura.c:1740:3: warning: implicit declaration of function ‘readlink’ - # [-Wimplicit-function-declaration] - append-cppflags -D_DEFAULT_SOURCE - - # sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed - # in C99 or C11 mode - append-cflags -std=c99 -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/x11-terms/sakura/sakura-3.6.0-r1.ebuild b/x11-terms/sakura/sakura-3.6.0-r1.ebuild deleted file mode 100644 index 9f68fad9974..00000000000 --- a/x11-terms/sakura/sakura-3.6.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils flag-o-matic gnome2-utils xdg-utils - -DESCRIPTION="sakura is a terminal emulator based on GTK and VTE" -HOMEPAGE="http://www.pleyades.net/david/projects/sakura/" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.20:2 - x11-libs/gtk+:3[X] - x11-libs/libX11 - >x11-libs/vte-0.50:2.91 -" -DEPEND=" - ${RDEPEND} - >=dev-lang/perl-5.10.1 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.3-flags.patch - "${FILESDIR}"/${PN}-3.6.0-tab-crash.patch -) - -DOCS=( - AUTHORS -) - -src_prepare() { - sed -i "/FILES INSTALL/d" CMakeLists.txt || die - - strip-linguas -i po/ - local lingua - for lingua in po/*.po; do - lingua="${lingua/po\/}" - lingua="${lingua/.po}" - if ! has ${lingua} ${LINGUAS}; then - rm po/${lingua}.po || die - fi - done - - cmake-utils_src_prepare - # sakura.c:1740:3: warning: implicit declaration of function ‘readlink’ - # [-Wimplicit-function-declaration] - append-cppflags -D_DEFAULT_SOURCE - - # sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed - # in C99 or C11 mode - append-cflags -std=c99 -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -}