[arch-commits] Commit in gnome-applets/repos (3 files)

[Jan de Groot]

    Date: Wednesday, October 21, 2009 @ 09:01:24
  Author: jgc
Revision: 56296

Merged revisions 56295 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-applets/trunk

........
  r56295 | jgc | 2009-10-21 15:01:09 +0200 (Wed, 21 Oct 2009) | 2 lines
  
  upgpkg: gnome-applets 2.28.0-2
      Fix stickynotes crash (FS#16628)
........

Added:
  gnome-applets/repos/extra-x86_64/stickynotes-fix-labels.patch
    (from rev 56295, gnome-applets/trunk/stickynotes-fix-labels.patch)
Modified:
  gnome-applets/repos/extra-x86_64/	(properties)
  gnome-applets/repos/extra-x86_64/PKGBUILD

------------------------------+
 PKGBUILD                     |   13 ++++++++-----
 stickynotes-fix-labels.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)


Property changes on: gnome-applets/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-applets/trunk:1-54844
   + /gnome-applets/trunk:1-56295

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-21 13:01:09 UTC (rev 56295)
+++ extra-x86_64/PKGBUILD	2009-10-21 13:01:24 UTC (rev 56296)
@@ -3,22 +3,25 @@
 
 pkgname=gnome-applets
 pkgver=2.28.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gstreamer0.10-base-plugins>=0.10.24' 'gnome-panel>=2.27.92' 'libgtop>=2.28.0' 'gucharmap>=2.27.0' 'libnotify>=0.4.5' 'cpufrequtils' 'libgnomekbd>=2.27.91')
-makedepends=('gnome-doc-utils>=0.17.5' 'pkgconfig' 'gnome-settings-daemon>=2.27.92' 'intltool' 'gnome-icon-theme>=2.27.90' 'gnome-python-desktop>=2.27.3' 'networkmanager')
+depends=('gstreamer0.10-base-plugins>=0.10.24' 'gnome-panel>=2.27.92' 'libgtop>=2.28.0' 'gucharmap>=2.28.1' 'libnotify>=0.4.5' 'cpufrequtils' 'libgnomekbd>=2.28.0')
+makedepends=('gnome-doc-utils>=0.18.0' 'pkgconfig' 'gnome-settings-daemon>=2.28.1' 'intltool' 'gnome-icon-theme>=2.28.0' 'gnome-python-desktop>=2.28.0' 'networkmanager')
 optdepends=('gnome-python-desktop: invest-applet')
 options=(!emptydirs)
 url="http://www.gnome.org"
 groups=(gnome)
 install=gnome-applets.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+        stickynotes-fix-labels.patch)
+sha256sums=('73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b'
+            'efb4de38d1d6caea31efe128a85ec49f54621d6ff87bb2863396c1b8c01f0120')
 	
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/stickynotes-fix-labels.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-applets \
       --localstatedir=/var --disable-static \

Copied: gnome-applets/repos/extra-x86_64/stickynotes-fix-labels.patch (from rev 56295, gnome-applets/trunk/stickynotes-fix-labels.patch)
===================================================================
--- extra-x86_64/stickynotes-fix-labels.patch	                        (rev 0)
+++ extra-x86_64/stickynotes-fix-labels.patch	2009-10-21 13:01:24 UTC (rev 56296)
@@ -0,0 +1,31 @@
+From 26488f7c397fd3e41c7c64eaf2b14b577605e97e Mon Sep 17 00:00:00 2001
+From: Callum McKenzie <callum at spooky-possum.org>
+Date: Wed, 07 Oct 2009 18:38:05 +0000
+Subject: stickynotes: More fixes for duplicate labels in the .ui file.
+
+Patch from Michael Pryc in bug 594797.
+---
+diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui
+index 7035355..16c3a29 100644
+--- a/stickynotes/stickynotes.ui
++++ b/stickynotes/stickynotes.ui
+@@ -474,7 +474,7 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox1">
++              <object class="GtkVBox" id="vbox3">
+                 <property name="visible">True</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+@@ -494,7 +494,7 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkLabel" id="label1">
++                  <object class="GtkLabel" id="label2">
+                     <property name="visible">True</property>
+                     <property name="xalign">0</property>
+                     <property name="label" translatable="yes">This cannot be undone.</property>
+--
+cgit v0.8.2