summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/asunder/PKGBUILD10
-rw-r--r--community/guake/PKGBUILD35
-rw-r--r--community/mate-control-center/PKGBUILD5
-rw-r--r--community/mate-session-manager/PKGBUILD5
-rw-r--r--community/pcurses/PKGBUILD4
-rw-r--r--community/python-sfml/PKGBUILD4
-rw-r--r--community/the_silver_searcher/PKGBUILD6
-rw-r--r--community/tint2/PKGBUILD54
-rw-r--r--community/tint2/add-power-now-support.patch6
-rw-r--r--community/tint2/clock.patch (renamed from community/tint2/middle_click_on_clock.patch)25
-rw-r--r--community/tint2/launcher_apps_dir-v2.patch100
-rw-r--r--community/tint2/src-task-align.patch115
-rw-r--r--community/tint2/zombie-fix.patch (renamed from community/tint2/fix_defunct_processes.patch)8
13 files changed, 309 insertions, 68 deletions
diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD
index f7e1d6723..a3f89e8ec 100644
--- a/community/asunder/PKGBUILD
+++ b/community/asunder/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 103408 2014-01-05 18:15:51Z xyne $
+# $Id: PKGBUILD 107259 2014-03-15 15:02:58Z xyne $
# Maintainer: Xyne <ac xunilhcra enyx, backwards>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: cs-cam - me.at.camdaniel.com
# Contributor: Sebastien Piccand <sebcactus gmail com>
pkgname=asunder
-pkgver=2.4
-pkgrel=2
+pkgver=2.5
+pkgrel=1
pkgdesc="a graphical CD ripper and encoder"
arch=('i686' 'x86_64')
url="http://littlesvr.ca/asunder/"
@@ -16,8 +16,8 @@ makedepends=('pkgconfig' 'intltool' 'gettext')
optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \
'flac: for flac support')
source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('11d36dcff71797e34a8e225e8fbd9e15')
-sha256sums=('90c2e13891697062661f3c1614b8781ce2e42963135174b8ba3ed6c3931cd293')
+md5sums=('43039a7cb7f6195d08a1203a7840f48e')
+sha256sums=('0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20')
install="$pkgname".install
build() {
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index b9efd89fa..52b0fd4f7 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,40 +1,49 @@
-# $Id: PKGBUILD 99804 2013-10-30 23:49:26Z allan $
+# $Id: PKGBUILD 107245 2014-03-15 11:25:10Z 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
+pkgrel=3
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')
+makedepends=('intltool' 'gnome-common')
install=$pkgname.install
-source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
+source=($pkgname-$pkgver.tar.gz::https://github.com/Guake/$pkgname/archive/$pkgver.tar.gz
guake-fix-notification.patch)
-md5sums=('532adada29b8f0bb79dc15904aa6b70c'
+md5sums=('06b424ae32c7e63a8256922f1e8c51b6'
'0b57227e6869dd84dd4fb0794ed0d082')
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
- sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
+
+ # Fix GConf schema dir
+ sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.am
+
+ # Python2 fix
sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
- # http://guake.org/ticket/416
+ # Runtime fix when no notification server available
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
+ # Fix build
+ sed -i '/AM_INIT_AUTOMAKE/ s/-Werror//' configure.ac
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./autogen.sh --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/mate-control-center/PKGBUILD b/community/mate-control-center/PKGBUILD
index 1d779b917..0152a3dc8 100644
--- a/community/mate-control-center/PKGBUILD
+++ b/community/mate-control-center/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Martin Wimpress <code@flexion.org>
pkgname=mate-control-center
-pkgver=1.8.0
+pkgver=1.8.1
pkgrel=1
pkgdesc="The Control Center for MATE"
url="http://mate-desktop.org"
@@ -13,10 +13,9 @@ depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-sche
'libxt' 'startup-notification')
makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
optdepends=('yelp: for reading MATE help documents')
-options=('!emptydirs')
groups=('mate')
source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d65088d1d7e9cf20aac466c98622f579979dc396')
+sha1sums=('9b7b5e0dee5bf7781bc186d97d0d5706ecb04631')
install=${pkgname}.install
build() {
diff --git a/community/mate-session-manager/PKGBUILD b/community/mate-session-manager/PKGBUILD
index fb006dcc8..7eeebed2c 100644
--- a/community/mate-session-manager/PKGBUILD
+++ b/community/mate-session-manager/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Martin Wimpress <code@flexion.org>
pkgname=mate-session-manager
-pkgver=1.8.0
+pkgver=1.8.1
pkgrel=1
pkgdesc="The MATE Session Handler"
url="http://mate-desktop.org"
@@ -11,10 +11,9 @@ depends=('dbus-glib' 'gtk2' 'libsm' 'libxtst' 'mate-desktop' 'mate-polkit'
'mate-settings-daemon' 'upower' 'xdg-user-dirs')
makedepends=('mate-common' 'perl-xml-parser' 'xmlto')
optdepends=('xdg-user-dirs-gtk: Add autostart that prompts to rename user directories when switching locales')
-options=('!emptydirs')
groups=('mate')
source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2dbb537ba2cc31a8d4f1fa02afd6dabc2919aaa3')
+sha1sums=('af07f12aaad1c6fd7626dfcf95c01c519bde3819')
install=${pkgname}.install
build() {
diff --git a/community/pcurses/PKGBUILD b/community/pcurses/PKGBUILD
index 1cc5e1827..938b46944 100644
--- a/community/pcurses/PKGBUILD
+++ b/community/pcurses/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: schuay <jakob.gruber@gmail.com>
pkgname=pcurses
-pkgver=3
-pkgrel=2
+pkgver=4
+pkgrel=1
pkgdesc='A curses package management tool using libalpm'
arch=('x86_64' 'i686')
url="https://github.com/schuay/$pkgname"
diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD
index d334ded2e..cbe5160cb 100644
--- a/community/python-sfml/PKGBUILD
+++ b/community/python-sfml/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=python-sfml
pkgver=1.3
-pkgrel=2
+pkgrel=3
pkgdesc="The unofficial Python binding for SFML"
arch=('i686' 'x86_64')
url="http://python-sfml.org"
@@ -22,6 +22,6 @@ package() {
python setup.py install --root="${pkgdir}" --prefix=/usr
- # Copying the License file
+ # Copy the license file
install -D -m644 "$srcdir/python-sfml/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 7789510de..871951917 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105344 2014-02-05 15:34:54Z arodseth $
+# $Id: PKGBUILD 107235 2014-03-15 09:42:59Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jeff Horelick <jdhore1@gmail.com>
# Contributor: skydrome <skydrome@i2pmail.org>
pkgname=the_silver_searcher
-pkgver=0.19.2
+pkgver=0.20.0
pkgrel=1
pkgdesc='Code searching tool similar to Ack, but faster'
url='https://github.com/ggreer/the_silver_searcher'
@@ -12,7 +12,7 @@ license=('Apache')
depends=('pcre' 'zlib' 'xz')
arch=('x86_64' 'i686')
source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('e2de31b8b4745b4614d3a6fa4cd61130474b0e861e80b3784daee7ce0eeca300')
+sha256sums=('6691b095232f5c7f376075d1a5797b4d1740a2d83b6111a3f6227dc43c22cb13')
prepare() {
cd "$pkgname-$pkgver"
diff --git a/community/tint2/PKGBUILD b/community/tint2/PKGBUILD
index 2571b8dee..899e9b240 100644
--- a/community/tint2/PKGBUILD
+++ b/community/tint2/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 97618 2013-09-25 18:19:34Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 107237 2014-03-15 10:43:27Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Blue Peppers <bluepeppers@archlinux.us>
# Contributor: Stefan Husmann< stefan-husmann@t-online.de>
pkgname=tint2
pkgver=0.11
-pkgrel=6
+pkgrel=7
pkgdesc='Basic, good-looking task manager for WMs'
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/tint2/"
+arch=('x86_64' 'i686')
+url='http://code.google.com/p/tint2/'
license=('GPL2')
conflicts=('ttm-svn' 'tint')
replaces=('tint')
@@ -16,21 +17,29 @@ depends=('gtk2' 'imlib2')
optdepends=('pygtk: for tint2wizard')
makedepends=('pygtk' 'cmake')
provides=('tint')
-source=(http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2
- add-power-now-support.patch
- fix_defunct_processes.patch
- middle_click_on_clock.patch)
+source=("http://tint2.googlecode.com/files/tint2-$pkgver.tar.bz2"
+ 'add-power-now-support.patch'
+ 'clock.patch'
+ 'launcher_apps_dir-v2.patch'
+ 'src-task-align.patch'
+ 'zombie-fix.patch')
md5sums=('6fc5731e7425125fa84a2add5cef4bff'
- '6cfcad028f1bd2f69812167f5395f890'
- 'b3d052ac5ada81c56e36133b1ecdee8c'
- 'f7918d29a87422aab6fb9d922867d8f8')
+ '448beead6c9d44b864f99e08a027cb56'
+ 'bc0bab2979dacff551a97bdf2c2fdedc'
+ '13218765dd684ae825967d3ffb4f4a75'
+ 'f0d7f51ec8dbf2e7b6bcca942f0fd6c0'
+ 'cdb83cd911e005a3529e5d1cd952a956')
prepare() {
- cd $pkgname-$pkgver
+ cd "$pkgname-$pkgver"
- patch -Np0 -i ../add-power-now-support.patch
- patch -Np0 -i ../fix_defunct_processes.patch
- patch -Np0 -i ../middle_click_on_clock.patch
+ # Applying all patches, even some that only applies partially.
+ # Tint2 works fine with these, but a new release from upstream would be nice.
+ for f in ../*.patch; do
+ echo -e "--- ${f##*/} ---\n"
+ patch -Np1 -i $f && echo "${f##*/} OK!" || echo "${f##*/} FAILED!"
+ echo
+ done
# python2 fix
sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/tint2conf/tintwizard.py
@@ -38,13 +47,18 @@ prepare() {
}
build() {
- cd $pkgname-$pkgver
+ cd "$pkgname-$pkgver"
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ mkdir -p build
+ cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_TINT2CONF=0
make
}
package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ make -C "$pkgname-$pkgver/build" DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tint2/add-power-now-support.patch b/community/tint2/add-power-now-support.patch
index 5057043df..6123f2786 100644
--- a/community/tint2/add-power-now-support.patch
+++ b/community/tint2/add-power-now-support.patch
@@ -1,6 +1,6 @@
-diff -rup ../tint2-0.11.orig/src/battery/battery.c ./src/battery/battery.c
---- ../tint2-0.11.orig/src/battery/battery.c 2010-12-02 23:56:11.313403140 +0100
-+++ ./src/battery/battery.c 2010-12-02 23:57:22.266956142 +0100
+diff -rup trunk/src/battery/battery.c ./src/battery/battery.c
+--- trunk/src/battery/battery.c 2010-12-02 23:56:11.313403140 +0100
++++ trunk/src/battery/battery.c 2010-12-02 23:57:22.266956142 +0100
@@ -184,8 +184,14 @@ void init_battery()
}
g_free(path2);
diff --git a/community/tint2/middle_click_on_clock.patch b/community/tint2/clock.patch
index 800c15c44..2b3857315 100644
--- a/community/tint2/middle_click_on_clock.patch
+++ b/community/tint2/clock.patch
@@ -3,14 +3,16 @@ Submitted By: David B. Cortarello (Nomius) <dcortarello at gmail dot com>
Date: 18-05-2013
Initial Package Version: subversion trunk (revision 652)
Description: Implemented middle click mouse button in the clock to execute tasks.
-* Implemented middle click mouse button over the clock by accepting the button 2 in the clock_action.
-* A new configuration parameter was created called clock_mclick_command, which works in the same way
+* Implemented middle click mouse button over the clock by accepting the button 2 in the
+clock_action.
+* A new configuration parameter was created called clock_mclick_command, which works in
+the same way
* clock_lclick_command and clock_rclick_command does.
-Index: src/clock/clock.c
+Index: trunk/src/clock/clock.c
===================================================================
---- src/clock/clock.c (revision 652)
-+++ src/clock/clock.c (working copy)
+--- trunk/src/clock/clock.c (revision 652)
++++ trunk/src/clock/clock.c (working copy)
@@ -39,6 +41,7 @@
char *time_tooltip_format;
char *time_tooltip_timezone;
@@ -45,10 +47,10 @@ Index: src/clock/clock.c
case 3:
command = clock_rclick_command;
break;
-Index: src/clock/clock.h
+Index: trunk/src/clock/clock.h
===================================================================
---- src/clock/clock.h (revision 652)
-+++ src/clock/clock.h (working copy)
+--- trunk/src/clock/clock.h (revision 652)
++++ trunk/src/clock/clock.h (working copy)
@@ -33,6 +33,7 @@
extern PangoFontDescription *time1_font_desc;
extern PangoFontDescription *time2_font_desc;
@@ -57,10 +59,10 @@ Index: src/clock/clock.h
extern char *clock_rclick_command;
extern int clock_enabled;
-Index: src/config.c
+Index: trunk/src/config.c
===================================================================
---- src/config.c (revision 652)
-+++ src/config.c (working copy)
+--- trunk/src/config.c (revision 652)
++++ trunk/src/config.c (working copy)
@@ -396,6 +396,10 @@
if (strlen(value) > 0)
clock_lclick_command = strdup(value);
@@ -73,3 +75,4 @@ Index: src/config.c
if (strlen(value) > 0)
clock_rclick_command = strdup(value);
+
diff --git a/community/tint2/launcher_apps_dir-v2.patch b/community/tint2/launcher_apps_dir-v2.patch
new file mode 100644
index 000000000..6dde4ed7e
--- /dev/null
+++ b/community/tint2/launcher_apps_dir-v2.patch
@@ -0,0 +1,100 @@
+Index: trunk/src/config.c
+===================================================================
+--- trunk/src/config.c (revision 646)
++++ trunk/src/config.c (working copy)
+@@ -583,6 +583,18 @@
+ char *app = strdup(value);
+ panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
+ }
++ else if (strcmp(key, "launcher_apps_dir") == 0) {
++
++ GList *list = dir_scan_alpha(value, "*.desktop");
++
++ for (list = g_list_first(list); list; list = g_list_next(list)) {
++ fprintf(stderr, "Add launcher app: %s\n", (const char *)list->data);
++ panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, (char *)strdup((const char *)list->data));
++ }
++
++ // Cleanup
++ g_list_free_full(list, g_free);
++ }
+ else if (strcmp(key, "launcher_icon_theme") == 0) {
+ // if XSETTINGS manager running, tint2 use it.
+ if (!icon_theme_name)
+Index: trunk/src/util/common.c
+===================================================================
+--- trunk/src/util/common.c (revision 646)
++++ trunk/src/util/common.c (working copy)
+@@ -22,10 +22,13 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/extensions/Xrender.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <fnmatch.h>
+
+ #include "common.h"
+ #include "../server.h"
+@@ -342,3 +345,46 @@
+ XRenderFreePicture(server.dsp, pict_image);
+ XRenderFreePicture(server.dsp, pict_drawable);
+ }
++
++/**
++ * @brief
++ * Scan given directory for files which are meet the given mask and sort them alphabetically
++ *
++ * @param path - directory path
++ * @param mask - filename mask
++ *
++ * @return files list
++ */
++GList *dir_scan_alpha(const char *path, const char *mask)
++{
++ GError *err = NULL;
++ GList *list = NULL;
++ const char *n;
++ gchar *fn;
++ struct stat st;
++
++ GDir *dir = g_dir_open(path, 0, &err);
++
++ if (!dir) {
++ fprintf(stderr, "%s\n", err->message);
++ g_error_free(err);
++ } else {
++ // Enumerate files
++ while ((n = g_dir_read_name(dir))) {
++ if (!fnmatch(mask, n, FNM_PATHNAME)) {
++ fn = g_build_filename(path, n, NULL);
++
++ if (stat((char *)fn, &st) < 0)
++ continue;
++
++ // Only regular files
++ if (S_ISREG(st.st_mode))
++ list = g_list_prepend(list, (gpointer)fn);
++ }
++ }
++
++ list = g_list_sort (list, (GCompareFunc) &strcmp);
++ }
++
++ return list;
++}
+Index: trunk/src/util/common.h
+===================================================================
+--- trunk/src/util/common.h (revision 646)
++++ trunk/src/util/common.h (working copy)
+@@ -57,5 +57,7 @@
+ void createHeuristicMask(DATA32* data, int w, int h);
+
+ void render_image(Drawable d, int x, int y, int w, int h);
++
++GList *dir_scan_alpha(const char *path, const char *mask);
+ #endif
+
diff --git a/community/tint2/src-task-align.patch b/community/tint2/src-task-align.patch
new file mode 100644
index 000000000..937725b67
--- /dev/null
+++ b/community/tint2/src-task-align.patch
@@ -0,0 +1,115 @@
+Index: trunk/src/panel.h
+===================================================================
+--- trunk/src/panel.h (revision 639)
++++ trunk/src/panel.h (working copy)
+@@ -61,6 +61,9 @@
+ extern int panel_strut_policy;
+ extern char *panel_items_order;
+
++// tasks alignment
++enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT };
++
+ extern int max_tick_urgent;
+
+ extern GArray* backgrounds;
+Index: src/config.c
+===================================================================
+--- trunk/src/config.c (revision 639)
++++ trunk/src/config.c (working copy)
+@@ -484,6 +484,14 @@
+ if (value2) panel_config.g_task.area.paddingy = atoi (value2);
+ if (value3) panel_config.g_task.area.paddingx = atoi (value3);
+ }
++ else if (strcmp (key, "task_align") == 0) {
++ extract_values(value, &value1, &value2, &value3);
++ printf("task_align: %s\n", value1);
++ if (strcmp (value1, "left") == 0) panel_config.g_task.align = ALIGN_LEFT;
++ else if (strcmp (value1, "center") == 0) panel_config.g_task.align = ALIGN_CENTER;
++ else if (strcmp (value1, "right") == 0) panel_config.g_task.align = ALIGN_RIGHT;
++ else fprintf(stderr, "Unknown value for task_align: %s\n", value1);
++ }
+ else if (strcmp (key, "task_font") == 0) {
+ panel_config.g_task.font_desc = pango_font_description_from_string (value);
+ }
+Index: trunk/src/taskbar/task.h
+===================================================================
+--- trunk/src/taskbar/task.h (revision 639)
++++ trunk/src/taskbar/task.h (working copy)
+@@ -26,6 +26,7 @@
+ int text;
+ int icon;
+ int centered;
++ int align;
+
+ int icon_posy;
+ int icon_size1;
+Index: trunk/src/util/area.c
+===================================================================
+--- trunk/src/util/area.c (revision 639)
++++ trunk/src/util/area.c (working copy)
+@@ -130,6 +130,54 @@
+ }
+
+
++// calculate total size of all children including
++// parent's padding
++int children_size(Area *a, int horizontal)
++{
++ int size = 0;
++ GSList *l;
++
++ for (l = a->list; l; l = l->next) {
++ Area *child = ((Area*)l->data);
++ if (!child->on_screen) continue;
++
++ if (horizontal)
++ size += child->width + a->paddingx;
++ else
++ size += child->height + a->paddingy;
++ }
++
++ return size;
++}
++
++
++// calculate chilren's align offset depending on the align type
++int align_offset(Area *a, int align, int horizontal)
++{
++ int size = 0;
++ int child_size = children_size(a, horizontal);
++
++ if (horizontal)
++ size = a->width;
++ else
++ size = a->height;
++
++ switch (align) {
++ case ALIGN_LEFT:
++ return 0;
++
++ case ALIGN_CENTER:
++ return (size - child_size) / 2;
++
++ case ALIGN_RIGHT:
++ return size - child_size;
++
++ default:
++ return 0;
++ }
++}
++
++
+ void size_by_layout (Area *a, int pos, int level)
+ {
+ // don't resize hiden objects
+@@ -179,7 +227,9 @@
+ int k;
+ for (k=0 ; k < level ; k++) printf(" ");
+ printf("tree level %d, object %d, pos %d, %s\n", level, i, pos, (child->size_mode == SIZE_BY_LAYOUT) ? "SIZE_BY_LAYOUT" : "SIZE_BY_CONTENT");*/
+- size_by_layout(child, pos, level+1);
++
++ int offset = align_offset(child, panel_config.g_task.align, panel_horizontal);
++ size_by_layout(child, pos + offset, level + 1);
+
+ if (panel_horizontal)
+ pos += child->width + a->paddingx;
diff --git a/community/tint2/fix_defunct_processes.patch b/community/tint2/zombie-fix.patch
index 28ea6c27a..48f767301 100644
--- a/community/tint2/fix_defunct_processes.patch
+++ b/community/tint2/zombie-fix.patch
@@ -4,10 +4,12 @@ Date: 18-05-2013
Initial Package Version: subversion trunk (revision 652)
Description: Fix zombie (defunct) processes created in clock_action.
This patch provides the following bugfixes:
- * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by tint2 (in particular by the clock -right or left- click). This is done by a small hack in the update_clocks_min, called to "redraw" that area.
+ * This patch uses waitpid with WNOHANG to eliminate all zombie processes created by
+tint2 (in particular by the clock -right or left- click). This is done by a small hack
+in the update_clocks_min, called to "redraw" that area.
---- src/clock/clock.c (revision 652)
-+++ src/clock/clock.c (working copy)
+--- trunk/src/clock/clock.c (revision 652)
++++ trunk/src/clock/clock.c (working copy)
@@ -23,6 +23,8 @@
#include <cairo-xlib.h>
#include <pango/pangocairo.h>
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-08 07:05:40 +0000