From 6417b537d9c3b5e5d6cfc976a1a10b2f485a5da8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:49:56 +0000 Subject: [PATCH 01/21] Initialize branch F-13 for accountsdialog --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 30a3fe616b5c5fdb4037734ecc6e93544a16e9b2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 22 Feb 2010 13:57:03 +0000 Subject: [PATCH 02/21] - Fix crasher with newer cheese --- ...pendencies-and-reflect-recent-api-ch.patch | 29 +++++++++++++++++++ accountsdialog.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch diff --git a/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch b/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch new file mode 100644 index 0000000..acfe957 --- /dev/null +++ b/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch @@ -0,0 +1,29 @@ +From 9182adfcf23a5cdaff79c19c1d738f2d44c88889 Mon Sep 17 00:00:00 2001 +From: Filippo Argiolas +Date: Sun, 21 Feb 2010 15:31:23 +0100 +Subject: [PATCH 1/2] Update cheese dependencies and reflect recent api changes + +--- + configure.ac | 2 +- + src/um-photo-dialog.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/um-photo-dialog.c b/src/um-photo-dialog.c +index 14be1e0..d546741 100644 +--- a/src/um-photo-dialog.c ++++ b/src/um-photo-dialog.c +@@ -306,7 +306,10 @@ update_photo_menu_status (UmPhotoDialog *um) + + static void + device_added (CheeseCameraDeviceMonitor *monitor, +- GObject *device, ++ const gchar *id, ++ const gchar *device_file, ++ const gchar *product_name, ++ gint api_version, + UmPhotoDialog *um) + { + um->num_cameras++; +-- +1.6.6.1 + diff --git a/accountsdialog.spec b/accountsdialog.spec index 946b3ab..673db95 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -10,6 +10,9 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.5/accountsdia # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=567084 +Patch1: 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch +Requires: cheese-libs >= 2.29.90 BuildRequires: intltool BuildRequires: glib2-devel @@ -37,6 +40,7 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts +%patch1 -p1 -b .cheese-crasher %build %configure @@ -64,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 22 2010 Bastien Nocera 0.5-2 +- Fix crasher with newer cheese + * Mon Feb 15 2010 Matthias Clasen 0.5-1 - Update to 0.5 - Require passwd From 1e4e9282597a24b57689617413e7d77283c3d73d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 22 Feb 2010 17:13:07 +0000 Subject: [PATCH 03/21] - Fix crasher with newer cheese --- accountsdialog.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 946b3ab..673db95 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -10,6 +10,9 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.5/accountsdia # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=567084 +Patch1: 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch +Requires: cheese-libs >= 2.29.90 BuildRequires: intltool BuildRequires: glib2-devel @@ -37,6 +40,7 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts +%patch1 -p1 -b .cheese-crasher %build %configure @@ -64,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 22 2010 Bastien Nocera 0.5-2 +- Fix crasher with newer cheese + * Mon Feb 15 2010 Matthias Clasen 0.5-1 - Update to 0.5 - Require passwd From b0364a83160f3b5fad48a4639faabf8ca334087b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 22 Feb 2010 17:19:01 +0000 Subject: [PATCH 04/21] add missing patch --- ...pendencies-and-reflect-recent-api-ch.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch diff --git a/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch b/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch new file mode 100644 index 0000000..acfe957 --- /dev/null +++ b/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch @@ -0,0 +1,29 @@ +From 9182adfcf23a5cdaff79c19c1d738f2d44c88889 Mon Sep 17 00:00:00 2001 +From: Filippo Argiolas +Date: Sun, 21 Feb 2010 15:31:23 +0100 +Subject: [PATCH 1/2] Update cheese dependencies and reflect recent api changes + +--- + configure.ac | 2 +- + src/um-photo-dialog.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/um-photo-dialog.c b/src/um-photo-dialog.c +index 14be1e0..d546741 100644 +--- a/src/um-photo-dialog.c ++++ b/src/um-photo-dialog.c +@@ -306,7 +306,10 @@ update_photo_menu_status (UmPhotoDialog *um) + + static void + device_added (CheeseCameraDeviceMonitor *monitor, +- GObject *device, ++ const gchar *id, ++ const gchar *device_file, ++ const gchar *product_name, ++ gint api_version, + UmPhotoDialog *um) + { + um->num_cameras++; +-- +1.6.6.1 + From 2b61d3b8b9be3fe6f2abdcae183d3e611850f64e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Mar 2010 20:56:39 +0000 Subject: [PATCH 05/21] 0.5.1 --- .cvsignore | 2 +- accountsdialog.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5908e98..2089205 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -accountsdialog-0.5.tar.bz2 +accountsdialog-0.5.1.tar.bz2 diff --git a/accountsdialog.spec b/accountsdialog.spec index 673db95..d97d199 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog -Version: 0.5 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -10,8 +10,6 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.5/accountsdia # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=567084 -Patch1: 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch Requires: cheese-libs >= 2.29.90 BuildRequires: intltool @@ -40,7 +38,6 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts -%patch1 -p1 -b .cheese-crasher %build %configure @@ -68,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 1 2010 Matthias Clasen - 0.5.1-1 +- Update to 0.5.1 +- Password dialog improvements + * Mon Feb 22 2010 Bastien Nocera 0.5-2 - Fix crasher with newer cheese diff --git a/sources b/sources index b7e9b8a..63ab1b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59e2bc339c60a6b11c0d97c47d3a391d accountsdialog-0.5.tar.bz2 +c6219231ad7d3db2f198f0fc99c9b9e6 accountsdialog-0.5.1.tar.bz2 From a752ee35b5fd1454b10fc4753a736e1e580921fe Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Mar 2010 21:02:12 +0000 Subject: [PATCH 06/21] fix spec --- accountsdialog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index d97d199..63624ae 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -6,7 +6,7 @@ Summary: An application to view and modify user accounts information Group: Applications/System License: GPLv3+ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog -Source0: http://download.gnome.org/sources/accountsdialog/0.5/accountsdialog-0.5.tar.bz2 +Source0: http://download.gnome.org/sources/accountsdialog/0.5/%{name}-%{version}.tar.bz2 # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch From 668af8d86ec43c7aba3db4559bea984b87cf9abf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Mar 2010 21:11:04 +0000 Subject: [PATCH 07/21] 0.5.1 --- accountsdialog.spec | 13 +++++++------ sources | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 673db95..63624ae 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,17 +1,15 @@ Name: accountsdialog -Version: 0.5 -Release: 2%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System License: GPLv3+ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog -Source0: http://download.gnome.org/sources/accountsdialog/0.5/accountsdialog-0.5.tar.bz2 +Source0: http://download.gnome.org/sources/accountsdialog/0.5/%{name}-%{version}.tar.bz2 # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=567084 -Patch1: 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch Requires: cheese-libs >= 2.29.90 BuildRequires: intltool @@ -40,7 +38,6 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts -%patch1 -p1 -b .cheese-crasher %build %configure @@ -68,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 1 2010 Matthias Clasen - 0.5.1-1 +- Update to 0.5.1 +- Password dialog improvements + * Mon Feb 22 2010 Bastien Nocera 0.5-2 - Fix crasher with newer cheese diff --git a/sources b/sources index b7e9b8a..63ab1b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59e2bc339c60a6b11c0d97c47d3a391d accountsdialog-0.5.tar.bz2 +c6219231ad7d3db2f198f0fc99c9b9e6 accountsdialog-0.5.1.tar.bz2 From 8cfaf8a4007bc49191eca78746920c411fad68fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 Mar 2010 18:51:31 +0000 Subject: [PATCH 08/21] Rebuild --- accountsdialog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 63624ae..21faa25 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,5 +1,5 @@ Name: accountsdialog -Version: 0.5.1 +Version: 0.5.2 Release: 1%{?dist} Summary: An application to view and modify user accounts information @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 +- Rebuild against new cheese + * Mon Mar 1 2010 Matthias Clasen - 0.5.1-1 - Update to 0.5.1 - Password dialog improvements From 9bde1eb0a1243c878d6ac1c4e22bba6b59a6cea9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 11 Mar 2010 19:07:03 +0000 Subject: [PATCH 09/21] fix spec --- accountsdialog.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 21faa25..086e128 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog -Version: 0.5.2 -Release: 1%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System From 53dccc35f83358262c96c63df8d87ca2800e82f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Mar 2010 18:59:27 +0000 Subject: [PATCH 10/21] Rebuild --- accountsdialog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 63624ae..086e128 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 +- Rebuild against new cheese + * Mon Mar 1 2010 Matthias Clasen - 0.5.1-1 - Update to 0.5.1 - Password dialog improvements From 353e8cb732de22897b2abf1a5ba39921d41ba8c9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 22 Mar 2010 13:29:00 +0000 Subject: [PATCH 11/21] rebuild --- accountsdialog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 086e128..f74a8e9 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 19 2010 Matthias Clasen - 0.5.1-3 +- Rebuild against new cheese + * Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 - Rebuild against new cheese From b0c5f9520600c4001a4268b2451139289c7f535b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 30 Mar 2010 17:32:24 +0000 Subject: [PATCH 12/21] 0.6 --- .cvsignore | 2 +- accountsdialog.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2089205..1891f7a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -accountsdialog-0.5.1.tar.bz2 +accountsdialog-0.6.tar.bz2 diff --git a/accountsdialog.spec b/accountsdialog.spec index 086e128..c2c11fc 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,12 +1,13 @@ Name: accountsdialog -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System License: GPLv3+ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog -Source0: http://download.gnome.org/sources/accountsdialog/0.5/%{name}-%{version}.tar.bz2 +#VCS: git:git://git.gnome.org/accountsdialog +Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{version}.tar.bz2 # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch @@ -25,7 +26,7 @@ BuildRequires: cheese-libs-devel BuildRequires: apg BuildRequires: desktop-file-utils -Requires: accountsservice +Requires: accountsservice >= 0.6 Requires: apg Requires: GConf2 Requires: passwd @@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 30 2010 Matthias Clasen - 0.6-1 +- Update to 0.6 + * Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 - Rebuild against new cheese diff --git a/sources b/sources index 63ab1b4..bf878b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6219231ad7d3db2f198f0fc99c9b9e6 accountsdialog-0.5.1.tar.bz2 +7e6dc4dd8a8d83b49df613a65e911eaf accountsdialog-0.6.tar.bz2 From 3884528299ce5fde939a74e631b287ee1ea64946 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 30 Mar 2010 17:34:46 +0000 Subject: [PATCH 13/21] 0.6 --- accountsdialog.spec | 13 +++++++------ sources | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index f74a8e9..c2c11fc 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,12 +1,13 @@ Name: accountsdialog -Version: 0.5.1 -Release: 3%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System License: GPLv3+ URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog -Source0: http://download.gnome.org/sources/accountsdialog/0.5/%{name}-%{version}.tar.bz2 +#VCS: git:git://git.gnome.org/accountsdialog +Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{version}.tar.bz2 # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch @@ -25,7 +26,7 @@ BuildRequires: cheese-libs-devel BuildRequires: apg BuildRequires: desktop-file-utils -Requires: accountsservice +Requires: accountsservice >= 0.6 Requires: apg Requires: GConf2 Requires: passwd @@ -65,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Mar 19 2010 Matthias Clasen - 0.5.1-3 -- Rebuild against new cheese +* Tue Mar 30 2010 Matthias Clasen - 0.6-1 +- Update to 0.6 * Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 - Rebuild against new cheese diff --git a/sources b/sources index 63ab1b4..bf878b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6219231ad7d3db2f198f0fc99c9b9e6 accountsdialog-0.5.1.tar.bz2 +7e6dc4dd8a8d83b49df613a65e911eaf accountsdialog-0.6.tar.bz2 From f5891055b06b3a2b6b88311b9358149593661e02 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Apr 2010 15:50:55 +0000 Subject: [PATCH 14/21] fix some issues with icon handling --- 0001-Fix-some-issues-with-icon-handling.patch | 51 +++++++++++++++++++ accountsdialog.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-some-issues-with-icon-handling.patch diff --git a/0001-Fix-some-issues-with-icon-handling.patch b/0001-Fix-some-issues-with-icon-handling.patch new file mode 100644 index 0000000..83656d5 --- /dev/null +++ b/0001-Fix-some-issues-with-icon-handling.patch @@ -0,0 +1,51 @@ +From 8ad8318ae483cae8f6a9b53245e10de428e55a63 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 5 Apr 2010 11:31:01 -0400 +Subject: [PATCH] Fix some issues with icon handling + +Preserve alpha channels if present in the file, and be careful +about not passing out-of-bounds coordinates to gdk_pixbuf_new_subpixbuf() +--- + src/um-crop-area.c | 18 ++++++++++++++---- + 1 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/src/um-crop-area.c b/src/um-crop-area.c +index 2c473a1..14ba5ee 100644 +--- a/src/um-crop-area.c ++++ b/src/um-crop-area.c +@@ -107,8 +107,10 @@ update_pixbufs (UmCropArea *area) + gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height) { + if (area->priv->pixbuf != NULL) + g_object_unref (area->priv->pixbuf); +- area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- allocation.width, allocation.height); ++ area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, ++ gdk_pixbuf_get_has_alpha (area->priv->browse_pixbuf), ++ 8, ++ allocation.width, allocation.height); + + color = &widget->style->bg[GTK_WIDGET_STATE (widget)]; + pixel = ((color->red & 0xff00) << 16) | +@@ -800,9 +802,17 @@ um_crop_area_new (void) + GdkPixbuf * + um_crop_area_get_picture (UmCropArea *area) + { ++ gint width, height; ++ ++ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf); ++ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf); ++ width = MIN (area->priv->crop.width, width - area->priv->crop.x); ++ height = MIN (area->priv->crop.height, height - area->priv->crop.y); ++ + return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf, +- area->priv->crop.x, area->priv->crop.y, +- area->priv->crop.width, area->priv->crop.height); ++ area->priv->crop.x, ++ area->priv->crop.y, ++ width, height); + } + + void +-- +1.7.0.1 + diff --git a/accountsdialog.spec b/accountsdialog.spec index c2c11fc..524ee20 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -11,6 +11,9 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{v # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch +# upstream fix +Patch1: 0001-Fix-some-issues-with-icon-handling.patch + Requires: cheese-libs >= 2.29.90 BuildRequires: intltool @@ -39,6 +42,7 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts +%patch1 -p1 -b .icon-changes %build %configure @@ -66,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 5 2010 Matthias Clasen - 0.6-2 +- Fix some issues with icon handling + * Tue Mar 30 2010 Matthias Clasen - 0.6-1 - Update to 0.6 From 39130f89880745df6bfd36419ac74d5fa728406d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Apr 2010 15:59:17 +0000 Subject: [PATCH 15/21] fix some icon handling issues --- 0001-Fix-some-issues-with-icon-handling.patch | 51 +++++++++++++++++++ accountsdialog.spec | 9 +++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-some-issues-with-icon-handling.patch diff --git a/0001-Fix-some-issues-with-icon-handling.patch b/0001-Fix-some-issues-with-icon-handling.patch new file mode 100644 index 0000000..83656d5 --- /dev/null +++ b/0001-Fix-some-issues-with-icon-handling.patch @@ -0,0 +1,51 @@ +From 8ad8318ae483cae8f6a9b53245e10de428e55a63 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 5 Apr 2010 11:31:01 -0400 +Subject: [PATCH] Fix some issues with icon handling + +Preserve alpha channels if present in the file, and be careful +about not passing out-of-bounds coordinates to gdk_pixbuf_new_subpixbuf() +--- + src/um-crop-area.c | 18 ++++++++++++++---- + 1 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/src/um-crop-area.c b/src/um-crop-area.c +index 2c473a1..14ba5ee 100644 +--- a/src/um-crop-area.c ++++ b/src/um-crop-area.c +@@ -107,8 +107,10 @@ update_pixbufs (UmCropArea *area) + gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height) { + if (area->priv->pixbuf != NULL) + g_object_unref (area->priv->pixbuf); +- area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- allocation.width, allocation.height); ++ area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, ++ gdk_pixbuf_get_has_alpha (area->priv->browse_pixbuf), ++ 8, ++ allocation.width, allocation.height); + + color = &widget->style->bg[GTK_WIDGET_STATE (widget)]; + pixel = ((color->red & 0xff00) << 16) | +@@ -800,9 +802,17 @@ um_crop_area_new (void) + GdkPixbuf * + um_crop_area_get_picture (UmCropArea *area) + { ++ gint width, height; ++ ++ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf); ++ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf); ++ width = MIN (area->priv->crop.width, width - area->priv->crop.x); ++ height = MIN (area->priv->crop.height, height - area->priv->crop.y); ++ + return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf, +- area->priv->crop.x, area->priv->crop.y, +- area->priv->crop.width, area->priv->crop.height); ++ area->priv->crop.x, ++ area->priv->crop.y, ++ width, height); + } + + void +-- +1.7.0.1 + diff --git a/accountsdialog.spec b/accountsdialog.spec index c2c11fc..524ee20 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -11,6 +11,9 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{v # hide nonfunctional UI Patch0: hide-unimplemented-parts.patch +# upstream fix +Patch1: 0001-Fix-some-issues-with-icon-handling.patch + Requires: cheese-libs >= 2.29.90 BuildRequires: intltool @@ -39,6 +42,7 @@ also lets you configure some aspects of the gdm login screen. %prep %setup -q %patch0 -p1 -b .hide-unimplemented-parts +%patch1 -p1 -b .icon-changes %build %configure @@ -66,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 5 2010 Matthias Clasen - 0.6-2 +- Fix some issues with icon handling + * Tue Mar 30 2010 Matthias Clasen - 0.6-1 - Update to 0.6 From 077f5636551488e08b08137f5c9eac4d72d32a1f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Apr 2010 02:08:45 +0000 Subject: [PATCH 16/21] fix a possible crash --- ...ossible-crash-when-changing-password.patch | 49 +++++++++++++++++++ accountsdialog.spec | 8 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-a-possible-crash-when-changing-password.patch diff --git a/0001-Fix-a-possible-crash-when-changing-password.patch b/0001-Fix-a-possible-crash-when-changing-password.patch new file mode 100644 index 0000000..3815d93 --- /dev/null +++ b/0001-Fix-a-possible-crash-when-changing-password.patch @@ -0,0 +1,49 @@ +From adf5a77d5f4f5f0e94f0fad669ee7192d1a5f5f5 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 5 Apr 2010 22:03:02 -0400 +Subject: [PATCH] Fix a possible crash when changing password + +--- + src/run-passwd.c | 1 - + src/um-password-dialog.c | 6 ++---- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/run-passwd.c b/src/run-passwd.c +index c702364..7e40661 100644 +--- a/src/run-passwd.c ++++ b/src/run-passwd.c +@@ -57,7 +57,6 @@ typedef enum { + struct PasswdHandler { + const char *current_password; + const char *new_password; +- const char *retyped_password; + + /* Communication with the passwd program */ + GPid backend_pid; +diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c +index d581a18..81c03dd 100644 +--- a/src/um-password-dialog.c ++++ b/src/um-password-dialog.c +@@ -777,10 +777,6 @@ um_password_dialog_set_user (UmPasswordDialog *um, + GdkPixbuf *pixbuf; + GtkTreeModel *model; + +- if (um->passwd_handler) { +- passwd_destroy (um->passwd_handler); +- um->passwd_handler = NULL; +- } + if (um->user) { + g_object_unref (um->user); + um->user = NULL; +@@ -803,6 +799,8 @@ um_password_dialog_set_user (UmPasswordDialog *um, + if (um_user_get_uid (um->user) == getuid()) { + gtk_widget_show (um->old_password_label); + gtk_widget_show (um->old_password_entry); ++ if (um->passwd_handler != NULL) ++ passwd_destroy (um->passwd_handler); + um->passwd_handler = passwd_init (); + um->old_password_ok = FALSE; + } +-- +1.7.0.1 + diff --git a/accountsdialog.spec b/accountsdialog.spec index 524ee20..59f6689 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -13,6 +13,8 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{v Patch0: hide-unimplemented-parts.patch # upstream fix Patch1: 0001-Fix-some-issues-with-icon-handling.patch +# upstream fix +Patch2: 0001-Fix-a-possible-crash-when-changing-password.patch Requires: cheese-libs >= 2.29.90 @@ -43,6 +45,7 @@ also lets you configure some aspects of the gdm login screen. %setup -q %patch0 -p1 -b .hide-unimplemented-parts %patch1 -p1 -b .icon-changes +%patch2 -p1 -b .password-crash %build %configure @@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 5 2010 Matthias Clasen - 0.6-3 +- Fix a possible crash when changing password + * Mon Apr 5 2010 Matthias Clasen - 0.6-2 - Fix some issues with icon handling From d00da3544e320c3da59c2f313f12d9cee3be00b8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Apr 2010 02:14:26 +0000 Subject: [PATCH 17/21] fix a crash when changing password --- ...ossible-crash-when-changing-password.patch | 49 +++++++++++++++++++ accountsdialog.spec | 8 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-a-possible-crash-when-changing-password.patch diff --git a/0001-Fix-a-possible-crash-when-changing-password.patch b/0001-Fix-a-possible-crash-when-changing-password.patch new file mode 100644 index 0000000..3815d93 --- /dev/null +++ b/0001-Fix-a-possible-crash-when-changing-password.patch @@ -0,0 +1,49 @@ +From adf5a77d5f4f5f0e94f0fad669ee7192d1a5f5f5 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 5 Apr 2010 22:03:02 -0400 +Subject: [PATCH] Fix a possible crash when changing password + +--- + src/run-passwd.c | 1 - + src/um-password-dialog.c | 6 ++---- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/run-passwd.c b/src/run-passwd.c +index c702364..7e40661 100644 +--- a/src/run-passwd.c ++++ b/src/run-passwd.c +@@ -57,7 +57,6 @@ typedef enum { + struct PasswdHandler { + const char *current_password; + const char *new_password; +- const char *retyped_password; + + /* Communication with the passwd program */ + GPid backend_pid; +diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c +index d581a18..81c03dd 100644 +--- a/src/um-password-dialog.c ++++ b/src/um-password-dialog.c +@@ -777,10 +777,6 @@ um_password_dialog_set_user (UmPasswordDialog *um, + GdkPixbuf *pixbuf; + GtkTreeModel *model; + +- if (um->passwd_handler) { +- passwd_destroy (um->passwd_handler); +- um->passwd_handler = NULL; +- } + if (um->user) { + g_object_unref (um->user); + um->user = NULL; +@@ -803,6 +799,8 @@ um_password_dialog_set_user (UmPasswordDialog *um, + if (um_user_get_uid (um->user) == getuid()) { + gtk_widget_show (um->old_password_label); + gtk_widget_show (um->old_password_entry); ++ if (um->passwd_handler != NULL) ++ passwd_destroy (um->passwd_handler); + um->passwd_handler = passwd_init (); + um->old_password_ok = FALSE; + } +-- +1.7.0.1 + diff --git a/accountsdialog.spec b/accountsdialog.spec index 524ee20..59f6689 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -13,6 +13,8 @@ Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{v Patch0: hide-unimplemented-parts.patch # upstream fix Patch1: 0001-Fix-some-issues-with-icon-handling.patch +# upstream fix +Patch2: 0001-Fix-a-possible-crash-when-changing-password.patch Requires: cheese-libs >= 2.29.90 @@ -43,6 +45,7 @@ also lets you configure some aspects of the gdm login screen. %setup -q %patch0 -p1 -b .hide-unimplemented-parts %patch1 -p1 -b .icon-changes +%patch2 -p1 -b .password-crash %build %configure @@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 5 2010 Matthias Clasen - 0.6-3 +- Fix a possible crash when changing password + * Mon Apr 5 2010 Matthias Clasen - 0.6-2 - Fix some issues with icon handling From 9df0ebf71c5c777e4471b4bb9e0cf9d664a3d23c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:53 +0000 Subject: [PATCH 18/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log 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 943d214..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: accountsdialog -# $Id$ -NAME := accountsdialog -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),) -# attept 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/import.log b/import.log deleted file mode 100644 index e9b23df..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -accountsdialog-0_4_1-1_fc12:HEAD:accountsdialog-0.4.1-1.fc12.src.rpm:1265211308 From 42625ba7a557c2cd9e644ca588fe499809412976 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:53 +0000 Subject: [PATCH 19/21] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 943d214..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: accountsdialog -# $Id$ -NAME := accountsdialog -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),) -# attept 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index e9b23df..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -accountsdialog-0_4_1-1_fc12:HEAD:accountsdialog-0.4.1-1.fc12.src.rpm:1265211308 From 4391efc3d2007e04fd3fb7140e8d50e4754f65a3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Aug 2010 12:32:18 -0400 Subject: [PATCH 20/21] Drop explicit cheese-libs dep --- accountsdialog.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/accountsdialog.spec b/accountsdialog.spec index 59f6689..d925c68 100644 --- a/accountsdialog.spec +++ b/accountsdialog.spec @@ -1,6 +1,6 @@ Name: accountsdialog Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An application to view and modify user accounts information Group: Applications/System @@ -16,8 +16,6 @@ Patch1: 0001-Fix-some-issues-with-icon-handling.patch # upstream fix Patch2: 0001-Fix-a-possible-crash-when-changing-password.patch -Requires: cheese-libs >= 2.29.90 - BuildRequires: intltool BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -73,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 13 2010 Matthias Clasen - 0.6-4 +- Drop explicit cheese-libs dep + * Mon Apr 5 2010 Matthias Clasen - 0.6-3 - Fix a possible crash when changing password From 84411232fd32339d3ab166076a8e8ec6a8789070 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Jan 2011 14:48:18 -0500 Subject: [PATCH 21/21] dead package --- ...y-require-gstreamer-0.10-for-linking.patch | 29 ----- ...ossible-crash-when-changing-password.patch | 49 -------- 0001-Fix-some-issues-with-icon-handling.patch | 51 -------- 0001-Remove-unused-m4-macros.patch | 51 -------- ...pendencies-and-reflect-recent-api-ch.patch | 29 ----- accountsdialog.spec | 109 ------------------ dead.package | 2 + hide-unimplemented-parts.patch | 71 ------------ sources | 1 - 9 files changed, 2 insertions(+), 390 deletions(-) delete mode 100644 0001-Explicitely-require-gstreamer-0.10-for-linking.patch delete mode 100644 0001-Fix-a-possible-crash-when-changing-password.patch delete mode 100644 0001-Fix-some-issues-with-icon-handling.patch delete mode 100644 0001-Remove-unused-m4-macros.patch delete mode 100644 0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch delete mode 100644 accountsdialog.spec create mode 100644 dead.package delete mode 100644 hide-unimplemented-parts.patch delete mode 100644 sources diff --git a/0001-Explicitely-require-gstreamer-0.10-for-linking.patch b/0001-Explicitely-require-gstreamer-0.10-for-linking.patch deleted file mode 100644 index a4b66ec..0000000 --- a/0001-Explicitely-require-gstreamer-0.10-for-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From def097f5f374cc490ea0307eddd9f3894cfade03 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 10 Feb 2010 10:54:59 +0000 -Subject: [PATCH] Explicitely require gstreamer-0.10 for linking - -Otherwise we get this error: -/usr/bin/ld: main.o: undefined reference to symbol 'gst_init_get_option_group' -/usr/bin/ld: note: 'gst_init_get_option_group' is defined in DSO /usr/lib/libgstreamer-0.10.so.0 so try adding it to the linker command line -/usr/lib/libgstreamer-0.10.so.0: could not read symbols: Invalid operation ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 43d6452..01b4533 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,7 +38,7 @@ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1) - PKG_CHECK_MODULES(UNIQUE, unique-1.0) - PKG_CHECK_MODULES(POLKIT, polkit-gtk-1) - PKG_CHECK_MODULES(GCONF, gconf-2.0) --PKG_CHECK_MODULES(CHEESE, cheese-gtk > 2.29.6, have_cheese=yes, have_cheese=no) -+PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk > 2.29.6, have_cheese=yes, have_cheese=no) - - if test x$have_cheese = xyes ; then - AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support]) --- -1.6.6 - diff --git a/0001-Fix-a-possible-crash-when-changing-password.patch b/0001-Fix-a-possible-crash-when-changing-password.patch deleted file mode 100644 index 3815d93..0000000 --- a/0001-Fix-a-possible-crash-when-changing-password.patch +++ /dev/null @@ -1,49 +0,0 @@ -From adf5a77d5f4f5f0e94f0fad669ee7192d1a5f5f5 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 5 Apr 2010 22:03:02 -0400 -Subject: [PATCH] Fix a possible crash when changing password - ---- - src/run-passwd.c | 1 - - src/um-password-dialog.c | 6 ++---- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/run-passwd.c b/src/run-passwd.c -index c702364..7e40661 100644 ---- a/src/run-passwd.c -+++ b/src/run-passwd.c -@@ -57,7 +57,6 @@ typedef enum { - struct PasswdHandler { - const char *current_password; - const char *new_password; -- const char *retyped_password; - - /* Communication with the passwd program */ - GPid backend_pid; -diff --git a/src/um-password-dialog.c b/src/um-password-dialog.c -index d581a18..81c03dd 100644 ---- a/src/um-password-dialog.c -+++ b/src/um-password-dialog.c -@@ -777,10 +777,6 @@ um_password_dialog_set_user (UmPasswordDialog *um, - GdkPixbuf *pixbuf; - GtkTreeModel *model; - -- if (um->passwd_handler) { -- passwd_destroy (um->passwd_handler); -- um->passwd_handler = NULL; -- } - if (um->user) { - g_object_unref (um->user); - um->user = NULL; -@@ -803,6 +799,8 @@ um_password_dialog_set_user (UmPasswordDialog *um, - if (um_user_get_uid (um->user) == getuid()) { - gtk_widget_show (um->old_password_label); - gtk_widget_show (um->old_password_entry); -+ if (um->passwd_handler != NULL) -+ passwd_destroy (um->passwd_handler); - um->passwd_handler = passwd_init (); - um->old_password_ok = FALSE; - } --- -1.7.0.1 - diff --git a/0001-Fix-some-issues-with-icon-handling.patch b/0001-Fix-some-issues-with-icon-handling.patch deleted file mode 100644 index 83656d5..0000000 --- a/0001-Fix-some-issues-with-icon-handling.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8ad8318ae483cae8f6a9b53245e10de428e55a63 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 5 Apr 2010 11:31:01 -0400 -Subject: [PATCH] Fix some issues with icon handling - -Preserve alpha channels if present in the file, and be careful -about not passing out-of-bounds coordinates to gdk_pixbuf_new_subpixbuf() ---- - src/um-crop-area.c | 18 ++++++++++++++---- - 1 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/um-crop-area.c b/src/um-crop-area.c -index 2c473a1..14ba5ee 100644 ---- a/src/um-crop-area.c -+++ b/src/um-crop-area.c -@@ -107,8 +107,10 @@ update_pixbufs (UmCropArea *area) - gdk_pixbuf_get_height (area->priv->pixbuf) != allocation.height) { - if (area->priv->pixbuf != NULL) - g_object_unref (area->priv->pixbuf); -- area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, -- allocation.width, allocation.height); -+ area->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, -+ gdk_pixbuf_get_has_alpha (area->priv->browse_pixbuf), -+ 8, -+ allocation.width, allocation.height); - - color = &widget->style->bg[GTK_WIDGET_STATE (widget)]; - pixel = ((color->red & 0xff00) << 16) | -@@ -800,9 +802,17 @@ um_crop_area_new (void) - GdkPixbuf * - um_crop_area_get_picture (UmCropArea *area) - { -+ gint width, height; -+ -+ width = gdk_pixbuf_get_width (area->priv->browse_pixbuf); -+ height = gdk_pixbuf_get_height (area->priv->browse_pixbuf); -+ width = MIN (area->priv->crop.width, width - area->priv->crop.x); -+ height = MIN (area->priv->crop.height, height - area->priv->crop.y); -+ - return gdk_pixbuf_new_subpixbuf (area->priv->browse_pixbuf, -- area->priv->crop.x, area->priv->crop.y, -- area->priv->crop.width, area->priv->crop.height); -+ area->priv->crop.x, -+ area->priv->crop.y, -+ width, height); - } - - void --- -1.7.0.1 - diff --git a/0001-Remove-unused-m4-macros.patch b/0001-Remove-unused-m4-macros.patch deleted file mode 100644 index ea47dde..0000000 --- a/0001-Remove-unused-m4-macros.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 31fb4bbef99a7ca0ab3626921fc4e12f85fa2929 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 10 Feb 2010 11:08:02 +0000 -Subject: [PATCH] Remove unused m4 macros - ---- - Makefile.am | 2 - - m4/Makefile.am | 9 - - m4/gettext.m4 | 381 ---------------------------- - m4/gettext.m4~ | 381 ---------------------------- - m4/iconv.m4 | 180 -------------- - m4/iconv.m4~ | 180 -------------- - m4/lib-ld.m4 | 110 --------- - m4/lib-ld.m4~ | 110 --------- - m4/lib-link.m4 | 709 ----------------------------------------------------- - m4/lib-link.m4~ | 709 ----------------------------------------------------- - m4/lib-prefix.m4 | 185 -------------- - m4/lib-prefix.m4~ | 185 -------------- - m4/nls.m4 | 31 --- - m4/nls.m4~ | 31 --- - m4/po.m4 | 449 --------------------------------- - m4/po.m4~ | 449 --------------------------------- - m4/progtest.m4 | 92 ------- - m4/progtest.m4~ | 92 ------- - 18 files changed, 0 insertions(+), 4285 deletions(-) - delete mode 100644 m4/Makefile.am - delete mode 100644 m4/gettext.m4 - delete mode 100644 m4/gettext.m4~ - delete mode 100644 m4/iconv.m4 - delete mode 100644 m4/iconv.m4~ - delete mode 100644 m4/lib-ld.m4 - delete mode 100644 m4/lib-ld.m4~ - delete mode 100644 m4/lib-link.m4 - delete mode 100644 m4/lib-link.m4~ - delete mode 100644 m4/lib-prefix.m4 - delete mode 100644 m4/lib-prefix.m4~ - delete mode 100644 m4/nls.m4 - delete mode 100644 m4/nls.m4~ - delete mode 100644 m4/po.m4 - delete mode 100644 m4/po.m4~ - delete mode 100644 m4/progtest.m4 - delete mode 100644 m4/progtest.m4~ - -diff --git a/Makefile.am b/Makefile.am -index 4f2fe8c..c4b9f50 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1 @@ - SUBDIRS = src data po -- --ACLOCAL_AMFLAGS = -I m4 diff --git a/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch b/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch deleted file mode 100644 index acfe957..0000000 --- a/0001-Update-cheese-dependencies-and-reflect-recent-api-ch.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9182adfcf23a5cdaff79c19c1d738f2d44c88889 Mon Sep 17 00:00:00 2001 -From: Filippo Argiolas -Date: Sun, 21 Feb 2010 15:31:23 +0100 -Subject: [PATCH 1/2] Update cheese dependencies and reflect recent api changes - ---- - configure.ac | 2 +- - src/um-photo-dialog.c | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/um-photo-dialog.c b/src/um-photo-dialog.c -index 14be1e0..d546741 100644 ---- a/src/um-photo-dialog.c -+++ b/src/um-photo-dialog.c -@@ -306,7 +306,10 @@ update_photo_menu_status (UmPhotoDialog *um) - - static void - device_added (CheeseCameraDeviceMonitor *monitor, -- GObject *device, -+ const gchar *id, -+ const gchar *device_file, -+ const gchar *product_name, -+ gint api_version, - UmPhotoDialog *um) - { - um->num_cameras++; --- -1.6.6.1 - diff --git a/accountsdialog.spec b/accountsdialog.spec deleted file mode 100644 index d925c68..0000000 --- a/accountsdialog.spec +++ /dev/null @@ -1,109 +0,0 @@ -Name: accountsdialog -Version: 0.6 -Release: 4%{?dist} -Summary: An application to view and modify user accounts information - -Group: Applications/System -License: GPLv3+ -URL: http://www.fedoraproject.org/wiki/Features/UserAccountDialog -#VCS: git:git://git.gnome.org/accountsdialog -Source0: http://download.gnome.org/sources/accountsdialog/0.6/%{name}-%{version}.tar.bz2 - -# hide nonfunctional UI -Patch0: hide-unimplemented-parts.patch -# upstream fix -Patch1: 0001-Fix-some-issues-with-icon-handling.patch -# upstream fix -Patch2: 0001-Fix-a-possible-crash-when-changing-password.patch - -BuildRequires: intltool -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -BuildRequires: gnome-desktop-devel -BuildRequires: dbus-glib-devel -BuildRequires: unique-devel -BuildRequires: polkit-gnome-devel -BuildRequires: GConf2-devel -BuildRequires: iso-codes-devel -BuildRequires: cheese-libs-devel -BuildRequires: apg -BuildRequires: desktop-file-utils - -Requires: accountsservice >= 0.6 -Requires: apg -Requires: GConf2 -Requires: passwd - -%description -The AccountsDialog project provides an application to view and modify -user account information that is provided by the AccountsService. It -also lets you configure some aspects of the gdm login screen. - -%prep -%setup -q -%patch0 -p1 -b .hide-unimplemented-parts -%patch1 -p1 -b .icon-changes -%patch2 -p1 -b .password-crash - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' - -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/accountsdialog.desktop - -%find_lang accounts-dialog - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -f accounts-dialog.lang -%defattr(-,root,root,-) -%doc COPYING README AUTHORS -%{_bindir}/accounts-dialog -%{_datadir}/accountsdialog -%{_datadir}/applications/accountsdialog.desktop - - -%changelog -* Fri Aug 13 2010 Matthias Clasen - 0.6-4 -- Drop explicit cheese-libs dep - -* Mon Apr 5 2010 Matthias Clasen - 0.6-3 -- Fix a possible crash when changing password - -* Mon Apr 5 2010 Matthias Clasen - 0.6-2 -- Fix some issues with icon handling - -* Tue Mar 30 2010 Matthias Clasen - 0.6-1 -- Update to 0.6 - -* Thu Mar 11 2010 Matthias Clasen - 0.5.1-2 -- Rebuild against new cheese - -* Mon Mar 1 2010 Matthias Clasen - 0.5.1-1 -- Update to 0.5.1 -- Password dialog improvements - -* Mon Feb 22 2010 Bastien Nocera 0.5-2 -- Fix crasher with newer cheese - -* Mon Feb 15 2010 Matthias Clasen 0.5-1 -- Update to 0.5 -- Require passwd - -* Tue Feb 09 2010 Bastien Nocera 0.4.1-2 -- Compile with webcam avatar capture - -* Tue Feb 2 2010 Matthias Clasen 0.4.1-1 -- Update to 0.4.1 -- Incorporate package review feedback -- Hide unimplemented parts of the UI - -* Fri Jan 29 2010 Matthias Clasen 0.4-1 -- Initial packaging, based on work of Richard Hughes diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d4472f6 --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +This has been merged upstream in the gnome-control-center, and +will be available in the control-center package in Fedora. diff --git a/hide-unimplemented-parts.patch b/hide-unimplemented-parts.patch deleted file mode 100644 index b767ac1..0000000 --- a/hide-unimplemented-parts.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/data/user-accounts-dialog.ui b/data/user-accounts-dialog.ui -index da6d217..98d6330 100644 ---- a/data/user-accounts-dialog.ui -+++ b/data/user-accounts-dialog.ui -@@ -146,11 +146,11 @@ - 10 - - -- True -+ False - - - Open -- True -+ False - True - True - 0 -@@ -177,7 +177,7 @@ - - - Open -- True -+ False - True - True - 0 -@@ -199,6 +199,7 @@ - - - 1 -+ False - Address Book Card: - - -@@ -576,7 +577,7 @@ - - - -- True -+ False - 1 - Restrictions: - -@@ -821,7 +822,7 @@ - - - Show password hints -- True -+ False - True - False - True -@@ -835,7 +836,7 @@ - - - -- True -+ False - 0 - 0 - A guest account will allow anyone to temporarily log in to this computer without a password. For security, remote logins to this account are not allowed. -@@ -853,7 +854,7 @@ - - - Allow guests to log in to this computer -- True -+ False - True - False - True diff --git a/sources b/sources deleted file mode 100644 index bf878b0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -7e6dc4dd8a8d83b49df613a65e911eaf accountsdialog-0.6.tar.bz2