[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Thursday, December 24, 2020 @ 16:31:01 Author: foutrelis Revision: 404993 upgpkg: xfce4-xkb-plugin 0.8.2-1: new upstream release Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-12-24 16:28:48 UTC (rev 404992) +++ PKGBUILD2020-12-24 16:31:01 UTC (rev 404993) @@ -3,8 +3,8 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.8.1 -pkgrel=3 +pkgver=0.8.2 +pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('x86_64') url="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin"; @@ -14,7 +14,7 @@ makedepends=('intltool') install=$pkgname.install source=(https://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1') +sha256sums=('bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967') build() { cd "$srcdir/$pkgname-$pkgver"
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Tuesday, May 19, 2020 @ 08:41:09 Author: felixonmars Revision: 386425 upgpkg: xfce4-xkb-plugin 0.8.1-3: reproducibility rebuild Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-19 08:41:04 UTC (rev 386424) +++ PKGBUILD2020-05-19 08:41:09 UTC (rev 386425) @@ -4,7 +4,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('x86_64') url="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin";
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Sunday, August 11, 2019 @ 23:56:19 Author: foutrelis Revision: 359671 xfconf 4.14 rebuild Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-11 23:56:17 UTC (rev 359670) +++ PKGBUILD2019-08-11 23:56:19 UTC (rev 359671) @@ -4,7 +4,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('x86_64') url="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Saturday, February 2, 2019 @ 22:22:15 Author: foutrelis Revision: 345167 Update url field to use HTTPS Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-02-02 22:22:13 UTC (rev 345166) +++ PKGBUILD2019-02-02 22:22:15 UTC (rev 345167) @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('x86_64') -url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; +url="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; license=('custom') groups=('xfce4-goodies') depends=('xfce4-panel' 'libxklavier' 'librsvg' 'libwnck3')
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Friday, September 8, 2017 @ 21:32:28 Author: foutrelis Revision: 305075 upgpkg: xfce4-xkb-plugin 0.8.1-1 New upstream release. Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-09-08 17:05:11 UTC (rev 305074) +++ PKGBUILD2017-09-08 21:32:28 UTC (rev 305075) @@ -4,7 +4,7 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('3b0d3b9f4b7c3e3e7be668e2f7c845b89b16e0ed3db2bacb544a17272682ced0') +sha256sums=('c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1') build() { cd "$srcdir/$pkgname-$pkgver"
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD xfce4-xkb-plugin.install)
Date: Thursday, July 20, 2017 @ 15:38:49 Author: foutrelis Revision: 300870 upgpkg: xfce4-xkb-plugin 0.8.0-1 New upstream release. Modified: xfce4-xkb-plugin/trunk/PKGBUILD xfce4-xkb-plugin/trunk/xfce4-xkb-plugin.install --+ PKGBUILD | 10 -- xfce4-xkb-plugin.install |9 + 2 files changed, 13 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-07-20 15:25:09 UTC (rev 300869) +++ PKGBUILD2017-07-20 15:38:49 UTC (rev 300870) @@ -4,18 +4,18 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.7.1 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; license=('custom') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxklavier' 'librsvg') +depends=('xfce4-panel' 'libxklavier' 'librsvg' 'libwnck3') makedepends=('intltool') install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('61fe2e33fe99939d5d06a682e94e40e05ef844c930ad612154090d158b2ce681') +sha256sums=('3b0d3b9f4b7c3e3e7be668e2f7c845b89b16e0ed3db2bacb544a17272682ced0') build() { cd "$srcdir/$pkgname-$pkgver" @@ -32,9 +32,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } Modified: xfce4-xkb-plugin.install === --- xfce4-xkb-plugin.install2017-07-20 15:25:09 UTC (rev 300869) +++ xfce4-xkb-plugin.install2017-07-20 15:38:49 UTC (rev 300870) @@ -6,6 +6,15 @@ echo echo ' You will need to reconfigure the keyboard layouts on your next login.' fi + + if (($(vercmp $2 0.8.0-1) < 0)); then +echo ':: Starting with version 0.8.0, xfce4-xkb-plugin stores its settings' +echo ' in Xfconf instead of a configuration file. Settings from previous' +echo ' versions are not migrated over, and the panel plugin itself might' +echo ' disappear upon restarting the panel.' +echo +echo ' You need to re-add the xkb plugin to your panel and reconfigure it.' + fi } # vim:set ts=2 sw=2 et:
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD xfce4-xkb-plugin.install)
Date: Tuesday, March 10, 2015 @ 19:23:19 Author: foutrelis Revision: 233326 upgpkg: xfce4-xkb-plugin 0.7.1-2 Add post_upgrade() message about the integration with xfce4-settings. Added: xfce4-xkb-plugin/trunk/xfce4-xkb-plugin.install Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |3 ++- xfce4-xkb-plugin.install | 11 +++ 2 files changed, 13 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-03-10 17:55:27 UTC (rev 233325) +++ PKGBUILD2015-03-10 18:23:19 UTC (rev 233326) @@ -5,7 +5,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; @@ -13,6 +13,7 @@ groups=('xfce4-goodies') depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') +install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) sha256sums=('61fe2e33fe99939d5d06a682e94e40e05ef844c930ad612154090d158b2ce681') Added: xfce4-xkb-plugin.install === --- xfce4-xkb-plugin.install(rev 0) +++ xfce4-xkb-plugin.install2015-03-10 18:23:19 UTC (rev 233326) @@ -0,0 +1,11 @@ +post_upgrade() { + if (($(vercmp $2 0.7.1-2) < 0)); then +echo ':: Keyboard layouts are now configured through xfce4-keyboard-settings' +echo ' and managed by xfsettingsd. This plugin now only acts as a layout' +echo ' indicator and manages per window/application layout preferences.' +echo +echo ' You will need to reconfigure the keyboard layouts on your next login.' + fi +} + +# vim:set ts=2 sw=2 et:
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Tuesday, March 10, 2015 @ 18:55:17 Author: foutrelis Revision: 233324 upgpkg: xfce4-xkb-plugin 0.7.1-1 New upstream release. Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-03-10 17:32:06 UTC (rev 233323) +++ PKGBUILD2015-03-10 17:55:17 UTC (rev 233324) @@ -4,8 +4,8 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.5.6 -pkgrel=2 +pkgver=0.7.1 +pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; @@ -13,8 +13,8 @@ groups=('xfce4-goodies') depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) -sha256sums=('09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('61fe2e33fe99939d5d06a682e94e40e05ef844c930ad612154090d158b2ce681') build() { cd "$srcdir/$pkgname-$pkgver"
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Sunday, March 1, 2015 @ 12:25:39 Author: foutrelis Revision: 232298 upgpkg: xfce4-xkb-plugin 0.5.6-2 libxfce4util 4.12.0 rebuild. Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-03-01 11:25:37 UTC (rev 232297) +++ PKGBUILD2015-03-01 11:25:39 UTC (rev 232298) @@ -5,7 +5,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Thursday, June 20, 2013 @ 05:52:09 Author: foutrelis Revision: 188773 upgpkg: xfce4-xkb-plugin 0.5.6-1 New upstream release. Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-06-20 03:52:08 UTC (rev 188772) +++ PKGBUILD2013-06-20 03:52:09 UTC (rev 188773) @@ -4,7 +4,7 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) -sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9') +sha256sums=('09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5') build() { cd "$srcdir/$pkgname-$pkgver"
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Monday, October 15, 2012 @ 10:11:49 Author: foutrelis Revision: 168749 Adopt and tweak PKGBUILD. Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD | 37 ++--- 1 file changed, 22 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-10-15 13:21:21 UTC (rev 168748) +++ PKGBUILD2012-10-15 14:11:49 UTC (rev 168749) @@ -1,5 +1,6 @@ # $Id$ -# Maintainer: AndyRTR +# Maintainer: Evangelos Foutras +# Contributor: AndyRTR # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin @@ -7,28 +8,34 @@ pkgrel=2 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; license=('custom') -url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') +depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) +sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ +--prefix=/usr \ +--sysconfdir=/etc \ +--libexecdir=/usr/lib \ +--localstatedir=/var \ +--disable-static \ +--disable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } + +# vim:set ts=2 sw=2 et:
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Saturday, April 28, 2012 @ 21:05:50 Author: allan Revision: 157574 upgpkg: xfce4-xkb-plugin 0.5.4.3-2 libxfce4util and xfce4-panel rebuild Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-04-29 00:54:04 UTC (rev 157573) +++ PKGBUILD2012-04-29 01:05:50 UTC (rev 157574) @@ -4,7 +4,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.5.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64') license=('custom')
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Saturday, October 22, 2011 @ 04:26:02 Author: andyrtr Revision: 141038 upgpkg: xfce4-xkb-plugin 0.5.4.2-1 upstream update 0.5.4.2 Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-10-22 08:22:04 UTC (rev 141037) +++ PKGBUILD2011-10-22 08:26:02 UTC (rev 141038) @@ -3,10 +3,10 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.5.4.1 +pkgver=0.5.4.2 pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; groups=('xfce4-goodies') @@ -14,7 +14,7 @@ makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8512c0b180004e1150d8c05255c202d8') +md5sums=('b79f7c65f8155cb77d99dcf9716bb38b') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Saturday, June 4, 2011 @ 11:24:03 Author: andyrtr Revision: 126312 upgpkg: xfce4-xkb-plugin 0.5.4.1-1 upstream update 0.5.4.1 Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-06-04 14:23:15 UTC (rev 126311) +++ PKGBUILD2011-06-04 15:24:03 UTC (rev 126312) @@ -3,7 +3,7 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.5.4.0 +pkgver=0.5.4.1 pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3ea1efe366367af660e6e1d24a240b5f') +md5sums=('8512c0b180004e1150d8c05255c202d8') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Wednesday, April 20, 2011 @ 12:40:20 Author: andyrtr Revision: 120152 upgpkg: xfce4-xkb-plugin 0.5.4.0-1 upstream update 0.5.4.0; should also fix FS#23805 Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD | 19 +-- 1 file changed, 5 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-20 15:41:05 UTC (rev 120151) +++ PKGBUILD2011-04-20 16:40:20 UTC (rev 120152) @@ -3,30 +3,21 @@ # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin -pkgver=0.5.3.3 -pkgrel=4 +pkgver=0.5.4.0 +pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" arch=(i686 x86_64) license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'libxklavier>=5.0' 'librsvg') +depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.gz -xfce4-xkb-plugin-0.5.3.3-libxklavier.patch - crashfix.diff) -md5sums=('b233cc9de1cbace075eaf6e2c9a8e685' - '781165ce1bc08059ae8e846c45c0bab2' - '4faeaaea7d294cbad2972af964508086') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3ea1efe366367af660e6e1d24a240b5f') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" - - # https://bugs.archlinux.org/task/21067 - http://bugzilla.xfce.org/show_bug.cgi?id=6477 - patch -Np1 -i ${srcdir}/crashfix.diff - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD crashfix.diff)
Date: Saturday, January 22, 2011 @ 17:04:45 Author: andyrtr Revision: 107269 upgpkg: xfce4-xkb-plugin 0.5.3.3-4 add a patch from upstream tracker to solve FS#21067 Added: xfce4-xkb-plugin/trunk/crashfix.diff Modified: xfce4-xkb-plugin/trunk/PKGBUILD ---+ PKGBUILD | 16 +++- crashfix.diff | 34 ++ 2 files changed, 45 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-22 21:55:54 UTC (rev 107268) +++ PKGBUILD2011-01-22 22:04:45 UTC (rev 107269) @@ -4,7 +4,7 @@ pkgname=xfce4-xkb-plugin pkgver=0.5.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" arch=(i686 x86_64) license=('custom') @@ -14,13 +14,19 @@ makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.gz -xfce4-xkb-plugin-0.5.3.3-libxklavier.patch) -sha1sums=('5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7' - '44691bd348e33ea17afe45869675c0f7c03ed32f') +xfce4-xkb-plugin-0.5.3.3-libxklavier.patch + crashfix.diff) +md5sums=('b233cc9de1cbace075eaf6e2c9a8e685' + '781165ce1bc08059ae8e846c45c0bab2' + '4faeaaea7d294cbad2972af964508086') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" || return 1 + patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" + + # https://bugs.archlinux.org/task/21067 - http://bugzilla.xfce.org/show_bug.cgi?id=6477 + patch -Np1 -i ${srcdir}/crashfix.diff + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ Added: crashfix.diff === --- crashfix.diff (rev 0) +++ crashfix.diff 2011-01-22 22:04:45 UTC (rev 107269) @@ -0,0 +1,34 @@ +From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc +Date: Fri, 24 Sep 2010 21:28:49 +0200 +Subject: Handle cases when the keyboard model is empty + +gtk_combo_box_get_active_iter () does not set the iter, and a call to +gtk_tree_model_get () using this iter will crash. Thus, check the return value +of gtk_combo_box_get_active_iter () before using the iter. +--- + panel-plugin/xkb-settings-dialog.c |8 +--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c +index 178ec5f..37a0a9a 100644 +--- a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c +@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb) + gint i = 0; + + model = GTK_TREE_MODEL (xkb->combo_store); +-gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter); +-gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); +-kbd_config->model = kbdmodel; ++if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter)) ++{ ++gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1); ++kbd_config->model = kbdmodel; ++} + + model = GTK_TREE_MODEL (xkb->toggle_options_store); + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter)) +-- +1.7.1 +
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Tuesday, January 11, 2011 @ 15:30:04 Author: andyrtr Revision: 105788 upgpkg: xfce4-xkb-plugin 0.5.3.3-3 rebuild for Xfce 4.8 Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD | 30 +++--- 1 file changed, 19 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-01-11 20:21:34 UTC (rev 105787) +++ PKGBUILD2011-01-11 20:30:04 UTC (rev 105788) @@ -1,19 +1,19 @@ # $Id$ -# Maintainer: tobias +# Maintainer: AndyRTR # Contributor: Tobias Kieslich pkgname=xfce4-xkb-plugin pkgver=0.5.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" arch=(i686 x86_64) license=('custom') -url="http://xfce-goodies.berlios.de/"; +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"; groups=('xfce4-goodies') -depends=('xfce4-panel>=4.5.99.1' 'libxklavier>=5.0' 'librsvg') -makedepends=('pkgconfig' 'intltool') +depends=('xfce4-panel' 'libxfcegui4' 'libxklavier>=5.0' 'librsvg') +makedepends=('intltool') options=('!libtool') -source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.gz xfce4-xkb-plugin-0.5.3.3-libxklavier.patch) sha1sums=('5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7' '44691bd348e33ea17afe45869675c0f7c03ed32f') @@ -21,9 +21,17 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make } + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +}
[arch-commits] Commit in xfce4-xkb-plugin/trunk (PKGBUILD)
Date: Wednesday, August 18, 2010 @ 07:00:20 Author: jgc Revision: 87815 Remove perlxml makedepend Modified: xfce4-xkb-plugin/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-08-18 10:58:44 UTC (rev 87814) +++ PKGBUILD2010-08-18 11:00:20 UTC (rev 87815) @@ -11,7 +11,7 @@ url="http://xfce-goodies.berlios.de/"; groups=('xfce4-goodies') depends=('xfce4-panel>=4.5.99.1' 'libxklavier>=5.0' 'librsvg') -makedepends=('pkgconfig' 'perlxml' 'intltool') +makedepends=('pkgconfig' 'intltool') options=('!libtool') source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz xfce4-xkb-plugin-0.5.3.3-libxklavier.patch)