From af87d2873bcaaf5a93ccf25da80aa670f89fbe96 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 13 May 2014 04:08:22 +0000 Subject: Tue May 13 04:03:53 UTC 2014 --- community/cinnamon-control-center/PKGBUILD | 6 +- community/cinnamon-desktop/PKGBUILD | 4 +- community/cinnamon-session/PKGBUILD | 6 +- community/doublecmd/PKGBUILD | 10 +- community/fcron/PKGBUILD | 11 +- community/kchmviewer/PKGBUILD | 18 +-- community/kchmviewer/kchmviewer-build.patch | 23 ++++ community/kchmviewer/kchmviewer.changelog | 3 + community/libfm/PKGBUILD | 24 ++-- community/libfm/hide-lxshortcut.patch | 22 ++++ community/libfm/libfm.install | 1 - community/lxterminal/PKGBUILD | 35 +++--- community/lxterminal/fix-keybinds.patch | 183 ++++++++++++++++++++++++++++ community/lxterminal/shift-keybinds.patch | 39 ------ community/menu-cache/PKGBUILD | 7 +- community/muffin/PKGBUILD | 6 +- community/pcmanfm/PKGBUILD | 12 +- community/tinc/PKGBUILD | 6 +- community/wireshark/PKGBUILD | 8 +- community/wxcam/PKGBUILD | 8 +- community/xnee/PKGBUILD | 8 +- community/xnee/xnee.changelog | 3 + community/yaml-cpp/PKGBUILD | 7 +- 23 files changed, 331 insertions(+), 119 deletions(-) create mode 100644 community/kchmviewer/kchmviewer-build.patch create mode 100644 community/libfm/hide-lxshortcut.patch create mode 100644 community/lxterminal/fix-keybinds.patch delete mode 100644 community/lxterminal/shift-keybinds.patch (limited to 'community') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index c767eb8a9..7f2fd3391 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110561 2014-05-03 17:43:28Z faidoc $ +# $Id: PKGBUILD 111019 2014-05-12 01:26:13Z bgyorgy $ # Maintainer: Alexandre Filgueira # Based on gnome-control-center: # Jan Alexander Steffens (heftig) # Jan de Groot pkgname=cinnamon-control-center -pkgver=2.2.4 +pkgver=2.2.7 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=cinnamon-control-center.install license=('GPL') options=('!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('cf3acbe6776398b2aa7b6519f21790c1b8ba7f62487dd062d89fd9f27cfce007') +sha256sums=('9585a9920e91561d7f4d7a85fe4d3321835d685ca6cbcb1e62c5c1b1d140dfbd') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD index 331786b65..9619d8faa 100644 --- a/community/cinnamon-desktop/PKGBUILD +++ b/community/cinnamon-desktop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot pkgname=cinnamon-desktop -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="Library with common API for various Cinnamon modules" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common) url="https://github.com/linuxmint/cinnamon-desktop" install=cinnamon-desktop.install source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz") -sha256sums=('241b9649b6152a8437fe6f6d2174a1a1d2bb790b1087c557273f36a7aed357a1') +sha256sums=('2680cc35b89e4e89bc78cbd11310a0efb1e6b42be628238585ddf8b121480db3') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD index f921c56f9..6400707b9 100644 --- a/community/cinnamon-session/PKGBUILD +++ b/community/cinnamon-session/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=cinnamon-session -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc="The Cinnamon Session Handler" arch=(i686 x86_64) license=(GPL LGPL) @@ -15,7 +15,7 @@ install=cinnamon-session.install url="https://github.com/linuxmint/cinnamon-session" source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz timeout.patch) -sha256sums=('b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae' +sha256sums=('357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e' 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a') prepare() { diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index bc7a16698..27623d62a 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,13 +1,13 @@ # vim:set ft=sh: -# $Id: PKGBUILD 110953 2014-05-10 14:08:22Z idevolder $ +# $Id: PKGBUILD 111060 2014-05-12 18:14:23Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: (sirocco AT ngs.ru) pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') -pkgver=0.5.9 +pkgver=0.5.10 _helpver=0.5.5 -pkgrel=2 +pkgrel=1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -71,6 +71,6 @@ package_doublecmd-qt() { cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } -sha256sums=('d5b3c93b3029f4b0a45b7c9912d34f753445e031c93bc0268d4cb4c313d06ba4' +sha256sums=('cc54a2d973836f46f6f99fff1b8dd631bc96d8aa8524c3cd9cfc60b0c7a3dc12' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf' - '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20') + '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20') diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index f43d56671..c13927264 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96423 2013-08-28 15:04:05Z seblu $ +# $Id: PKGBUILD 111045 2014-05-12 10:09:29Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -6,8 +6,8 @@ # Maintainer: Thorsten Töpper pkgname=fcron -pkgver=3.1.2 -pkgrel=8 +pkgver=3.1.3 +pkgrel=1 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) url='http://fcron.free.fr' @@ -29,7 +29,7 @@ options=('emptydirs' '!makeflags') install=$pkgname.install source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" 'systab.orig') -md5sums=('36bf213e15f3a480f2274f8e46cced0a' +md5sums=('b58ce88344eb4c80a353066547d20a24' 'afecbfd98caa49e8e4aa239fa1b19255') build() { @@ -70,6 +70,9 @@ package() { install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" + # remove docs + rm -r "$pkgdir/usr/share/doc" + # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir"/{var/,}run diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD index 3a41d670c..c43a8f4ae 100644 --- a/community/kchmviewer/PKGBUILD +++ b/community/kchmviewer/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 85365 2013-03-01 10:34:18Z andrea $ +# $Id: PKGBUILD 111068 2014-05-12 20:33:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Alexander Bogdanov pkgname=kchmviewer -pkgver=6.0 -pkgrel=3 +pkgver=6.1 +pkgrel=1 pkgdesc="A .chm files (MS HTML help file format) viewer" arch=('i686' 'x86_64') url="http://kchmviewer.sourceforge.net/" license=('GPL') depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'patch') options=('libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-build.patch) +sha256sums=('f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78' + '567bdcaa1809618fe3a441345586a491247b76e4dd46db8ff8497bd53d74adbc') build() { cd $pkgname-$pkgver + patch -Np1 -i "${srcdir}"/$pkgname-build.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr make } @@ -30,7 +34,7 @@ package() { make DESTDIR=${pkgdir} install #icon file - install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \ + install -D -m644 "${srcdir}"/$pkgname-$pkgver/packages/$pkgname.png \ ${pkgdir}/usr/share/pixmaps/$pkgname.png #msits.protocol file provided by kdegraphics-okular package diff --git a/community/kchmviewer/kchmviewer-build.patch b/community/kchmviewer/kchmviewer-build.patch new file mode 100644 index 000000000..e08440d30 --- /dev/null +++ b/community/kchmviewer/kchmviewer-build.patch @@ -0,0 +1,23 @@ +diff -ruN kchmviewer-6.1-orig/packages/kchmviewer.desktop kchmviewer-6.1/packages/kchmviewer.desktop +--- kchmviewer-6.1-orig/packages/kchmviewer.desktop 2009-12-15 07:02:57.000000000 +0100 ++++ kchmviewer-6.1/packages/kchmviewer.desktop 2014-05-12 20:37:00.983182220 +0200 +@@ -3,7 +3,6 @@ + Categories=Qt;KDE;Office;Viewer; + Terminal=false + Type=Application +-Encoding=UTF-8 + Exec=kchmviewer %f + Icon=kchmviewer + GenericName=CHM file viewer +diff -ruN kchmviewer-6.1-orig/src/CMakeLists.txt kchmviewer-6.1/src/CMakeLists.txt +--- kchmviewer-6.1-orig/src/CMakeLists.txt 2011-12-19 08:16:43.000000000 +0100 ++++ kchmviewer-6.1/src/CMakeLists.txt 2014-05-12 20:35:51.195078972 +0200 +@@ -8,7 +8,7 @@ + dialog_chooseurlfromlist.cpp + dialog_setup.cpp + kde-qt.cpp +- keyeventfilter.cpp ++# keyeventfilter.cpp + main.cpp + mainwindow.cpp + navigationpanel.cpp diff --git a/community/kchmviewer/kchmviewer.changelog b/community/kchmviewer/kchmviewer.changelog index 3204bc3dc..4fa985423 100644 --- a/community/kchmviewer/kchmviewer.changelog +++ b/community/kchmviewer/kchmviewer.changelog @@ -1,3 +1,6 @@ +2014-05-12 Jaroslav Lichtblau + * kchmviewer 6.1-1 + 2011-12-21 Jaroslav Lichtblau * kchmviewer 6.0-1 diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index 8e7fff94f..54961036a 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105979 2014-02-20 12:14:35Z bpiotrowski $ +# $Id: PKGBUILD 111071 2014-05-12 20:48:03Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez @@ -6,20 +6,28 @@ pkgname=libfm pkgver=1.2.0 -pkgrel=3 +pkgrel=5 pkgdesc='Library for file management' url='http://pcmanfm.sourceforge.net/' arch=('i686' 'x86_64') license=('GPL') -groups=('lxde') -depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif') -makedepends=('intltool' 'gtk-doc') +depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib') +makedepends=('udisks' 'intltool' 'gtk-doc') replaces=('lxshortcut') provides=('lxshortcut') conflicts=('lxshortcut') install=libfm.install -source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz) -md5sums=('07d1361bc008db46b0fd4c775f5696de') +source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz + hide-lxshortcut.patch) +md5sums=('07d1361bc008db46b0fd4c775f5696de' + '49f7f47a3c59c83d1e7a7691eb1cccfe') + +prepare() { + cd $pkgname-$pkgver + + # Hide desktop entry of lxshortcut + patch -Np1 -i ../hide-lxshortcut.patch +} build() { cd $pkgname-$pkgver @@ -27,7 +35,7 @@ build() { --sysconfdir=/etc \ --enable-udisks \ --with-gnu-ld - make LDFLAGS+=' -lgobject-2.0 -lglib-2.0' + make } package() { diff --git a/community/libfm/hide-lxshortcut.patch b/community/libfm/hide-lxshortcut.patch new file mode 100644 index 000000000..fc7ba62dd --- /dev/null +++ b/community/libfm/hide-lxshortcut.patch @@ -0,0 +1,22 @@ +From 4d2b79048573dd2fa1dee853230ccc45b1d9c8df Mon Sep 17 00:00:00 2001 +From: Andriy Grytsenko +Date: Tue, 25 Feb 2014 15:24:59 +0200 +Subject: [PATCH] [LP#1284401]The lxshortcut should not be present in the + menus. + +--- + data/lxshortcut.desktop.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/lxshortcut.desktop.in b/data/lxshortcut.desktop.in +index 8ef7bca..f60a63e 100644 +--- a/data/lxshortcut.desktop.in ++++ b/data/lxshortcut.desktop.in +@@ -8,3 +8,4 @@ Exec=lxshortcut -i %f + StartupNotify=true + Terminal=false + MimeType=application/x-desktop; ++NoDisplay=true +-- +1.7.10.4 + diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install index e83eccb55..5329d70d8 100644 --- a/community/libfm/libfm.install +++ b/community/libfm/libfm.install @@ -1,7 +1,6 @@ post_install() { update-mime-database /usr/share/mime > /dev/null update-desktop-database -q - #[ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules } post_upgrade() { diff --git a/community/lxterminal/PKGBUILD b/community/lxterminal/PKGBUILD index 9751bc21a..66715f3b2 100644 --- a/community/lxterminal/PKGBUILD +++ b/community/lxterminal/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 71600 2012-05-30 16:08:38Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 111033 2014-05-12 03:35:45Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Bartłomiej Piotrowski # Contributor: Angel Velasquez # Contributor: Geoffroy Carrier pkgname=lxterminal pkgver=0.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="VTE-based terminal emulator (part of LXDE)" arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2') -makedepends=('pkgconfig' 'intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz - shift-keybinds.patch) +depends=('vte') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz + fix-keybinds.patch) md5sums=('fd9140b45c0f28d021253c4aeb8c4aea' - '7eff715e02181b006b1912cd041b7f1a') + '1919977c8c745e65129dbe468b8dcbeb') -build() { - cd "$srcdir"/$pkgname-$pkgver +prepare() { + cd "$srcdir"/$pkgname-$pkgver - patch -Np1 -i "$srcdir"/shift-keybinds.patch + # Filter out key events of terminal keybinds + patch -Np1 -i ../fix-keybinds.patch +} - ./configure --sysconfdir=/etc --prefix=/usr - make +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxterminal/fix-keybinds.patch b/community/lxterminal/fix-keybinds.patch new file mode 100644 index 000000000..fb77430ce --- /dev/null +++ b/community/lxterminal/fix-keybinds.patch @@ -0,0 +1,183 @@ +diff -Naur lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c +--- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200 ++++ lxterminal-0.1.11/src/lxterminal.c 2014-05-12 05:13:32.264123691 +0200 +@@ -69,29 +70,29 @@ + /* Menu and accelerator event handlers. */ + static void terminal_initialize_switch_tab_accelerator(Term * term); + static void terminal_set_disable_alt(Term *term, gboolean disable_alt); +-static void terminal_switch_tab_accelerator(Term * term); ++static gboolean terminal_switch_tab_accelerator(Term * term); + static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal); + static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_move_tab_execute(LXTerminal * terminal, gint direction); + static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal); +-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); ++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); + static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal); + + /* Window creation, destruction, and control. */ +@@ -327,11 +328,14 @@ + + /* Handler for accelerator n, where n is a digit. + * Switch to the tab selected by the digit, if it exists. */ +-static void terminal_switch_tab_accelerator(Term * term) ++static gboolean terminal_switch_tab_accelerator(Term * term) + { + LXTerminal * terminal = term->parent; +- if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) ++ if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index); ++ return TRUE; ++ } ++ return FALSE; + } + + /* Handler for "activate" signal on File/New Window menu item. +@@ -344,9 +348,10 @@ + } + + /* Handler for accelerator N. Open a new window. */ +-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_new_window_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "activate" signal on File/New Tab menu item. +@@ -405,9 +410,10 @@ + } + + /* Handler for accelerator T. Open a new tab. */ +-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_new_tab_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "activate" signal on File/Close Tab menu item. +@@ -419,9 +425,10 @@ + } + + /* Handler for accelerator W. Close the current tab. */ +-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_close_tab_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "activate" signal on Edit/Copy menu item. +@@ -433,9 +440,10 @@ + } + + /* Handler for accelerator C. Copy to the clipboard. */ +-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_copy_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "activate" signal on Edit/Paste menu item. +@@ -447,9 +455,10 @@ + } + + /* Handler for accelerator V. Paste from the clipboard. */ +-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_paste_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "response" signal on Name Tab dialog. */ +@@ -521,9 +530,10 @@ + } + + /* Handler for accelerator R. Name the tab. */ +-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_name_tab_activate_event(NULL, terminal); ++ return TRUE; + } + + /* Handler for "activate" signal on Tabs/Previous Tab menu item. +@@ -538,10 +548,11 @@ + } + + /* Handler for accelerator . Cycle through tabs in the reverse direction. */ +-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab"); + gtk_action_activate(_action); ++ return TRUE; + } + + /* Handler for "activate" signal on Tabs/Next Tab menu item. +@@ -556,10 +567,11 @@ + } + + /* Handler for accelerator . Cycle through tabs in the forward direction. */ +-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab"); + gtk_action_activate(_action); ++ return TRUE; + } + + /* Helper for move tab left and right. */ +@@ -594,9 +606,10 @@ + } + + /* Handler for accelerator . Move the tab one position in the reverse direction. */ +-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_move_tab_execute(terminal, -1); ++ return TRUE; + } + + /* Handler for "activate" signal on Tabs/Move Tab Right menu item. +@@ -607,9 +620,10 @@ + } + + /* Handler for accelerator . Move the tab one position in the forward direction. */ +-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) ++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) + { + terminal_move_tab_execute(terminal, 1); ++ return TRUE; + } + + /* Handler for "activate" signal on Help/About menu item. */ diff --git a/community/lxterminal/shift-keybinds.patch b/community/lxterminal/shift-keybinds.patch deleted file mode 100644 index ecef20318..000000000 --- a/community/lxterminal/shift-keybinds.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c ---- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200 -+++ lxterminal-0.1.11/src/lxterminal.c 2012-05-18 17:58:40.483588501 +0200 -@@ -77,9 +77,9 @@ - static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal); - static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); - static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal); --static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); -+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); - static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal); --static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); -+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); - static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal); - static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal); - static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); -@@ -433,9 +433,10 @@ - } - - /* Handler for accelerator C. Copy to the clipboard. */ --static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) -+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) - { - terminal_copy_activate_event(NULL, terminal); -+ return TRUE; - } - - /* Handler for "activate" signal on Edit/Paste menu item. -@@ -447,9 +448,10 @@ - } - - /* Handler for accelerator V. Paste from the clipboard. */ --static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) -+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) - { - terminal_paste_activate_event(NULL, terminal); -+ return TRUE; - } - - /* Handler for "response" signal on Name Tab dialog. */ diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD index 63551eb48..951cde345 100644 --- a/community/menu-cache/PKGBUILD +++ b/community/menu-cache/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 99908 2013-10-31 02:24:40Z allan $ +# $Id: PKGBUILD 111062 2014-05-12 18:55:38Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski # Contributor: Angel Velasquez # Contributor: Juergen Hoetzel pkgname=menu-cache pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc='Caching mechanism for freedesktop.org compliant menus' arch=('i686' 'x86_64') license=('GPL2') url='http://lxde.org/' -groups=('lxde') depends=('glib2') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) sha256sums=('08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122') @@ -18,7 +17,7 @@ sha256sums=('08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/menu-cache \ + --libexecdir=/usr/lib \ --disable-static make } diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 02974536a..c7f4593e7 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110555 2014-05-03 17:27:50Z faidoc $ +# $Id: PKGBUILD 111021 2014-05-12 01:29:26Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz") -sha256sums=('1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739') +sha256sums=('c34f02a67c96d3d0925988a87865f1dc590c84ba7ddd9d8e1872b5ad768f445c') prepare() { cd ${pkgname}-${pkgver} diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index b9377e19f..6fdb40e25 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105925 2014-02-19 10:35:08Z bpiotrowski $ +# $Id: PKGBUILD 111066 2014-05-12 19:35:38Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski # Contributor: Unknown47 # Contributor: Angel Velasquez @@ -6,7 +6,7 @@ pkgname=pcmanfm pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Extremely fast and lightweight file manager' arch=('i686' 'x86_64') url='http://pcmanfm.sourceforge.net/' @@ -14,7 +14,8 @@ license=('GPL') groups=('lxde') depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool') -optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems') +optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems' + 'udisks: alternative for mounting volumes') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz) md5sums=('11d59a492c9802866279a6e7e2b3f49e') @@ -22,13 +23,10 @@ md5sums=('11d59a492c9802866279a6e7e2b3f49e') build() { cd $pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr - make LDFLAGS+=' -lm' + make } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - sed -e 's|x-directory/normal|inode/directory|' -i \ - "$pkgdir"/usr/share/applications/pcmanfm.desktop } diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index ce0e94829..e9fb11ff5 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99008 2013-10-22 08:58:32Z tredaelli $ +# $Id: PKGBUILD 111043 2014-05-12 09:28:42Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: helios # Contributor: Lothar Gesslein # Contributor: Dominik George pkgname=tinc -pkgver=1.0.23 +pkgver=1.0.24 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lzo2' 'openssl') install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd@.service) -md5sums=('762c0d47bdf1b33a40b19165d9c2761f' +md5sums=('14a91eb2e85bdc0451a815612521b708' 'SKIP' '112327da32fdb56ab779fe004712235f') diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index dafe8812d..f95ba4e2c 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110754 2014-05-06 09:29:25Z tredaelli $ +# $Id: PKGBUILD 111041 2014-05-12 09:22:44Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Guillaume ALAUX # Contributor: Florian Pritz pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.10.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' @@ -39,7 +39,7 @@ build() { package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio') + depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua') install=wireshark.install conflicts=(wireshark) @@ -63,7 +63,7 @@ package_wireshark-cli() { package_wireshark-gtk() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') install=wireshark-gtk.install replaces=(wireshark) conflicts=(wireshark) diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD index 032d3fe71..6382faba7 100644 --- a/community/wxcam/PKGBUILD +++ b/community/wxcam/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 107128 2014-03-12 23:53:54Z foutrelis $ +# $Id: PKGBUILD 111011 2014-05-12 01:07:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=wxcam pkgver=1.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=(GPL) pkgdesc="Webcam application for linux" # version of CImg library needed to compile wxcam - # http://cimg.sourceforge.net/ -_CImg_ver=1.4.9 +_CImg_ver=1.5.8 url="http://wxcam.sourceforge.net" makedepends=('intltool>=0.35.0' 'libsm') depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib') source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip) md5sums=('c9ea8991b6375c1709a7ce4e61fcc263' - 'a07cba03f6d66a9970e0b3fcc230bddc') + '4941a3959f790ee68326403da1ed6dc7') prepare() { cp "$srcdir"/CImg-${_CImg_ver}/CImg.h "$srcdir"/$pkgname-$pkgver diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index f18e73770..a123b5237 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106236 2014-02-25 19:42:02Z jlichtblau $ +# $Id: PKGBUILD 111053 2014-05-12 17:42:26Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Jaroslaw Swierczynski pkgname=xnee -pkgver=3.18 +pkgver=3.19 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('xosd: feedback support') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gnee.desktop) -sha256sums=('c76d1c8b9deff2e52721e474cb69cf092c0d72212c916c6dacc94e33618c8638' +sha256sums=('52a41e5cf62f81b7a3e5b58124eb3565e1e12028abda63f547fbbe0d98a2c212' 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1') build() { @@ -33,5 +33,3 @@ package() { #.desktop file install -Dm644 "${srcdir}"/gnee.desktop "${pkgdir}"/usr/share/applications/gnee.desktop } -sha256sums=('24d521b604f3118faf1bd087619feb230cda38bf3721000828e670e0f311cb48' - 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1') diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index 44d09c1b0..e0e1f9b87 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2014-05-12 Jaroslav Lichtblau + * xnee 3.19-1 + 2014-02-25 Jaroslav Lichtblau * xnee 3.18-1 diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD index c2fc7add7..d236eadb9 100644 --- a/community/yaml-cpp/PKGBUILD +++ b/community/yaml-cpp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89824 2013-05-02 16:13:14Z svenstaro $ +# $Id: PKGBUILD 111017 2014-05-12 01:22:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Markus Martin pkgname=yaml-cpp @@ -8,7 +8,8 @@ pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" url="http://code.google.com/p/yaml-cpp/" arch=('i686' 'x86_64') license=('MIT') -makedepends=('cmake' 'boost') +makedepends=('cmake') +depends=('boost') source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz) md5sums=('0fa47a5ed8fedefab766592785c85ee7') @@ -23,4 +24,6 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + install -Dm644 license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE } -- cgit v1.2.3-54-g00ecf