From e3b835989ec5f1aa370e8e791aa0d4be6bd2eb45 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Fri, 3 Jul 2020 19:36:47 +0200 Subject: Removing x11-terms/sakura as single tab patch went upstream --- README.md | 4 -- x11-terms/sakura/Manifest | 5 -- x11-terms/sakura/files/sakura-3.7.0-gentoo.patch | 23 -------- .../sakura/files/sakura-3.7.0-single-tab.patch | 13 ----- x11-terms/sakura/metadata.xml | 20 ------- x11-terms/sakura/sakura-3.7.0.ebuild | 63 ---------------------- 6 files changed, 128 deletions(-) delete mode 100644 x11-terms/sakura/Manifest delete mode 100644 x11-terms/sakura/files/sakura-3.7.0-gentoo.patch delete mode 100644 x11-terms/sakura/files/sakura-3.7.0-single-tab.patch delete mode 100644 x11-terms/sakura/metadata.xml delete mode 100644 x11-terms/sakura/sakura-3.7.0.ebuild diff --git a/README.md b/README.md index 07b6501..f44e3e7 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,6 @@ present in the official Sylpheed release - https://github.com/blackm0re/sylpheed * x11-misc/i3lock-extended - a fork of i3lock offering some additional features and niceties - https://github.com/blackm0re/i3lock-extended -* x11-terms/sakura - contains own patch that prevents tab events to be consumed -when no multiple tabs are spawned. This patch is expected to go upstream in the -next official release of *sakura*. - * x11-terms/terminator - contains own patch that prevents tab events to be consumed when no multiple tabs are spawned. diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest deleted file mode 100644 index 3113207..0000000 --- a/x11-terms/sakura/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532 -AUX sakura-3.7.0-single-tab.patch 722 BLAKE2B ffe3847fc8fe73e63e6ece0f9c4eedc5ec55034e8a777cf6bcff86e1a52c0ad55d186bddd1290c9a3486b19cafd07e3f8d189105b932ad9e91c7381772a92841 SHA512 26b77961df78aadbefb886b165dcc5996ed690023336cd8254df8042ff20bac85e88c96ccce10cf510300c93df690fbad360e0171c1814a062636a72dc6084b8 -DIST sakura-3.7.0.tar.gz 64728 BLAKE2B 637d8c9a393fe2823943190ec3c1676d3dd900b574f58fc3f6d61709ac3b70081736f0804c0e7d8ec5a1409cc2651aa1c3bee04a04c5d3df4ac1432fa2a5c41b SHA512 1018ea952d491f68a05ee3b3d8ac70cbfb485687f76224f9a395ff6508e0e75ff58bfd12dcb534c86430da54803a3016619f441d8bd14e496df32f81e00ca72e -EBUILD sakura-3.7.0.ebuild 1362 BLAKE2B 8960b814e31128fd8b40991adcd75d7064c574bd18490240a11f1abecd5260465ff9206eeb9c10102226a840272cd51b33a872aaaa6d1289bd5fbf49655ee5af SHA512 06fed686c54ff6cc772c920a5f53fa823b1999051558aea04c6fb9ddb2eacaeac757c5fe8c88b02be3831afaddf2f13331e8df356c7aab4316f1b099b676f8a7 -MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb diff --git a/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch b/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch deleted file mode 100644 index ab1d8be..0000000 --- a/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,12 +38,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} ${X11_LIBRARY_DIRS}) - LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} ${X11_LIBRARIES} m) -@@ -57,7 +51,6 @@ - IF (POD2MAN) - INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION share/man/man1) - ENDIF (POD2MAN) --INSTALL (FILES INSTALL DESTINATION share/doc/sakura) - - FILE (GLOB MO_FILES po/*.mo) - diff --git a/x11-terms/sakura/files/sakura-3.7.0-single-tab.patch b/x11-terms/sakura/files/sakura-3.7.0-single-tab.patch deleted file mode 100644 index ddd0cec..0000000 --- a/x11-terms/sakura/files/sakura-3.7.0-single-tab.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN sakura-3.7.0.old/src/sakura.c sakura-3.7.0/src/sakura.c ---- sakura-3.7.0.old/src/sakura.c 2019-08-12 23:13:08.000000000 +0200 -+++ sakura-3.7.0/src/sakura.c 2019-12-01 20:21:29.067142517 +0100 -@@ -511,6 +511,9 @@ sakura_key_press (GtkWidget *widget, Gdk - if ( ((event->state & sakura.switch_tab_accelerator) == sakura.switch_tab_accelerator) && - ((event->state & sakura.move_tab_accelerator) != sakura.move_tab_accelerator) ) { - -+ /* Just propagate the event if there is only one tab */ -+ if(npages < 2) return FALSE; -+ - if ((keycode>=sakura_tokeycode(GDK_KEY_1)) && (keycode<=sakura_tokeycode( GDK_KEY_9))) { - - /* User has explicitly disabled this branch, make sure to propagate the event */ diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml deleted file mode 100644 index 9825940..0000000 --- a/x11-terms/sakura/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project - - - sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator - with few dependencies, so you don't need a full GNOME desktop installed to - have a decent terminal emulator. Current terminal emulators based on VTE are - gnome-terminal, XFCE Terminal, TermIt and a small sample program included - in the vte sources. Sakura differences from the last one is that it uses a - notebook to provide several terminals in one window and adds a contextual - menu with some basic options. No more no less. - - - sakura - - diff --git a/x11-terms/sakura/sakura-3.7.0.ebuild b/x11-terms/sakura/sakura-3.7.0.ebuild deleted file mode 100644 index e53be0d..0000000 --- a/x11-terms/sakura/sakura-3.7.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake-utils eutils flag-o-matic 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.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86 ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.20:2 - >=x11-libs/gtk+-3.20: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.7.0-gentoo.patch - "${FILESDIR}"/${PN}-3.7.0-single-tab.patch -) -DOCS=( - AUTHORS -) - -src_prepare() { - 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() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} -- cgit v1.3