Date: Wednesday, February 17, 2016 @ 03:26:51 Author: bgyorgy Revision: 161932
archrelease: copy trunk to community-i686, community-x86_64 Added: lxtask/repos/community-i686/PKGBUILD (from rev 161931, lxtask/trunk/PKGBUILD) lxtask/repos/community-i686/gtk3.patch (from rev 161931, lxtask/trunk/gtk3.patch) lxtask/repos/community-x86_64/PKGBUILD (from rev 161931, lxtask/trunk/PKGBUILD) lxtask/repos/community-x86_64/gtk3.patch (from rev 161931, lxtask/trunk/gtk3.patch) Deleted: lxtask/repos/community-i686/PKGBUILD lxtask/repos/community-x86_64/PKGBUILD -----------------------------+ /PKGBUILD | 118 ++++++++++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 29 ---------- community-i686/gtk3.patch | 24 ++++++++ community-x86_64/PKGBUILD | 29 ---------- community-x86_64/gtk3.patch | 24 ++++++++ 5 files changed, 166 insertions(+), 58 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-02-17 02:26:43 UTC (rev 161931) +++ community-i686/PKGBUILD 2016-02-17 02:26:51 UTC (rev 161932) @@ -1,29 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgname=lxtask -pkgver=0.1.6 -pkgrel=1 -pkgdesc='Task manager of the LXDE Desktop' -arch=('i686' 'x86_64') -license=('GPL2') -url='http://lxde.org/' -groups=('lxde') -depends=('gtk2') -makedepends=('intltool') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz) -md5sums=('14b5341822aaa049f2d4d5a56c1b28f2') - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lxtask/repos/community-i686/PKGBUILD (from rev 161931, lxtask/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-02-17 02:26:51 UTC (rev 161932) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgbase=lxtask +pkgname=(lxtask lxtask-gtk3) +pkgver=0.1.6 +pkgrel=2 +pkgdesc='Task manager of the LXDE Desktop' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://lxde.org/' +groups=('lxde') +depends=('gtk2' 'gtk3') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz + gtk3.patch) +md5sums=('14b5341822aaa049f2d4d5a56c1b28f2' + '86d38c288611bbe3565218abb12bf5ac') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../gtk3.patch +} + +build() { + # GTK+ 2 version + [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2 + cd gtk2 + ./configure --sysconfdir=/etc --prefix=/usr + make + + cd "$srcdir" + # GTK+ 3 version + [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3 + cd gtk3 + ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + make +} + +package_lxtask() { + groups=('lxde') + depends=('gtk2') + + cd gtk2 + make DESTDIR="$pkgdir" install +} + +package_lxtask-gtk3() { + groups=('lxde-gtk3') + pkgdesc+=' (GTK+ 3 version)' + depends=('gtk3') + conflicts=('lxtask') + + cd gtk3 + make DESTDIR="$pkgdir" install +} Copied: lxtask/repos/community-i686/gtk3.patch (from rev 161931, lxtask/trunk/gtk3.patch) =================================================================== --- community-i686/gtk3.patch (rev 0) +++ community-i686/gtk3.patch 2016-02-17 02:26:51 UTC (rev 161932) @@ -0,0 +1,24 @@ +From 91656b073774e9ba3b9c27c99c3fd2553be60bab Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Mon, 15 Dec 2014 15:41:26 +0100 +Subject: [PATCH] Add icon to the about dialog + +--- + src/interface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/interface.c b/src/interface.c +index cb0eeef..4771f0c 100644 +--- a/src/interface.c ++++ b/src/interface.c +@@ -403,6 +403,7 @@ void show_about_dialog(void) + gtk_about_dialog_set_program_name ( (GtkAboutDialog*)about_dlg, _( "LXTask" ) ); + #endif + /* gtk_about_dialog_set_logo( (GtkAboutDialog*)about_dlg, gdk_pixbuf_new_from_file( PACKAGE_DATA_DIR"/pixmaps/lxtask.png", NULL ) ); */ ++ gtk_about_dialog_set_logo_icon_name( (GtkAboutDialog*)about_dlg, "utilities-system-monitor" ); + gtk_about_dialog_set_copyright ( (GtkAboutDialog*)about_dlg, _( "Copyright (C) 2008 LXDE team" ) ); + gtk_about_dialog_set_comments ( (GtkAboutDialog*)about_dlg, _( "Lightweight task manager for LXDE project" ) ); + gtk_about_dialog_set_license ( (GtkAboutDialog*)about_dlg, "LXTask\n\nCopyright (C) 2008 LXDE team\n\nThis program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." ); +-- +2.1.4 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-02-17 02:26:43 UTC (rev 161931) +++ community-x86_64/PKGBUILD 2016-02-17 02:26:51 UTC (rev 161932) @@ -1,29 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgname=lxtask -pkgver=0.1.6 -pkgrel=1 -pkgdesc='Task manager of the LXDE Desktop' -arch=('i686' 'x86_64') -license=('GPL2') -url='http://lxde.org/' -groups=('lxde') -depends=('gtk2') -makedepends=('intltool') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz) -md5sums=('14b5341822aaa049f2d4d5a56c1b28f2') - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lxtask/repos/community-x86_64/PKGBUILD (from rev 161931, lxtask/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-02-17 02:26:51 UTC (rev 161932) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgbase=lxtask +pkgname=(lxtask lxtask-gtk3) +pkgver=0.1.6 +pkgrel=2 +pkgdesc='Task manager of the LXDE Desktop' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://lxde.org/' +groups=('lxde') +depends=('gtk2' 'gtk3') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz + gtk3.patch) +md5sums=('14b5341822aaa049f2d4d5a56c1b28f2' + '86d38c288611bbe3565218abb12bf5ac') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../gtk3.patch +} + +build() { + # GTK+ 2 version + [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2 + cd gtk2 + ./configure --sysconfdir=/etc --prefix=/usr + make + + cd "$srcdir" + # GTK+ 3 version + [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3 + cd gtk3 + ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + make +} + +package_lxtask() { + groups=('lxde') + depends=('gtk2') + + cd gtk2 + make DESTDIR="$pkgdir" install +} + +package_lxtask-gtk3() { + groups=('lxde-gtk3') + pkgdesc+=' (GTK+ 3 version)' + depends=('gtk3') + conflicts=('lxtask') + + cd gtk3 + make DESTDIR="$pkgdir" install +} Copied: lxtask/repos/community-x86_64/gtk3.patch (from rev 161931, lxtask/trunk/gtk3.patch) =================================================================== --- community-x86_64/gtk3.patch (rev 0) +++ community-x86_64/gtk3.patch 2016-02-17 02:26:51 UTC (rev 161932) @@ -0,0 +1,24 @@ +From 91656b073774e9ba3b9c27c99c3fd2553be60bab Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Mon, 15 Dec 2014 15:41:26 +0100 +Subject: [PATCH] Add icon to the about dialog + +--- + src/interface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/interface.c b/src/interface.c +index cb0eeef..4771f0c 100644 +--- a/src/interface.c ++++ b/src/interface.c +@@ -403,6 +403,7 @@ void show_about_dialog(void) + gtk_about_dialog_set_program_name ( (GtkAboutDialog*)about_dlg, _( "LXTask" ) ); + #endif + /* gtk_about_dialog_set_logo( (GtkAboutDialog*)about_dlg, gdk_pixbuf_new_from_file( PACKAGE_DATA_DIR"/pixmaps/lxtask.png", NULL ) ); */ ++ gtk_about_dialog_set_logo_icon_name( (GtkAboutDialog*)about_dlg, "utilities-system-monitor" ); + gtk_about_dialog_set_copyright ( (GtkAboutDialog*)about_dlg, _( "Copyright (C) 2008 LXDE team" ) ); + gtk_about_dialog_set_comments ( (GtkAboutDialog*)about_dlg, _( "Lightweight task manager for LXDE project" ) ); + gtk_about_dialog_set_license ( (GtkAboutDialog*)about_dlg, "LXTask\n\nCopyright (C) 2008 LXDE team\n\nThis program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." ); +-- +2.1.4 +