[arch-commits] Commit in emesene/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Thu Sep 5 12:29:37 UTC 2013
Date: Thursday, September 5, 2013 @ 14:29:37
Author: bgyorgy
Revision: 96793
upgpkg: emesene 2.12.9-3
- General cleanup
- Remove unused dependencies (FS#35011)
- Fix opening preferences dialog (FS#32182)
Added:
emesene/trunk/fix-preferences.patch
Modified:
emesene/trunk/PKGBUILD
emesene/trunk/emesene.install
Deleted:
emesene/trunk/setup.patch
-----------------------+
PKGBUILD | 52 ++++++++++++++++++++++--------------------------
emesene.install | 1
fix-preferences.patch | 11 ++++++++++
setup.patch | 20 ------------------
4 files changed, 35 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-05 09:31:14 UTC (rev 96792)
+++ PKGBUILD 2013-09-05 12:29:37 UTC (rev 96793)
@@ -4,53 +4,49 @@
pkgname=emesene
pkgver=2.12.9
-pkgrel=2
-pkgdesc="A pygtk MSN Messenger client"
+pkgrel=3
+pkgdesc="Chat program that allows you to connect to different networks like MSN, Gtalk, Facebook chat, Jabber and others"
url="http://www.emesene.org/"
license=('GPL' 'GPL3' 'LGPL3')
arch=('any')
-depends=('python2' 'pygtk' 'python2-dnspython' 'pylint' 'python2-notify' 'openssl' \
-'python2-imaging' 'python2-dbus' 'xdg-utils' 'hicolor-icon-theme' \
-'gstreamer0.10-python' 'gstreamer0.10-good' 'python2-crypto' \
-'python2-gobject2' 'python2-pyopenssl' 'pywebkitgtk')
-makedepends=('python2-distribute')
+depends=('hicolor-icon-theme' 'python2-crypto' 'python2-dbus' 'python2-dnspython'
+ 'gstreamer0.10-good' 'gstreamer0.10-python' 'python2-notify' 'python2-pyopenssl' \
+ 'pywebkitgtk' 'xdg-utils')
+makedepends=('python2-setuptools')
optdepends=('python2-gtkspell: spell-check plugin'
- 'farstream-0.1: webcam support'
- 'xmpppy: for gtalk and facebook chat support'
- 'python2-pyqt: alternative qt4 interface (emesene -e main:qt4_main')
+ 'python2-pyqt4: alternative qt4 interface (emesene -e main:qt4_main)')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/emesene/emesene/tarball/v${pkgver}"
+ 'fix-preferences.patch'
'emesene.run')
install=emesene.install
options=('!libtool')
sha1sums=('a1cd8aee7affae8f2637df65e2d45a06d3298f7a'
+ '3f68fe23c4c5c795c6b4f0d40802af424838f8b5'
'2bd13ada86aa0af6307a41047f0d7caf2995660d')
-package() {
+prepare() {
cd "${srcdir}"/${pkgname}-${pkgname}-b89aa5e
- # do not import dummy session
- # sed -i -e "/import dummy/d" emesene/emesene.py
+ # python -> python2
+ find -name '*.py' -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \;
+ sed -i "s|/usr/bin/env python|/usr/bin/env python2|" emesene/emesene
- # fix version number
-# sed -i 's|2.12.2-devel|2.12.3|' setup.py
+ # fix preferences (FS#32182)
+ patch -Np1 -i ../fix-preferences.patch
+}
- # install files
- export PYTHONPATH="${pkgdir}/usr/lib/python2.7/site-packages/"
- install -d "${pkgdir}"/usr/lib/python2.7/site-packages/
- python2 setup.py install --prefix="${pkgdir}"/usr
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgname}-b89aa5e
+ python2 setup.py install --root="$pkgdir" --optimize=1
cd "${pkgdir}"
# use /usr/share/emesene instead of /usr/lib/python2.7/site-packages
- mv -f "${pkgdir}"/usr/lib/python2.7/site-packages/emesene-${pkgver}-py2.7.egg/share \
- "${pkgdir}"/usr
- mv -f "${pkgdir}"/usr/lib/python2.7/site-packages/emesene-${pkgver}-py2.7.egg/emesene \
- "${pkgdir}"/usr/share
- rm -rf "${pkgdir}"/usr/lib
+ mv usr/lib/python2.7/site-packages/emesene usr/share/
+ rm -r usr/lib usr/share/emesene/data
- # python -> python2
- find -name *.py -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \;
- sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/emesene/emesene
+ # create plugins dir
+ install -dm755 usr/share/emesene/plugins
# create executable
- install -Dm755 "${srcdir}"/emesene.run "${pkgdir}"/usr/bin/emesene
+ install -Dm755 "${srcdir}"/emesene.run usr/bin/emesene
}
Modified: emesene.install
===================================================================
--- emesene.install 2013-09-05 09:31:14 UTC (rev 96792)
+++ emesene.install 2013-09-05 12:29:37 UTC (rev 96793)
@@ -1,5 +1,4 @@
post_install() {
- update-desktop-database -q
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
Added: fix-preferences.patch
===================================================================
--- fix-preferences.patch (rev 0)
+++ fix-preferences.patch 2013-09-05 12:29:37 UTC (rev 96793)
@@ -0,0 +1,11 @@
+diff -Naur emesene-emesene-b89aa5e.orig/emesene/gui/gtkui/Preferences.py emesene-emesene-b89aa5e/emesene/gui/gtkui/Preferences.py
+--- emesene-emesene-b89aa5e.orig/emesene/gui/gtkui/Preferences.py 2013-09-05 10:51:23.394961971 +0000
++++ emesene-emesene-b89aa5e/emesene/gui/gtkui/Preferences.py 2013-09-05 10:52:29.541187002 +0000
+@@ -1287,6 +1287,7 @@
+ self.append_check(_('Open mail in default desktop client'),
+ 'session.config.b_open_mail_in_desktop')
+
++ self.session.config.get_or_set('b_check_for_updates', True)
+ self.append_markup('<b>'+_('Updates')+'</b>')
+ self.append_check(_('Weekly check for plugins/themes updates on startup'),
+ 'session.config.b_check_for_updates')
Deleted: setup.patch
===================================================================
--- setup.patch 2013-09-05 09:31:14 UTC (rev 96792)
+++ setup.patch 2013-09-05 12:29:37 UTC (rev 96793)
@@ -1,20 +0,0 @@
---- setup.py.orig 2010-05-03 11:02:53.551508139 +0200
-+++ setup.py 2010-05-03 11:03:09.681918067 +0200
-@@ -6,17 +6,6 @@
- import sys
-
- if os.name == 'posix':
-- for arg in sys.argv:
-- if arg == 'install':
-- print 'Hello.\nYou are trying to do a system-wide install of emesene '\
-- 'using this script, which is a very bad thing to do.\n'\
-- 'Seriously, you do NOT want to do this, since it can break '\
-- 'other python apps, and emesene too!\n'\
-- 'Follow my advice: just run the \"emesene\" script that is '\
-- 'in this very same directory and you\'re done. emesene is running '\
-- 'and your system is safe. It\'s a win-win, don\'t you think?\n'\
-- 'Thanks for trying emesene.'
-- quit()
-
- # From apport's setup.py
- mo_files = []
More information about the arch-commits
mailing list