[gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/
commit: 8454b7008f428f5ffc540d11639e76b6c9372651 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jan 21 18:58:44 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jan 22 00:32:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8454b700 x11-terms/sakura: drop 3.8.3 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/sakura/Manifest | 1 - x11-terms/sakura/files/sakura-3.8.3-opacity.patch | 14 --- x11-terms/sakura/sakura-3.8.3.ebuild | 45 --- 3 files changed, 60 deletions(-) diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest index 7e6ee2bc09f4..6263e2f6df9c 100644 --- a/x11-terms/sakura/Manifest +++ b/x11-terms/sakura/Manifest @@ -1,2 +1 @@ -DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e DIST sakura-3.8.4.tar.bz2 70492 BLAKE2B 4f53a86813de49d1f76c0a209a825b19601a22b4078744a0e4dfe21afd000e524a3705e8125b275b3615b35e5e7f38934270baa73d190e06dabf4284d4dab536 SHA512 9450f523555a40c66375304cb41346861b15233a70e488d1220fbdacd46b8e93cb679bbd1c235cc8d08f08551743b4780130d282d94d258247436a84ed61 diff --git a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch deleted file mode 100644 index 4bb4ba88f189.. --- a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix regression with opacity not being applied on startup. -https://bugs.launchpad.net/sakura/+bug/1942665 -https://github.com/dabisu/sakura/pull/5 a/src/sakura.c -+++ b/src/sakura.c -@@ -2180,4 +2180,8 @@ - gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK); - -+ screen = gtk_widget_get_screen (GTK_WIDGET (sakura.main_window)); -+ GdkVisual *visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL && gdk_screen_is_composited (screen)) -+ gtk_widget_set_visual (GTK_WIDGET (sakura.main_window), visual); - - /*** Command line options initialization ***/ diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild deleted file mode 100644 index 717bbf73513c.. --- a/x11-terms/sakura/sakura-3.8.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="GTK/VTE based terminal emulator" -HOMEPAGE="https://www.pleyades.net/david/projects/sakura; -SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:3[X] - x11-libs/pango - x11-libs/vte:2.91" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-libs/libX11" -BDEPEND=" - sys-devel/gettext - virtual/perl-podlators" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-opacity.patch -) - -src_prepare() { - cmake_src_prepare - - if [[ -v LINGUAS ]]; then - local lingua - for lingua in po/*.po; do - lingua=${lingua#*/} - lingua=${lingua%.*} - has ${lingua} ${LINGUAS} || rm po/${lingua}.po || die - done - fi -}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/
commit: 4a83d5e115d0631f70e33e3493d2b147854807b9 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Sep 19 03:04:02 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Sep 19 03:39:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a83d5e1 x11-terms/sakura: add 3.8.3 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/sakura/Manifest | 1 + x11-terms/sakura/files/sakura-3.8.3-gentoo.patch | 15 x11-terms/sakura/files/sakura-3.8.3-opacity.patch | 14 +++ x11-terms/sakura/sakura-3.8.3.ebuild | 45 +++ 4 files changed, 75 insertions(+) diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest index 6c355d7a1cb..15f4a80713e 100644 --- a/x11-terms/sakura/Manifest +++ b/x11-terms/sakura/Manifest @@ -1 +1,2 @@ DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df +DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e diff --git a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch b/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch new file mode 100644 index 000..c9f2c5a85f4 --- /dev/null +++ b/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -40,8 +40,2 @@ + +-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}) +@@ -59,3 +53,2 @@ + ENDIF (POD2MAN) +-INSTALL (FILES README.md DESTINATION share/doc/sakura) + diff --git a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch new file mode 100644 index 000..4bb4ba88f18 --- /dev/null +++ b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch @@ -0,0 +1,14 @@ +Fix regression with opacity not being applied on startup. +https://bugs.launchpad.net/sakura/+bug/1942665 +https://github.com/dabisu/sakura/pull/5 +--- a/src/sakura.c b/src/sakura.c +@@ -2180,4 +2180,8 @@ + gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK); + ++ screen = gtk_widget_get_screen (GTK_WIDGET (sakura.main_window)); ++ GdkVisual *visual = gdk_screen_get_rgba_visual (screen); ++ if (visual != NULL && gdk_screen_is_composited (screen)) ++ gtk_widget_set_visual (GTK_WIDGET (sakura.main_window), visual); + + /*** Command line options initialization ***/ diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild new file mode 100644 index 000..bb84f11c518 --- /dev/null +++ b/x11-terms/sakura/sakura-3.8.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="GTK/VTE based terminal emulator" +HOMEPAGE="https://www.pleyades.net/david/projects/sakura; +SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3[X] + x11-libs/pango + x11-libs/vte:2.91" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + x11-libs/libX11" +BDEPEND=" + sys-devel/gettext + virtual/perl-podlators" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-opacity.patch +) + +src_prepare() { + cmake_src_prepare + + if [[ -v LINGUAS ]]; then + local lingua + for lingua in po/*.po; do + lingua=${lingua#*/} + lingua=${lingua%.*} + has ${lingua} ${LINGUAS} || rm po/${lingua}.po || die + done + fi +}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/
commit: 2e77a59b3e0f9f14ba1f20f96ea7fe171d60638a Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jul 3 11:35:25 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jul 3 11:35:38 2020 + 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..000 --- 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..000 --- 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, , 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); -
[gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/
commit: 34dc5a0de3247ac88d24af95a4301d3d8ef9562d Author: Jeroen Roovers gentoo org> AuthorDate: Sat Nov 30 12:21:05 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Nov 30 12:23:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34dc5a0d x11-terms/sakura: Version 3.7.0 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Fixes: https://bugs.gentoo.org/701518 Signed-off-by: Jeroen Roovers gentoo.org> x11-terms/sakura/Manifest| 1 + x11-terms/sakura/files/sakura-3.7.0-gentoo.patch | 23 + x11-terms/sakura/sakura-3.7.0.ebuild | 62 3 files changed, 86 insertions(+) diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest index e6c31dce20d..f2946fd9813 100644 --- a/x11-terms/sakura/Manifest +++ b/x11-terms/sakura/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch b/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch new file mode 100644 index 000..ab1d8bebc93 --- /dev/null +++ b/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch @@ -0,0 +1,23 @@ +--- 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/sakura-3.7.0.ebuild b/x11-terms/sakura/sakura-3.7.0.ebuild new file mode 100644 index 000..80e1ce96127 --- /dev/null +++ b/x11-terms/sakura/sakura-3.7.0.ebuild @@ -0,0 +1,62 @@ +# 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 +) +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 +}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/sakura/, x11-terms/sakura/files/
commit: 7f0a3eaea4bad1f148cdf1c031a083e3e4e7abf9 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Nov 4 12:16:25 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Nov 4 12:16:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0a3eae x11-terms/sakura: Fix tab closing segmentation fault Fixes: https://bugs.gentoo.org/670216 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Jeroen Roovers gentoo.org> .../sakura/files/sakura-3.6.0-tab-crash.patch | 60 +++ x11-terms/sakura/sakura-3.6.0-r1.ebuild| 67 ++ 2 files changed, 127 insertions(+) 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 new file mode 100644 index 000..4d1a33e2751 --- /dev/null +++ b/x11-terms/sakura/files/sakura-3.6.0-tab-crash.patch @@ -0,0 +1,60 @@ +--- 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, , 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.6.0-r1.ebuild b/x11-terms/sakura/sakura-3.6.0-r1.ebuild new file mode 100644 index 000..9f68fad9974 --- /dev/null +++ b/x11-terms/sakura/sakura-3.6.0-r1.ebuild @@ -0,0 +1,67 @@ +# 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 + +