diff --git a/gnome-terminal-2.15.0-338913-revert-336325.patch b/gnome-terminal-2.15.0-338913-revert-336325.patch deleted file mode 100644 index 9524a12..0000000 --- a/gnome-terminal-2.15.0-338913-revert-336325.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: gnome-terminal-2.15.0/src/terminal-window.c -=================================================================== -RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v -retrieving revision 1.124 -diff -u -p -d -r1.124 terminal-window.c ---- gnome-terminal-2.15.0/src/terminal-window.c 4 Mar 2006 06:21:01 -0000 1.124 -+++ gnome-terminal-2.15.0/src/terminal-window.c 1 Apr 2006 03:11:46 -0000 -@@ -1536,6 +1536,14 @@ terminal_window_set_size_force_grid (Ter - app = gtk_widget_get_toplevel (widget); - g_assert (app != NULL); - -+ /* This set_size_request hack is because the extra size above base -+ * size should only include the width of widgets that intersect the -+ * term vertically and the height of widgets that intersect the term -+ * horizontally. It works around a GTK bug, GTK should handle -+ * this case. The size request can be huge without hosing -+ * anything because we set the MIN_SIZE geometry hint. -+ */ -+ gtk_widget_set_size_request (widget, 2000, 2000); - gtk_widget_size_request (app, &toplevel_request); - gtk_widget_size_request (widget, &widget_request); - diff --git a/gnome-terminal-builder.patch b/gnome-terminal-builder.patch deleted file mode 100644 index bd5a8c4..0000000 --- a/gnome-terminal-builder.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up gnome-terminal-2.33.3/configure.ac.builder gnome-terminal-2.33.3/configure.ac ---- gnome-terminal-2.33.3/configure.ac.builder 2011-01-07 17:37:33.449993002 -0500 -+++ gnome-terminal-2.33.3/configure.ac 2011-01-07 17:37:49.942992152 -0500 -@@ -130,10 +130,7 @@ AC_SUBST([GLIB_GENMARSHAL]) - GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)" - AC_SUBST([GLIB_MKENUMS]) - --case "$with_gtk" in -- 2.0) AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) ;; -- 3.0) AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert-3.0],[false]) ;; --esac -+AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) - - if test "$GTK_BUILDER_CONVERT" = "false"; then - AC_MSG_ERROR([gtk-builder-convert not found]) diff --git a/gnome-terminal-libs.patch b/gnome-terminal-libs.patch deleted file mode 100644 index 5f8ab26..0000000 --- a/gnome-terminal-libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gnome-terminal-2.33.3/src/Makefile.am.libs gnome-terminal-2.33.3/src/Makefile.am ---- gnome-terminal-2.33.3/src/Makefile.am.libs 2011-01-07 22:19:10.168992663 -0500 -+++ gnome-terminal-2.33.3/src/Makefile.am 2011-01-07 22:19:47.375993276 -0500 -@@ -75,7 +75,8 @@ gnome_terminal_CFLAGS = \ - gnome_terminal_LDFLAGS = - - gnome_terminal_LDADD = \ -- $(TERM_LIBS) -+ $(TERM_LIBS) \ -+ -lX11 - - if WITH_SMCLIENT - gnome_terminal_SOURCES += \ diff --git a/gnome-terminal-potfiles.patch b/gnome-terminal-potfiles.patch deleted file mode 100644 index 1745965..0000000 --- a/gnome-terminal-potfiles.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-terminal-2.31.1/po/POTFILES.in.potfiles gnome-terminal-2.31.1/po/POTFILES.in ---- gnome-terminal-2.31.1/po/POTFILES.in.potfiles 2010-05-04 00:41:15.490932905 -0400 -+++ gnome-terminal-2.31.1/po/POTFILES.in 2010-05-04 00:41:26.265182941 -0400 -@@ -17,8 +17,6 @@ src/terminal-accels.c - src/terminal-app.c - src/terminal.c - src/terminal-encoding.c --src/terminal-find.c --src/terminal-find.glade - src/terminal-options.c - src/terminal-profile.c - src/terminal-screen.c diff --git a/gnome-terminal.spec b/gnome-terminal.spec index c46f3f9..8891ac4 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -15,8 +15,6 @@ Group: User Interface/Desktops URL: http://www.gnome.org/ #VCS: git:git://git.gnome.org/gnome-terminal Source0: http://download.gnome.org/sources/gnome-terminal/3.4/gnome-terminal-%{version}.tar.xz -# http://bugzilla.gnome.org/show_bug.cgi?id=588732 -Source1: profile-new-dialog.ui # gconftool-2 Requires(pre): GConf2 >= %{gconf_version} diff --git a/gtk3-build.patch b/gtk3-build.patch deleted file mode 100644 index 50962aa..0000000 --- a/gtk3-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-terminal-2.33.0/configure.ac.gtk3-build gnome-terminal-2.33.0/configure.ac ---- gnome-terminal-2.33.0/configure.ac.gtk3-build 2010-10-07 13:02:12.307779002 -0400 -+++ gnome-terminal-2.33.0/configure.ac 2010-10-07 13:05:13.335779007 -0400 -@@ -129,7 +129,7 @@ AC_SUBST([GLIB_GENMARSHAL]) - GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)" - AC_SUBST([GLIB_MKENUMS]) - --AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false]) -+AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert] [gtk-builder-convert-3.0],[false]) - if test "$GTK_BUILDER_CONVERT" = "false"; then - AC_MSG_ERROR([gtk-builder-convert not found]) - fi diff --git a/profile-new-dialog.ui b/profile-new-dialog.ui deleted file mode 100644 index bc596f2..0000000 --- a/profile-new-dialog.ui +++ /dev/null @@ -1,196 +0,0 @@ - - - - - True - gtk-apply - 4 - 0.5 - 0.5 - 0 - 0 - - - 5 - New Profile - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - True - False - 2 - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - True - False - icon-1212 - C_reate - True - True - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - GTK_PACK_END - - - - - 5 - True - False - 0 - - - True - 2 - 2 - False - 6 - 12 - - - True - False - 6 - - - - - - 1 - 2 - 1 - 2 - - - - - True - Profile _name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - new-profile-name-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - True - True - True - True - 0 - - True - False - 14 - - - 1 - 2 - 0 - 1 - - - - - - True - _Base on: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - new-profile-cancel-button - new-profile-create-button - - - diff --git a/terminal-search.patch b/terminal-search.patch deleted file mode 100644 index 57e520e..0000000 --- a/terminal-search.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/terminal-search-dialog.c b/src/terminal-search-dialog.c -index 81e3317..e299ae9 100644 ---- a/src/terminal-search-dialog.c -+++ b/src/terminal-search-dialog.c -@@ -108,7 +108,11 @@ terminal_search_dialog_new (GtkWindow *parent) - priv->store = store = gtk_list_store_new (1, G_TYPE_STRING); - g_object_set (G_OBJECT (priv->search_entry), - "model", store, -+#if GTK_CHECK_VERSION (2, 91, 0) -+ "entry-text-column", 0, -+#else - "text-column", 0, -+#endif - NULL); - - priv->completion = completion = gtk_entry_completion_new ();