rpms/gquilt/FC-3 gquilt-pygtk-2.4-compat.patch, NONE, 1.1 gquilt.spec, 1.3, 1.4
Joshua W. Boyer (jwboyer)
fedora-extras-commits at redhat.com
Tue Aug 30 03:19:15 UTC 2005
Author: jwboyer
Update of /cvs/extras/rpms/gquilt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20455
Modified Files:
gquilt.spec
Added Files:
gquilt-pygtk-2.4-compat.patch
Log Message:
bug 167077: fix gquilt to work with older gtk
gquilt-pygtk-2.4-compat.patch:
--- NEW FILE gquilt-pygtk-2.4-compat.patch ---
Index: gquilt-0.13/gquilt.py
===================================================================
--- gquilt-0.13.orig/gquilt.py
+++ gquilt-0.13/gquilt.py
@@ -340,8 +340,8 @@ class gquilt(gtk.Window):
self.playground_files.set_size_request(240, 320)
self.playground_files.view.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
self.playground_files.append_selection_menu_item("_Add", "Add a the selected files to the top patch", gtk.STOCK_ADD, self._add_playground_selection_to_patch)
- self.playground_files.append_selection_menu_item("_Edit", "Edit the selected files after adding them to the top patch", gtk.STOCK_EDIT, self._edit_playground_selection_in_top_patch)
- self.playground_files.append_selection_menu_item("_Peruse", "Peruse the selected files", gtk.STOCK_FILE, self._peruse_playground_selection)
+ self.playground_files.append_selection_menu_item("_Edit", "Edit the selected files after adding them to the top patch", gtk.STOCK_DND, self._edit_playground_selection_in_top_patch)
+ self.playground_files.append_selection_menu_item("_Peruse", "Peruse the selected files", gtk.STOCK_NEW, self._peruse_playground_selection)
self.playground_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
return self.playground_files
def _create_patch_file_tree(self):
@@ -352,7 +352,7 @@ class gquilt(gtk.Window):
self.patch_files.append_menu_item("_Diff", "Display diff for selected files", gquilt_icons.diff, self._display_diff)
self.patch_files.append_conditional_menu_item("_Meld", "Display diff for selected files using \"meld\"", gquilt_icons.meld, self._display_diff_with_meld, self._unique_selection_and_meld)
self.patch_files.append_menu_item("_New", "Add a new file to the top patch", gtk.STOCK_NEW, self._add_new_file_to_patch)
- self.patch_files.append_menu_item("_Edit", "Edit selected files in the top patch", gtk.STOCK_EDIT, self._edit_selected_files)
+ self.patch_files.append_menu_item("_Edit", "Edit selected files in the top patch", gtk.STOCK_DND, self._edit_selected_files)
self.patch_files.append_selection_menu_item("_Remove", "Remove the selected files from the top patch", gtk.STOCK_REMOVE, self._remove_files_from_patch)
self.patch_files.append_selection_menu_item("_Delete", "Delete the selected files from the playground", gtk.STOCK_DELETE, self._delete_selected_files)
return self.patch_files
@@ -360,8 +360,8 @@ class gquilt(gtk.Window):
self.patches = gquilt_patch_list()
self.patches.set_tooltips(self.tooltips)
self.patches.set_size_request(240, 320)
- self.patches.append_unique_selection_menu_item("D_escription", "View/edit patch description", gtk.STOCK_EDIT, self._edit_patch_description)
- self.patches.append_unique_selection_menu_item("_Files", "Show the files modified by the selected patch", gtk.STOCK_FILE, self._display_patch_files)
+ self.patches.append_unique_selection_menu_item("D_escription", "View/edit patch description", gtk.STOCK_DND, self._edit_patch_description)
+ self.patches.append_unique_selection_menu_item("_Files", "Show the files modified by the selected patch", gtk.STOCK_NEW, self._display_patch_files)
self.patches.append_unique_selection_menu_item("D_iff", "Displa the diff for the selected patch", gquilt_icons.diff, self._display_patch_diff)
self.patches.append_unique_selection_menu_item("Re_name", "Rename the selected patch", None, self._rename_patch)
self.patches.append_unique_selection_menu_item("_Delete", "Delete the selected patch from the series", gtk.STOCK_DELETE, self._delete_patch)
Index: gquilt-0.13/gquilt_gtk.py
===================================================================
--- gquilt-0.13.orig/gquilt_gtk.py
+++ gquilt-0.13/gquilt_gtk.py
@@ -402,11 +402,11 @@ class dir_file_tree(file_tree):
dirs, files = self._dir_contents(dir)
dirs.sort()
for d in dirs:
- iter = self.store.append(parent, (d, True, style, foreground, gtk.STOCK_DIRECTORY))
+ iter = self.store.append(parent, (d, True, style, foreground, gtk.STOCK_OPEN))
self.store.append(iter)
files.sort()
for f in files:
- iter = self.store.append(parent, (f, False, style, foreground, gtk.STOCK_FILE))
+ iter = self.store.append(parent, (f, False, style, foreground, gtk.STOCK_NEW))
def _update_dir(self, dir, parent=None, style=pango.STYLE_NORMAL, foreground="black"):
dirs, files = self._dir_contents(dir)
dirs.sort()
@@ -421,12 +421,12 @@ class dir_file_tree(file_tree):
dead_entries.append(ci)
ci = self.store.iter_next(ci)
if ci is None:
- iter = self.store.append(parent, (d, True, style, foreground, gtk.STOCK_DIRECTORY))
+ iter = self.store.append(parent, (d, True, style, foreground, gtk.STOCK_OPEN))
self.store.append(iter)
continue
name = self.store.get_value(ci, 0)
if (not self.store.is_dir(ci)) or (name > d):
- iter = self.store.insert_before(parent, ci, (d, True, style, foreground, gtk.STOCK_DIRECTORY))
+ iter = self.store.insert_before(parent, ci, (d, True, style, foreground, gtk.STOCK_OPEN))
self.store.append(iter)
continue
if self.view.row_expanded(self.store.get_path(ci)):
@@ -440,10 +440,10 @@ class dir_file_tree(file_tree):
dead_entries.append(ci)
ci = self.store.iter_next(ci)
if ci is None:
- iter = self.store.append(parent, (f, False, style, foreground, gtk.STOCK_FILE))
+ iter = self.store.append(parent, (f, False, style, foreground, gtk.STOCK_NEW))
continue
if self.store.get_value(ci, 0) > f:
- iter = self.store.insert_before(parent, ci, (f, False, style, foreground, gtk.STOCK_FILE))
+ iter = self.store.insert_before(parent, ci, (f, False, style, foreground, gtk.STOCK_NEW))
continue
ci = self.store.iter_next(ci)
while ci is not None:
@@ -477,15 +477,15 @@ class path_file_tree(file_tree):
else:
iter = self.store.iter_children(parent)
if iter is None:
- return (False, self.store.append(parent, (name, True, style, foreground, gtk.STOCK_DIRECTORY)))
+ return (False, self.store.append(parent, (name, True, style, foreground, gtk.STOCK_OPEN)))
while self.store.is_dir(iter) and self.store.get_value(iter, 0) < name:
next = self.store.iter_next(iter)
if next is None or not self.store.get_value(next, 1):
- return (False, self.store.insert_after(parent, iter, (name, True, style, foreground, gtk.STOCK_DIRECTORY)))
+ return (False, self.store.insert_after(parent, iter, (name, True, style, foreground, gtk.STOCK_OPEN)))
iter = next
if self.store.get_value(iter, 0) == name:
return (True, iter)
- return (False, self.store.insert_before(parent, iter, (name, True, style, foreground, gtk.STOCK_DIRECTORY)))
+ return (False, self.store.insert_before(parent, iter, (name, True, style, foreground, gtk.STOCK_OPEN)))
def find_or_insert_dir(self, path, foreground="black"):
if path == "":
return (False, None)
@@ -503,20 +503,20 @@ class path_file_tree(file_tree):
else:
iter = self.store.iter_children(parent)
if iter is None:
- return (False, self.store.append(parent, (name, False, style, foreground, gtk.STOCK_FILE)))
+ return (False, self.store.append(parent, (name, False, style, foreground, gtk.STOCK_NEW)))
while self.store.is_dir(iter):
next = self.store.iter_next(iter)
if next is None:
- return (False, self.store.insert_after(parent, iter, (name, False, style, foreground, gtk.STOCK_FILE)))
+ return (False, self.store.insert_after(parent, iter, (name, False, style, foreground, gtk.STOCK_NEW)))
iter = next
while self.store.get_value(iter, 0) < name:
next = self.store.iter_next(iter)
if next is None:
- return (False, self.store.insert_after(parent, iter, (name, False, style, foreground, gtk.STOCK_FILE)))
+ return (False, self.store.insert_after(parent, iter, (name, False, style, foreground, gtk.STOCK_NEW)))
iter = next
if self.store.get_value(iter, 0) == name:
return (True, iter)
- return (False, self.store.insert_before(parent, iter, (name, False, style, foreground, gtk.STOCK_FILE)))
+ return (False, self.store.insert_before(parent, iter, (name, False, style, foreground, gtk.STOCK_NEW)))
def find_or_insert_file(self, path, foreground="black"):
if os.path.exists(path):
style=pango.STYLE_NORMAL
Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-3/gquilt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gquilt.spec 28 Aug 2005 17:43:35 -0000 1.3
+++ gquilt.spec 30 Aug 2005 03:19:13 -0000 1.4
@@ -1,10 +1,11 @@
Name: gquilt
Version: 0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Development/Tools
Summary: PyGTK GUI wrapper for quilt
Source0: http://users.bigpond.net.au/Peter-Williams/%{name}-%{version}.tar.gz
+Patch0: gquilt-pygtk-2.4-compat.patch
URL: http://users.bigpond.net.au/Peter-Williams/
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +21,7 @@
%prep
%setup
+%patch0 -p1 -b .compat
%build
make PREFIX=%{_prefix} all gquilt
@@ -51,6 +53,9 @@
rm -rf "$RPM_BUILD_ROOT"
%changelog
+* Sun Aug 29 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.13-2
+- Fix gtk 2.4 problems
+
* Sun Aug 28 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.13-1
- Update to latest release
- Remove COPYING file (included upstream)
More information about the scm-commits
mailing list