diff options
Diffstat (limited to 'community')
23 files changed, 330 insertions, 739 deletions
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 111957f53..9820e5256 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 103794 2014-01-11 20:08:28Z eric $ +# $Id: PKGBUILD 105169 2014-02-02 09:46:45Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla pkgver=3.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk2.8' 'libidn' 'hicolor-icon-theme' 'sqlite') +depends=('dbus-core' 'xdg-utils' 'wxgtk2.8' 'libidn' 'hicolor-icon-theme' 'sqlite' 'gnutls') install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index e62823d19..08d9c9c39 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99568 2013-10-29 21:15:35Z seblu $ +# $Id: PKGBUILD 105161 2014-02-02 00:47:06Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset pkgver=6.20.1 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -13,7 +13,7 @@ backup=("etc/$pkgname.conf") source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.service") md5sums=('8af741492752fbf24d3a28a9d1473d40' - '6be6a2b34c1f38fc8ad60828403e2077') + '4b195827996c6012a801e21f869c385d') build() { cd $pkgname-$pkgver diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 39183c7d7..c3e7460a0 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -6,6 +6,7 @@ Before=iptables.service Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore +ExecReload=/usr/bin/ipset -f /etc/ipset.conf restore ExecStop=/usr/bin/ipset destroy [Install] diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD index ec6f017c1..030d85ad2 100644 --- a/community/jwm/PKGBUILD +++ b/community/jwm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 90050 2013-05-06 19:37:59Z foutrelis $ +# $Id: PKGBUILD 105157 2014-02-02 00:03:54Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=jwm -pkgver=2.1.0 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 pkgdesc="A lightweight window manager for the X11 Window System" arch=('i686' 'x86_64') url="http://joewing.net/programs/jwm/" license=('GPL2') depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng') backup=('etc/system.jwmrc') -source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2) -md5sums=('e8fab21b2410eb82032b7c3472af642c') +source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.xz) +md5sums=('4950ed5d44d1f00e7b7386fea4657b54') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index 3eb21dddc..0324d43e3 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 101449 2013-11-25 20:44:51Z idevolder $ +# $Id: PKGBUILD 105190 2014-02-02 16:31:36Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs -pkgver=1.8.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64') @@ -10,7 +10,6 @@ url="https://github.com/sahlberg/libnfs" license=('GPL') depends=('glibc') source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz") -sha256sums=('e4d766efba85e79b04c18038070506d0a9df5b7e0f08aa54ab402892cd1542cc') build() { cd "$pkgname-$pkgname-$pkgver" @@ -24,3 +23,4 @@ package() { cd "$pkgname-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +sha256sums=('77d9d543eb1ae3e36497e5a3d4f37c8dd3d66def8d11817d4ed84368bbbb225b') diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index 0734e08f7..7e70ac084 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98452 2013-10-10 20:04:45Z alucryd $ +# $Id: PKGBUILD 105171 2014-02-02 11:07:34Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter pkgver=1.6.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') @@ -15,8 +15,16 @@ makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/2/}") conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') -source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") -sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9') +source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz" + 'fix-null-username.patch') +sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9' + '27e1ec5f73f963ea5fbc69d4b380dbfa47a4066b35fa1a00341203568d9aa64d') + +prepare() { + cd ${pkgname/2/}-${pkgver} + + patch -Np0 -i ../fix-null-username.patch +} build() { cd ${pkgname/2/}-${pkgver} diff --git a/community/lightdm-gtk2-greeter/fix-null-username.patch b/community/lightdm-gtk2-greeter/fix-null-username.patch new file mode 100644 index 000000000..63cdf83c1 --- /dev/null +++ b/community/lightdm-gtk2-greeter/fix-null-username.patch @@ -0,0 +1,83 @@ +=== modified file 'src/lightdm-gtk-greeter.c' +--- src/lightdm-gtk-greeter.c 2014-01-07 11:02:12 +0000 ++++ src/lightdm-gtk-greeter.c 2014-01-08 00:21:56 +0000 +@@ -333,7 +333,7 @@ + gchar *s; + gboolean matched; + s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "session-key")); +- matched = strcmp (s, session) == 0; ++ matched = g_strcmp0 (s, session) == 0; + g_free (s); + if (matched) + { +@@ -402,7 +402,7 @@ + gchar *s; + gboolean matched; + s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code")); +- matched = strcmp (s, language) == 0; ++ matched = g_strcmp0 (s, language) == 0; + g_free (s); + if (matched) + { +@@ -423,7 +423,7 @@ + static void + set_message_label (const gchar *text) + { +- gtk_widget_set_visible (GTK_WIDGET (info_bar), strcmp (text, "") != 0); ++ gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0); + gtk_label_set_text (message_label, text); + } + +@@ -633,13 +633,13 @@ + } + g_free (data); + +- if (strcmp (username, "*other") == 0) ++ if (g_strcmp0 (username, "*other") == 0) + { + gtk_widget_show (GTK_WIDGET (username_entry)); + gtk_widget_show (GTK_WIDGET (cancel_button)); + lightdm_greeter_authenticate (greeter, NULL); + } +- else if (strcmp (username, "*guest") == 0) ++ else if (g_strcmp0 (username, "*guest") == 0) + { + lightdm_greeter_authenticate_as_guest (greeter); + } +@@ -689,7 +689,7 @@ + gchar *user; + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1); +- other = (strcmp (user, "*other") == 0); ++ other = (g_strcmp0 (user, "*other") == 0); + g_free (user); + } + +@@ -964,7 +964,7 @@ + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1); + +- if (strcmp (user, "*other") == 0) ++ if (g_strcmp0 (user, "*other") == 0) + { + gtk_widget_show (GTK_WIDGET (username_entry)); + gtk_widget_show (GTK_WIDGET (cancel_button)); +@@ -1463,7 +1463,7 @@ + do + { + gtk_tree_model_get (model, &iter, 0, &name, -1); +- matched = strcmp (name, selected_user) == 0; ++ matched = g_strcmp0 (name, selected_user) == 0; + g_free (name); + if (matched) + { +@@ -1954,7 +1954,7 @@ + g_object_set (gtk_settings_get_default (), "gtk-xft-dpi", (int) (1024 * atof (value)), NULL); + value = g_key_file_get_value (config, "greeter", "xft-antialias", NULL); + if (value) +- g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", strcmp (value, "true") == 0, NULL); ++ g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", g_strcmp0 (value, "true") == 0, NULL); + g_free (value); + value = g_key_file_get_value (config, "greeter", "xft-hintstyle", NULL); + if (value) + diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 974539f2b..785711d1e 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98450 2013-10-10 19:59:15Z alucryd $ +# $Id: PKGBUILD 105173 2014-02-02 11:18:41Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter pkgver=1.6.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') @@ -15,8 +15,16 @@ makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/3/}") conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') -source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9') +source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz" + 'fix-null-username.patch') +sha256sums=('1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9' + '27e1ec5f73f963ea5fbc69d4b380dbfa47a4066b35fa1a00341203568d9aa64d') + +prepare() { + cd ${pkgname/3/}-${pkgver} + + patch -Np0 -i ../fix-null-username.patch +} build() { cd ${pkgname/3/}-${pkgver} diff --git a/community/lightdm-gtk3-greeter/fix-null-username.patch b/community/lightdm-gtk3-greeter/fix-null-username.patch new file mode 100644 index 000000000..63cdf83c1 --- /dev/null +++ b/community/lightdm-gtk3-greeter/fix-null-username.patch @@ -0,0 +1,83 @@ +=== modified file 'src/lightdm-gtk-greeter.c' +--- src/lightdm-gtk-greeter.c 2014-01-07 11:02:12 +0000 ++++ src/lightdm-gtk-greeter.c 2014-01-08 00:21:56 +0000 +@@ -333,7 +333,7 @@ + gchar *s; + gboolean matched; + s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "session-key")); +- matched = strcmp (s, session) == 0; ++ matched = g_strcmp0 (s, session) == 0; + g_free (s); + if (matched) + { +@@ -402,7 +402,7 @@ + gchar *s; + gboolean matched; + s = g_strdup(g_object_get_data (G_OBJECT (menu_iter->data), "language-code")); +- matched = strcmp (s, language) == 0; ++ matched = g_strcmp0 (s, language) == 0; + g_free (s); + if (matched) + { +@@ -423,7 +423,7 @@ + static void + set_message_label (const gchar *text) + { +- gtk_widget_set_visible (GTK_WIDGET (info_bar), strcmp (text, "") != 0); ++ gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0); + gtk_label_set_text (message_label, text); + } + +@@ -633,13 +633,13 @@ + } + g_free (data); + +- if (strcmp (username, "*other") == 0) ++ if (g_strcmp0 (username, "*other") == 0) + { + gtk_widget_show (GTK_WIDGET (username_entry)); + gtk_widget_show (GTK_WIDGET (cancel_button)); + lightdm_greeter_authenticate (greeter, NULL); + } +- else if (strcmp (username, "*guest") == 0) ++ else if (g_strcmp0 (username, "*guest") == 0) + { + lightdm_greeter_authenticate_as_guest (greeter); + } +@@ -689,7 +689,7 @@ + gchar *user; + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1); +- other = (strcmp (user, "*other") == 0); ++ other = (g_strcmp0 (user, "*other") == 0); + g_free (user); + } + +@@ -964,7 +964,7 @@ + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &user, -1); + +- if (strcmp (user, "*other") == 0) ++ if (g_strcmp0 (user, "*other") == 0) + { + gtk_widget_show (GTK_WIDGET (username_entry)); + gtk_widget_show (GTK_WIDGET (cancel_button)); +@@ -1463,7 +1463,7 @@ + do + { + gtk_tree_model_get (model, &iter, 0, &name, -1); +- matched = strcmp (name, selected_user) == 0; ++ matched = g_strcmp0 (name, selected_user) == 0; + g_free (name); + if (matched) + { +@@ -1954,7 +1954,7 @@ + g_object_set (gtk_settings_get_default (), "gtk-xft-dpi", (int) (1024 * atof (value)), NULL); + value = g_key_file_get_value (config, "greeter", "xft-antialias", NULL); + if (value) +- g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", strcmp (value, "true") == 0, NULL); ++ g_object_set (gtk_settings_get_default (), "gtk-xft-antialias", g_strcmp0 (value, "true") == 0, NULL); + g_free (value); + value = g_key_file_get_value (config, "greeter", "xft-hintstyle", NULL); + if (value) + diff --git a/community/lucene++/0001-Add-support-for-compiling-with-c-11.patch b/community/lucene++/0001-Add-support-for-compiling-with-c-11.patch deleted file mode 100644 index afd4dd7cd..000000000 --- a/community/lucene++/0001-Add-support-for-compiling-with-c-11.patch +++ /dev/null @@ -1,291 +0,0 @@ -From f4f7a4e212dc96146a9b71c8a09d375a1cd9980e Mon Sep 17 00:00:00 2001 -From: Jason Gilanfarr <jason@upthere.com> -Date: Thu, 26 Sep 2013 16:46:23 -0700 -Subject: [PATCH] Add support for compiling with c++11. - ---- - include/Array.h | 2 +- - include/AttributeSource.h | 2 +- - include/Collection.h | 2 +- - include/HashMap.h | 2 +- - include/HashSet.h | 2 +- - include/Map.h | 2 +- - include/MiscUtils.h | 2 +- - include/Set.h | 2 +- - src/core/include/_FieldCacheRangeFilter.h | 2 +- - src/core/index/DirectoryReader.cpp | 2 +- - src/core/index/IndexWriter.cpp | 2 +- - src/core/index/MultiLevelSkipListReader.cpp | 2 +- - src/core/index/SegmentMerger.cpp | 2 +- - src/core/index/SegmentReader.cpp | 4 ++-- - src/core/queryparser/QueryParserTokenManager.cpp | 7 ++++--- - src/core/search/FieldCacheRangeFilter.cpp | 2 +- - src/core/search/Query.cpp | 2 +- - src/core/store/NativeFSLockFactory.cpp | 2 +- - src/core/util/OpenBitSetIterator.cpp | 2 +- - 19 files changed, 23 insertions(+), 22 deletions(-) - -diff --git a/include/Array.h b/include/Array.h -index 774d58a..46f38aa 100644 ---- a/include/Array.h -+++ b/include/Array.h -@@ -119,7 +119,7 @@ namespace Lucene - - operator bool () const - { -- return container; -+ return container.get() != NULL; - } - - bool operator! () const -diff --git a/include/AttributeSource.h b/include/AttributeSource.h -index ed3895b..13f716e 100644 ---- a/include/AttributeSource.h -+++ b/include/AttributeSource.h -@@ -95,7 +95,7 @@ namespace Lucene - template <class ATTR> - bool hasAttribute() - { -- return getAttribute(ATTR::_getClassName()); -+ return getAttribute(ATTR::_getClassName()).get() != NULL; - } - - /// Returns the instance of the passed in Attribute contained in this AttributeSource. -diff --git a/include/Collection.h b/include/Collection.h -index 2e05a82..31d475e 100644 ---- a/include/Collection.h -+++ b/include/Collection.h -@@ -211,7 +211,7 @@ namespace Lucene - - operator bool() const - { -- return container; -+ return container.get() != NULL; - } - - bool operator! () const -diff --git a/include/HashMap.h b/include/HashMap.h -index 2d40f5d..217c774 100644 ---- a/include/HashMap.h -+++ b/include/HashMap.h -@@ -82,7 +82,7 @@ namespace Lucene - - operator bool() const - { -- return mapContainer; -+ return mapContainer.get() != NULL; - } - - bool operator! () const -diff --git a/include/HashSet.h b/include/HashSet.h -index cefd533..b7dff18 100644 ---- a/include/HashSet.h -+++ b/include/HashSet.h -@@ -88,7 +88,7 @@ namespace Lucene - - operator bool() const - { -- return setContainer; -+ return setContainer.get() != NULL; - } - - bool operator! () const -diff --git a/include/Map.h b/include/Map.h -index c7dabcd..36e8cd9 100644 ---- a/include/Map.h -+++ b/include/Map.h -@@ -82,7 +82,7 @@ namespace Lucene - - operator bool() const - { -- return mapContainer; -+ return mapContainer.get() != NULL; - } - - bool operator! () const -diff --git a/include/MiscUtils.h b/include/MiscUtils.h -index ed65f70..7227b93 100644 ---- a/include/MiscUtils.h -+++ b/include/MiscUtils.h -@@ -125,7 +125,7 @@ namespace Lucene - template <typename TYPE> - static bool typeOf(LuceneObjectPtr object) - { -- return boost::dynamic_pointer_cast<TYPE>(object); -+ return boost::dynamic_pointer_cast<TYPE>(object).get() != NULL; - } - - /// Return whether given Lucene objects are of equal type. -diff --git a/include/Set.h b/include/Set.h -index bc62f17..7adff10 100644 ---- a/include/Set.h -+++ b/include/Set.h -@@ -132,7 +132,7 @@ namespace Lucene - - operator bool() const - { -- return setContainer; -+ return setContainer.get() != NULL; - } - - bool operator! () const -diff --git a/src/core/include/_FieldCacheRangeFilter.h b/src/core/include/_FieldCacheRangeFilter.h -index 7e494fd..ba44022 100644 ---- a/src/core/include/_FieldCacheRangeFilter.h -+++ b/src/core/include/_FieldCacheRangeFilter.h -@@ -146,7 +146,7 @@ namespace Lucene - return false; - if (lowerVal != otherFilter->lowerVal || upperVal != otherFilter->upperVal) - return false; -- if (parser ? !parser->equals(otherFilter->parser) : otherFilter->parser) -+ if (parser.get() != NULL ? !parser->equals(otherFilter->parser) : otherFilter->parser.get() != NULL) - return false; - return true; - } -diff --git a/src/core/index/DirectoryReader.cpp b/src/core/index/DirectoryReader.cpp -index 2d2d1ce..9fddf41 100644 ---- a/src/core/index/DirectoryReader.cpp -+++ b/src/core/index/DirectoryReader.cpp -@@ -976,7 +976,7 @@ namespace Lucene - - SegmentMergeInfoPtr smi(newLucene<SegmentMergeInfo>(starts[i], termEnum, reader)); - smi->ord = i; -- if (t ? termEnum->term() : smi->next()) -+ if (t.get() != NULL ? termEnum->term().get() != NULL : smi->next()) - queue->add(smi); // initialize queue - else - smi->close(); -diff --git a/src/core/index/IndexWriter.cpp b/src/core/index/IndexWriter.cpp -index aabb6e4..11926e9 100644 ---- a/src/core/index/IndexWriter.cpp -+++ b/src/core/index/IndexWriter.cpp -@@ -687,7 +687,7 @@ namespace Lucene - - bool IndexWriter::verbose() - { -- return infoStream; -+ return infoStream.get() != NULL; - } - - void IndexWriter::setWriteLockTimeout(int64_t writeLockTimeout) -diff --git a/src/core/index/MultiLevelSkipListReader.cpp b/src/core/index/MultiLevelSkipListReader.cpp -index 19096b6..c38fd60 100644 ---- a/src/core/index/MultiLevelSkipListReader.cpp -+++ b/src/core/index/MultiLevelSkipListReader.cpp -@@ -27,7 +27,7 @@ namespace Lucene - this->maxNumberOfSkipLevels = maxSkipLevels; - this->skipInterval = Collection<int32_t>::newInstance(maxSkipLevels); - this->skipStream[0] = skipStream; -- this->inputIsBuffered = boost::dynamic_pointer_cast<BufferedIndexInput>(skipStream); -+ this->inputIsBuffered = boost::dynamic_pointer_cast<BufferedIndexInput>(skipStream).get() != NULL; - this->skipInterval[0] = skipInterval; - this->skipDoc = Collection<int32_t>::newInstance(maxSkipLevels); - -diff --git a/src/core/index/SegmentMerger.cpp b/src/core/index/SegmentMerger.cpp -index d532501..41f4dc5 100644 ---- a/src/core/index/SegmentMerger.cpp -+++ b/src/core/index/SegmentMerger.cpp -@@ -38,7 +38,7 @@ namespace Lucene - const int32_t SegmentMerger::MAX_RAW_MERGE_DOCS = 4192; - - /// norms header placeholder -- const uint8_t SegmentMerger::NORMS_HEADER[] = {'N', 'R', 'M', -1}; -+ const uint8_t SegmentMerger::NORMS_HEADER[] = {'N', 'R', 'M', static_cast<uint8_t>(-1) }; - const int32_t SegmentMerger::NORMS_HEADER_LENGTH = 4; - - SegmentMerger::SegmentMerger(DirectoryPtr dir, const String& name) -diff --git a/src/core/index/SegmentReader.cpp b/src/core/index/SegmentReader.cpp -index 2be0b1f..d9d1b79 100644 ---- a/src/core/index/SegmentReader.cpp -+++ b/src/core/index/SegmentReader.cpp -@@ -376,7 +376,7 @@ namespace Lucene - bool SegmentReader::hasDeletions() - { - // Don't call ensureOpen() here (it could affect performance) -- return deletedDocs; -+ return deletedDocs.get() != NULL; - } - - bool SegmentReader::usesCompoundFile(SegmentInfoPtr si) -@@ -923,7 +923,7 @@ namespace Lucene - bool CoreReaders::termsIndexIsLoaded() - { - SyncLock syncLock(this); -- return tis; -+ return tis.get() != NULL; - } - - void CoreReaders::loadTermsIndex(SegmentInfoPtr si, int32_t termsIndexDivisor) -diff --git a/src/core/queryparser/QueryParserTokenManager.cpp b/src/core/queryparser/QueryParserTokenManager.cpp -index e769470..cb64c97 100644 ---- a/src/core/queryparser/QueryParserTokenManager.cpp -+++ b/src/core/queryparser/QueryParserTokenManager.cpp -@@ -15,9 +15,10 @@ - namespace Lucene - { - const int64_t QueryParserTokenManager::jjbitVec0[] = {0x1LL, 0x0LL, 0x0LL, 0x0LL}; -- const int64_t QueryParserTokenManager::jjbitVec1[] = {0xfffffffffffffffeLL, 0xffffffffffffffffLL, 0xffffffffffffffffLL, 0xffffffffffffffffLL}; -- const int64_t QueryParserTokenManager::jjbitVec3[] = {0x0LL, 0x0LL, 0xffffffffffffffffLL, 0xffffffffffffffffLL}; -- const int64_t QueryParserTokenManager::jjbitVec4[] = {0xfffefffffffffffeLL, 0xffffffffffffffffLL, 0xffffffffffffffffLL, 0xffffffffffffffffLL}; -+ const int64_t QueryParserTokenManager::jjbitVec1[] = {static_cast<int64_t>(0xfffffffffffffffeLL), static_cast<int64_t>(0xffffffffffffffffLL), static_cast<int64_t>(0xffffffffffffffffLL), static_cast<int64_t>(0xffffffffffffffffLL)}; -+ const int64_t QueryParserTokenManager::jjbitVec3[] = {0x0LL, 0x0LL, static_cast<int64_t>(0xffffffffffffffffLL), static_cast<int64_t>(0xffffffffffffffffLL)}; -+ const int64_t QueryParserTokenManager::jjbitVec4[] = {static_cast<int64_t>(0xfffefffffffffffeLL), static_cast<int64_t>(0xffffffffffffffffLL), static_cast<int64_t>(0xffffffffffffffffLL), static_cast<int64_t>(0xffffffffffffffffLL)}; -+ - const int32_t QueryParserTokenManager::jjnextStates[] = {15, 16, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27, 2, 4, 5, 0, 1}; - - /// Token literal values. -diff --git a/src/core/search/FieldCacheRangeFilter.cpp b/src/core/search/FieldCacheRangeFilter.cpp -index ce82a28..1585121 100644 ---- a/src/core/search/FieldCacheRangeFilter.cpp -+++ b/src/core/search/FieldCacheRangeFilter.cpp -@@ -170,7 +170,7 @@ namespace Lucene - return false; - if (lowerVal != otherFilter->lowerVal || upperVal != otherFilter->upperVal) - return false; -- if (parser ? !parser->equals(otherFilter->parser) : otherFilter->parser) -+ if (parser.get() != NULL ? !parser->equals(otherFilter->parser) : otherFilter->parser.get() != NULL) - return false; - return true; - } -diff --git a/src/core/search/Query.cpp b/src/core/search/Query.cpp -index 33aac96..0cfc482 100644 ---- a/src/core/search/Query.cpp -+++ b/src/core/search/Query.cpp -@@ -73,7 +73,7 @@ namespace Lucene - Collection<BooleanClausePtr> clauses; - BooleanQueryPtr bq(boost::dynamic_pointer_cast<BooleanQuery>(*query)); - // check if we can split the query into clauses -- bool splittable = bq; -+ bool splittable = bq.get() != NULL; - if (splittable) - { - splittable = bq->isCoordDisabled(); -diff --git a/src/core/store/NativeFSLockFactory.cpp b/src/core/store/NativeFSLockFactory.cpp -index 06f9a47..cc5e96e 100644 ---- a/src/core/store/NativeFSLockFactory.cpp -+++ b/src/core/store/NativeFSLockFactory.cpp -@@ -79,7 +79,7 @@ namespace Lucene - bool NativeFSLock::lockExists() - { - SyncLock syncLock(this); -- return lock; -+ return lock.get() != NULL; - } - - bool NativeFSLock::obtain() -diff --git a/src/core/util/OpenBitSetIterator.cpp b/src/core/util/OpenBitSetIterator.cpp -index 5d61c13..3d43e06 100644 ---- a/src/core/util/OpenBitSetIterator.cpp -+++ b/src/core/util/OpenBitSetIterator.cpp -@@ -43,7 +43,7 @@ namespace Lucene - 0x876, 0x8761, 0x8762, 0x87621, 0x8763, 0x87631, 0x87632, 0x876321, 0x8764, - 0x87641, 0x87642, 0x876421, 0x87643, 0x876431, 0x876432, 0x8764321, 0x8765, - 0x87651, 0x87652, 0x876521, 0x87653, 0x876531, 0x876532, 0x8765321, 0x87654, -- 0x876541, 0x876542, 0x8765421, 0x876543, 0x8765431, 0x8765432, 0x87654321 -+ 0x876541, 0x876542, 0x8765421, 0x876543, 0x8765431, 0x8765432, static_cast<int32_t>(0x87654321) - }; - - OpenBitSetIterator::OpenBitSetIterator(OpenBitSetPtr bitSet) --- -1.8.5.2 - diff --git a/community/lucene++/0002-Turn-off-custom-allocator-by-default.patch b/community/lucene++/0002-Turn-off-custom-allocator-by-default.patch deleted file mode 100644 index 10c21a8c4..000000000 --- a/community/lucene++/0002-Turn-off-custom-allocator-by-default.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 65c63d0a6c3927e0f123f6ec24d5516739fd53b3 Mon Sep 17 00:00:00 2001 -From: Alan Wright <alan@spotify.com> -Date: Thu, 12 Sep 2013 10:34:00 +0100 -Subject: [PATCH] Turn off custom allocator by default. - -closes #40 ---- - CMakeLists.txt | 25 ++++++++++++++----------- - include/Config.h.cmake | 2 +- - src/core/CMakeLists.txt | 12 ++++++++---- - 3 files changed, 23 insertions(+), 16 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec89210..ab1f10d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,6 +62,9 @@ ENDIF(NOT CMAKE_BUILD_TYPE) - OPTION(ENABLE_PACKAGING - "create build scripts for creating lucene++ packages" - OFF) -+OPTION(ENABLE_CUSTOM_ALLOCATOR -+ "use custom memory allocator" -+ OFF) - OPTION(ENABLE_NEDMALLOC - "use nedmalloc for memory allocations" - OFF) -@@ -75,18 +78,18 @@ OPTION(ENABLE_CYCLIC_CHECK - #install path options - SET(LIB_DESTINATION "lib" CACHE STRING "Define lib output directory name") - -+IF ( ENABLE_CUSTOM_ALLOCATOR ) -+ SET(DEFINE_USE_CUSTOM_ALLOCATOR "define") -+ELSE ( ENABLE_CUSTOM_ALLOCATOR ) -+ SET(DEFINE_USE_CUSTOM_ALLOCATOR "undef") -+ENDIF ( ENABLE_CUSTOM_ALLOCATOR ) -+ - IF ( ENABLE_NEDMALLOC ) - SET(DEFINE_USE_NEDMALLOC "define") - ELSE ( ENABLE_NEDMALLOC ) - SET(DEFINE_USE_NEDMALLOC "undef") - ENDIF ( ENABLE_NEDMALLOC ) - --IF ( ENABLE_STANDARD_ALLOCATOR ) -- SET(DEFINE_USE_ALLOCATOR "undef") --ELSE ( ENABLE_STANDARD_ALLOCATOR ) -- SET(DEFINE_USE_ALLOCATOR "define") --ENDIF ( ENABLE_STANDARD_ALLOCATOR ) -- - IF ( ENABLE_CYCLIC_CHECK ) - SET(DEFINE_USE_CYCLIC_CHECK "define") - ELSE ( ENABLE_CYCLIC_CHECK ) -@@ -116,11 +119,11 @@ IF(CYGWIN) - ADD_DEFINITIONS(-D__LARGE64_FILES) - ENDIF(CYGWIN) - --#set ansi mode -+#set ansi mode - SET(ENABLE_ANSI_MODE OFF) - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(ENABLE_ANSI_MODE ON) -- -+ - #exceptions: - IF(MINGW OR CYGWIN) - SET(ENABLE_ANSI_MODE OFF) -@@ -130,20 +133,20 @@ IF ( CMAKE_COMPILER_IS_GNUCC ) - IF( ENABLE_ANSI_MODE ) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi") - ENDIF ( ENABLE_ANSI_MODE ) --ENDIF(CMAKE_COMPILER_IS_GNUCC) -+ENDIF(CMAKE_COMPILER_IS_GNUCC) - - #################################### - #find boost - #################################### - SET(Boost_USE_STATIC_LIBS ${LUCENE_USE_STATIC_BOOST_LIBS}) - SET(Boost_USE_MULTITHREADED ON) --#Boost 1.38 required for bug fixes in basic_streambuf. -+#Boost 1.38 required for bug fixes in basic_streambuf. - #The following line fails in earlier builds, so if altered, may allow older versions of boost: - #boost::gregorian::date date = parser.parse_date(paddedDate.c_str(), dateFormat->c_str(), svp); - find_package( Boost 1.38.0 COMPONENTS date_time filesystem iostreams regex system thread unit_test_framework REQUIRED) - IF (Boost_FOUND) - MESSAGE( STATUS "boost found: includes in ${Boost_INCLUDE_DIRS}, library in ${Boost_LIBRARY_DIRS}") -- SET(LUCENE_BOOST_LIBS -+ SET(LUCENE_BOOST_LIBS - ${Boost_FILESYSTEM_LIBRARY_RELEASE} - ${Boost_IOSTREAMS_LIBRARY_RELEASE} - ${Boost_REGEX_LIBRARY_RELEASE} -diff --git a/include/Config.h.cmake b/include/Config.h.cmake -index ac83b77..13f6460 100644 ---- a/include/Config.h.cmake -+++ b/include/Config.h.cmake -@@ -78,7 +78,7 @@ - #@DEFINE_USE_CYCLIC_CHECK@ LPP_USE_CYCLIC_CHECK - - // Define to use custom allocator (useful in Windows builds and when using nedmalloc) --#@DEFINE_USE_ALLOCATOR@ LPP_USE_ALLOCATOR -+#@DEFINE_USE_CUSTOM_ALLOCATOR@ LPP_USE_ALLOCATOR - - // Define to use nedmalloc memory allocator - #@DEFINE_USE_NEDMALLOC@ LPP_USE_NEDMALLOC -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index a77c12f..ce91ae9 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -20,7 +20,11 @@ file(GLOB_RECURSE HEADERS ${lucene++-base_SOURCE_DIR}/include/*.h - file(GLOB_RECURSE lucene_c_sources - ${lucene++-lib_SOURCE_DIR}/util/*.c) - -- -+ -+IF ( ENABLE_CUSTOM_ALLOCATOR ) -+ ADD_DEFINITIONS(-DLPP_USE_ALLOCATOR) -+ENDIF() -+ - IF ( ENABLE_NEDMALLOC ) - ADD_DEFINITIONS(-DLPP_USE_NEDMALLOC) - ENDIF() -@@ -51,12 +55,12 @@ SET_TARGET_PROPERTIES(lucene++ PROPERTIES - SOVERSION ${LUCENE++_SOVERSION} - COMPILE_FLAGS -DLPP_HAVE_DLL - ) --TARGET_LINK_LIBRARIES(lucene++ -- lucene++-c -+TARGET_LINK_LIBRARIES(lucene++ -+ lucene++-c - ${CMAKE_THREAD_LIBS_INIT} - ${LUCENE_BOOST_LIBS} ) - install(TARGETS lucene++ -- DESTINATION ${LIB_DESTINATION} -+ DESTINATION ${LIB_DESTINATION} - COMPONENT runtime) - - ################################# --- -1.8.5.2 - diff --git a/community/lucene++/0003-Fix-accidental-use-of-operator-instead-of-operator.patch b/community/lucene++/0003-Fix-accidental-use-of-operator-instead-of-operator.patch deleted file mode 100644 index f05182fcf..000000000 --- a/community/lucene++/0003-Fix-accidental-use-of-operator-instead-of-operator.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2ac8183e48a0ab95fa3f405bc26b1b20d51755f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@gmail.com> -Date: Sun, 27 Oct 2013 09:17:45 +0100 -Subject: [PATCH] Fix accidental use of operator+ instead of operator<<. - -There was a typo in the output expression, appending a number to a string, instead of concatenating them as indented. ---- - src/core/index/CheckIndex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/index/CheckIndex.cpp b/src/core/index/CheckIndex.cpp -index 9e910f1..7f783d8 100644 ---- a/src/core/index/CheckIndex.cpp -+++ b/src/core/index/CheckIndex.cpp -@@ -640,7 +640,7 @@ namespace Lucene - std::wcout << L"WARNING: would write new segments file, and " << result->totLoseDocCount << L" documents would be lost, if -fix were specified\n\n"; - else - { -- std::wcout << L"WARNING: " << result->totLoseDocCount + L" documents will be lost\n"; -+ std::wcout << L"WARNING: " << result->totLoseDocCount << L" documents will be lost\n"; - std::wcout << L"NOTE: will write new segments file in 5 seconds; this will remove " << result->totLoseDocCount; - std::wcout << L" docs from the index. THIS IS YOUR LAST CHANCE TO CTRL+C!\n"; - for (int32_t sec = 0; sec < 5; ++sec) --- -1.8.5.2 - diff --git a/community/lucene++/PKGBUILD b/community/lucene++/PKGBUILD index 105ec3dcb..4ce234302 100644 --- a/community/lucene++/PKGBUILD +++ b/community/lucene++/PKGBUILD @@ -1,34 +1,21 @@ -# $Id$ +# $Id: PKGBUILD 105220 2014-02-02 21:53:42Z eric $ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Rafael Ferreira <josephgbr@archlinux.info> pkgname=lucene++ -pkgver=3.0.4 +pkgver=3.0.5 pkgrel=1 pkgdesc='C++ port of the popular Java Lucene library' arch=(i686 x86_64) url='https://github.com/luceneplusplus/LucenePlusPlus' license=('GPL' 'Apache') -depends=('boost-libs' 'gcc-libs') +depends=('boost-libs') makedepends=('boost' 'cmake') -source=($url/archive/rel_$pkgver.tar.gz - 0001-Add-support-for-compiling-with-c-11.patch - 0002-Turn-off-custom-allocator-by-default.patch - 0003-Fix-accidental-use-of-operator-instead-of-operator.patch) -md5sums=('64c34aa66b3870cc015c5d084a1a2b4e' - '243c87bed96250043f21d4d6ea6b6c6e' - 'ab8c8d5484411a9af55121b4d565f746' - '2c1758953b1b3d7c3c14c88b770bcb26') +source=(https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_$pkgver.tar.gz) +md5sums=('da785510716a759d7d37a2ee52cb8140') prepare() { mkdir build - - cd LucenePlusPlus-rel_$pkgver - - # http://www.poedit.net/trac/ticket/568 - patch -p1 -i ../0001-Add-support-for-compiling-with-c-11.patch - patch -p1 -i ../0002-Turn-off-custom-allocator-by-default.patch - patch -p1 -i ../0003-Fix-accidental-use-of-operator-instead-of-operator.patch } build() { diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index 7bbb5a918..518a47e14 100644 --- a/community/pcsc-tools/PKGBUILD +++ b/community/pcsc-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81203 2012-12-13 02:21:32Z giovanni $ +# $Id: PKGBUILD 105196 2014-02-02 17:02:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-tools -pkgver=1.4.21 +pkgver=1.4.22 pkgrel=1 pkgdesc="PC/SC Architecture smartcard tools" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl') makedepends=('pkg-config') source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c5ec17124aab4e933d537d6253046423') +md5sums=('b519862fa75b61da72b7d09f20bbbc9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD index b98d4f66f..77de302ee 100644 --- a/community/ratpoison/PKGBUILD +++ b/community/ratpoison/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88374 2013-04-16 20:26:08Z kkeen $ +# $Id: PKGBUILD 105159 2014-02-02 00:22:45Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: juergen <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ratpoison pkgver=1.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A simple keystroke-driven window manager" arch=('i686' 'x86_64') license=('GPL') @@ -21,6 +21,9 @@ md5sums=('5fbaab737cf7fcc8e5eb2d619aaa0eab' build() { cd "${srcdir}/${pkgname}-${pkgver}" + # FS#38726, v1.4.6-2 + sed -i 's|PRINT_ERROR (("XGetWMName|PRINT_DEBUG (("XGetWMName|' src/manage.c + ./configure --prefix=/usr make CFLAGS="$CFLAGS -DHAVE_GETLINE" } diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index 3d1c47fa8..501f2cf41 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103864 2014-01-12 20:24:24Z foutrelis $ +# $Id: PKGBUILD 105200 2014-02-02 18:40:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=2.2.3 -pkgrel=2 +pkgver=2.2.4 +pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) url="http://rubini.us" @@ -13,18 +13,16 @@ depends=(llvm-libs libffi openssl libyaml) makedepends=(llvm rubinius-ruby) options=(!emptydirs) source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 - gemrc dirs.patch llvm34.patch) -sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf' + gemrc dirs.patch) +sha256sums=('7d06d63d12d9eecff196d8f53953bd520c17fbb9baa921c5481c43af8129d85e' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' - '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66' - 'a24850f34a8a308ce4a4e1da12d75a669095a38b6b5da5082eb4d3bd41770095') + '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66') prepare() { export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8" cd $pkgbase-$pkgver patch -Np1 -i ../dirs.patch - patch -Np1 -i ../llvm34.patch mkdir -p "$GEM_HOME" gem install --no-user-install -N vendor/cache/bundler-*.gem @@ -63,7 +61,7 @@ package_rubinius() { DESTDIR="$pkgdir" rake install mkdir -p "$pkgdir/usr/share/ri" - ln -s 2.0.0 "$pkgdir/usr/share/ri/2.1" + ln -s 2.1.0 "$pkgdir/usr/share/ri/2.1" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/rubinius/LICENSE" @@ -77,7 +75,7 @@ package_rubinius() { package_rubinius-ruby() { pkgdesc="Ruby compat for Rubinius" - depends=(rubinius) + depends=("rubinius=$pkgver-$pkgrel") provides=(ruby) conflicts=(ruby) backup=(etc/gemrc) diff --git a/community/rubinius/llvm34.patch b/community/rubinius/llvm34.patch deleted file mode 100644 index ca8f2d289..000000000 --- a/community/rubinius/llvm34.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git i/vm/llvm/disassembler.cpp w/vm/llvm/disassembler.cpp -index 79c74ff..b3ea424 100644 ---- i/vm/llvm/disassembler.cpp -+++ w/vm/llvm/disassembler.cpp -@@ -46,20 +46,27 @@ namespace rubinius { - #if RBX_LLVM_API_VER > 300 - llvm::TargetOptions options; - options.NoFramePointerElim = true; -+#if RBX_LLVM_API_VER < 304 - options.NoFramePointerElimNonLeaf = true; -+#endif - target_machine = target->createTargetMachine(host, llvm::sys::getHostCPUName(), "", options); - #else - target_machine = target->createTargetMachine(host, llvm::sys::getHostCPUName(), ""); - #endif - - sub_target = target->createMCSubtargetInfo(host, llvm::sys::getHostCPUName(), ""); -- asm_info = target->createMCAsmInfo(host); - - #if RBX_LLVM_API_VER > 300 - instr_info = target->createMCInstrInfo(); - reg_info = target->createMCRegInfo(host); - #endif - -+#if RBX_LLVM_API_VER > 303 -+ asm_info = target->createMCAsmInfo(*reg_info, host); -+#else -+ asm_info = target->createMCAsmInfo(host); -+#endif -+ - if(asm_info) { - disassembler = target->createMCDisassembler(*sub_target); - memory_object = new JITMemoryObject((const uint8_t*)buffer, (uint64_t) size); -diff --git i/vm/llvm/jit_builder.cpp w/vm/llvm/jit_builder.cpp -index 652350f..c479aab 100644 ---- i/vm/llvm/jit_builder.cpp -+++ w/vm/llvm/jit_builder.cpp -@@ -56,12 +56,21 @@ namespace jit { - "", "rubinius", true, "", 0); - DIFile file = debug_builder().createFile(file_str, ""); - -+#if RBX_LLVM_API_VER > 303 -+ DIType dummy_return_type = debug_builder().createNullPtrType(); -+ Value* dummy_signature[] = { -+ &*dummy_return_type, -+ }; -+ DICompositeType dummy_subroutine_type = debug_builder().createSubroutineType(file, -+ debug_builder().getOrCreateArray(dummy_signature)); -+#else - DIType dummy_return_type = debug_builder().createNullPtrType("dummy type"); - Value* dummy_signature[] = { - &*dummy_return_type, - }; - DIType dummy_subroutine_type = debug_builder().createSubroutineType(file, - debug_builder().getOrCreateArray(dummy_signature)); -+#endif - - #if RBX_LLVM_API_VER > 300 - DISubprogram subprogram = debug_builder().createFunction(file, "", "", -diff --git i/vm/llvm/jit_context.cpp w/vm/llvm/jit_context.cpp -index e555adb..594a63a 100644 ---- i/vm/llvm/jit_context.cpp -+++ w/vm/llvm/jit_context.cpp -@@ -84,7 +84,9 @@ namespace rubinius { - #if RBX_LLVM_API_VER > 300 - llvm::TargetOptions opts; - opts.NoFramePointerElim = true; -+#if RBX_LLVM_API_VER < 304 - opts.NoFramePointerElimNonLeaf = true; -+#endif - opts.JITEmitDebugInfo = true; - - factory.setTargetOptions(opts); -diff --git i/vm/llvm/jit_memory_manager.hpp w/vm/llvm/jit_memory_manager.hpp -index 8a58a09..7205f89 100644 ---- i/vm/llvm/jit_memory_manager.hpp -+++ w/vm/llvm/jit_memory_manager.hpp -@@ -202,7 +202,7 @@ namespace jit { - - public: - RubiniusJITMemoryManager(); -- ~RubiniusJITMemoryManager(); -+ virtual ~RubiniusJITMemoryManager(); - - /// allocateNewSlab - Allocates a new MemoryBlock and remembers it as the - /// last slab it allocated, so that subsequent allocations follow it. -@@ -356,8 +356,13 @@ namespace jit { - } - - /// allocateCodeSection - Allocate memory for a code section. -+#if RBX_LLVM_API_VER > 303 -+ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, -+ unsigned SectionID, StringRef SectionName) { -+#else - uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, - unsigned SectionID) { -+#endif - utilities::thread::SpinLock::LockGuard guard(lock_); - // Grow the required block size to account for the block header - Size += sizeof(*CurBlock); -@@ -397,11 +402,21 @@ namespace jit { - } - - /// allocateDataSection - Allocate memory for a data section. -- uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, -- unsigned SectionID) { -+ /// TODO: currently IsReadOnly is ignored. -+#if RBX_LLVM_API_VER > 303 -+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, -+ unsigned SectionID, StringRef SectionName, -+ bool IsReadOnly) { - utilities::thread::SpinLock::LockGuard guard(lock_); - return (uint8_t*)DataAllocator.Allocate(Size, Alignment); - } -+#else -+ uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, -+ unsigned SectionID, bool IsReadOnly) { -+ utilities::thread::SpinLock::LockGuard guard(lock_); -+ return (uint8_t*)DataAllocator.Allocate(Size, Alignment); -+ } -+#endif - - /// startExceptionTable - Use startFunctionBody to allocate memory for the - /// function's exception table. -@@ -495,7 +510,7 @@ namespace jit { - , GOTBase(NULL) - {} - -- ~RubiniusRequestJITMemoryManager() { -+ virtual ~RubiniusRequestJITMemoryManager() { - if(GOTBase) delete[] GOTBase; - } - -@@ -504,17 +519,32 @@ namespace jit { - return mgr_->getPointerToNamedFunction(Name, AbortOnFailure); - } - -+#if RBX_LLVM_API_VER >= 304 -+ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, -+ unsigned SectionID, StringRef SectionName) { -+ return mgr_->allocateCodeSection(Size, Alignment, SectionID, -+ SectionName); -+ } -+#else - uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment, - unsigned SectionID) { - return mgr_->allocateCodeSection(Size, Alignment, SectionID); - } -+#endif - - /// allocateDataSection - Allocate memory for a data section. --#if RBX_LLVM_API_VER >= 303 -+#if RBX_LLVM_API_VER >= 304 -+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, -+ unsigned SectionID, StringRef SectionName, -+ bool IsReadOnly) { -+ return mgr_->allocateDataSection(Size, Alignment, SectionID, -+ SectionName, IsReadOnly); -+ } -+#elif RBX_LLVM_API_VER >= 303 - uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, - unsigned SectionID, bool IsReadOnly) { -- // TODO: currently IsReadOnly is ignored. -- return mgr_->allocateDataSection(Size, Alignment, SectionID); -+ return mgr_->allocateDataSection(Size, Alignment, SectionID, -+ IsReadOnly); - } - #else - uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment, -@@ -601,6 +631,12 @@ namespace jit { - void resetGeneratedFunction() { - GeneratedFunction = NULL; - } -+ -+#if RBX_LLVM_API_VER > 303 -+ virtual bool finalizeMemory(std::string* ErrMsg = 0) { -+ return false; -+ } -+#endif - }; - - diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 1e1c5cd5e..f7b786d42 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103181 2013-12-28 19:39:48Z arodseth $ +# $Id: PKGBUILD 105192 2014-02-02 16:50:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.3.7 +pkgver=3.3.9 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('ad094de779572a5c1bb0f2c590acc05a8706fc2f8c8e9ba7d4d98182bb37f174') +sha256sums=('cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775') prepare() { if [ $?CXXBASEFLAGS == 1 ]; then diff --git a/community/skanlite/PKGBUILD b/community/skanlite/PKGBUILD new file mode 100644 index 000000000..b8654f92c --- /dev/null +++ b/community/skanlite/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=skanlite +pkgver=1.1 +pkgrel=2 +pkgdesc="Image Scanning Application for KDE" +arch=('i686' 'x86_64') +url='http://www.kde.org/applications/graphics/skanlite' +license=('GPL') +depends=('kdebase-runtime' 'libksane') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz") +md5sums=('21cd642d4177fff759bf4694af39b9fe') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index 508577be5..61388b1d9 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -6,43 +6,42 @@ pkgname=teeworlds pkgver=0.6.2 -pkgrel=1 -pkgdesc="A multiplayer 2D shooter" +pkgrel=2 +pkgdesc='Multiplayer 2D shooter' arch=('i686' 'x86_64') -url="https://www.teeworlds.com" +url='https://www.teeworlds.com' license=('custom') depends=('alsa-lib' 'glu' 'sdl' 'freetype2') -makedepends=('python' 'bam' 'mesa') -replaces=('teewars') -source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz - teeworlds.desktop - teeworlds.png) -md5sums=('649f6c05a7b117096b238c07062edc39' - '3944aaf7a8c19a83510b2b39c4cddf5f' - '44f39e398409232a0e0a431ed46d8cc8') +makedepends=('python' 'bam' 'mesa' 'imagemagick' 'gendesk') +source=("https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz") +md5sums=('649f6c05a7b117096b238c07062edc39') + +prepare() { + convert "$pkgname-$pkgver-source/other/icons/Teeworlds.ico" "$srcdir/$pkgname.png" + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \ + --name 'Teeworlds' --categories 'Game;ArcadeGame' +} build() { - # Build teeworlds - cd ${srcdir}/${pkgname}-*-source + cd "$pkgname-$pkgver-source" - bam server_release client_release + bam server_release client_release } package() { - cd ${srcdir}/${pkgname}-*-source - - # Install data files - mkdir -p ${pkgdir}/usr/share/${pkgname}/data - cp -r data/* ${pkgdir}/usr/share/${pkgname}/data - - install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} - install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv - - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png - - install -Dm644 license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/license.txt + cd "$pkgname-$pkgver-source" + + # Install data files + mkdir -p ${pkgdir}/usr/share/${pkgname}/data + cp -r data/* ${pkgdir}/usr/share/${pkgname}/data + + install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} + install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv + + install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/${pkgname}-0.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png + + install -Dm644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt } + +# vim:set ts=2 sw=2 et: diff --git a/community/teeworlds/teeworlds.desktop b/community/teeworlds/teeworlds.desktop deleted file mode 100644 index ddfb8994d..000000000 --- a/community/teeworlds/teeworlds.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Icon=teeworlds -Exec=teeworlds -Terminal=false -StartupNotify=false - -Name=TeeWorlds -GenericName=Arcade Game -Comment=is a multiplayer 2D FPS shooter -Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D - -Categories=Game;ArcadeGame; diff --git a/community/teeworlds/teeworlds.png b/community/teeworlds/teeworlds.png Binary files differdeleted file mode 100644 index 890baaff3..000000000 --- a/community/teeworlds/teeworlds.png +++ /dev/null diff --git a/community/xtrabackup/PKGBUILD b/community/xtrabackup/PKGBUILD new file mode 100644 index 000000000..1cba22af7 --- /dev/null +++ b/community/xtrabackup/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> + +pkgname=xtrabackup +pkgver=2.1.7 +pkgrel=2 +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') + +build() { + cd percona-xtrabackup-$pkgver + utils/build.sh innodb55 + + cd doc + make man +} + +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 + + cd doc/build/man + for file in *.1; do + install -Dm0644 $file "$pkgdir"/usr/share/man/man1/$file + done +} |
