diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-14 03:37:58 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-14 03:37:58 +0000 |
commit | 86a5624291a8a72d9a0a2c51fcc64bf6e221524b (patch) | |
tree | e585f1910631fdca9c14bc3127c269c8005c838e /community | |
parent | b6ad8075baf858359209aa7f1af82a143dcc0c80 (diff) |
Fri Feb 14 03:35:43 UTC 2014
Diffstat (limited to 'community')
-rw-r--r-- | community/chntpw/PKGBUILD | 17 | ||||
-rw-r--r-- | community/elasticsearch/PKGBUILD | 15 | ||||
-rw-r--r-- | community/elasticsearch/elasticsearch-sysctl.conf | 1 | ||||
-rw-r--r-- | community/elasticsearch/elasticsearch.service | 5 | ||||
-rw-r--r-- | community/elasticsearch/elasticsearch@.service | 5 | ||||
-rw-r--r-- | community/gearmand/PKGBUILD | 6 | ||||
-rw-r--r-- | community/liblogging/PKGBUILD | 24 | ||||
-rw-r--r-- | community/lucene++/PKGBUILD | 8 | ||||
-rw-r--r-- | community/notion/PKGBUILD | 66 | ||||
-rw-r--r-- | community/oath-toolkit/PKGBUILD | 10 | ||||
-rw-r--r-- | community/poedit/PKGBUILD | 18 | ||||
-rw-r--r-- | community/poedit/build-fix.patch | 235 | ||||
-rw-r--r-- | community/redis/PKGBUILD | 6 | ||||
-rw-r--r-- | community/rsyslog/PKGBUILD | 6 | ||||
-rw-r--r-- | community/sfk/PKGBUILD | 6 | ||||
-rw-r--r-- | community/xtrabackup/PKGBUILD | 25 | ||||
-rw-r--r-- | community/xtrabackup/build.patch | 11 |
17 files changed, 352 insertions, 112 deletions
diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD index 16c8f504c..20d09257b 100644 --- a/community/chntpw/PKGBUILD +++ b/community/chntpw/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 64647 2012-02-17 13:33:11Z lfleischer $ +# $Id: PKGBUILD 105665 2014-02-13 09:45:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=chntpw -pkgver=110511 -pkgrel=2 -pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file.' +pkgver=140201 +pkgrel=1 +pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file' arch=('i686' 'x86_64') url='http://pogostick.net/~pnh/ntpasswd/' license=('GPL' 'LGPL') makedepends=('openssl') source=("http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip") -md5sums=('a3fb358d1adec589cd6bc8dedf68896c') +md5sums=('d60bc657206b07ad84d926649d6417dc') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's/^CFLAGS= \(.*\) -m32 $/CFLAGS= \1/' Makefile +} - [ "$CARCH" = "x86_64" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile +build() { + cd "${srcdir}/${pkgname}-${pkgver}" make } diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD index 75361e5e8..eb45c7f30 100644 --- a/community/elasticsearch/PKGBUILD +++ b/community/elasticsearch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105273 2014-02-03 18:00:50Z mtorromeo $ +# $Id: PKGBUILD 105667 2014-02-13 10:14:53Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> pkgname=elasticsearch -pkgver=0.90.11 +pkgver=1.0.0 pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') @@ -17,6 +17,7 @@ source=( elasticsearch.service elasticsearch@.service elasticsearch-tmpfile.conf + elasticsearch-sysctl.conf ) backup=('etc/elasticsearch/elasticsearch.yml' @@ -70,9 +71,11 @@ package() { install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service" install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf" + install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf" } -sha256sums=('cff503078fcb3e1b1d2b966e9173599be38a1a451278f587415c7f2311fd5697' - '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb' - 'e3dd705bec204b8572456344b90c4773f867965a1215c22b6e9518f0aa268a2d' - '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f') +sha256sums=('0150bc7609c885eb2868bd27b817051e08b4bbe50a8aad5a51698c43283cd51b' + 'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a' + 'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f' + '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f' + 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c') diff --git a/community/elasticsearch/elasticsearch-sysctl.conf b/community/elasticsearch/elasticsearch-sysctl.conf new file mode 100644 index 000000000..32da2c91c --- /dev/null +++ b/community/elasticsearch/elasticsearch-sysctl.conf @@ -0,0 +1 @@ +vm.max_map_count=262144
\ No newline at end of file diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service index 28364b878..4121332af 100644 --- a/community/elasticsearch/elasticsearch.service +++ b/community/elasticsearch/elasticsearch.service @@ -1,12 +1,15 @@ [Unit] Description=ElasticSearch +Documentation=http://www.elasticsearch.org After=network.target [Service] User=elasticsearch Type=forking PIDFile=/run/elasticsearch/elasticsearch.pid -ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid +ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid +LimitNOFILE=65535 +TimeoutStopSec=20 Restart=on-failure [Install] diff --git a/community/elasticsearch/elasticsearch@.service b/community/elasticsearch/elasticsearch@.service index b2940c91d..093f7df59 100644 --- a/community/elasticsearch/elasticsearch@.service +++ b/community/elasticsearch/elasticsearch@.service @@ -1,12 +1,15 @@ [Unit] Description=ElasticSearch +Documentation=http://www.elasticsearch.org After=network.target [Service] User=elasticsearch Type=forking PIDFile=/run/elasticsearch/%I.pid -ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml +ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml +LimitNOFILE=65535 +TimeoutStopSec=20 Restart=on-failure [Install] diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD index f0f325628..894a79528 100644 --- a/community/gearmand/PKGBUILD +++ b/community/gearmand/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102452 2013-12-11 14:33:31Z mtorromeo $ +# $Id: PKGBUILD 105677 2014-02-13 14:56:45Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Lev Lybin <lev.lybin@gmail.com> # Contributor: Vadym Abramchuk <abramm@gmail.com> # Contributor: John Gerritse <reaphsharc@gmail.com> pkgname=gearmand -pkgver=1.1.11 +pkgver=1.1.12 pkgrel=1 pkgdesc="Distributed job queue server." arch=('i686' 'x86_64') @@ -45,6 +45,6 @@ package() { install -Dm644 gearmand.conf "$pkgdir/etc/gearmand.conf" } -sha256sums=('a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825' +sha256sums=('973d7a3523141a84c7b757c6f243febbc89a3631e919b532c056c814d8738acb' 'dee38ad4e614969047253b8c4996b8cdf33c981b0df215b6627356fd4cbafa33' '6c14fdcd94105338e13bdd59dbed4f9b77430a517b2c125ac2e6d3bc43bdf506') diff --git a/community/liblogging/PKGBUILD b/community/liblogging/PKGBUILD index e6f747d2c..9c2c94f39 100644 --- a/community/liblogging/PKGBUILD +++ b/community/liblogging/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104586 2014-01-23 09:47:05Z spupykin $ +# $Id: PKGBUILD 105659 2014-02-13 09:26:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Denis Wernert <deniswernert@gmail.com> pkgname=liblogging -pkgver=1.0.0pre +pkgver=1.0.1 pkgrel=1 pkgdesc="easy to use, portable, open source library for system logging" url="http://www.liblogging.org/" @@ -11,24 +11,24 @@ arch=('i686' 'x86_64') license=('GPL') makedepends=('git') options=('strip' 'zipman' '!libtool') -#source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz") -source=("git://git.adiscon.com/git/liblogging.git") -md5sums=('SKIP') +source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz") +#source=("git://git.adiscon.com/git/liblogging.git") +md5sums=('1db6bef59157a5676f8fad49be6e5d9d') build() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} - libtoolize --force --copy - aclocal - autoheader - automake --add-missing --copy - autoconf +# libtoolize --force --copy +# aclocal +# autoheader +# automake --add-missing --copy +# autoconf ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} } diff --git a/community/lucene++/PKGBUILD b/community/lucene++/PKGBUILD index 4ce234302..d5a9410d2 100644 --- a/community/lucene++/PKGBUILD +++ b/community/lucene++/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105220 2014-02-02 21:53:42Z eric $ +# $Id: PKGBUILD 105669 2014-02-13 11:02:33Z spupykin $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Rafael Ferreira <josephgbr@archlinux.info> pkgname=lucene++ pkgver=3.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='C++ port of the popular Java Lucene library' arch=(i686 x86_64) url='https://github.com/luceneplusplus/LucenePlusPlus' @@ -16,6 +16,10 @@ md5sums=('da785510716a759d7d37a2ee52cb8140') prepare() { mkdir build + sed -i \ + -e 's#SET(LUCENE++_VERSION_REVISION.*#SET(LUCENE++_VERSION_REVISION "5")#' \ + -e 's#SET(LUCENE++_VERSION_PATCH.*#SET(LUCENE++_VERSION_PATCH "0")#' \ + $srcdir/LucenePlusPlus-rel_$pkgver/CMakeLists.txt } build() { diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 067b21921..87ab1d721 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $ +# $Id: PKGBUILD 105675 2014-02-13 14:16:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20131223 +pkgver=20140213 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -17,73 +17,43 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' provides=('libtu' 'libextl') changelog=ChangleLog source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion" - "$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu" - "$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl" - "$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc" - "$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" - "$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" - "$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" - "$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" - "$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib") + "notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc") md5sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' 'SKIP') prepare() { cd ${srcdir} - sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk - sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk - - for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do - mkdir -p ${srcdir}/notion/$i - cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/ - done - - cd ${srcdir}/notion - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -e 's|/usr/local|/usr|g' \ - -i system-autodetect.mk + cat >notion/build/lua-detect.mk <<EOF +LUA_VERSION := 5.2 +LUA_LIBS := $(pkg-config --libs lua) +LUA_INCLUDES := $(pkg-config --cflags lua) +LUA := $(which lua) +LUAC := $(which luac) +EOF } build() { cd ${srcdir}/notion - - # build notion - make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion - - # build doc and modules - for i in mod_xinerama mod_xkbevents mod_xrandr; do - (cd $i && make -j1 TOPDIR=.. all) - done - - (cd notion-doc && make -j1 TOPDIR=.. all) + make INCLUDES=-I${srcdir}/notion LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion + cd ${srcdir}/notion-doc + make -j1 all } package() { cd ${srcdir}/notion + make DESTDIR=$pkgdir LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion install - # notion - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install + # doc + cd ${srcdir}/notion-doc + make PREFIX=$pkgdir/usr ETCDIR=/etc/notion install # modules - for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do - (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) - done cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/ cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/ # contrib mkdir -p $pkgdir/usr/share/notion/contrib - cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib + cp -a ${srcdir}/$pkgname/contrib/* $pkgdir/usr/share/notion/contrib # license install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index e3e86c036..e2c206f85 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 98970 2013-10-21 20:20:39Z seblu $ +# $Id: PKGBUILD 105649 2014-02-13 00:27:31Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.4.0 -pkgrel=2 +pkgver=2.4.1 +pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') url='http://www.nongnu.org/oath-toolkit/' license=('GPL3') depends=('glibc' 'pam' 'xmlsec') -source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('456774fbc37d5267e4e8920694b7ad48' +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('951bafd1d86e6013903c10be3b6623bb' 'SKIP') build() { diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index b0676ed4a..f6b66bc0b 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 105570 2014-02-10 12:39:42Z spupykin $ +# $Id: PKGBUILD 105671 2014-02-13 11:03:29Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.6.3 -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') url="http://www.poedit.net/" license=('MIT') -depends=('wxgtk' 'desktop-file-utils' 'lucene++') +depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell') makedepends=('boost' 'libsm') install=poedit.install -source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz) -md5sums=('f58be3cee666d3c586a85c26abba7816') +#source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz) +source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-$pkgver.tar.gz + build-fix.patch) +md5sums=('203e27826c1baa4de403ce6d1cc60444' + '724aed37a6760c8ac9405f9ee4b70c05') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|Wx/filename.h|wx/filename.h|' src/tm/transmem.cpp - sed -i 's|libexec/poedit|lib/poedit/poedit|g' src/tm/tm_migrate.cpp + patch -p1 <$srcdir/build-fix.patch } build() { diff --git a/community/poedit/build-fix.patch b/community/poedit/build-fix.patch new file mode 100644 index 000000000..fb582bf2b --- /dev/null +++ b/community/poedit/build-fix.patch @@ -0,0 +1,235 @@ +diff -wbBur poedit-1.6.4/src/edapp.cpp poedit-1.6.4.my/src/edapp.cpp +--- poedit-1.6.4/src/edapp.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edapp.cpp 2014-02-13 14:49:30.231324614 +0400 +@@ -67,7 +67,6 @@ + + #include "edapp.h" + #include "edframe.h" +-#include "aboutbox.h" + #include "manager.h" + #include "prefsdlg.h" + #include "parser.h" +@@ -666,7 +665,7 @@ + about.SetCopyright(L"Copyright \u00a9 1999-2014 Václav Slavík"); + about.SetWebSite("http://www.poedit.net"); + +- PoeditAboutBox(about); ++// PoeditAboutBox(about); + } + + +@@ -792,7 +791,7 @@ + void PoeditApp::EmailSupport(const wxString& subject, const wxString& body) + { + wxString body2(body); +- wxString appname(HasLicense() ? "Poedit Pro" : "Poedit"); ++ wxString appname("Poedit"); + + #ifdef __WXOSX__ + NSString *s = [[NSProcessInfo processInfo] operatingSystemVersionString]; +@@ -927,31 +926,8 @@ + + void PoeditApp::OnLicense(wxCommandEvent&) + { +- ShowLicenseInformation(); + } + + void PoeditApp::ImportLicenseKey(const wxString& url) + { +- PoeditLicense lic = PoeditLicense::FromURL(url); +- +- if (lic.IsValid()) +- { +- lic.Store(); // save valid license +- ShowLicenseInformation(nullptr, &lic); // ...and thank the user +- } +- else if (!lic.Key().empty()) +- { +- // if we at least parsed the data, even if invalid, show it and let the +- // user correct them +- ShowLicenseInformation(nullptr, &lic); +- } +- else +- { +- wxMessageDialog dlg(nullptr, _("Invalid license data."), _("Poedit"), wxOK | wxICON_ERROR); +- dlg.SetExtendedMessage(wxString::Format(_("The link doesn't contain valid Poedit license. Try entering it manually or contact support at help@poedit.net.\n\n(%s)"), url)); +- dlg.ShowModal(); +- } +- +- if (wxTopLevelWindows.empty()) +- OpenNewFile(); + } +diff -wbBur poedit-1.6.4/src/edapp.h poedit-1.6.4.my/src/edapp.h +--- poedit-1.6.4/src/edapp.h 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edapp.h 2014-02-13 14:49:08.831324860 +0400 +@@ -27,8 +27,6 @@ + #ifndef _EDAPP_H_ + #define _EDAPP_H_ + +-#include "licensing.h" +- + #include <wx/app.h> + #include <wx/string.h> + #include <wx/intl.h> +diff -wbBur poedit-1.6.4/src/edframe.cpp poedit-1.6.4.my/src/edframe.cpp +--- poedit-1.6.4/src/edframe.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edframe.cpp 2014-02-13 14:49:20.301324729 +0400 +@@ -85,9 +85,7 @@ + #include "errorbar.h" + #include "utility.h" + #include "languagectrl.h" +-#include "statistics.h" + #include "welcomescreen.h" +-#include "wordpress.h" + #include "errors.h" + + #include <wx/listimpl.cpp> +@@ -1374,8 +1372,6 @@ + + void PoeditFrame::OnNewForWordpress(wxCommandEvent&) + { +- CHECK_LICENSE(Wordpress); +- + DoIfCanDiscardCurrentDoc([=]{ + NewForWordpress(); + }); +@@ -1466,73 +1462,6 @@ + void PoeditFrame::NewForWordpress() + { + // TODO: share code with NewFromPOT() +- +- wxDirDialog dirdlg(this, +- _("Select the folder with the WordPress theme or plugin"), +- "", +- wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); +- if (dirdlg.ShowModal() != wxID_OK) +- return; +- +- try +- { +- std::unique_ptr<ProgressInfo> progress(new ProgressInfo(this, _("WordPress"))); +- progress->UpdateMessage(_("Analyzing WordPress code...")); +- +- auto wpInfo = WordpressInfo::Analyze(dirdlg.GetPath()); +- auto catalog = wpInfo.CreateCatalog(); +- +- delete m_catalog; +- m_catalog = catalog.release(); +- +- m_fileName = wpInfo.GetPOFilePath("LANG"); +- m_catalog->SetFileName(m_fileName); +- m_fileExistsOnDisk = false; +- m_modified = true; +- +- EnsureContentView(Content::PO); +- m_list->CatalogChanged(m_catalog); +- +- UpdateTitle(); +- UpdateMenu(); +- UpdateStatusBar(); +- InitSpellchecker(); +- +- progress.reset(); +- +- UpdateCatalog(); +- +- // Choose the language: +- wxWindowPtr<LanguageDialog> dlg(new LanguageDialog(this)); +- +- dlg->ShowWindowModalThenDo([=](int retcode){ +- if (retcode == wxID_OK) +- { +- Language lang = dlg->GetLang(); +- m_catalog->Header().Lang = lang; +- m_catalog->Header().SetHeaderNotEmpty("Plural-Forms", lang.DefaultPluralFormsExpr()); +- +- m_fileName = wpInfo.GetPOFilePath(lang.Code()); +- m_catalog->SetFileName(m_fileName); +- m_fileExistsOnDisk = false; +- m_modified = true; +- +- UpdateTitle(); +- UpdateMenu(); +- UpdateStatusBar(); +- RecreatePluralTextCtrls(); +- InitSpellchecker(); +- if (m_list) +- m_list->CatalogChanged(m_catalog); // refresh language column +- } +- }); +- } +- catch (const WordpressException& e) +- { +- WordpressErrorDialog dlg(this, e); +- dlg.ShowModal(); +- return; +- } + } + + +@@ -1728,10 +1657,6 @@ + + void PoeditFrame::OnStatistics(wxCommandEvent&) + { +- CHECK_LICENSE(Statistics); +- +- wxWindowPtr<wxDialog> dlg(new StatisticsWindow(this, *m_catalog)); +- dlg->ShowWindowModalThenDo([dlg](int){}); + } + + +diff -wbBur poedit-1.6.4/src/tm/tm_migrate.cpp poedit-1.6.4.my/src/tm/tm_migrate.cpp +--- poedit-1.6.4/src/tm/tm_migrate.cpp 2014-02-01 22:10:12.000000000 +0400 ++++ poedit-1.6.4.my/src/tm/tm_migrate.cpp 2014-02-13 14:15:57.734681082 +0400 +@@ -92,7 +92,7 @@ + return path.GetFullPath(); + #endif + #else +- return wxStandardPaths::Get().GetInstallPrefix() + "/libexec/poedit-dump-legacy-tm"; ++ return wxStandardPaths::Get().GetInstallPrefix() + "/lib/poedit/poedit-dump-legacy-tm"; + #endif + } + +diff -wbBur poedit-1.6.4/src/welcomescreen.cpp poedit-1.6.4.my/src/welcomescreen.cpp +--- poedit-1.6.4/src/welcomescreen.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/welcomescreen.cpp 2014-02-13 14:48:36.421325233 +0400 +@@ -118,11 +118,10 @@ + #endif + + +-class UpgradeSizer : public wxBoxSizer, public LicenseObserver ++class UpgradeSizer : public wxBoxSizer + { + public: + UpgradeSizer(int orient) : wxBoxSizer(orient) {} +- virtual void OnLicenseEntered() { ShowItems(false); } + }; + + } // anonymous namespace +@@ -203,26 +202,6 @@ + + sizer->AddSpacer(20); + +- if (!HasLicense()) +- { +- auto upgradeSizer = new UpgradeSizer(wxHORIZONTAL); +- sizer->Add(upgradeSizer, wxSizerFlags().Align(wxALIGN_RIGHT).Border()); +- auto upgradeBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBanner"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro"); +- upgradeBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerHighlight")); +- upgradeBtn->SetToolTip(_("Upgrade to the Pro version of Poedit with more features.")); +- upgradeSizer->Add(upgradeBtn); +- auto upgradeInfoBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBannerInfo"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro Info"); +- upgradeInfoBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerInfoHighlight")); +- upgradeSizer->Add(upgradeInfoBtn); +- +- upgradeBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){ +- PurchaseUpgrade(UpgradeSource::WelcomeScreen_Upgrade, /*certain=*/false, parent); +- }); +- upgradeInfoBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){ +- AskUserToUpgradeIfAppliable(UpgradeSource::WelcomeScreen_Info, parent); +- }); +- } +- + sizer->Add(new ActionButton( + this, wxID_OPEN, + _("Edit a translation"), diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index f171ecf44..91b4112fc 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105288 2014-02-04 16:31:50Z spupykin $ +# $Id: PKGBUILD 105686 2014-02-13 16:52:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.8.5 +pkgver=2.8.6 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('a27c23673585ad97ae40ed0214c1480b' +md5sums=('f0dbfcdea98ed237e7990d1eaff82241' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index eca4ff9be..9e0fe100c 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 104588 2014-01-23 09:47:24Z spupykin $ +# $Id: PKGBUILD 105661 2014-02-13 09:27:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.4.9 +pkgver=7.6.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" @@ -21,7 +21,7 @@ options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('43c91cbc86b51979de61e868ff921f17' +md5sums=('26a12cb6d6693839aea07d29f8654bc9' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD index 3290a5d89..c5ca26769 100644 --- a/community/sfk/PKGBUILD +++ b/community/sfk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102870 2013-12-23 01:46:34Z seblu $ +# $Id: PKGBUILD 105651 2014-02-13 00:44:20Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Baumi <baumi@gmx.com> pkgname=sfk -pkgver=1.6.9 +pkgver=1.7.0 pkgrel=1 pkgdesc='Swiss File Knife - A Command Line Tools Collection' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk' license=('custom: BSD') depends=('gcc-libs') source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") -md5sums=('3a006bd1f73587ef347838231a5adbb3') +md5sums=('325842e02ca7db504deace76b6375861') build() { cd ${pkgname}${pkgver//./} diff --git a/community/xtrabackup/PKGBUILD b/community/xtrabackup/PKGBUILD index 1cba22af7..d90eeb4a8 100644 --- a/community/xtrabackup/PKGBUILD +++ b/community/xtrabackup/PKGBUILD @@ -1,21 +1,26 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=xtrabackup pkgver=2.1.7 -pkgrel=2 +pkgrel=3 pkgdesc='Non-blocking backup tool for MySQL' arch=('i686' 'x86_64') url='http://www.percona.com/software/percona-xtrabackup/' license=('GPL') depends=('libaio' 'libgcrypt' 'openssl') makedepends=('cmake' 'python-sphinx' 'zlib') -source=(http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz) -md5sums=('cce4ad2e6e1481a98cd403563fd989dc') +source=(http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz + build.patch) build() { cd percona-xtrabackup-$pkgver - utils/build.sh innodb55 + + utils/build.sh xtradb55 + cp src/xtrabackup_55 src/xbstream src/xbcrypt . + utils/build.sh xtradb56 + cp src/xtrabackup_56 . cd doc make man @@ -24,15 +29,15 @@ build() { package() { cd percona-xtrabackup-$pkgver - install -D innobackupex "$pkgdir"/usr/bin/innobackupex - install -D src/xtrabackup_innodb55 "$pkgdir"/usr/bin/xtrabackup_55 - install -D src/xbcrypt "$pkgdir"/usr/bin/xbcrypt - install -D src/xbstream "$pkgdir"/usr/bin/xbstream - - ln -s /usr/bin/xtrabackup_55 "$pkgdir"/usr/bin/xtrabackup + for file in innobackupex xtrabackup_55 xtrabackup_56 xbcrypt xbstream; do + install -Dm0755 $file "$pkgdir"/usr/bin/$file + done cd doc/build/man for file in *.1; do install -Dm0644 $file "$pkgdir"/usr/share/man/man1/$file done } + +sha256sums=('b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587' + 'e6f329c061c921be6e44e16fd64d79bcca8c61ea1ce4a1d2f923408d30318b25') diff --git a/community/xtrabackup/build.patch b/community/xtrabackup/build.patch new file mode 100644 index 000000000..fc2ef2866 --- /dev/null +++ b/community/xtrabackup/build.patch @@ -0,0 +1,11 @@ +--- utils/build.sh.orig 2014-01-24 10:37:41.206535420 +0100 ++++ utils/build.sh 2014-01-24 10:44:00.841407894 +0100 +@@ -167,6 +167,9 @@ + tar xzf $top_dir/$1 + cd $dirname + patch -p1 < $top_dir/patches/$2 ++ sed 's|srv_buf_size|srv_sort_buf_size|g' -i \ ++ sql/sql_planner.cc \ ++ storage/innobase/row/row0log.cc + cd - + } |