From bfcbe4d4aeba2d3595b584ca663107c8ca7023fd Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Mon, 17 Jan 2005 12:49:30 +0000 Subject: [PATCH] bump with filechooser patch --- x11-libs/gtk+/ChangeLog | 8 +- x11-libs/gtk+/Manifest | 33 ++--- ...digest-gtk+-2.6.1 => digest-gtk+-2.6.1-r1} | 0 .../gtk+-2.6.1-empty_default_combo.patch | 139 ++++++++++++++++++ ...gtk+-2.6.1.ebuild => gtk+-2.6.1-r1.ebuild} | 11 +- 5 files changed, 165 insertions(+), 26 deletions(-) rename x11-libs/gtk+/files/{digest-gtk+-2.6.1 => digest-gtk+-2.6.1-r1} (100%) create mode 100644 x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch rename x11-libs/gtk+/{gtk+-2.6.1.ebuild => gtk+-2.6.1-r1.ebuild} (89%) diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 6d9954e4e35e..eddbe66649f7 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gtk+ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.141 2005/01/14 02:25:26 kingtaco Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.142 2005/01/17 12:49:30 foser Exp $ + +*gtk+-2.6.1-r1 (17 Jan 2005) + + 17 Jan 2005; foser gtk+-2.6.1-r1.ebuild : + Add upstream patch for http://bugzilla.gnome.org/show_bug.cgi?id=164290 + block pixmap engine, partially fixes #77791 13 Jan 2005; Mike Doty gtk+-2.6.1.ebuild: amd64 patch update by seemant diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index a6cdc9d58982..5f813a4da8cf 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,33 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719 MD5 db49b476d800c643e57ce06255a0d3d0 gtk+-1.2.10-r11.ebuild 1792 MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120 MD5 f2ca4375fe9dca60d7b745e7597f9126 gtk+-2.4.14.ebuild 2925 MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139 +MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719 +MD5 6f7f61d2b523fe4f54b897cb816278ff ChangeLog 21312 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178 -MD5 af86af900de867d0ba30bd70b24b1d9c gtk+-2.6.1.ebuild 2964 -MD5 c5a0e018ab25e84a0535313d7002dfb9 ChangeLog 21101 +MD5 92719398ada22d324a8ed018735a6719 gtk+-2.6.1-r1.ebuild 3137 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138 -MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 -MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 -MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 +MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006 +MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133 -MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291 -MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208 -MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208 MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133 +MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r1 208 +MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208 +MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208 +MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293 +MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732 -MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1 208 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFB51i26J2i8a8J4okRAmmlAJ9jf+iURI2YIghvAkzsxye3J9FXLwCdFo1y -WJyhOq9cXdUdXdYXNBLr5nk= -=JHDh ------END PGP SIGNATURE----- +MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1 b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r1 similarity index 100% rename from x11-libs/gtk+/files/digest-gtk+-2.6.1 rename to x11-libs/gtk+/files/digest-gtk+-2.6.1-r1 diff --git a/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch b/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch new file mode 100644 index 000000000000..c153258cce66 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch @@ -0,0 +1,139 @@ +=================================================================== +RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v +retrieving revision 1.240 +retrieving revision 1.240.2.1 +diff -u -r1.240 -r1.240.2.1 +--- gtkfilechooserdefault.c 2005/01/06 20:27:58 1.240 ++++ gtkfilechooserdefault.c 2005/01/17 07:05:59 1.240.2.1 +@@ -376,6 +376,8 @@ + GtkTreePath *path, + gboolean path_currently_selected, + gpointer data); ++static gboolean shortcuts_get_selected (GtkFileChooserDefault *impl, ++ GtkTreeIter *iter); + static void shortcuts_activate_iter (GtkFileChooserDefault *impl, + GtkTreeIter *iter); + static int shortcuts_get_index (GtkFileChooserDefault *impl, +@@ -1056,9 +1058,9 @@ + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter)); + } + +-/* If a shortcut corresponds to the current folder, selects it */ +-static void +-shortcuts_find_current_folder (GtkFileChooserDefault *impl) ++static void ++shortcuts_find_folder (GtkFileChooserDefault *impl, ++ GtkFilePath *folder) + { + GtkTreeSelection *selection; + int pos; +@@ -1066,8 +1068,8 @@ + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view)); + +- g_assert (impl->current_folder != NULL); +- pos = shortcut_find_position (impl, impl->current_folder); ++ g_assert (folder != NULL); ++ pos = shortcut_find_position (impl, folder); + if (pos == -1) + { + gtk_tree_selection_unselect_all (selection); +@@ -1079,6 +1081,13 @@ + gtk_tree_path_free (path); + } + ++/* If a shortcut corresponds to the current folder, selects it */ ++static void ++shortcuts_find_current_folder (GtkFileChooserDefault *impl) ++{ ++ shortcuts_find_folder (impl, impl->current_folder); ++} ++ + /* Convenience function to get the display name and icon info for a path */ + static GtkFileInfo * + get_file_info (GtkFileSystem *file_system, +@@ -1452,10 +1461,41 @@ + { + GSList *bookmarks; + gboolean old_changing_folders; +- ++ GtkTreeIter iter; ++ GtkFilePath *list_selected = NULL; ++ GtkFilePath *combo_selected = NULL; ++ gboolean is_volume; ++ gpointer col_data; ++ + old_changing_folders = impl->changing_folder; + impl->changing_folder = TRUE; + ++ if (shortcuts_get_selected (impl, &iter)) ++ { ++ gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), ++ &iter, ++ SHORTCUTS_COL_DATA, &col_data, ++ SHORTCUTS_COL_IS_VOLUME, &is_volume, ++ -1); ++ ++ if (col_data && !is_volume) ++ list_selected = gtk_file_path_copy (col_data); ++ } ++ ++ if (impl->save_folder_combo && ++ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), ++ &iter)) ++ { ++ gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), ++ &iter, ++ SHORTCUTS_COL_DATA, &col_data, ++ SHORTCUTS_COL_IS_VOLUME, &is_volume, ++ -1); ++ ++ if (col_data && !is_volume) ++ combo_selected = gtk_file_path_copy (col_data); ++ } ++ + if (impl->num_bookmarks > 0) + shortcuts_remove_rows (impl, + shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR), +@@ -1466,12 +1506,28 @@ + gtk_file_paths_free (bookmarks); + + if (impl->num_bookmarks > 0) +- { +- shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); +- } ++ shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); ++ + if (impl->shortcuts_filter_model) + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model)); + ++ if (list_selected) ++ { ++ shortcuts_find_folder (impl, list_selected); ++ gtk_file_path_free (list_selected); ++ } ++ ++ if (combo_selected) ++ { ++ gint pos; ++ ++ pos = shortcut_find_position (impl, combo_selected); ++ if (pos != -1) ++ gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), ++ pos); ++ gtk_file_path_free (combo_selected); ++ } ++ + impl->changing_folder = old_changing_folders; + } + +@@ -1918,6 +1974,9 @@ + GtkTreeSelection *selection; + GtkTreeIter parent_iter; + ++ if (!impl->browse_shortcuts_tree_view) ++ return FALSE; ++ + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view)); + + if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter)) diff --git a/x11-libs/gtk+/gtk+-2.6.1.ebuild b/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild similarity index 89% rename from x11-libs/gtk+/gtk+-2.6.1.ebuild rename to x11-libs/gtk+/gtk+-2.6.1-r1.ebuild index 4d64d6856205..0979d3a467c9 100644 --- a/x11-libs/gtk+/gtk+-2.6.1.ebuild +++ b/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1.ebuild,v 1.2 2005/01/14 02:25:26 kingtaco Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1-r1.ebuild,v 1.1 2005/01/17 12:49:30 foser Exp $ inherit libtool flag-o-matic eutils @@ -28,7 +28,8 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0 sys-devel/autoconf >=sys-devel/automake-1.7.9 - doc? ( >=dev-util/gtk-doc-1 )" + doc? ( >=dev-util/gtk-doc-1 ) + !x11-themes/gtk-engines-pixmap" src_unpack() { @@ -43,7 +44,11 @@ src_unpack() { # add smoothscroll support for usability reasons # http://bugzilla.gnome.org/show_bug.cgi?id=103811 epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch + # fix empty filechooser combo (http://bugzilla.gnome.org/show_bug.cgi?id=164290) + cd ${S}/gtk + epatch ${FILESDIR}/${P}-empty_default_combo.patch + cd ${S} # use an arch-specific config directory so that 32bit and 64bit versions # dont clash on multilib systems use amd64 && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2 @@ -63,8 +68,6 @@ src_compile() { # bug 8762 replace-flags "-O3" "-O2" - elibtoolize - econf \ `use_enable doc gtk-doc` \ `use_with jpeg libjpeg` \ -- 2.26.2