diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /community-staging/guake | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'community-staging/guake')
-rw-r--r-- | community-staging/guake/PKGBUILD | 41 | ||||
-rw-r--r-- | community-staging/guake/guake-fix-notification.patch | 42 | ||||
-rw-r--r-- | community-staging/guake/guake.install | 22 |
3 files changed, 0 insertions, 105 deletions
diff --git a/community-staging/guake/PKGBUILD b/community-staging/guake/PKGBUILD deleted file mode 100644 index dfa432504..000000000 --- a/community-staging/guake/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 77984 2012-10-16 02:10:51Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> - -pkgname=guake -pkgver=0.4.4 -pkgrel=2 -pkgdesc='Drop-down terminal for GNOME' -arch=('i686' 'x86_64') -url="http://guake.org/" -license=('GPL') -depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool') -options=('!libtool') -install=$pkgname.install -source=(http://guake.org/files/$pkgname-$pkgver.tar.gz - guake-fix-notification.patch) -md5sums=('532adada29b8f0bb79dc15904aa6b70c' - '0b57227e6869dd84dd4fb0794ed0d082') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in - sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py} - - # http://guake.org/ticket/416 - patch -Np1 -i "$srcdir/guake-fix-notification.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/guake/guake-fix-notification.patch b/community-staging/guake/guake-fix-notification.patch deleted file mode 100644 index 847dac10e..000000000 --- a/community-staging/guake/guake-fix-notification.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/guake 2011-02-09 20:00:35.000000000 +0100 -+++ b/src/guake 2012-02-25 00:55:28.513075769 +0100 -@@ -46,7 +46,10 @@ - TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \ - ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER - --pynotify.init('Guake!') -+popup_works = True -+if not pynotify.init('Guake!') or pynotify.get_server_info() == None : -+ popup_works = False -+ print "WARNING: could not use popup notification" - - GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name' - -@@ -637,7 +640,12 @@ - 'Please use Guake Preferences dialog to choose another ' - 'key (The trayicon was enabled)') % label, filename) - self.client.set_bool(KEY('/general/use_trayicon'), True) -- notification.show() -+ if popup_works : -+ notification.show() -+ else : -+ print _('A problem happened when binding <b>%s</b> key.\n' -+ 'Please use Guake Preferences dialog to choose another ' -+ 'key (The trayicon was enabled)') % label - - elif self.client.get_bool(KEY('/general/use_popup')): - # Pop-up that shows that guake is working properly (if not -@@ -646,7 +654,11 @@ - _('Guake!'), - _('Guake is now running,\n' - 'press <b>%s</b> to use it.') % label, filename) -- notification.show() -+ if popup_works : -+ notification.show() -+ else : -+ print _('Guake is now running,\n' -+ 'press <b>%s</b> to use it.') % label - - def execute_command(self, command, tab=None): - """Execute the `command' in the `tab'. If tab is None, the - diff --git a/community-staging/guake/guake.install b/community-staging/guake/guake.install deleted file mode 100644 index 8084333b1..000000000 --- a/community-staging/guake/guake.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=guake - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - xdg-icon-resource forceupdate -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - xdg-icon-resource forceupdate -} |