diff options
-rw-r--r-- | community/aria2/PKGBUILD | 6 | ||||
-rw-r--r-- | community/ascii/PKGBUILD | 4 | ||||
-rw-r--r-- | community/cinnamon/PKGBUILD | 18 | ||||
-rw-r--r-- | community/cinnamon/gtk3-lock-dialog.patch | 418 | ||||
-rw-r--r-- | community/lucene++/0001-Add-support-for-compiling-with-c-11.patch | 291 | ||||
-rw-r--r-- | community/lucene++/0002-Turn-off-custom-allocator-by-default.patch | 138 | ||||
-rw-r--r-- | community/lucene++/0003-Fix-accidental-use-of-operator-instead-of-operator.patch | 26 | ||||
-rw-r--r-- | community/lucene++/PKGBUILD | 49 | ||||
-rw-r--r-- | community/nsd/PKGBUILD | 6 | ||||
-rw-r--r-- | community/nsd/install | 9 | ||||
-rw-r--r-- | community/nsd/service | 2 | ||||
-rw-r--r-- | community/opensips/PKGBUILD | 8 | ||||
-rw-r--r-- | community/python-sqlalchemy/PKGBUILD | 6 | ||||
-rw-r--r-- | community/squid/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/audacious/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/fontforge/PKGBUILD | 41 | ||||
-rw-r--r-- | extra/imagemagick/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/mpg123/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/taglib-sharp/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/xsane/PKGBUILD | 8 |
20 files changed, 989 insertions, 75 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 0de12e8a4..cce37eba5 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103183 2013-12-28 20:42:34Z bpiotrowski $ +# $Id: PKGBUILD 103391 2014-01-05 15:54:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.18.2 +pkgver=1.18.3 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.xz) -sha256sums=('b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460') +sha256sums=('014706c67406be380384484635ca2e811b405c876f0bbcf7a31be79df392d84d') build() { cd $pkgname-$pkgver diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD index 3c43cdbf1..e9bd0f92c 100644 --- a/community/ascii/PKGBUILD +++ b/community/ascii/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=ascii -pkgver=3.12 +pkgver=3.14 pkgrel=1 pkgdesc="Utility for conversion between various byte representations and the ASCII character table" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.catb.org/~esr/ascii" license=('BSD') depends=('glibc') source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz") -md5sums=('d06267813ac83ed511b7330f43fcc4ee') +sha256sums=('7f0e3fbfe318a372428a1117ec9527ec0a88946323c8b15dc86634a11989bcd1') build() { cd ${pkgname}-${pkgver} diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 9659394f4..edfc21200 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101561 2013-11-28 01:14:22Z faidoc $ +# $Id: PKGBUILD 103395 2014-01-05 16:56:22Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=2.0.14 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -14,7 +14,7 @@ license=('GPL2') depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session' 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme' 'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' - 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' + 'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow' 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' 'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd' 'network-manager-applet' 'nemo' 'polkit-gnome') @@ -25,11 +25,13 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/ "cinnamon-gstreamer1.patch" "keyboard_applet.patch" "input_keybindings.patch" + "gtk3-lock-dialog.patch" "org.archlinux.pkexec.cinnamon-settings-users.policy") sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85' '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a' '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3' 'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6' + 'e10dd01201b9274b45a6c94319d4eb1e9ff800e63f10a3d5e42fc9f3a87e337c' '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23') prepare() { @@ -48,9 +50,11 @@ prepare() { # Port to GStreamer 1.0. Also backports some recorder bugfixes patch -Np1 -i ../cinnamon-gstreamer1.patch + # Port Lock screen dialog to GTK+ 3 + patch -Np1 -i ../gtk3-lock-dialog.patch + # Fix required components - sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/ - s/nm-applet;/cinnamon-nm-applet;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session + sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session # fix for the python2 PAM module sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py @@ -87,10 +91,6 @@ package() { cd ${srcdir}/Cinnamon* make DESTDIR="${pkgdir}" install - # Install cinnamon-nm-applet.desktop file - sed 's/^NotShowIn=.*/OnlyShowIn=GNOME/' /usr/share/applications/nm-applet.desktop \ - > "${pkgdir}/usr/share/applications/cinnamon-nm-applet.desktop" - # Install policy file install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \ "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.cinnamon-settings-users.policy" diff --git a/community/cinnamon/gtk3-lock-dialog.patch b/community/cinnamon/gtk3-lock-dialog.patch new file mode 100644 index 000000000..36f0d4469 --- /dev/null +++ b/community/cinnamon/gtk3-lock-dialog.patch @@ -0,0 +1,418 @@ +commit 7bb5af86b404d3e89f92019dba224e6fe258f7ea +Author: Balló György <ballogyor@gmail.com> +Date: Sun Jan 5 16:54:41 2014 +0100 + + Port Lock screen dialog to GTK+ 3 + +diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade +deleted file mode 100644 +index a4200f9..0000000 +--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade ++++ /dev/null +@@ -1,165 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<glade-interface> +- <!-- interface-requires gtk+ 2.24 --> +- <!-- interface-naming-policy project-wide --> +- <widget class="GtkDialog" id="main_dialog"> +- <property name="can_focus">False</property> +- <property name="border_width">6</property> +- <property name="type_hint">dialog</property> +- <child internal-child="vbox"> +- <widget class="GtkVBox" id="dialog-vbox1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="spacing">6</property> +- <child internal-child="action_area"> +- <widget class="GtkHButtonBox" id="dialog-action_area1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="layout_style">end</property> +- <child> +- <widget class="GtkButton" id="button_cancel"> +- <property name="label">gtk-cancel</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <property name="use_action_appearance">False</property> +- <property name="use_stock">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkButton" id="button_ok"> +- <property name="label">gtk-ok</property> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <property name="use_action_appearance">False</property> +- <property name="use_stock">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="padding">3</property> +- <property name="pack_type">end</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkImage" id="image_face"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="stock">gtk-missing-image</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="padding">3</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label_description"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes">label</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="padding">3</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <child> +- <widget class="GtkLabel" id="label_away_message"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes">label</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkHBox" id="hbox3"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <child> +- <widget class="GtkLabel" id="label1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes"><b>"</b></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <widget class="GtkEntry" id="entry_away_message"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="invisible_char">●</property> +- <property name="invisible_char_set">True</property> +- <property name="primary_icon_activatable">False</property> +- <property name="secondary_icon_activatable">False</property> +- <property name="primary_icon_sensitive">True</property> +- <property name="secondary_icon_sensitive">True</property> +- </widget> +- <packing> +- <property name="expand">True</property> +- <property name="fill">True</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <widget class="GtkLabel" id="label2"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes"><b>"</b></property> +- <property name="use_markup">True</property> +- </widget> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">2</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">True</property> +- <property name="fill">True</property> +- <property name="position">1</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="expand">True</property> +- <property name="fill">True</property> +- <property name="padding">3</property> +- <property name="position">3</property> +- </packing> +- </child> +- </widget> +- </child> +- </widget> +-</glade-interface> +diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py +index f6f3ad1..72cdf4f 100755 +--- a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py ++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py +@@ -3,8 +3,7 @@ + import sys + import os + import gettext +-import gtk +-import gtk.glade ++from gi.repository import Gtk + import pwd + import socket + +@@ -25,32 +24,32 @@ class MainWindow: + if real_name == "": + real_name = username + +- gladefile = "/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade" +- self.wTree = gtk.glade.XML(gladefile, "main_dialog") ++ self.builder = Gtk.Builder() ++ self.builder.add_from_file("/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui") + +- self.window = self.wTree.get_widget("main_dialog") +- self.button_cancel = self.wTree.get_widget("button_cancel") +- self.button_ok = self.wTree.get_widget("button_ok") +- self.entry = self.wTree.get_widget("entry_away_message") +- self.image = self.wTree.get_widget("image_face") ++ self.window = self.builder.get_object("main_dialog") ++ self.button_cancel = self.builder.get_object("button_cancel") ++ self.button_ok = self.builder.get_object("button_ok") ++ self.entry = self.builder.get_object("entry_away_message") ++ self.image = self.builder.get_object("image_face") + + self.window.set_title(_("Lock screen")) + self.window.set_icon_from_file("/usr/lib/cinnamon-settings/data/icons/screensaver.svg") + +- self.wTree.get_widget("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen")) +- self.wTree.get_widget("label_away_message").set_markup("<b>%s: </b>" % real_name) ++ self.builder.get_object("label_description").set_markup("<i>%s</i>" % _("Please type an away message for the lock screen")) ++ self.builder.get_object("label_away_message").set_markup("<b>%s: </b>" % real_name) + + if os.path.exists("%s/.face" % home_dir): + self.image.set_from_file("%s/.face" % home_dir) + else: + self.image.set_from_file("/usr/share/pixmaps/nobody.png") + +- self.window.connect("destroy", gtk.main_quit) +- self.button_cancel.connect("clicked", gtk.main_quit) ++ self.window.connect("destroy", Gtk.main_quit) ++ self.button_cancel.connect("clicked", Gtk.main_quit) + self.button_ok.connect('clicked', self.lock_screen) + self.entry.connect('activate', self.lock_screen) + +- self.wTree.get_widget("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel)) ++ self.builder.get_object("dialog-action_area1").set_focus_chain((self.button_ok, self.button_cancel)) + + self.window.show() + +@@ -60,8 +59,8 @@ class MainWindow: + os.system("cinnamon-screensaver-command --lock --away-message \"%s\" &" % self.entry.get_text()) + else: + os.system("cinnamon-screensaver-command --lock &") +- gtk.main_quit() ++ Gtk.main_quit() + + if __name__ == "__main__": + MainWindow() +- gtk.main() ++ Gtk.main() +diff --git a/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui +new file mode 100644 +index 0000000..30700b9 +--- /dev/null ++++ b/files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui +@@ -0,0 +1,165 @@ ++<?xml version="1.0"?> ++<interface> ++ <!-- interface-requires gtk+ 2.24 --> ++ <!-- interface-naming-policy project-wide --> ++ <object class="GtkDialog" id="main_dialog"> ++ <property name="can_focus">False</property> ++ <property name="border_width">6</property> ++ <property name="type_hint">dialog</property> ++ <child internal-child="vbox"> ++ <object class="GtkVBox" id="dialog-vbox1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="spacing">6</property> ++ <child internal-child="action_area"> ++ <object class="GtkHButtonBox" id="dialog-action_area1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="layout_style">end</property> ++ <child> ++ <object class="GtkButton" id="button_cancel"> ++ <property name="label">gtk-cancel</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <property name="use_action_appearance">False</property> ++ <property name="use_stock">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="button_ok"> ++ <property name="label">gtk-ok</property> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="receives_default">True</property> ++ <property name="use_action_appearance">False</property> ++ <property name="use_stock">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="padding">3</property> ++ <property name="pack_type">end</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkImage" id="image_face"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="stock">gtk-missing-image</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="padding">3</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label_description"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes">label</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="padding">3</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkLabel" id="label_away_message"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes">label</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkHBox" id="hbox3"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <child> ++ <object class="GtkLabel" id="label1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes"><b>"</b></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkEntry" id="entry_away_message"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="invisible_char">●</property> ++ <property name="invisible_char_set">True</property> ++ <property name="primary_icon_activatable">False</property> ++ <property name="secondary_icon_activatable">False</property> ++ <property name="primary_icon_sensitive">True</property> ++ <property name="secondary_icon_sensitive">True</property> ++ </object> ++ <packing> ++ <property name="expand">True</property> ++ <property name="fill">True</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkLabel" id="label2"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="label" translatable="yes"><b>"</b></property> ++ <property name="use_markup">True</property> ++ </object> ++ <packing> ++ <property name="expand">False</property> ++ <property name="fill">True</property> ++ <property name="position">2</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">True</property> ++ <property name="fill">True</property> ++ <property name="position">1</property> ++ </packing> ++ </child> ++ </object> ++ <packing> ++ <property name="expand">True</property> ++ <property name="fill">True</property> ++ <property name="padding">3</property> ++ <property name="position">3</property> ++ </packing> ++ </child> ++ </object> ++ </child> ++ </object> ++</interface> 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 new file mode 100644 index 000000000..afd4dd7cd --- /dev/null +++ b/community/lucene++/0001-Add-support-for-compiling-with-c-11.patch @@ -0,0 +1,291 @@ +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 new file mode 100644 index 000000000..10c21a8c4 --- /dev/null +++ b/community/lucene++/0002-Turn-off-custom-allocator-by-default.patch @@ -0,0 +1,138 @@ +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 new file mode 100644 index 000000000..f05182fcf --- /dev/null +++ b/community/lucene++/0003-Fix-accidental-use-of-operator-instead-of-operator.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000..105ec3dcb --- /dev/null +++ b/community/lucene++/PKGBUILD @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Rafael Ferreira <josephgbr@archlinux.info> + +pkgname=lucene++ +pkgver=3.0.4 +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') +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') + +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() { + cd build + + cmake ../LucenePlusPlus-rel_$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_DESTINATION=/usr/lib \ + -DBoost_LIBRARY_DIR=/usr/lib \ + -DENABLE_CUSTOM_ALLOCATOR='FALSE' + + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index bc40dcfb8..f12229e29 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100223 2013-11-02 00:00:56Z bisson $ +# $Id: PKGBUILD 103387 2014-01-05 10:34:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd pkgver=4.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -17,7 +17,7 @@ source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.g 'service') sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369' '7ad2b8da961a893095eede8963cf8026b13186a1' - '491bf9c6e63644f7d6c81d3b16138f0d87706aa0') + '3dbe300d834a32c9a339a6c76c58f5c240239e9b') install=install diff --git a/community/nsd/install b/community/nsd/install index 6e56e9ba1..5f693dba0 100644 --- a/community/nsd/install +++ b/community/nsd/install @@ -1,12 +1,13 @@ +post_upgrade() { + usr/bin/systemd-tmpfiles --create nsd.conf || true +} + post_install() { getent group nsd &>/dev/null || groupadd -r nsd >/dev/null getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null chown nsd:nsd /var/db/nsd chmod 700 /var/db/nsd -} - -post_upgrade() { - usr/bin/systemd-tmpfiles --create nsd.conf || true + post_upgrade } post_remove() { diff --git a/community/nsd/service b/community/nsd/service index b6125a686..9f0231227 100644 --- a/community/nsd/service +++ b/community/nsd/service @@ -4,7 +4,7 @@ After=network.target [Service] PIDFile=/run/nsd/nsd.pid -ExecStart=/usr/bin/nsd -c /etc/nsd/nsd.conf +ExecStart=/usr/bin/nsd -d -c /etc/nsd/nsd.conf ExecReload=/bin/kill -HUP $MAINPID ExecStop=/bin/kill -TERM $MAINPID diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 7a39ec2b6..23ccc3729 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $ +# $Id: PKGBUILD 103436 2014-01-05 21:24:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.9.1 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -25,7 +25,7 @@ install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz opensips.service) -md5sums=('0b7b93f4df29a96daedf12e490e7ec86' +md5sums=('5cbccda321940c51baed798f2f6c5b1a' '35cdcb3692f6925236fd5fe7e9484c58') prepare() { diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index c0652ae7e..f8a0e4a28 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102482 2013-12-12 10:34:55Z jelle $ +# $Id: PKGBUILD 103389 2014-01-05 15:48:26Z jelle $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.8.4 +pkgver=0.9.0 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose') source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('fd517e1bb4031cac1e3fa00108111b38') +md5sums=('acfd77b6ca71678237b1066a3fda05b0') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index e706a9343..8371f3094 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102758 2013-12-19 10:29:53Z spupykin $ +# $Id: PKGBUILD 103438 2014-01-05 21:24:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.4.1 -pkgrel=2 +pkgver=3.4.2 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('859cf167499d8a5430070dbde78c8eea' +md5sums=('7ec46965bc58bc927e81869805a25241' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 15dd7d7f1..3beb3b40f 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198671 2013-11-01 21:03:18Z bisson $ +# $Id: PKGBUILD 203195 2014-01-05 05:23:56Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=audacious -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('341452d3beceb57451f0675a61fabfd9c59d2dab') +sha1sums=('1d348f8ef5238de7cd6669189ecca690452e96c4') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index c0fe5e738..6090afa89 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,63 +1,54 @@ -# $Id: PKGBUILD 197956 2013-10-30 11:54:42Z allan $ +# $Id: PKGBUILD 203200 2014-01-05 09:58:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge -pkgver=20120731_b -pkgrel=6 +_pkgver=2.0.20140101 +pkgver=${_pkgver##*.} +pkgrel=1 pkgdesc='Outline and bitmap font editor' url='http://fontforge.sourceforge.net/' arch=('i686' 'x86_64') license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro' - 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme') -source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2" + 'libltdl' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme') +source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz" 'http://fontforge.org/cidmaps.tgz') -sha1sums=('b520f532b48e557c177dffa29120225066cc4e84' +sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7' 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94') -# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz -# source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") - options=('!makeflags') install=install prepare() { - cd "${srcdir}/${pkgname}-${pkgver//_/-}" - sed 's/python /python2 /g' -i Makefile.dynamic.in - sed \ - -e'/^#include <gif_lib.h>/i #include <stddef.h>' \ - -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \ - -i configure gutils/gimagereadgif.c + cd "${srcdir}/${pkgname}-${_pkgver}" + sed '/fontforge_package_name/s/^#//' -i configure.ac + ./autogen.sh } build() { - cd "${srcdir}/${pkgname}-${pkgver//_/-}" + cd "${srcdir}/${pkgname}-${_pkgver}" + export PYTHON=python2 ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ - --enable-type3 \ - --enable-devicetables \ - --enable-double \ - --with-regular-link \ - --with-python=python2 \ - --enable-pyextension \ + --enable-python-extension \ make } package() { - cd "${srcdir}/${pkgname}-${pkgver//_/-}" + cd "${srcdir}/${pkgname}-${_pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/fontforge" install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge" install -d "${pkgdir}/usr/share/icons" - cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor" + cp -a desktop/icons "${pkgdir}/usr/share/icons/hicolor" rm -fr "${pkgdir}/usr/share/icons/hicolor/src" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop" + install -Dm644 desktop/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop" } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 5441bf248..4bad0dd52 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201665 2013-12-17 20:27:22Z eric $ +# $Id: PKGBUILD 203186 2014-01-05 00:41:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.7.10 +pkgver=6.8.8.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ perlmagick.rpath.patch) -sha1sums=('a74ebac95fb592e98cbe33e25c05978590807c57' +sha1sums=('1a2c0c83b38cc39170825bc247f41c0bb7a92792' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index ef557d1cc..0b7fbb569 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198329 2013-10-30 14:12:16Z allan $ +# $Id: PKGBUILD 203182 2014-01-05 00:11:38Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.16.0 +pkgver=1.17.0 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4' +sha1sums=('8185f06ab94651adb2fc7a1ab860f0fd154b6f80' 'SKIP') build() { diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD index 6e68a0a67..a45d61ca6 100644 --- a/extra/taglib-sharp/PKGBUILD +++ b/extra/taglib-sharp/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 188889 2013-06-23 22:30:41Z daniel $ +# $Id: PKGBUILD 203202 2014-01-05 10:51:18Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Carlos Ruiz <cailovirtual@gmail.com> pkgname=taglib-sharp pkgver=2.1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for reading and writing metadata in media files for Mono" arch=('i686' 'x86_64') url="https://github.com/mono/taglib-sharp" -license=('LGPL2') +license=('LGPL2.1') depends=('mono') -source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz) +source=(http://download.banshee-project.org/taglib-sharp/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('815f5bdb3cd1b3a4d6bbb34de448ad9d') build() { diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index bc68f6eb5..ae751665e 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $ +# $Id: PKGBUILD 203218 2014-01-05 19:22:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') -pkgver=0.998 -pkgrel=5 +pkgver=0.999 +pkgrel=1 arch=(i686 x86_64) url="http://www.xsane.org" license=('GPL2') makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp') source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz xsane-0.995-xdg-open.patch) -md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' +md5sums=('9927f21e1ab6ba96315e7f0e30746deb' '15541ff0ddc10acfa2059cf99d5478eb') prepare() { |