public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
@ 2013-12-03 20:48 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2013-12-03 20:48 UTC (permalink / raw
  To: gentoo-commits

commit:     8bd3d0b9dc9ec8b84cd8b38e229e4dd8a93b0e53
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 20:49:51 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 20:49:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8bd3d0b9

x11-terms/gnome-terminal: add missing include <sys/wait.h>

Package-Manager: portage-2.2.7
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

---
 .../files/gnome-terminal-3.8.4-sys-wait.h          | 11 ++++
 .../gnome-terminal/gnome-terminal-3.8.4-r99.ebuild | 76 ++++++++++++++++++++++
 x11-terms/gnome-terminal/metadata.xml              |  8 +++
 3 files changed, 95 insertions(+)

diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h b/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h
new file mode 100644
index 0000000..bbbb505
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h
@@ -0,0 +1,11 @@
+diff -Naur gnome-terminal-3.8.4.orig/src/terminal-app.c gnome-terminal-3.8.4/src/terminal-app.c
+--- gnome-terminal-3.8.4.orig/src/terminal-app.c	2013-07-07 06:54:02.000000000 -0400
++++ gnome-terminal-3.8.4/src/terminal-app.c	2013-12-03 15:45:27.726685357 -0500
+@@ -45,6 +45,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <sys/wait.h>
+ 
+ #define DESKTOP_INTERFACE_SETTINGS_SCHEMA       "org.gnome.desktop.interface"
+ 

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild
new file mode 100644
index 0000000..4d64e3b
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.8.4.ebuild,v 1.2 2013/11/30 20:04:00 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://help.gnome.org/users/gnome-terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+nautilus"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+	>=dev-libs/glib-2.33.2:2
+	>=x11-libs/gtk+-3.6:3[X]
+	>=x11-libs/vte-0.34.6:2.90
+	>=gnome-base/gconf-2.31.3
+	>=gnome-base/dconf-0.12
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	x11-libs/libSM
+	x11-libs/libICE
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
+# gtk+:2 needed for gtk-builder-convert, bug 356239
+DEPEND="${RDEPEND}
+	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+	app-text/yelp-tools
+	>=dev-util/intltool-0.40
+	>=gnome-base/dconf-0.14.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened
+	tab you will need to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte.sh"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sys-wait.h
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
+	# FIXME: leave smclient configure unset until it accepts values from the
+	# switch and not from GDK_TARGET, bug #363033
+	gnome2_src_configure \
+		--disable-static \
+		--enable-migration \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
+		  ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
+		elog
+		elog "Gnome Terminal no longer uses login shell by default, switching"
+		elog "to upstream default. Because of this, if you have some command you"
+		elog "want to be run, be sure to have it placed in your ~/.bashrc file."
+		elog
+	fi
+	readme.gentoo_print_elog
+}

diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
new file mode 100644
index 0000000..6b23610
--- /dev/null
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+<flag name="nautilus">Build gnome-base/nautilus extension</flag>
+</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/
@ 2014-10-21 13:49 Anthony G. Basile
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2014-10-21 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     eb7ab2b723321a6f850d7e2e16d7c227de7da441
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 13:50:11 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 13:50:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=eb7ab2b7

x11-terms/gnome-terminal: we switch to xfce4-terminal

---
 .../files/gnome-terminal-3.8.4-sys-wait.h          | 11 ----
 .../gnome-terminal/gnome-terminal-3.8.4-r99.ebuild | 76 ----------------------
 x11-terms/gnome-terminal/metadata.xml              |  8 ---
 3 files changed, 95 deletions(-)

diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h b/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h
deleted file mode 100644
index bbbb505..0000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-3.8.4-sys-wait.h
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur gnome-terminal-3.8.4.orig/src/terminal-app.c gnome-terminal-3.8.4/src/terminal-app.c
---- gnome-terminal-3.8.4.orig/src/terminal-app.c	2013-07-07 06:54:02.000000000 -0400
-+++ gnome-terminal-3.8.4/src/terminal-app.c	2013-12-03 15:45:27.726685357 -0500
-@@ -45,6 +45,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <time.h>
-+#include <sys/wait.h>
- 
- #define DESKTOP_INTERFACE_SETTINGS_SCHEMA       "org.gnome.desktop.interface"
- 

diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild
deleted file mode 100644
index 4d64e3b..0000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.8.4-r99.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.8.4.ebuild,v 1.2 2013/11/30 20:04:00 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://help.gnome.org/users/gnome-terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+nautilus"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND="
-	>=dev-libs/glib-2.33.2:2
-	>=x11-libs/gtk+-3.6:3[X]
-	>=x11-libs/vte-0.34.6:2.90
-	>=gnome-base/gconf-2.31.3
-	>=gnome-base/dconf-0.12
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	x11-libs/libSM
-	x11-libs/libICE
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	>=gnome-base/dconf-0.14.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened
-	tab you will need to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte.sh"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sys-wait.h
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	# FIXME: leave smclient configure unset until it accepts values from the
-	# switch and not from GDK_TARGET, bug #363033
-	gnome2_src_configure \
-		--disable-static \
-		--enable-migration \
-		$(use_with nautilus nautilus-extension)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
-		  ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
-		elog
-		elog "Gnome Terminal no longer uses login shell by default, switching"
-		elog "to upstream default. Because of this, if you have some command you"
-		elog "want to be run, be sure to have it placed in your ~/.bashrc file."
-		elog
-	fi
-	readme.gentoo_print_elog
-}

diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
deleted file mode 100644
index 6b23610..0000000
--- a/x11-terms/gnome-terminal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnome</herd>
-<use>
-<flag name="nautilus">Build gnome-base/nautilus extension</flag>
-</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-10-21 13:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-21 13:49 [gentoo-commits] proj/hardened-dev:uclibc commit in: x11-terms/gnome-terminal/files/, x11-terms/gnome-terminal/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2013-12-03 20:48 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox