From cb7a4761db2041604a9eea5bf87da79f9dc338b0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:35:21 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for vte --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 8719ad2c90184df3a167931d3658af5c7e0b8f92 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Jun 2009 03:38:18 +0000 Subject: [PATCH 2/6] 0.20.4 --- .cvsignore | 2 +- sources | 2 +- vte.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c5d763a..5cd8de3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vte-0.20.1.tar.bz2 +vte-0.20.4.tar.bz2 diff --git a/sources b/sources index 0d4e7ed..b7a517b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0fe9038978eaeb70abf16cd7f791752 vte-0.20.1.tar.bz2 +6432681ebefaeaecc2fefeb4dfacf7bb vte-0.20.4.tar.bz2 diff --git a/vte.spec b/vte.spec index c29ee30..5e5d8fb 100644 --- a/vte.spec +++ b/vte.spec @@ -3,7 +3,7 @@ %define gtk2_version 2.12.0 Name: vte -Version: 0.20.1 +Version: 0.20.4 Release: 1%{?dist} Summary: A terminal emulator License: LGPLv2+ @@ -108,8 +108,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.a %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Mon Jun 1 2009 Matthias Clasen 0.20.4-1 +- Update to 0.20.4 +- See http://download.gnome.org/sources/vte/0.20/vte-0.20.4.news +- See http://download.gnome.org/sources/vte/0.20/vte-0.20.3.news +- See http://download.gnome.org/sources/vte/0.20/vte-0.20.2.news + * Mon Apr 13 2009 Matthias Clasen 0.20.1-1 -- Update to 2.20.1 +- Update to 0.20.1 - See http://download.gnome.org/sources/vte/0.20/vte-0.20.1.news * Mon Mar 16 2009 Matthias Clasen 0.20.0-1 From d0eb19be6e0ade2607a20eec3f31c021181bcb7b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 10 Jun 2009 02:36:13 +0000 Subject: [PATCH 3/6] 0.20.5 --- .cvsignore | 2 +- sources | 2 +- vte.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5cd8de3..38e3b18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vte-0.20.4.tar.bz2 +vte-0.20.5.tar.bz2 diff --git a/sources b/sources index b7a517b..19e7acf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6432681ebefaeaecc2fefeb4dfacf7bb vte-0.20.4.tar.bz2 +90de70ddd1340be308430ded74d6b8d6 vte-0.20.5.tar.bz2 diff --git a/vte.spec b/vte.spec index 5e5d8fb..cb1d864 100644 --- a/vte.spec +++ b/vte.spec @@ -3,7 +3,7 @@ %define gtk2_version 2.12.0 Name: vte -Version: 0.20.4 +Version: 0.20.5 Release: 1%{?dist} Summary: A terminal emulator License: LGPLv2+ @@ -108,6 +108,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.a %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Tue Jun 9 2009 Matthias Clasen 0.20.5-1 +- Update to 0.20.5 + * Mon Jun 1 2009 Matthias Clasen 0.20.4-1 - Update to 0.20.4 - See http://download.gnome.org/sources/vte/0.20/vte-0.20.4.news From 24b2e59fd4cd2bba4e74b29bed674da3042a0a71 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:51 +0000 Subject: [PATCH 4/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0f98678..631f820 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vte -# $Id: Makefile,v 1.1 2004/09/09 14:07:43 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:30:25 notting Exp $ NAME := vte SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2c0c790691990c93049b9230dfad50614c1d3473 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Tue, 8 Dec 2009 13:58:53 +0000 Subject: [PATCH 5/6] fix environment passing bug in python bindings --- python-env-passing.patch | 46 ++++++++++++++++++++++++++++++++++++++++ vte.spec | 8 ++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 python-env-passing.patch diff --git a/python-env-passing.patch b/python-env-passing.patch new file mode 100644 index 0000000..e8b4917 --- /dev/null +++ b/python-env-passing.patch @@ -0,0 +1,46 @@ +From 3c22f5997c7e11f371c606520daff279d9b613e4 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Tue, 29 Sep 2009 18:54:30 +0000 +Subject: Bug 587894 - the environment passing with python does no longer work + +--- +diff --git a/python/vte.override b/python/vte.override +index 29c3316..196b935 100644 +--- a/python/vte.override ++++ b/python/vte.override +@@ -112,7 +112,7 @@ _build_envv(PyObject *py_envv, char ***envv) + int i, pos, n_envs; + PyObject *py_dict_k, *py_dict_v; + +- if (py_envv == NULL || py_envv != Py_None) { ++ if (py_envv == NULL || py_envv == Py_None) { + return 0; + } + +@@ -122,20 +122,20 @@ _build_envv(PyObject *py_envv, char ***envv) + pos = 0; + i = 0; + while (PyDict_Next(py_envv, &pos, &py_dict_k, &py_dict_v)) { +- *envv[i++] = g_strdup_printf("%s=%s", ++ (*envv)[i++] = g_strdup_printf("%s=%s", + PyString_AsString(py_dict_k), + PyString_AsString(py_dict_v)); + } +- *envv[n_envs] = NULL; ++ (*envv)[n_envs] = NULL; + } else if (PySequence_Check(py_envv)) { + n_envs = PySequence_Length(py_envv); + *envv = g_new(gchar *, n_envs + 1); + for (i = 0; i < n_envs; i++) { + PyObject *item = PySequence_GetItem(py_envv, i); + Py_DECREF(item); /* PySequence_GetItem INCREF's */ +- *envv[i] = PyString_AsString(item); ++ (*envv)[i] = PyString_AsString(item); + } +- *envv[n_envs] = NULL; ++ (*envv)[n_envs] = NULL; + } else { + PyErr_SetString(PyExc_TypeError, + "envv must be a sequence or a dictionary"); +-- +cgit v0.8.2 diff --git a/vte.spec b/vte.spec index cb1d864..f89cd6c 100644 --- a/vte.spec +++ b/vte.spec @@ -4,7 +4,7 @@ Name: vte Version: 0.20.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A terminal emulator License: LGPLv2+ Group: User Interface/X @@ -22,6 +22,8 @@ BuildRequires: intltool # initscripts creates the utmp group Prereq: initscripts +Patch1: python-env-passing.patch + %description VTE is a terminal emulator widget for use with GTK+ 2.0. @@ -43,6 +45,7 @@ vte. %prep %setup -q +%patch1 -p1 %build PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"` @@ -108,6 +111,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.a %doc %{_datadir}/gtk-doc/html/%{name} %changelog +* Tue Dec 8 2009 Daniel Drake 0.20.5-2 +- Add upstream patch to fix environment bug with Python bindings (#537391) + * Tue Jun 9 2009 Matthias Clasen 0.20.5-1 - Update to 0.20.5 From 80d18a31ff21251614909642ae8c160602643b05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:07:48 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 631f820..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vte -# $Id: Makefile,v 1.2 2007/10/15 19:30:25 notting Exp $ -NAME := vte -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11