root
10 years ago
parent
30097939ab
commit
b25a6c1afe
@ -1,38 +0,0 @@
|
||||
From 049a3bfdfc59590a24dfeefa707abb64b74ae17b Mon Sep 17 00:00:00 2001
|
||||
From: Amadeusz Sławiński <amade@asmblr.net>
|
||||
Date: Fri, 18 Apr 2014 18:28:39 +0000
|
||||
Subject: do proper checks if we are on altscreen or not
|
||||
|
||||
fixes screen segfaults with `altscreen on` when using applications making
|
||||
use of altscreen like mc when resizing screen window
|
||||
|
||||
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
|
||||
---
|
||||
diff --git a/src/ansi.c b/src/ansi.c
|
||||
index 04c9012..e76eef4 100644
|
||||
--- a/src/ansi.c
|
||||
+++ b/src/ansi.c
|
||||
@@ -1436,14 +1436,17 @@ int c, intermediate;
|
||||
{
|
||||
if (i)
|
||||
{
|
||||
- if (!curr->w_alt.on)
|
||||
+ if (!curr->w_alt.on) {
|
||||
SaveCursor(&curr->w_alt.cursor);
|
||||
- EnterAltScreen(curr);
|
||||
+ EnterAltScreen(curr);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
- LeaveAltScreen(curr);
|
||||
- RestoreCursor(&curr->w_alt.cursor);
|
||||
+ if (curr->w_alt.on) {
|
||||
+ LeaveAltScreen(curr);
|
||||
+ RestoreCursor(&curr->w_alt.cursor);
|
||||
+ }
|
||||
}
|
||||
if (a1 == 47 && !i)
|
||||
curr->w_saved.on = 0;
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -1,23 +0,0 @@
|
||||
From 14f23ca838b3d6daafbc23d14fa6aec13c382601 Mon Sep 17 00:00:00 2001
|
||||
From: Jürgen Weigert <jnweiger@gmail.com>
|
||||
Date: Fri, 18 Apr 2014 13:45:21 +0000
|
||||
Subject: incompatible protocol
|
||||
|
||||
---
|
||||
diff --git a/src/screen.h b/src/screen.h
|
||||
index 5c93f32..e74d711 100644
|
||||
--- a/src/screen.h
|
||||
+++ b/src/screen.h
|
||||
@@ -182,8 +182,9 @@ struct mode
|
||||
* A few revisions after 8147d08 incorrectly
|
||||
* carried version 1, but should have carried 2.
|
||||
* 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY)
|
||||
+ * 3: screen version 4.2.0 (was incorrectly originally. Patched here)
|
||||
*/
|
||||
-#define MSG_VERSION 2
|
||||
+#define MSG_VERSION 3
|
||||
|
||||
#define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION)
|
||||
struct msg
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -1,69 +0,0 @@
|
||||
From 44020241d033555e8e90fad3c88617dce1aed0bb Mon Sep 17 00:00:00 2001
|
||||
From: Amadeusz Sławiński <amade@asmblr.net>
|
||||
Date: Fri, 18 Apr 2014 14:01:21 +0000
|
||||
Subject: fix screen to run on terminals with long $TERM
|
||||
|
||||
According to tic man page:
|
||||
Terminal names exceeding the maximum alias length
|
||||
(32 characters on systems with long filenames, 14 characters otherwise)
|
||||
will be truncated to the maximum alias length and a warning message
|
||||
will be printed.
|
||||
|
||||
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
|
||||
---
|
||||
diff --git a/src/display.h b/src/display.h
|
||||
index e8b3b80..a433e6d 100644
|
||||
--- a/src/display.h
|
||||
+++ b/src/display.h
|
||||
@@ -73,7 +73,7 @@ struct display
|
||||
struct win *d_other; /* pointer to other window */
|
||||
int d_nonblock; /* -1 don't block if obufmax reached */
|
||||
/* >0: block after nonblock secs */
|
||||
- char d_termname[20 + 1]; /* $TERM */
|
||||
+ char d_termname[MAXTERMLEN + 1]; /* $TERM */
|
||||
char *d_tentry; /* buffer for tgetstr */
|
||||
char d_tcinited; /* termcap inited flag */
|
||||
int d_width, d_height; /* width/height of the screen */
|
||||
diff --git a/src/os.h b/src/os.h
|
||||
index 5c17c83..f1d849c 100644
|
||||
--- a/src/os.h
|
||||
+++ b/src/os.h
|
||||
@@ -45,6 +45,14 @@
|
||||
#define NAME_MAX 14
|
||||
#endif
|
||||
|
||||
+#if !defined(MAXTERMLEN)
|
||||
+# if !defined(HAVE_LONG_FILE_NAMES)
|
||||
+# define MAXTERMLEN 14
|
||||
+# else
|
||||
+# define MAXTERMLEN 32
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
#ifdef ISC
|
||||
# ifdef ENAMETOOLONG
|
||||
# undef ENAMETOOLONG
|
||||
diff --git a/src/screen.h b/src/screen.h
|
||||
index e74d711..01d678a 100644
|
||||
--- a/src/screen.h
|
||||
+++ b/src/screen.h
|
||||
@@ -203,7 +203,7 @@ struct msg
|
||||
int nargs;
|
||||
char line[MAXPATHLEN];
|
||||
char dir[MAXPATHLEN];
|
||||
- char screenterm[20]; /* is screen really "screen" ? */
|
||||
+ char screenterm[MAXTERMLEN]; /* is screen really "screen" ? */
|
||||
}
|
||||
create;
|
||||
struct
|
||||
@@ -215,7 +215,7 @@ struct msg
|
||||
char preselect[20];
|
||||
int esc; /* his new escape character unless -1 */
|
||||
int meta_esc; /* his new meta esc character unless -1 */
|
||||
- char envterm[20 + 1]; /* terminal type */
|
||||
+ char envterm[MAXTERMLEN + 1]; /* terminal type */
|
||||
int encoding; /* encoding of display */
|
||||
int detachfirst; /* whether to detach remote sessions first */
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -1,43 +0,0 @@
|
||||
From 5b2ba5b3d48cb62894841f85a8c18db691491c8a Mon Sep 17 00:00:00 2001
|
||||
From: Amadeusz Sławiński <amade@asmblr.net>
|
||||
Date: Fri, 18 Apr 2014 16:44:52 +0000
|
||||
Subject: Fix bug when building without nethack commands
|
||||
|
||||
When building with -DNONETHACK all commands were off by 1 because of
|
||||
missing nethack command in table.
|
||||
|
||||
Provide dummy command with info message.
|
||||
|
||||
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
|
||||
---
|
||||
diff --git a/src/comm.c b/src/comm.c
|
||||
index 5f4af8a..daad0a6 100644
|
||||
--- a/src/comm.c
|
||||
+++ b/src/comm.c
|
||||
@@ -241,9 +241,7 @@ struct comm comms[RC_LAST + 1] =
|
||||
#ifdef MULTIUSER
|
||||
{ "multiuser", ARGS_1 },
|
||||
#endif
|
||||
-#ifdef NETHACK
|
||||
{ "nethack", ARGS_1 },
|
||||
-#endif
|
||||
{ "next", ARGS_0 },
|
||||
#ifdef MULTI
|
||||
{ "nonblock", NEED_DISPLAY|ARGS_01 },
|
||||
diff --git a/src/process.c b/src/process.c
|
||||
index 30497a3..d9dfc17 100644
|
||||
--- a/src/process.c
|
||||
+++ b/src/process.c
|
||||
@@ -3185,6 +3185,10 @@ int key;
|
||||
case RC_NETHACK:
|
||||
(void)ParseOnOff(act, &nethackflag);
|
||||
break;
|
||||
+#else
|
||||
+ case RC_NETHACK:
|
||||
+ Msg(0, "nethack disabled at build time");
|
||||
+ break;
|
||||
#endif
|
||||
case RC_HARDCOPY_APPEND:
|
||||
(void)ParseOnOff(act, &hardcopy_append);
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -1,31 +0,0 @@
|
||||
From 937fcec34ba0d7ebfe0fb654c4106cc9c496f106 Mon Sep 17 00:00:00 2001
|
||||
From: Amadeusz Sławiński <amade@asmblr.net>
|
||||
Date: Fri, 18 Apr 2014 14:05:56 +0000
|
||||
Subject: test more libraries for tgetent
|
||||
|
||||
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
|
||||
---
|
||||
diff --git a/src/configure.in b/src/configure.in
|
||||
index e9ca223..139bba1 100644
|
||||
--- a/src/configure.in
|
||||
+++ b/src/configure.in
|
||||
@@ -674,10 +674,16 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||
LIBS="-lncursesw $olibs"
|
||||
AC_CHECKING(libncursesw)
|
||||
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||
+LIBS="-ltinfow $olibs"
|
||||
+AC_CHECKING(libtinfow)
|
||||
+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||
LIBS="-lncurses $olibs"
|
||||
AC_CHECKING(libncurses)
|
||||
AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||
-AC_MSG_ERROR(!!! no tgetent - no screen)))))))
|
||||
+LIBS="-ltinfo $olibs"
|
||||
+AC_CHECKING(libtinfo)
|
||||
+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
|
||||
+AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
|
||||
|
||||
AC_TRY_RUN([
|
||||
main()
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -0,0 +1,22 @@
|
||||
--- sbcl-1.1.17-orig/src/runtime/Config.x86-linux 2014-03-31 03:14:22.000000000 +1100
|
||||
+++ sbcl-1.1.17/src/runtime/Config.x86-linux 2014-04-28 15:34:59.822482441 +1000
|
||||
@@ -27,7 +27,7 @@
|
||||
# (You *are* encouraged to design and implement a coherent stable
|
||||
# interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
|
||||
# working on one and it would be a nice thing to have.)
|
||||
-LINKFLAGS += -Wl,--export-dynamic -m32
|
||||
+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
|
||||
OS_LIBS = -ldl
|
||||
|
||||
ifdef LISP_FEATURE_LARGEFILE
|
||||
--- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux 2014-03-31 03:14:22.000000000 +1100
|
||||
+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux 2014-04-28 15:35:22.364623003 +1000
|
||||
@@ -27,7 +27,7 @@
|
||||
# (You *are* encouraged to design and implement a coherent stable
|
||||
# interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
|
||||
# working on one and it would be a nice thing to have.)
|
||||
-LINKFLAGS += -Wl,--export-dynamic
|
||||
+LINKFLAGS += -Wl,--export-dynamic -nopie
|
||||
OS_LIBS = -ldl
|
||||
|
||||
ifdef LISP_FEATURE_LARGEFILE
|
||||
@ -1,4 +1,14 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST timers-1.1.0.gem 7680 SHA256 3bbb9651a73e43e47950a5e13a7fa62f852cd5c46e421bb671e9ade1fbb47b74 SHA512 4fbaa450b935316e62799e1b8bbeef0dc90959de20a839d2169bdb3909e22c0613344a8a71e4583bb148e4772711312e973b2a47007fa49f2cd6b67d317987f1 WHIRLPOOL 8e190b2f95efcc8d4d3692a848d371f9d8d3f39c8cbc197743c58829de0596e32bff3b7a9d62342dffd603480926d2ab338596e90798896c770ff8dd591b47ee
|
||||
EBUILD timers-1.1.0-r1.ebuild 636 SHA256 702ac7510571c27728862af7e15584879e24c3f2aa5d52de7d8e3111d7369bbc SHA512 6f5ccc21027e0f97ba14e608aced62843c5638cf96d5d80404177b7dc2b62119f3c78383441c87f0c18b09c211c6816c55a28409d2a6e596f1740ccd3741e735 WHIRLPOOL f33598173671dc138643fab19b72b9bb30127b6b586d1d6adc84cd85efdb118a37a2a3ed170a2deacc314eea82e8e716f9029fa7a59b1da072c86cc051aa0286
|
||||
MISC ChangeLog 1019 SHA256 cd96866e639bc939f01942498d96d5ce125ff4513947035c945f4c3be31a62fc SHA512 a185856dd0636e850abaa8c2ace943b1972ac797f9378d9f21a3c3c8bb3a34a055dd3ebb328831998f8d29252ef578455773ea603103a192a97f43d0ac709fd0 WHIRLPOOL 01dc3a5ab080f2c21eb4f713de92a4b0586fe6534169434d1bd828e57f9050ae7007b0a8f4a6b211ae120db906a303cc25067fcd03f27dff37322045d05fecd3
|
||||
EBUILD timers-1.1.0-r1.ebuild 644 SHA256 4607c3f11c336c5f3b712b7d1b301f88a86a8b22f5654320c55e7f110de52fbf SHA512 7f6d494cbd06c1f69a1af05ef89053d720840626cfe0359dfec8373b737a29ed7250da391b9277b74f9c19039659a1307de30ea2885034a29d0ac3c301e91db6 WHIRLPOOL 9cb1fb2e923de64b5ecca19f5237b4a056537b28e4cd3b8ba4cb091bc4f534918a7f2ec546a9f7212d759056dfd3cc8f61f0085b9c81c0f025b7e9b920e13fad
|
||||
MISC ChangeLog 1109 SHA256 1a490b541106f69b8bea5a721fa2b1345956e761b1f957e876e34d059bc7c8b8 SHA512 d878ad65f6878be24cfbf294189775d7598acdefcb4f2a2bff752ade4a9c0611721ab95449b00c05abbba7b1d2d5316e3fed3095ff193f06f324253c97f77e5b WHIRLPOOL 0ebd382a7909b7206f20ad8ba1753a6f3369eff1fd5e8a9c8148a029e531fcfce0750aae7efca8bc46f8a2da4f458e8454e2492ab153739a037ce94b0d237acb
|
||||
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iF4EAREIAAYFAlNd6KoACgkQiIP6VqMIqNewOQD/SUX4cGCIcdVPhibtXtyM7gFa
|
||||
ucCEwlQH9YfXH57zIbsA/1OZA9EHhkVQu5d6PTNTImXpRYCS8amip5nnALelWEPX
|
||||
=4vCE
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-libs/gnome-core-libs-3.12.0.ebuild,v 1.1 2014/04/28 07:01:11 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
|
||||
HOMEPAGE="http://www.gnome.org/"
|
||||
LICENSE="metapackage"
|
||||
SLOT="3.0"
|
||||
IUSE="cups python"
|
||||
|
||||
# when unmasking for an arch
|
||||
# double check none of the deps are still masked !
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
# Note to developers:
|
||||
# This is a wrapper for the core libraries used by GNOME 3
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.40.0:2
|
||||
>=x11-libs/gdk-pixbuf-2.30.7:2
|
||||
>=x11-libs/pango-1.36.3
|
||||
>=media-libs/clutter-1.18.2:1.0
|
||||
>=x11-libs/gtk+-${PV}:3[cups?]
|
||||
>=dev-libs/atk-2.12
|
||||
>=x11-libs/libwnck-3.4.7:3
|
||||
>=gnome-base/librsvg-2.40.2
|
||||
>=gnome-base/gnome-desktop-${PV}:3
|
||||
>=gnome-base/libgnomekbd-3.6
|
||||
>=x11-libs/startup-notification-0.12
|
||||
|
||||
>=gnome-base/gvfs-1.20.0
|
||||
>=gnome-base/dconf-0.20.0
|
||||
|
||||
|| (
|
||||
>=media-libs/gstreamer-0.10.36:0.10
|
||||
>=media-libs/gstreamer-1.2.3:1.0 )
|
||||
|| (
|
||||
>=media-libs/gst-plugins-base-0.10.36:0.10
|
||||
>=media-libs/gst-plugins-base-1.2.3:1.0 )
|
||||
|| (
|
||||
>=media-libs/gst-plugins-good-0.10.31:0.10
|
||||
>=media-libs/gst-plugins-good-1.2.3:1.0 )
|
||||
|
||||
python? ( >=dev-python/pygobject-${PV}:3 )
|
||||
"
|
||||
DEPEND=""
|
||||
|
||||
S="${WORKDIR}"
|
||||
@ -1 +1 @@
|
||||
Mon, 28 Apr 2014 05:07:00 +0000
|
||||
Mon, 28 Apr 2014 07:07:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 28 Apr 2014 05:07:00 +0000
|
||||
Mon, 28 Apr 2014 07:07:01 +0000
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||
DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
|
||||
DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
|
||||
DESCRIPTION=Pure Ruby one-shot and periodic timers
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/tarcieri/timers
|
||||
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
|
||||
IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=MIT
|
||||
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
|
||||
RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://rubygems/timers-1.1.0.gem
|
||||
_eclasses_=eutils 025442f2eecab39ad0b4e541b6e142af java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib fac675dcccf94392371a6abee62d909f ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 48b38a216afb92db6314d6c3187abea3 versionator a8a3963967d6140be9a14b08bb8f047f
|
||||
_md5_=7a5bb1cb5ad601e6010134612fba033d
|
||||
_md5_=da118318adca45a5286bf0bb18bf88d1
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
DEFINED_PHASES=-
|
||||
DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.gnome.org/
|
||||
IUSE=cups python
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
|
||||
LICENSE=metapackage
|
||||
RDEPEND=>=dev-libs/glib-2.40.0:2 >=x11-libs/gdk-pixbuf-2.30.7:2 >=x11-libs/pango-1.36.3 >=media-libs/clutter-1.18.2:1.0 >=x11-libs/gtk+-3.12.0:3[cups?] >=dev-libs/atk-2.12 >=x11-libs/libwnck-3.4.7:3 >=gnome-base/librsvg-2.40.2 >=gnome-base/gnome-desktop-3.12.0:3 >=gnome-base/libgnomekbd-3.6 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.20.0 >=gnome-base/dconf-0.20.0 || ( >=media-libs/gstreamer-0.10.36:0.10 >=media-libs/gstreamer-1.2.3:1.0 ) || ( >=media-libs/gst-plugins-base-0.10.36:0.10 >=media-libs/gst-plugins-base-1.2.3:1.0 ) || ( >=media-libs/gst-plugins-good-0.10.31:0.10 >=media-libs/gst-plugins-good-1.2.3:1.0 ) python? ( >=dev-python/pygobject-3.12.0:3 )
|
||||
SLOT=3.0
|
||||
_md5_=5af05fbc39a447aeb76b15e18509616b
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
|
||||
DEPEND=>=dev-libs/glib-2.39.2:2 >=x11-libs/gtk+-3.9.9:3[X] >=x11-libs/vte-0.36:2.90 >=gnome-base/dconf-0.14 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
|
||||
DESCRIPTION=The Gnome Terminal
|
||||
EAPI=5
|
||||
HOMEPAGE=https://help.gnome.org/users/gnome-terminal/
|
||||
IUSE=+gnome-shell +nautilus
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
|
||||
LICENSE=GPL-3+
|
||||
RDEPEND=>=dev-libs/glib-2.39.2:2 >=x11-libs/gtk+-3.9.9:3[X] >=x11-libs/vte-0.36:2.90 >=gnome-base/dconf-0.14 >=gnome-base/gconf-2.31.3 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnome/sources/gnome-terminal/3.12/gnome-terminal-3.12.0.tar.xz
|
||||
_eclasses_=eutils 025442f2eecab39ad0b4e541b6e142af fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool b9b3340e3a19510f0d9f05cfccbf209f multilib fac675dcccf94392371a6abee62d909f readme.gentoo be2652cdd5c20f4689ccb4769072ea99 toolchain-funcs 48b38a216afb92db6314d6c3187abea3 versionator a8a3963967d6140be9a14b08bb8f047f
|
||||
_md5_=9829e034082666f051ce58fb420d76ae
|
||||
@ -1 +1 @@
|
||||
Mon, 28 Apr 2014 05:07:03 +0000
|
||||
Mon, 28 Apr 2014 07:07:04 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon Apr 28 05:07:00 UTC 2014
|
||||
Mon Apr 28 07:07:01 UTC 2014
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 28 Apr 2014 05:30:01 +0000
|
||||
Mon, 28 Apr 2014 07:30:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1398661501 Mon 28 Apr 2014 05:05:01 AM UTC UTC
|
||||
1398668701 Mon 28 Apr 2014 07:05:01 AM UTC UTC
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From d58bc01a2e891e31e11f03eb0d6ae9b5ff260b2b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Mon, 24 Mar 2014 15:16:22 +0100
|
||||
Subject: [PATCH 02/61] appmenu: Fix action parameter
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=726942
|
||||
---
|
||||
src/terminal-appmenu.ui | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-appmenu.ui b/src/terminal-appmenu.ui
|
||||
index 148c640..01ff5a8 100644
|
||||
--- a/src/terminal-appmenu.ui
|
||||
+++ b/src/terminal-appmenu.ui
|
||||
@@ -21,7 +21,7 @@
|
||||
<item>
|
||||
<attribute name="label" translatable="yes">_New Terminal</attribute>
|
||||
<attribute name="action">win.new-terminal</attribute>
|
||||
- <attribute name="target">'default'</attribute>
|
||||
+ <attribute name="target" type="(ss)">('default','default')</attribute>
|
||||
</item>
|
||||
</section>
|
||||
<section>
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
From fe7230e2113510596be5e773f9c1074ed650e858 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sun, 20 Apr 2014 20:21:04 +0200
|
||||
Subject: [PATCH 56/61] window: Use fallback tab title for empty terminal title
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=706816
|
||||
---
|
||||
src/terminal-tab-label.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
|
||||
index 90bab28..a83d94f 100644
|
||||
--- a/src/terminal-tab-label.c
|
||||
+++ b/src/terminal-tab-label.c
|
||||
@@ -75,8 +75,9 @@ sync_tab_label (TerminalScreen *screen,
|
||||
title = terminal_screen_get_title (screen);
|
||||
hbox = gtk_widget_get_parent (label);
|
||||
|
||||
- gtk_label_set_text (GTK_LABEL (label), title);
|
||||
-
|
||||
+ gtk_label_set_text (GTK_LABEL (label),
|
||||
+ title && title[0] ? title : _("Terminal"));
|
||||
+
|
||||
gtk_widget_set_tooltip_text (hbox, title);
|
||||
}
|
||||
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 0d52fef0ca60483debbdedec43bd07a8e9f76bfa Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sun, 20 Apr 2014 20:21:04 +0200
|
||||
Subject: [PATCH 57/61] window: Use fallback tab title for empty terminal title
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=706816
|
||||
---
|
||||
src/terminal-tabs-menu.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-tabs-menu.c b/src/terminal-tabs-menu.c
|
||||
index ed5fc7b..fb2b966 100644
|
||||
--- a/src/terminal-tabs-menu.c
|
||||
+++ b/src/terminal-tabs-menu.c
|
||||
@@ -176,7 +176,9 @@ sync_tab_title (TerminalScreen *screen,
|
||||
|
||||
title = terminal_screen_get_title (screen);
|
||||
|
||||
- g_object_set (action, "label", title, NULL);
|
||||
+ g_object_set (action,
|
||||
+ "label", title && title[0] ? title : _("Terminal"),
|
||||
+ NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,131 @@
|
||||
From de0dc7c2649c42e2aa02a66e4be27d262b34452d Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Fri, 11 Apr 2014 15:52:23 +0200
|
||||
Subject: [PATCH 45/61] Remove unused code to create terminals with custom
|
||||
titles
|
||||
|
||||
Irrespective of how you create a new terminal (over D-Bus using
|
||||
$bindir/gnome-terminal, ctrl+shift n, or the application menu), the
|
||||
code to set a custom title during construction was unused. Possibly
|
||||
as a result of f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=724110
|
||||
---
|
||||
src/terminal-app.c | 3 +--
|
||||
src/terminal-app.h | 1 -
|
||||
src/terminal-gdbus.c | 6 ++----
|
||||
src/terminal-screen.c | 4 ----
|
||||
src/terminal-screen.h | 1 -
|
||||
src/terminal-window.c | 2 +-
|
||||
6 files changed, 4 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-app.c b/src/terminal-app.c
|
||||
index 9ded6fc..57a6f15 100644
|
||||
--- a/src/terminal-app.c
|
||||
+++ b/src/terminal-app.c
|
||||
@@ -527,7 +527,6 @@ terminal_app_new_terminal (TerminalApp *app,
|
||||
TerminalWindow *window,
|
||||
GSettings *profile,
|
||||
char **override_command,
|
||||
- const char *title,
|
||||
const char *working_dir,
|
||||
char **child_env,
|
||||
double zoom)
|
||||
@@ -537,7 +536,7 @@ terminal_app_new_terminal (TerminalApp *app,
|
||||
g_return_val_if_fail (TERMINAL_IS_APP (app), NULL);
|
||||
g_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
|
||||
|
||||
- screen = terminal_screen_new (profile, override_command, title,
|
||||
+ screen = terminal_screen_new (profile, override_command,
|
||||
working_dir, child_env, zoom);
|
||||
|
||||
terminal_window_add_screen (window, screen, -1);
|
||||
diff --git a/src/terminal-app.h b/src/terminal-app.h
|
||||
index 6da6036..9502845 100644
|
||||
--- a/src/terminal-app.h
|
||||
+++ b/src/terminal-app.h
|
||||
@@ -75,7 +75,6 @@ TerminalScreen *terminal_app_new_terminal (TerminalApp *app,
|
||||
TerminalWindow *window,
|
||||
GSettings *profile,
|
||||
char **override_command,
|
||||
- const char *title,
|
||||
const char *working_dir,
|
||||
char **child_env,
|
||||
double zoom);
|
||||
diff --git a/src/terminal-gdbus.c b/src/terminal-gdbus.c
|
||||
index b801b9e..7b68a85 100644
|
||||
--- a/src/terminal-gdbus.c
|
||||
+++ b/src/terminal-gdbus.c
|
||||
@@ -368,7 +368,7 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
|
||||
TerminalObjectSkeleton *skeleton;
|
||||
char *object_path;
|
||||
GSettings *profile = NULL;
|
||||
- const char *profile_uuid, *title;
|
||||
+ const char *profile_uuid;
|
||||
gboolean zoom_set = FALSE;
|
||||
gdouble zoom = 1.0;
|
||||
guint window_id;
|
||||
@@ -456,12 +456,10 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
|
||||
|
||||
g_assert (window != NULL);
|
||||
|
||||
- if (!g_variant_lookup (options, "title", "&s", &title))
|
||||
- title = NULL;
|
||||
if (g_variant_lookup (options, "zoom", "d", &zoom))
|
||||
zoom_set = TRUE;
|
||||
|
||||
- screen = terminal_screen_new (profile, NULL, title, NULL, NULL,
|
||||
+ screen = terminal_screen_new (profile, NULL, NULL, NULL,
|
||||
zoom_set ? zoom : 1.0);
|
||||
terminal_window_add_screen (window, screen, -1);
|
||||
terminal_window_switch_screen (window, screen);
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index c504881..bb05924 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -622,7 +622,6 @@ terminal_screen_finalize (GObject *object)
|
||||
TerminalScreen *
|
||||
terminal_screen_new (GSettings *profile,
|
||||
char **override_command,
|
||||
- const char *title,
|
||||
const char *working_dir,
|
||||
char **child_env,
|
||||
double zoom)
|
||||
@@ -643,9 +642,6 @@ terminal_screen_new (GSettings *profile,
|
||||
g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY));
|
||||
}
|
||||
|
||||
- if (title)
|
||||
- terminal_screen_set_user_title (screen, title);
|
||||
-
|
||||
priv->initial_working_directory = g_strdup (working_dir);
|
||||
|
||||
if (override_command)
|
||||
diff --git a/src/terminal-screen.h b/src/terminal-screen.h
|
||||
index d0341c8..2a0d391 100644
|
||||
--- a/src/terminal-screen.h
|
||||
+++ b/src/terminal-screen.h
|
||||
@@ -76,7 +76,6 @@ const char *terminal_screen_get_uuid (TerminalScreen *screen);
|
||||
|
||||
TerminalScreen *terminal_screen_new (GSettings *profile,
|
||||
char **override_command,
|
||||
- const char *title,
|
||||
const char *working_dir,
|
||||
char **child_env,
|
||||
double zoom);
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index 0a611a7..9c209f7 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -400,7 +400,7 @@ action_new_terminal_cb (GSimpleAction *action,
|
||||
|
||||
new_working_directory = terminal_screen_get_current_dir (priv->active_screen);
|
||||
terminal_app_new_terminal (app, window, profile,
|
||||
- NULL, NULL,
|
||||
+ NULL,
|
||||
new_working_directory,
|
||||
terminal_screen_get_initial_environment (priv->active_screen),
|
||||
1.0);
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,214 @@
|
||||
From 9bbe19e98f62aa3c9020913a3a5a8080a5177505 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 16 Apr 2014 15:04:38 +0200
|
||||
Subject: [PATCH 47/61] Remove the action and shortcut to set a static title
|
||||
from the menus
|
||||
|
||||
Setting a static title does not work because there is no code
|
||||
listening to changes in TerminalScreen:description. The title is
|
||||
dynamically set via escape sequences, usually from a suitable
|
||||
PROMPT_COMMAND, which is noticed by VteTerminal.
|
||||
|
||||
If you want to customize the title of a particular terminal, please use
|
||||
the escape sequence. This is what you had to use before, anyway.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=724110
|
||||
---
|
||||
src/migration.c | 1 -
|
||||
src/org.gnome.Terminal.gschema.xml | 4 --
|
||||
src/terminal-accels.c | 2 -
|
||||
src/terminal-window.c | 88 --------------------------------------
|
||||
src/terminal.xml | 3 --
|
||||
5 files changed, 98 deletions(-)
|
||||
|
||||
diff --git a/src/migration.c b/src/migration.c
|
||||
index 7a7a773..b626ec5 100644
|
||||
--- a/src/migration.c
|
||||
+++ b/src/migration.c
|
||||
@@ -541,7 +541,6 @@ migrate_accels (GSettings *global_settings,
|
||||
{ "zoom_in", "zoom-in" },
|
||||
{ "zoom_out", "zoom-out" },
|
||||
{ "zoom_normal", "zoom-normal" },
|
||||
- { "set_window_title", "set-terminal-title" },
|
||||
{ "reset", "reset" },
|
||||
{ "reset_and_clear", "reset-and-clear" },
|
||||
{ "prev_tab", "prev-tab" },
|
||||
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
|
||||
index 1b926a6..be8f104 100644
|
||||
--- a/src/org.gnome.Terminal.gschema.xml
|
||||
+++ b/src/org.gnome.Terminal.gschema.xml
|
||||
@@ -374,10 +374,6 @@
|
||||
<default>'disabled'</default>
|
||||
<summary>Keyboard shortcut to toggle the visibility of the menubar</summary>
|
||||
</key>
|
||||
- <key name="set-terminal-title" type="s">
|
||||
- <default>'disabled'</default>
|
||||
- <summary>Keyboard shortcut to set the terminal title</summary>
|
||||
- </key>
|
||||
<key name="reset" type="s">
|
||||
<default>'disabled'</default>
|
||||
<summary>Keyboard shortcut to reset the terminal</summary>
|
||||
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
|
||||
index a3a8034..65d56bd 100644
|
||||
--- a/src/terminal-accels.c
|
||||
+++ b/src/terminal-accels.c
|
||||
@@ -70,7 +70,6 @@
|
||||
#define KEY_RESET_AND_CLEAR "reset-and-clear"
|
||||
#define KEY_RESET "reset"
|
||||
#define KEY_SAVE_CONTENTS "save-contents"
|
||||
-#define KEY_SET_TERMINAL_TITLE "set-terminal-title"
|
||||
#define KEY_TOGGLE_MENUBAR "toggle-menubar"
|
||||
#define KEY_ZOOM_IN "zoom-in"
|
||||
#define KEY_ZOOM_NORMAL "zoom-normal"
|
||||
@@ -144,7 +143,6 @@ static KeyEntry view_entries[] = {
|
||||
};
|
||||
|
||||
static KeyEntry terminal_entries[] = {
|
||||
- ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", NULL, NULL ),
|
||||
ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"),
|
||||
ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ),
|
||||
};
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index 9c209f7..93145ac 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -179,8 +179,6 @@ static void view_zoom_out_callback (GtkAction *action,
|
||||
TerminalWindow *window);
|
||||
static void view_zoom_normal_callback (GtkAction *action,
|
||||
TerminalWindow *window);
|
||||
-static void terminal_set_title_callback (GtkAction *action,
|
||||
- TerminalWindow *window);
|
||||
static void terminal_add_encoding_callback (GtkAction *action,
|
||||
TerminalWindow *window);
|
||||
static void terminal_reset_callback (GtkAction *action,
|
||||
@@ -718,88 +716,6 @@ action_move_tab_cb (GSimpleAction *action,
|
||||
}
|
||||
|
||||
static void
|
||||
-terminal_set_title_dialog_response_cb (GtkWidget *dialog,
|
||||
- int response,
|
||||
- TerminalScreen *screen)
|
||||
-{
|
||||
- if (response == GTK_RESPONSE_OK)
|
||||
- {
|
||||
- GtkEntry *entry;
|
||||
- const char *text;
|
||||
-
|
||||
- entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "title-entry"));
|
||||
- text = gtk_entry_get_text (entry);
|
||||
- terminal_screen_set_user_title (screen, text);
|
||||
- }
|
||||
-
|
||||
- gtk_widget_destroy (dialog);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-action_set_title_cb (GSimpleAction *action,
|
||||
- GVariant *parameter,
|
||||
- gpointer user_data)
|
||||
-{
|
||||
- TerminalWindow *window = user_data;
|
||||
- TerminalWindowPrivate *priv = window->priv;
|
||||
- GtkWidget *dialog, *message_area, *hbox, *label, *entry;
|
||||
-
|
||||
- if (priv->active_screen == NULL)
|
||||
- return;
|
||||
-
|
||||
- /* FIXME: hook the screen up so this dialogue closes if the terminal screen closes */
|
||||
-
|
||||
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
|
||||
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
- GTK_MESSAGE_OTHER,
|
||||
- GTK_BUTTONS_OK_CANCEL,
|
||||
- "%s", "");
|
||||
-
|
||||
- gtk_window_set_title (GTK_WINDOW (dialog), _("Set Title"));
|
||||
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
|
||||
- gtk_window_set_role (GTK_WINDOW (dialog), "gnome-terminal-change-title");
|
||||
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
|
||||
- /* Alternative button order was set automatically by GtkMessageDialog */
|
||||
-
|
||||
- g_signal_connect (dialog, "response",
|
||||
- G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen);
|
||||
- g_signal_connect (dialog, "delete-event",
|
||||
- G_CALLBACK (terminal_util_dialog_response_on_delete), NULL);
|
||||
-
|
||||
- message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
|
||||
- gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL);
|
||||
-
|
||||
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
|
||||
- gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0);
|
||||
-
|
||||
- label = gtk_label_new_with_mnemonic (_("_Title:"));
|
||||
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
||||
-
|
||||
- entry = gtk_entry_new ();
|
||||
- gtk_entry_set_width_chars (GTK_ENTRY (entry), 32);
|
||||
- gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
|
||||
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
|
||||
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
|
||||
- gtk_widget_show_all (hbox);
|
||||
-
|
||||
- gtk_widget_grab_focus (entry);
|
||||
- gtk_entry_set_text (GTK_ENTRY (entry), terminal_screen_get_user_title (priv->active_screen));
|
||||
- gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
|
||||
- g_object_set_data (G_OBJECT (dialog), "title-entry", entry);
|
||||
-
|
||||
- gtk_window_present (GTK_WINDOW (dialog));
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-terminal_set_title_callback (GtkAction *action,
|
||||
- TerminalWindow *window)
|
||||
-{
|
||||
- g_action_activate (g_action_map_lookup_action (G_ACTION_MAP (window), "set-title"),
|
||||
- NULL);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
action_zoom_cb (GSimpleAction *action,
|
||||
GVariant *parameter,
|
||||
gpointer user_data)
|
||||
@@ -2423,7 +2339,6 @@ terminal_window_init (TerminalWindow *window)
|
||||
{ "reset", action_reset_cb, "b", NULL, NULL },
|
||||
{ "switch-tab", action_switch_tab_cb, "i", NULL, NULL },
|
||||
{ "move-tab", action_move_tab_cb, "i", NULL, NULL },
|
||||
- { "set-title", action_set_title_cb, NULL, NULL, NULL },
|
||||
{ "zoom", action_zoom_cb, "i", NULL, NULL },
|
||||
{ "detach-tab", action_detach_tab_cb, NULL, NULL, NULL },
|
||||
{ "find", action_find_cb, "s", NULL, NULL },
|
||||
@@ -2528,9 +2443,6 @@ terminal_window_init (TerminalWindow *window)
|
||||
|
||||
/* Terminal menu */
|
||||
{ "TerminalProfiles", NULL, N_("Change _Profile") },
|
||||
- { "TerminalSetTitle", NULL, N_("_Set Title…"), NULL,
|
||||
- NULL,
|
||||
- G_CALLBACK (terminal_set_title_callback) },
|
||||
{ "TerminalSetEncoding", NULL, N_("Set _Character Encoding") },
|
||||
{ "TerminalReset", NULL, N_("_Reset"), NULL,
|
||||
NULL,
|
||||
diff --git a/src/terminal.xml b/src/terminal.xml
|
||||
index 6743393..72cef17 100644
|
||||
--- a/src/terminal.xml
|
||||
+++ b/src/terminal.xml
|
||||
@@ -46,7 +46,6 @@
|
||||
</menu>
|
||||
<menu action="Terminal">
|
||||
<menu action="TerminalProfiles" />
|
||||
- <menuitem action="TerminalSetTitle" />
|
||||
<menu action="TerminalSetEncoding" >
|
||||
<placeholder name="EncodingsPH" />
|
||||
<separator />
|
||||
@@ -100,8 +99,6 @@
|
||||
<menuitem action="TabsMoveLeft"/>
|
||||
<menuitem action="TabsMoveRight"/>
|
||||
<separator />
|
||||
- <menuitem action="TerminalSetTitle" />
|
||||
- <separator />
|
||||
<menuitem action="FileCloseTab"/>
|
||||
</popup>
|
||||
</ui>
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,217 @@
|
||||
From e9cb8fea14a849704074c5d69f173bcf4dc2fb27 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 16 Apr 2014 16:01:56 +0200
|
||||
Subject: [PATCH 48/61] Remove the static title setting from profile
|
||||
preferences
|
||||
|
||||
The static title setting does not work because TerminalWindow hardcodes
|
||||
the title as "Terminal" in the absence of VteTerminal:window-title,
|
||||
which is set dynamically via escape sequences. Usually the escape
|
||||
sequence is emitted from a suitable PROMPT_COMMAND. You can do the same
|
||||
if you want a customized title.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=724110
|
||||
---
|
||||
src/migration.c | 3 --
|
||||
src/org.gnome.Terminal.gschema.xml | 5 ---
|
||||
src/profile-editor.c | 3 --
|
||||
src/profile-preferences.ui | 86 --------------------------------------
|
||||
src/terminal-schemas.h | 1 -
|
||||
src/terminal-screen.c | 9 ----
|
||||
6 files changed, 107 deletions(-)
|
||||
|
||||
diff --git a/src/migration.c b/src/migration.c
|
||||
index b626ec5..ecd1493 100644
|
||||
--- a/src/migration.c
|
||||
+++ b/src/migration.c
|
||||
@@ -86,7 +86,6 @@ enum {
|
||||
#define KEY_SCROLL_ON_KEYSTROKE "scroll_on_keystroke"
|
||||
#define KEY_SCROLL_ON_OUTPUT "scroll_on_output"
|
||||
#define KEY_SILENT_BELL "silent_bell"
|
||||
-#define KEY_TITLE "title"
|
||||
#define KEY_UPDATE_RECORDS "update_records"
|
||||
#define KEY_USE_CUSTOM_COMMAND "use_custom_command"
|
||||
#define KEY_USE_CUSTOM_DEFAULT_SIZE "use_custom_default_size"
|
||||
@@ -395,8 +394,6 @@ migrate_profile (TerminalSettingsList *list,
|
||||
migrate_bool (client, path, KEY_BOLD_COLOR_SAME_AS_FG,
|
||||
settings, TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY,
|
||||
FALSE);
|
||||
- migrate_string (client, path, KEY_TITLE,
|
||||
- settings, TERMINAL_PROFILE_TITLE_KEY);
|
||||
migrate_bool (client, path, KEY_ALLOW_BOLD,
|
||||
settings, TERMINAL_PROFILE_ALLOW_BOLD_KEY,
|
||||
FALSE);
|
||||
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
|
||||
index be8f104..af7f418 100644
|
||||
--- a/src/org.gnome.Terminal.gschema.xml
|
||||
+++ b/src/org.gnome.Terminal.gschema.xml
|
||||
@@ -116,11 +116,6 @@
|
||||
<summary>Whether bold text should use the same color as normal text</summary>
|
||||
<description>If true, boldface text will be rendered using the same color as normal text.</description>
|
||||
</key>
|
||||
- <key name="title" type="s">
|
||||
- <default l10n="messages" context="title">'Terminal'</default>
|
||||
- <summary>Title for terminal</summary>
|
||||
- <description>Title to display for the terminal window or tab. This title may be replaced by or combined with the title set by the application inside the terminal, depending on the title_mode setting.</description>
|
||||
- </key>
|
||||
<key name="allow-bold" type="b">
|
||||
<default>true</default>
|
||||
<summary>Whether to allow bold text</summary>
|
||||
diff --git a/src/profile-editor.c b/src/profile-editor.c
|
||||
index 4bc1f7f..70a1afa 100644
|
||||
--- a/src/profile-editor.c
|
||||
+++ b/src/profile-editor.c
|
||||
@@ -1014,9 +1014,6 @@ terminal_profile_edit (GSettings *profile,
|
||||
gtk_builder_get_object (builder,
|
||||
"system-font-checkbutton"),
|
||||
"active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
|
||||
- g_settings_bind (profile, TERMINAL_PROFILE_TITLE_KEY,
|
||||
- gtk_builder_get_object (builder, "title-entry"), "text",
|
||||
- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
|
||||
g_settings_bind (profile, TERMINAL_PROFILE_UPDATE_RECORDS_KEY,
|
||||
gtk_builder_get_object (builder,
|
||||
"update-records-checkbutton"),
|
||||
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
|
||||
index 02889a3..e730681 100644
|
||||
--- a/src/profile-preferences.ui
|
||||
+++ b/src/profile-preferences.ui
|
||||
@@ -579,92 +579,6 @@
|
||||
<property name="border_width">12</property>
|
||||
<property name="spacing">18</property>
|
||||
<child>
|
||||
- <object class="GtkVBox" id="vbox79">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="spacing">6</property>
|
||||
- <child>
|
||||
- <object class="GtkLabel" id="label33">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="xalign">0</property>
|
||||
- <property name="label" translatable="yes">Title</property>
|
||||
- <attributes>
|
||||
- <attribute name="weight" value="bold"/>
|
||||
- </attributes>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</property>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkAlignment" id="alignment10108">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="left_padding">12</property>
|
||||
- <child>
|
||||
- <object class="GtkVBox" id="vbox93">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="spacing">6</property>
|
||||
- <child>
|
||||
- <object class="GtkHBox" id="hbox137">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="spacing">12</property>
|
||||
- <child>
|
||||
- <object class="GtkLabel" id="title-entry-label">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">False</property>
|
||||
- <property name="xalign">0</property>
|
||||
- <property name="label" translatable="yes">_Title:</property>
|
||||
- <property name="use_underline">True</property>
|
||||
- <property name="justify">center</property>
|
||||
- <property name="mnemonic_widget">title-entry</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</property>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkEntry" id="title-entry">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">True</property>
|
||||
- <property name="fill">True</property>
|
||||
- <property name="position">1</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">True</property>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- </object>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">True</property>
|
||||
- <property name="position">1</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">True</property>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
<object class="GtkVBox" id="vbox80">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
|
||||
index 7673da1..0bddcab 100644
|
||||
--- a/src/terminal-schemas.h
|
||||
+++ b/src/terminal-schemas.h
|
||||
@@ -56,7 +56,6 @@ G_BEGIN_DECLS
|
||||
#define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy"
|
||||
#define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke"
|
||||
#define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output"
|
||||
-#define TERMINAL_PROFILE_TITLE_KEY "title"
|
||||
#define TERMINAL_PROFILE_UPDATE_RECORDS_KEY "update-records"
|
||||
#define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command"
|
||||
#define TERMINAL_PROFILE_USE_CUSTOM_DEFAULT_SIZE_KEY "use-custom-default-size"
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index bb05924..d03ed80 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -717,14 +717,11 @@ char *
|
||||
terminal_screen_get_description (TerminalScreen *screen)
|
||||
{
|
||||
TerminalScreenPrivate *priv = screen->priv;
|
||||
- gs_free char *title_string = NULL;
|
||||
const char *title;
|
||||
|
||||
/* use --title argument if one was supplied, otherwise ask the profile */
|
||||
if (priv->title)
|
||||
title = priv->title;
|
||||
- else
|
||||
- title = title_string = g_settings_get_string (priv->profile, TERMINAL_PROFILE_TITLE_KEY);
|
||||
|
||||
return g_strdup_printf ("%s — %d",
|
||||
title && title[0] ? title : _("Terminal"),
|
||||
@@ -772,12 +769,6 @@ terminal_screen_profile_changed_cb (GSettings *profile,
|
||||
vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width);
|
||||
}
|
||||
|
||||
- if (!prop_name ||
|
||||
- prop_name == I_(TERMINAL_PROFILE_TITLE_KEY))
|
||||
- {
|
||||
- g_object_notify (object, "description");
|
||||
- }
|
||||
-
|
||||
if (gtk_widget_get_realized (GTK_WIDGET (screen)) &&
|
||||
(!prop_name ||
|
||||
prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) ||
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,181 @@
|
||||
From 3bb41272b7509a16ec2a5cd93e44f73d5743b626 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Wed, 16 Apr 2014 17:39:39 +0200
|
||||
Subject: [PATCH 49/61] screen: Remove unused description and user_title API
|
||||
|
||||
These were used by various parts of the static title code, which has
|
||||
now been removed.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=724110
|
||||
---
|
||||
src/terminal-screen.c | 63 ---------------------------------------------------
|
||||
src/terminal-screen.h | 6 -----
|
||||
2 files changed, 69 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index d03ed80..e35914c 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -77,7 +77,6 @@ struct _TerminalScreenPrivate
|
||||
GSettings *profile; /* never NULL */
|
||||
guint profile_changed_id;
|
||||
guint profile_forgotten_id;
|
||||
- char *title;
|
||||
char *initial_working_directory;
|
||||
char **initial_env;
|
||||
char **override_command;
|
||||
@@ -102,7 +101,6 @@ enum {
|
||||
PROP_ICON_TITLE,
|
||||
PROP_ICON_TITLE_SET,
|
||||
PROP_TITLE,
|
||||
- PROP_DESCRIPTION,
|
||||
PROP_INITIAL_ENVIRONMENT
|
||||
};
|
||||
|
||||
@@ -390,9 +388,6 @@ terminal_screen_get_property (GObject *object,
|
||||
case PROP_TITLE:
|
||||
g_value_set_string (value, terminal_screen_get_title (screen));
|
||||
break;
|
||||
- case PROP_DESCRIPTION:
|
||||
- g_value_take_string (value, terminal_screen_get_description (screen));
|
||||
- break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -418,7 +413,6 @@ terminal_screen_set_property (GObject *object,
|
||||
case PROP_ICON_TITLE:
|
||||
case PROP_ICON_TITLE_SET:
|
||||
case PROP_TITLE:
|
||||
- case PROP_DESCRIPTION:
|
||||
/* not writable */
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
@@ -517,13 +511,6 @@ terminal_screen_class_init (TerminalScreenClass *klass)
|
||||
NULL,
|
||||
G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
|
||||
|
||||
- g_object_class_install_property (object_class,
|
||||
- PROP_DESCRIPTION,
|
||||
- g_param_spec_string ("description", NULL, NULL,
|
||||
- NULL,
|
||||
- G_PARAM_READABLE |
|
||||
- G_PARAM_STATIC_STRINGS));
|
||||
-
|
||||
g_object_class_install_property
|
||||
(object_class,
|
||||
PROP_INITIAL_ENVIRONMENT,
|
||||
@@ -606,7 +593,6 @@ terminal_screen_finalize (GObject *object)
|
||||
|
||||
terminal_screen_set_profile (screen, NULL);
|
||||
|
||||
- g_free (priv->title);
|
||||
g_free (priv->initial_working_directory);
|
||||
g_strfreev (priv->override_command);
|
||||
g_strfreev (priv->initial_env);
|
||||
@@ -713,21 +699,6 @@ terminal_screen_get_icon_title_set (TerminalScreen *screen)
|
||||
return vte_terminal_get_icon_title (VTE_TERMINAL (screen)) != NULL;
|
||||
}
|
||||
|
||||
-char *
|
||||
-terminal_screen_get_description (TerminalScreen *screen)
|
||||
-{
|
||||
- TerminalScreenPrivate *priv = screen->priv;
|
||||
- const char *title;
|
||||
-
|
||||
- /* use --title argument if one was supplied, otherwise ask the profile */
|
||||
- if (priv->title)
|
||||
- title = priv->title;
|
||||
-
|
||||
- return g_strdup_printf ("%s — %d",
|
||||
- title && title[0] ? title : _("Terminal"),
|
||||
- screen->priv->child_pid);
|
||||
-}
|
||||
-
|
||||
static void
|
||||
terminal_screen_profile_changed_cb (GSettings *profile,
|
||||
const char *prop_name,
|
||||
@@ -949,7 +920,6 @@ terminal_screen_set_profile (TerminalScreen *screen,
|
||||
g_object_unref (old_profile);
|
||||
|
||||
g_object_notify (G_OBJECT (screen), "profile");
|
||||
- g_object_notify (G_OBJECT (screen), "description");
|
||||
}
|
||||
|
||||
GSettings*
|
||||
@@ -1359,8 +1329,6 @@ out:
|
||||
g_strfreev (env);
|
||||
free_fd_setup_data (data);
|
||||
|
||||
- g_object_notify (G_OBJECT (screen), "description");
|
||||
-
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1543,35 +1511,6 @@ terminal_screen_button_press (GtkWidget *widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
-void
|
||||
-terminal_screen_set_user_title (TerminalScreen *screen,
|
||||
- const char *title)
|
||||
-{
|
||||
- TerminalScreenPrivate *priv = screen->priv;
|
||||
-
|
||||
- g_return_if_fail (TERMINAL_IS_SCREEN (screen));
|
||||
-
|
||||
- if (g_strcmp0 (priv->title, title) == 0)
|
||||
- return;
|
||||
-
|
||||
- g_free (priv->title);
|
||||
- priv->title = title && title[0] ? g_strdup (title) : NULL;
|
||||
-
|
||||
- g_object_notify (G_OBJECT (screen), "description");
|
||||
-}
|
||||
-
|
||||
-const char*
|
||||
-terminal_screen_get_user_title (TerminalScreen *screen)
|
||||
-{
|
||||
- TerminalScreenPrivate *priv;
|
||||
-
|
||||
- g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
|
||||
-
|
||||
- priv = screen->priv;
|
||||
-
|
||||
- return priv->title ? priv->title : _("Terminal");
|
||||
-}
|
||||
-
|
||||
/**
|
||||
* terminal_screen_get_current_dir:
|
||||
* @screen:
|
||||
@@ -1629,8 +1568,6 @@ terminal_screen_child_exited (VteTerminal *terminal,
|
||||
|
||||
priv->child_pid = -1;
|
||||
|
||||
- g_object_notify (G_OBJECT (screen), "description");
|
||||
-
|
||||
action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY);
|
||||
|
||||
switch (action)
|
||||
diff --git a/src/terminal-screen.h b/src/terminal-screen.h
|
||||
index 2a0d391..96f0a0d 100644
|
||||
--- a/src/terminal-screen.h
|
||||
+++ b/src/terminal-screen.h
|
||||
@@ -100,15 +100,9 @@ void terminal_screen_set_initial_environment (TerminalScreen *screen,
|
||||
char **argv);
|
||||
char ** terminal_screen_get_initial_environment (TerminalScreen *screen);
|
||||
|
||||
-const char *terminal_screen_get_user_title (TerminalScreen *screen);
|
||||
const char* terminal_screen_get_title (TerminalScreen *screen);
|
||||
const char* terminal_screen_get_icon_title (TerminalScreen *screen);
|
||||
gboolean terminal_screen_get_icon_title_set (TerminalScreen *screen);
|
||||
-char * terminal_screen_get_description (TerminalScreen *screen);
|
||||
-
|
||||
-void terminal_screen_set_user_title (TerminalScreen *screen,
|
||||
- const char *text);
|
||||
-
|
||||
|
||||
char *terminal_screen_get_current_dir (TerminalScreen *screen);
|
||||
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,89 @@
|
||||
# Copyright 1999-2014 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.12.0.ebuild,v 1.1 2014/04/28 06:57:43 eva 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="+gnome-shell +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.39.2:2
|
||||
>=x11-libs/gtk+-3.9.9:3[X]
|
||||
>=x11-libs/vte-0.36:2.90
|
||||
>=gnome-base/dconf-0.14
|
||||
>=gnome-base/gconf-2.31.3
|
||||
>=gnome-base/gsettings-desktop-schemas-0.1.0
|
||||
sys-apps/util-linux
|
||||
x11-libs/libSM
|
||||
x11-libs/libICE
|
||||
gnome-shell? ( gnome-base/gnome-shell )
|
||||
nautilus? ( >=gnome-base/nautilus-3 )
|
||||
"
|
||||
# gtk+:2 needed for gtk-builder-convert, bug 356239
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/yelp-tools
|
||||
dev-util/appdata-tools
|
||||
|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
|
||||
>=dev-util/intltool-0.50
|
||||
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}-appmenu-parameter.patch \
|
||||
"${FILESDIR}"/${P}-remove-set-title-feature-0.patch \
|
||||
"${FILESDIR}"/${P}-remove-set-title-feature-1.patch \
|
||||
"${FILESDIR}"/${P}-remove-set-title-feature-2.patch \
|
||||
"${FILESDIR}"/${P}-remove-set-title-feature-3.patch \
|
||||
"${FILESDIR}"/${P}-fallback-title-1.patch \
|
||||
"${FILESDIR}"/${P}-fallback-title-2.patch
|
||||
|
||||
gnome2_src_prepare
|
||||
}
|
||||
src_configure() {
|
||||
# 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_enable gnome-shell search-provider) \
|
||||
$(use_with nautilus nautilus-extension) \
|
||||
# Docs are broken in this release.
|
||||
#ITSTOOL=$(type -P true) \
|
||||
#XMLLINT=$(type -P true)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
DOCS="AUTHORS ChangeLog HACKING NEWS"
|
||||
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
|
||||
}
|
||||
Loading…
Reference in new issue