diff options
author | root <root@rshg054.dnsready.net> | 2012-11-12 01:31:01 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-11-12 01:31:01 -0800 |
commit | b863c91c6c9218e2ad9458231b24385be177ed08 (patch) | |
tree | da88c798b067fd2af9ad0c2237917826cef02c8e /community/avant-window-navigator | |
parent | c1c596c922f0dc8622339011db936c531647203d (diff) |
Mon Nov 12 01:30:54 PST 2012
Diffstat (limited to 'community/avant-window-navigator')
-rw-r--r-- | community/avant-window-navigator/688_687.diff | 23 | ||||
-rw-r--r-- | community/avant-window-navigator/821_820.diff | 96 | ||||
-rw-r--r-- | community/avant-window-navigator/824_823.diff | 40 | ||||
-rw-r--r-- | community/avant-window-navigator/PKGBUILD | 67 | ||||
-rw-r--r-- | community/avant-window-navigator/avant-window-navigator.install | 22 |
5 files changed, 248 insertions, 0 deletions
diff --git a/community/avant-window-navigator/688_687.diff b/community/avant-window-navigator/688_687.diff new file mode 100644 index 000000000..34c5b8fa4 --- /dev/null +++ b/community/avant-window-navigator/688_687.diff @@ -0,0 +1,23 @@ +=== modified file 'libawn/awn-applet-simple.c' +--- libawn/awn-applet-simple.c 2010-01-10 14:43:43 +0000 ++++ libawn/awn-applet-simple.c 2010-04-11 21:08:28 +0000 +@@ -393,16 +393,16 @@ + GStrv states, + GStrv icon_names) + { +- gchar *applet_name; ++ gchar *applet_name=NULL; + + g_return_if_fail (AWN_IS_APPLET_SIMPLE (applet)); +- g_return_if_fail (applet_name); + g_return_if_fail (states); + g_return_if_fail (icon_names); + + g_object_get (applet, + "canonical-name",&applet_name, + NULL); ++ g_return_if_fail (applet_name); + applet->priv->last_set_icon = ICON_THEMED_MANY; + awn_themed_icon_set_size (AWN_THEMED_ICON (applet->priv->icon), + awn_applet_get_size (AWN_APPLET (applet))); + diff --git a/community/avant-window-navigator/821_820.diff b/community/avant-window-navigator/821_820.diff new file mode 100644 index 000000000..bd8c5b279 --- /dev/null +++ b/community/avant-window-navigator/821_820.diff @@ -0,0 +1,96 @@ +=== modified file 'awn-settings/awnClass.py' +--- awn-settings/awnClass.py 2010-08-24 00:21:51 +0000 ++++ awn-settings/awnClass.py 2011-02-13 23:43:42 +0000 +@@ -53,9 +53,13 @@ + import tempfile + import dbus + +-from bzrlib import branch +-from bzrlib.builtins import cmd_branch, cmd_pull +-from bzrlib.plugins.launchpad.lp_directory import LaunchpadDirectory ++try: ++ from bzrlib import branch ++ from bzrlib.builtins import cmd_branch, cmd_pull ++ from bzrlib.plugins.launchpad.lp_directory import LaunchpadDirectory ++ support_bzr = True ++except: ++ support_bzr = False + + defs.i18nize(globals()) + +@@ -127,8 +131,11 @@ + path: a url from a branch + return: the http format of a lp: format, or the same url + ''' +- directory = LaunchpadDirectory() +- return directory._resolve(path).replace("bzr+ssh","http") ++ if support_bzr == True: ++ directory = LaunchpadDirectory() ++ return directory._resolve(path).replace("bzr+ssh","http") ++ else: ++ return path + + def read_list(self, file_path): + ''' Read a flat file and return the content in a list +@@ -148,34 +155,44 @@ + path: the path of the branch + bzr_dir: the location of the futur tree. + ''' +- if os.path.exists(path): +- print ("Error, the path already exist") ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) + else: +- try: +- bzr_branch = cmd_branch() +- status = StringIO() +- status = bzr_branch._setup_outf() +- bzr_branch.run(from_location=self.lp_path_normalize(bzr_dir), to_location=path) +- except socket.gaierror: +- print 'Socket error, could not create branch.' ++ if os.path.exists(path): ++ print (_("Error, the path already exist")) ++ else: ++ try: ++ bzr_branch = cmd_branch() ++ status = StringIO() ++ status = bzr_branch._setup_outf() ++ bzr_branch.run(from_location=self.lp_path_normalize(bzr_dir), to_location=path) ++ except socket.gaierror: ++ print (_('Socket error, could not create branch.')) + + def update_branch(self, path): + ''' Update a local branch + path: Location of the branch + Return the output of the command + ''' +- bzr_pull = cmd_pull() +- status = StringIO() +- status = bzr_pull._setup_outf() +- bzr_pull.run(directory=path) ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) ++ else: ++ bzr_pull = cmd_pull() ++ status = StringIO() ++ status = bzr_pull._setup_outf() ++ bzr_pull.run(directory=path) + + def get_revision_from_path(self, path): + ''' Return the last revision number of the branch + specify with path parameter + ''' +- tree = branch.Branch.open(path) +- revision_number, revision_id = tree.last_revision_info() +- return revision_number ++ if support_bzr == False: ++ print (_("Bzr support is not enable, try to install bzr")) ++ return 0 ++ else: ++ tree = branch.Branch.open(path) ++ revision_number, revision_id = tree.last_revision_info() ++ return revision_number + + #Sources.list + def dict_from_sources_list(self, config=defs.HOME_CONFIG_DIR): + diff --git a/community/avant-window-navigator/824_823.diff b/community/avant-window-navigator/824_823.diff new file mode 100644 index 000000000..290b4ad6d --- /dev/null +++ b/community/avant-window-navigator/824_823.diff @@ -0,0 +1,40 @@ +=== modified file 'applets/taskmanager/task-manager.c' +--- applets/taskmanager/task-manager.c 2011-01-15 16:44:44 +0000 ++++ applets/taskmanager/task-manager.c 2011-03-12 21:42:33 +0000 +@@ -1611,11 +1611,6 @@ + g_debug ("%s: Window opened: %s",__func__,wnck_window_get_name (window)); + g_debug ("xid = %lu, pid = %d",wnck_window_get_xid (window),wnck_window_get_pid (window)); + #endif +- /* +- for some reason the skip tasklist property for the taskmanager toggles briefly +- off and on in certain circumstances. Nip this in the bud. +- TODO: Investigate wth this is happening... it bothers me. +- */ + // if ( wnck_window_get_pid (window) == getpid() || + if ( g_strcmp0 (wnck_window_get_name (window),"awn-applet")==0 ) + { +@@ -1626,11 +1621,6 @@ + */ + g_signal_connect (window, "state-changed", G_CALLBACK (on_window_state_changed), manager); + +- if (wnck_window_is_skip_tasklist (window)) +- { +- return; +- } +- + g_signal_connect (window, "state-changed", + G_CALLBACK (check_attention_requested), manager); + +@@ -1798,6 +1787,11 @@ + g_return_if_fail (TASK_IS_MANAGER (manager)); + g_return_if_fail (WNCK_IS_WINDOW (window)); + ++ if (wnck_window_is_skip_tasklist(window)) ++ { ++ return; ++ } ++ + _wnck_get_wmclass (wnck_window_get_xid (window), + &res_name, &class_name); + if (get_special_wait_from_window_data (res_name, + diff --git a/community/avant-window-navigator/PKGBUILD b/community/avant-window-navigator/PKGBUILD new file mode 100644 index 000000000..8f8562a69 --- /dev/null +++ b/community/avant-window-navigator/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 79700 2012-11-11 10:30:00Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Timm Preetz <timm@preetz.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=avant-window-navigator +pkgver=0.4.0 +pkgrel=13 +pkgdesc="Fully customisable dock-like window navigator for GNOME" +arch=('i686' 'x86_64') +url="https://launchpad.net/awn" +license=('GPL') +depends=('libdesktop-agnostic' 'libwnck' 'libgtop' 'gconf' 'python2-dbus' 'pygtk' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('gtk-doc' 'vala' 'intltool') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/awn/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz + 688_687.diff + 821_820.diff + 824_823.diff) +md5sums=('03654b45dd95cbb83fa7e112bd00523c' + '6b05ccb539f811729820d5545eb50d6e' + '2cc0ecf9fccb6e559a98003715ebf6df' + 'd068c19503b7be1868bcce5dab003628') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix uninitialised pointer + # https://bugs.launchpad.net/awn/+bug/562499 + patch -Np0 -i "$srcdir/688_687.diff" + + # Remove bzr dependency + # https://bugs.launchpad.net/awn/+bug/707863 + patch -Np0 -i "$srcdir/821_820.diff" + + # Hide windows with skip taskbar state + # https://bugs.launchpad.net/awn/+bug/707863 + patch -Np0 -i "$srcdir/824_823.diff" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' awn-settings/{awnSettings.py.in,awnSettingsHelper.py} + sed -i 's/with ("python"/with ("python2"/' applet-activation/main.c + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static \ + PYTHON=/usr/bin/python2 + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/awn.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas + rm -r "$pkgdir/etc" +} diff --git a/community/avant-window-navigator/avant-window-navigator.install b/community/avant-window-navigator/avant-window-navigator.install new file mode 100644 index 000000000..f5473a092 --- /dev/null +++ b/community/avant-window-navigator/avant-window-navigator.install @@ -0,0 +1,22 @@ +pkgname=awn + +post_install() { + gconfpkg --install $pkgname + xdg-icon-resource forceupdate +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + xdg-icon-resource forceupdate +} |