diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
| commit | 87b9cca463a1dbf2b5026c9dc770b5591b2d3fdc (patch) | |
| tree | e3d31e01c79dc0e68742716887ed07c5f6a1015e /community | |
| parent | c09bfc90e874607edab8e77d50d9aa15ea145b53 (diff) | |
| parent | 35e9f8bc93db9e691bf6d00950956ca3e5d86e83 (diff) | |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/acpi/PKGBUILD
community/alure/PKGBUILD
community/ario/PKGBUILD
community/cantata/PKGBUILD
community/cgit/PKGBUILD
community/chntpw/PKGBUILD
community/clamz/PKGBUILD
community/deadbeef/PKGBUILD
community/dunst/PKGBUILD
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnome-commander/PKGBUILD
community/gq/PKGBUILD
community/gtkimageview/PKGBUILD
community/i3status/PKGBUILD
community/iasl/PKGBUILD
community/krename/PKGBUILD
community/libesmtp/PKGBUILD
community/liblinebreak/PKGBUILD
community/libmilter/PKGBUILD
community/libpaper/PKGBUILD
community/libvirt/PKGBUILD
community/libx86emu/PKGBUILD
community/libxdg-basedir/PKGBUILD
community/lightdm-gtk2-greeter/PKGBUILD
community/lightdm-gtk3-greeter/PKGBUILD
community/lightdm/PKGBUILD
community/luakit/PKGBUILD
community/lxtask/PKGBUILD
community/marisa/PKGBUILD
community/megaglest/PKGBUILD
community/mumble/PKGBUILD
community/opencolorio/PKGBUILD
community/openssh-askpass/PKGBUILD
community/pdf2svg/PKGBUILD
community/pidgin-toobars/PKGBUILD
community/powerdns/PKGBUILD
community/python-numexpr/PKGBUILD
community/python-pybox2d/PKGBUILD
community/python-pytables/PKGBUILD
community/python2-imaging/PKGBUILD
community/python2-pybluez/PKGBUILD
community/remmina/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-iconv/PKGBUILD
community/scummvm-tools/PKGBUILD
community/shapelib/PKGBUILD
community/sshfs/PKGBUILD
community/subtle/PKGBUILD
community/teeworlds/PKGBUILD
community/uget/PKGBUILD
community/wireshark/PKGBUILD
community/wxcam/PKGBUILD
community/wxgtk2.9/PKGBUILD
community/xchm/PKGBUILD
community/xdelta3/PKGBUILD
community/zynaddsubfx/PKGBUILD
core/gcc/PKGBUILD
core/gcc/gcc_mips64el_lib.patch
core/gdbm/PKGBUILD
core/ldns/PKGBUILD
core/pth/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
elementary/gtk-engine-equinox/PKGBUILD
elementary/postler/PKGBUILD
elementary/vala-010/PKGBUILD
extra/aubio/PKGBUILD
extra/audacity/PKGBUILD
extra/bc/PKGBUILD
extra/cagibi/PKGBUILD
extra/calligra/PKGBUILD
extra/chmlib/PKGBUILD
extra/clamav/PKGBUILD
extra/clisp/PKGBUILD
extra/crypto++/PKGBUILD
extra/cups/PKGBUILD
extra/dhcp/PKGBUILD
extra/ecore/PKGBUILD
extra/edje/PKGBUILD
extra/eet/PKGBUILD
extra/eeze/PKGBUILD
extra/efreet/PKGBUILD
extra/eina/PKGBUILD
extra/eio/PKGBUILD
extra/embryo/PKGBUILD
extra/emotion/PKGBUILD
extra/enlightenment17/PKGBUILD
extra/ethumb/PKGBUILD
extra/evas/PKGBUILD
extra/festival/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/git/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtkmathview/PKGBUILD
extra/gvfs/PKGBUILD
extra/hugin/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3lib/PKGBUILD
extra/imagemagick/PKGBUILD
extra/jack/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libaccounts-qt/PKGBUILD
extra/libdvdnav/PKGBUILD
extra/libdvdread/PKGBUILD
extra/libetpan/PKGBUILD
extra/libgadu/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libpst/PKGBUILD
extra/libsecret/PKGBUILD
extra/libssh/PKGBUILD
extra/libvorbis/PKGBUILD
extra/lilv/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/msmtp/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/openbabel/PKGBUILD
extra/opencv/PKGBUILD
extra/opengtl/PKGBUILD
extra/perl-net-dns/PKGBUILD
extra/perl-socket6/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/pycurl/PKGBUILD
extra/python-geoip/PKGBUILD
extra/qt5/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/sqlite/PKGBUILD
extra/texmacs/PKGBUILD
extra/v4l-utils/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/wildmidi/PKGBUILD
extra/wxpython/PKGBUILD
extra/x2goclient/PKGBUILD
extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
extra/xf86-video-siliconmotion/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xsane/PKGBUILD
extra/zsh/PKGBUILD
libre-testing/unace-libre/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/audacity-libre/PKGBUILD
libre/audex-libre/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/bumblebee-libre/PKGBUILD
libre/crosstool-ng/PKGBUILD
libre/dvdrip-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/enscript/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/hardinfo/PKGBUILD
libre/kile-libre/PKGBUILD
libre/lesspipe-libre/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/linux-libre-tools/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
libre/midori-libre/PKGBUILD
libre/oss-libre/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/python2-reportlab-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
libre/seamonkey-libre/PKGBUILD
libre/unzip-libre/PKGBUILD
libre/xarchiver-libre/PKGBUILD
libre/xmlstarlet/PKGBUILD
pcr/a2jmidid/PKGBUILD
pcr/amsynth/PKGBUILD
pcr/anyremote/PKGBUILD
pcr/azr3-jack/PKGBUILD
pcr/bambus/PKGBUILD
pcr/bamf2/PKGBUILD
pcr/barnyard2/PKGBUILD
pcr/bison++/PKGBUILD
pcr/bup/PKGBUILD
pcr/din/PKGBUILD
pcr/django-tagging/PKGBUILD
pcr/doxymacs/PKGBUILD
pcr/emacs-js2-mode/PKGBUILD
pcr/eterm/PKGBUILD
pcr/frame/PKGBUILD
pcr/freeipmi/PKGBUILD
pcr/geis/PKGBUILD
pcr/ginn/PKGBUILD
pcr/grail/PKGBUILD
pcr/libast/PKGBUILD
pcr/libdshconfig/PKGBUILD
pcr/networkmanager-openswan/PKGBUILD
pcr/networkmanager-strongswan/PKGBUILD
pcr/openswan/PKGBUILD
pcr/par/PKGBUILD
pcr/snort/PKGBUILD
pcr/strongswan/PKGBUILD
social/batctl/PKGBUILD
social/bip/PKGBUILD
social/bitcoin-daemon/PKGBUILD
social/dropbear/PKGBUILD
social/ffingerd/PKGBUILD
social/haveged/PKGBUILD
social/inadyn-opendns/PKGBUILD
social/liblockfile/PKGBUILD
social/libowfat/PKGBUILD
social/lockfile-progs/PKGBUILD
social/netatalk/PKGBUILD
social/olsrd/PKGBUILD
social/poco/PKGBUILD
social/spectrum/PKGBUILD
social/squirm/PKGBUILD
social/tokyotyrant/PKGBUILD
social/tomoyo-tools/PKGBUILD
Diffstat (limited to 'community')
620 files changed, 10485 insertions, 6795 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index b4c2ff3af..a510a3e0f 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 103111 2013-12-26 13:52:36Z svenstaro $ +# $Id: PKGBUILD 105861 2014-02-16 16:38:12Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad pkgver=a15 _pkgver=0.0.15-alpha -pkgrel=1 +pkgrel=3 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm') +depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' + 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu' + 'gloox' 'miniupnpc' 'libsm') makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") md5sums=('a651d81eb9b31da01e376ddaa597e954') @@ -20,9 +22,9 @@ build() { unset CPPFLAGS # for le spidermonkey + export WX_CONFIG=/usr/bin/wx-config-2.8 ./update-workspaces.sh \ --with-system-enet \ - --with-system-miniupnpc \ --bindir=/usr/bin \ --libdir=/usr/lib/0ad \ --datadir=/usr/share/${pkgname}/data @@ -34,10 +36,14 @@ build() { package() { install -d "${pkgdir}"/usr/{bin,lib/0ad} - install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin" - install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad" + cd "$srcdir/$pkgname-$_pkgver" - install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm755 binaries/system/pyrogenesis "${pkgdir}/usr/bin" + install -Dm755 binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib/0ad" + + install -Dm755 build/resources/${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 build/resources/${pkgname}.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 build/resources/${pkgname}.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" } diff --git a/community/acpi/PKGBUILD b/community/acpi/PKGBUILD index 9ea5236c1..035cfaa00 100644 --- a/community/acpi/PKGBUILD +++ b/community/acpi/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 148027 2012-01-30 03:41:28Z dan $ +# $Id: PKGBUILD 103278 2014-01-02 12:22:39Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=acpi -pkgver=1.6 -pkgrel=1.1 -pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings" +pkgver=1.7 +pkgrel=1 +pkgdesc='Client for battery, power, and thermal readings' arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/acpiclient" -depends=('glibc') -source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz) +url='http://sourceforge.net/projects/acpiclient/' license=('GPL2') -sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31') +depends=('glibc') +source=("http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz") +sha256sums=('d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make -C "$pkgname-$pkgver" DESTDIR"=$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 4ae84bafd..12f4ccbf1 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $ +# $Id: PKGBUILD 104282 2014-01-16 21:18:23Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.20 +pkgver=2.0.21 pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'acpid.service' 'anything' 'handler.sh') -md5sums=('1b740e6419cf45aaeb2bd78d589f27f9' +md5sums=('252bb4b3a8053227e743e267d98b8a52' 'd11700eb136e0489835ddaf977a7905b' '79cc7a9dceacdeffd51f070c2ba5f023' '2d37b98d6e74bab815604b8b48c6cfd4' diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 4d450a170..8787dd667 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,42 +1,33 @@ -# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $ +# $Id: PKGBUILD 105243 2014-02-03 10:40:39Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub -pkgver=3.0.4 -pkgrel=5 +pkgver=3.1.2 +pkgrel=1 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64' 'mips64el') url="http://www.aegisub.org" license=('GPL' 'BSD') -depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') -makedepends=('mesa') +depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk') +makedepends=('boost' 'intltool' 'mesa') install="${pkgname}.install" -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" - 'wxgtk2.9.5.patch') -sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' - '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') - -prepare() { - cd ${pkgname}/${pkgname} - - patch -Np2 -i ../../wxgtk2.9.5.patch -} +source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz") +sha256sums=('36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86') build() { - cd ${pkgname}/${pkgname} + cd ${pkgname}-${pkgver}/${pkgname} - ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' + ./configure --prefix='/usr' --without-{portaudio,openal,oss} make } package() { - cd ${pkgname}/${pkgname} + cd ${pkgname}-${pkgver}/${pkgname} make DESTDIR="${pkgdir}" install -# License install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE } diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch deleted file mode 100644 index b50fac01b..000000000 --- a/community/aegisub/wxgtk2.9.5.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/aegisub/src/utils.cpp -+++ b/aegisub/src/utils.cpp -@@ -121,8 +121,7 @@ void RestartAegisub() { - config::opt->Flush(); - - #if defined(__WXMSW__) -- wxStandardPaths stand; -- wxExecute("\"" + stand.GetExecutablePath() + "\""); -+ wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\""); - #elif defined(__WXMAC__) - std::string bundle_path = agi::util::OSX_GetBundlePath(); - std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper"); -@@ -132,8 +131,7 @@ void RestartAegisub() { - LOG_I("util/restart/exec") << exec; - wxExecute(exec); - #else -- wxStandardPaths stand; -- wxExecute(stand.GetExecutablePath()); -+ wxExecute(wxStandardPaths::Get().GetExecutablePath()); - #endif - } - ---- a/aegisub/src/menu.cpp -+++ b/aegisub/src/menu.cpp -@@ -457,11 +457,11 @@ namespace menu { - window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm); - window->SetMenuBar(menu.get()); - --#ifdef __WXGTK__ -- // GTK silently swallows keypresses for accelerators whose associated -- // menu items are disabled. As we don't update the menu until it's -- // opened, this means that conditional hotkeys don't work if the menu -- // hasn't been opened since they became valid. -+#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5) -+ // Older versions of wxGTK silently swallow keypresses for accelerators -+ // whose associated menu items are disabled. As we don't update the -+ // menu until it's opened, this means that conditional hotkeys don't -+ // work if the menu hasn't been opened since they became valid. - // - // To work around this, we completely disable accelerators from menu - // item. wxGTK doesn't expose any way to do this other that at wx diff --git a/community/afpfs-ng/PKGBUILD b/community/afpfs-ng/PKGBUILD index c51c117fc..1811a1df7 100644 --- a/community/afpfs-ng/PKGBUILD +++ b/community/afpfs-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99034 2013-10-22 19:25:28Z idevolder $ +# $Id: PKGBUILD 103906 2014-01-13 17:16:36Z andyrtr $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: slubman <slubman.dndd@laposte.net> pkgname=afpfs-ng pkgver=0.8.1 -pkgrel=7 +pkgrel=8 pkgdesc="A client for the Apple Filing Protocol (AFP)" url="http://alexthepuffin.googlepages.com/" license=('GPL') diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD index da9ad5247..ad3937dc3 100644 --- a/community/alure/PKGBUILD +++ b/community/alure/PKGBUILD @@ -3,7 +3,7 @@ pkgname=alure pkgver=1.2 -pkgrel=2.1 +pkgrel=3 pkgdesc='Utility library to help manage common tasks with OpenAL applications.' arch=('i686' 'x86_64' 'mips64el') url='http://kcat.strangesoft.net/alure.html' @@ -17,14 +17,22 @@ optdepends=('libsndfile: for uncompressed audio support' 'dumb: for IT, XM, S3M and MOD support' 'fluidsynth: for SoundFont 2 support') source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2" - 'unistd.patch') + 'unistd.patch' + build.patch) md5sums=('3088aba074ad02d95ea51e705053b9f5' - '17d3f8b4dc423cac64772e5694739fce') + '17d3f8b4dc423cac64772e5694739fce' + '6a8dfd62ccae920d393b4202736aba46') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../build.patch + test "$CARCH" = "mips64el" && patch -Np0 -i "$srcdir/unistd.patch" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" cmake . -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/community/alure/build.patch b/community/alure/build.patch new file mode 100644 index 000000000..6da41c0dd --- /dev/null +++ b/community/alure/build.patch @@ -0,0 +1,12 @@ +diff -rupN a/src/codec_fluidsynth.cpp b/src/codec_fluidsynth.cpp +--- a/src/codec_fluidsynth.cpp 2011-07-29 08:37:48.000000000 +0000 ++++ b/src/codec_fluidsynth.cpp 2014-01-03 10:42:13.280792235 +0000 +@@ -32,7 +32,7 @@ + #endif + + #include <istream> +- ++#include <unistd.h> + #include <fluidsynth.h> + + diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD index 21110bd41..4c7d808b3 100644 --- a/community/argyllcms/PKGBUILD +++ b/community/argyllcms/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 102451 2013-12-11 14:31:37Z tredaelli $ +# $Id: PKGBUILD 105726 2014-02-14 14:17:13Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) pkgname=argyllcms _pkgname=Argyll -pkgver=1.6.2 +pkgver=1.6.3 _pkgver="V${pkgver}" pkgrel=1 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" arch=(i686 x86_64) depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr') makedepends=('ftjam' 'zip' 'unzip') +# You need to fake an UserAgent or it doesn't download source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) url="http://www.argyllcms.com/" license=("GPL" "AGPL") install=${pkgname}.install -sha256sums=('c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f') +sha256sums=('188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84') build() { cd ${_pkgname}_${_pkgver} diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 60f5d78b3..e2f24a7d1 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' 'mips64el') @@ -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/ario/PKGBUILD b/community/ario/PKGBUILD index 6012f53a3..55f748ee9 100644 --- a/community/ario/PKGBUILD +++ b/community/ario/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99673 2013-10-30 22:56:21Z allan $ +# $Id: PKGBUILD 103907 2014-01-13 17:16:37Z andyrtr $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=ario pkgver=1.5.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster" arch=('i686' 'x86_64' 'mips64el') url="http://ario-player.sourceforge.net/" @@ -13,13 +13,17 @@ makedepends=('intltool' 'perl-xml-parser') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz - ario-1.5.1-glib.patch) + glib.patch) sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e' - '2e42992e7ed0be590278198b75bc9a7259cdfdde4de41a38ddbf2f093ccda930') + '16481cc5fe3fb52ee36bae63522e319193285542fe0c8ab4281ecc5794a82184') + +prepare() { + cd "${srcdir}/$pkgname-$pkgver" + patch -p1 -i ../glib.patch +} build() { cd "${srcdir}/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/ario-1.5.1-glib.patch ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/ario/glib.patch b/community/ario/glib.patch new file mode 100644 index 000000000..15b96074b --- /dev/null +++ b/community/ario/glib.patch @@ -0,0 +1,24 @@ +diff -rupN a/src/ario-profiles.c b/src/ario-profiles.c +--- a/src/ario-profiles.c 2011-05-17 17:54:49.000000000 +0000 ++++ b/src/ario-profiles.c 2013-12-25 10:52:06.668807328 +0000 +@@ -22,7 +22,7 @@ + #include <config.h> + #include <stdlib.h> + #include <libxml/parser.h> +-#include <glib/gi18n.h> ++#include <glib.h> + #include "ario-util.h" + #include "ario-debug.h" + +diff -rupN a/src/ario-profiles.h b/src/ario-profiles.h +--- a/src/ario-profiles.h 2011-05-17 17:54:49.000000000 +0000 ++++ b/src/ario-profiles.h 2013-12-25 10:50:47.839363409 +0000 +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include <glib/gslist.h> ++#include <glib.h> + #include "servers/ario-server.h" + + G_BEGIN_DECLS diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD index c4b1c55bc..c0b82490c 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' 'mips64el') @@ -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/augeas/PKGBUILD b/community/augeas/PKGBUILD index d990b72ed..8b53ffec1 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 100130 2013-11-01 20:20:20Z spupykin $ +# $Id: PKGBUILD 105015 2014-01-30 08:53:11Z spupykin $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64' 'mips64el') url="http://augeas.net" license=('LGPL') depends=('libxml2' 'gcc-libs') source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig}) -md5sums=('520ce983457ff9ffa3816bc41a9f328b' +md5sums=('dce2f52cbd20f72c7da48e014ad48076' 'SKIP') build() { diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index f6cfa98e9..d1be9b8cd 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $ +# $Id: PKGBUILD 103697 2014-01-10 07:48:01Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.8 -pkgrel=1 +pkgrel=2 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' @@ -14,15 +14,24 @@ license=('GPL2') depends=('libxml2') makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') -backup=('etc/default/autofs' - 'etc/autofs/auto.master' - 'etc/autofs/auto.misc') +backup=('etc/autofs/auto.master' + 'etc/autofs/auto.misc' + 'etc/autofs/auto.net' + 'etc/autofs/auto.smb' + 'etc/autofs/autofs_ldap_auth.conf' + 'etc/default/autofs') options=(!makeflags) -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz") -sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52') +source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz" + "git-fixes.patch") +sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52' + '09c41a73db6a352cb04b51795591e5ae1c4a3fff37257fc8bb117020fa0e2724') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + + # Apply fixes from git + patch -Np1 -i "${srcdir}/git-fixes.patch" + sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \ -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master } diff --git a/community/autofs/git-fixes.patch b/community/autofs/git-fixes.patch new file mode 100644 index 000000000..fd096193f --- /dev/null +++ b/community/autofs/git-fixes.patch @@ -0,0 +1,777 @@ +diff --git a/CHANGELOG b/CHANGELOG +index 62dac81..a9263c8 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,17 @@ ++??/??/20?? autofs-5.0.9 ++======================= ++- fix undefined authtype_requires_creds err if ldap enabled but without sasl. ++- fix master map type check. ++- fix task manager not getting signaled. ++- allow --with-systemd to take a path arg. ++- fix WITH_LIBTIRPC function name. ++- fix ipv6 libtirpc getport. ++- fix ipv6 link local address handling. ++- fix fix ipv6 libtirpc getport. ++- get_nfs_info() should query portmapper if port is not given. ++- fix rpc_portmap_getport() proto not set. ++- fix protmap not trying proto v2. ++ + 17/10/2013 autofs-5.0.8 + ======================= + - fix nobind sun escaped map entries. +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..2115204 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -------------------------------------------------------------------------- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +- is found on system], ++[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path.], + [if test "$withval" = yes; then + if test -z "$systemddir"; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test "$withval" != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +@@ -435,7 +441,7 @@ CFLAGS="$af_check_libtirpc_save_cflags" + LDFLAGS="$af_check_libtirpc_save_ldflags" + ]) + +-AC_DEFUN([AM_WITH_LIBTIRPC], ++AC_DEFUN([AF_WITH_LIBTIRPC], + [AC_MSG_CHECKING([if libtirpc is requested and available]) + AC_ARG_WITH(libtirpc, + [ --with-libtirpc use libtirpc if available], +diff --git a/configure b/configure +index 2c2e312..4e1743d 100755 +--- a/configure ++++ b/configure +@@ -1372,8 +1372,10 @@ Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-path=PATH look in PATH for binaries needed by the automounter +- --with-systemd install systemd unit file if systemd unit directory +- is found on system ++ --with-systemd[=systemddir] install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path. + --with-confdir=DIR use DIR for autofs configuration files + --with-mapdir=PATH look in PATH for mount maps used by the automounter + --with-fifodir=PATH use PATH as the directory for fifos used by the automounter +@@ -2260,6 +2262,10 @@ $as_echo "$systemddir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + fi ++else ++ if test "$withval" != no; then ++ systemddir=$withval ++ fi + fi + fi + +diff --git a/configure.in b/configure.in +index 5f29163..1eeb8dc 100644 +--- a/configure.in ++++ b/configure.in +@@ -124,7 +124,7 @@ AC_SUBST(flagdir) + # + # Use libtirpc + # +-AM_WITH_LIBTIRPC() ++AF_WITH_LIBTIRPC() + AC_SUBST(TIRPCLIB) + + # +diff --git a/daemon/lookup.c b/daemon/lookup.c +index e3d9536..7fea942 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -171,14 +171,22 @@ int lookup_nss_read_master(struct master *master, time_t age) + char source[10]; + + memset(source, 0, 10); +- if (!strncmp(name, "file:", 5) || +- !strncmp(name, "yp:", 3) || +- !strncmp(name, "nis:", 4) || +- !strncmp(name, "nisplus:", 8) || +- !strncmp(name, "ldap:", 5) || +- !strncmp(name, "ldaps:", 6) || +- !strncmp(name, "sss:", 4) || +- !strncmp(name, "dir:", 4)) { ++ if ((!strncmp(name, "file", 4) && ++ (name[4] == ',' || name[4] == ':')) || ++ (!strncmp(name, "yp", 3) && ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "nis", 3) && ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "nisplus", 7) && ++ (name[7] == ',' || name[7] == ':')) || ++ (!strncmp(name, "ldap", 4) && ++ (name[4] == ',' || name[4] == ':')) || ++ (!strncmp(name, "ldaps", 5) && ++ (name[5] == ',' || name[5] == ':')) || ++ (!strncmp(name, "sss", 3) || ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "dir", 3) && ++ (name[3] == ',' || name[3] == ':'))) { + strncpy(source, name, tmp - name); + + /* +diff --git a/daemon/state.c b/daemon/state.c +index 8d81788..3174a9c 100644 +--- a/daemon/state.c ++++ b/daemon/state.c +@@ -818,13 +818,13 @@ done: + new = st_alloc_task(ap, state); + if (new) + list_add(&new->list, head); +- /* Added to empty state queue, kick state machine */ +- signaled = 1; +- status = pthread_cond_signal(&cond); +- if (status) +- fatal(status); + } + ++ signaled = 1; ++ status = pthread_cond_signal(&cond); ++ if (status) ++ fatal(status); ++ + return 1; + } + +diff --git a/include/automount.h b/include/automount.h +index 71787a5..396391c 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -335,6 +335,7 @@ size_t _strlen(const char *str, size_t max); + int cat_path(char *buf, size_t len, const char *dir, const char *base); + int ncat_path(char *buf, size_t len, + const char *dir, const char *base, size_t blen); ++int _strncmp(const char *s1, const char *s2, size_t n); + + /* Core automount definitions */ + +diff --git a/lib/cat_path.c b/lib/cat_path.c +index 60669db..c386b33 100644 +--- a/lib/cat_path.c ++++ b/lib/cat_path.c +@@ -87,3 +87,12 @@ int ncat_path(char *buf, size_t len, + return cat_path(buf, len, dir, name); + } + ++/* Compare first n bytes of s1 and s2 and that n == strlen(s1) */ ++int _strncmp(const char *s1, const char *s2, size_t n) ++{ ++ size_t len = strlen(s1); ++ ++ if (n != len) ++ return n - len; ++ return strncmp(s1, s2, n); ++} +diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c +index 46b3e8d..5d6ead0 100644 +--- a/lib/rpc_subs.c ++++ b/lib/rpc_subs.c +@@ -234,6 +234,29 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + + return 0; + } ++static int rpc_getport(struct conn_info *info, ++ struct pmap *parms, CLIENT *client, ++ unsigned short *port) ++{ ++ enum clnt_stat status; ++ ++ /* ++ * Check to see if server is up otherwise a getport will take ++ * forever to timeout. ++ */ ++ status = clnt_call(client, PMAPPROC_NULL, ++ (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0, ++ info->timeout); ++ ++ if (status == RPC_SUCCESS) { ++ status = clnt_call(client, PMAPPROC_GETPORT, ++ (xdrproc_t) xdr_pmap, (caddr_t) parms, ++ (xdrproc_t) xdr_u_short, (caddr_t) port, ++ info->timeout); ++ } ++ ++ return status; ++} + #else + static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, int *fd, CLIENT **client) + { +@@ -267,9 +290,6 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + laddr = (struct sockaddr *) &in4_laddr; + in4_raddr->sin_port = htons(info->port); + slen = sizeof(struct sockaddr_in); +- /* Use rpcbind v2 for AF_INET */ +- if (info->program == rpcb_prog) +- info->version = PMAPVERS; + } else if (addr->sa_family == AF_INET6) { + struct sockaddr_in6 *in6_raddr = (struct sockaddr_in6 *) addr; + in6_laddr.sin6_family = AF_INET6; +@@ -324,6 +344,255 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + + return 0; + } ++ ++/* ++ * Thankfully nfs-utils had already dealt with this. ++ * Thanks to Chuck Lever for his nfs-utils patch series, much of ++ * which is used here. ++ */ ++static pthread_mutex_t proto_mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++static enum clnt_stat rpc_get_netid(const sa_family_t family, ++ const int protocol, char **netid) ++{ ++ char *nc_protofmly, *nc_proto, *nc_netid; ++ struct netconfig *nconf; ++ struct protoent *proto; ++ void *handle; ++ ++ switch (family) { ++ case AF_LOCAL: ++ case AF_INET: ++ nc_protofmly = NC_INET; ++ break; ++ case AF_INET6: ++ nc_protofmly = NC_INET6; ++ break; ++ default: ++ return RPC_UNKNOWNPROTO; ++ } ++ ++ pthread_mutex_lock(&proto_mutex); ++ proto = getprotobynumber(protocol); ++ if (!proto) { ++ pthread_mutex_unlock(&proto_mutex); ++ return RPC_UNKNOWNPROTO; ++ } ++ nc_proto = strdup(proto->p_name); ++ pthread_mutex_unlock(&proto_mutex); ++ if (!nc_proto) ++ return RPC_SYSTEMERROR; ++ ++ handle = setnetconfig(); ++ while ((nconf = getnetconfig(handle)) != NULL) { ++ if (nconf->nc_protofmly != NULL && ++ strcmp(nconf->nc_protofmly, nc_protofmly) != 0) ++ continue; ++ if (nconf->nc_proto != NULL && ++ strcmp(nconf->nc_proto, nc_proto) != 0) ++ continue; ++ ++ nc_netid = strdup(nconf->nc_netid); ++ if (!nc_netid) { ++ free(nc_proto); ++ return RPC_SYSTEMERROR; ++ } ++ ++ *netid = nc_netid; ++ } ++ endnetconfig(handle); ++ free(nc_proto); ++ ++ return RPC_SUCCESS; ++} ++ ++static char *rpc_sockaddr2universal(const struct sockaddr *addr) ++{ ++ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *) addr; ++ const struct sockaddr_un *sun = (const struct sockaddr_un *) addr; ++ const struct sockaddr_in *sin = (const struct sockaddr_in *) addr; ++ char buf[INET6_ADDRSTRLEN + 8 /* for port information */]; ++ uint16_t port; ++ size_t count; ++ char *result; ++ int len; ++ ++ switch (addr->sa_family) { ++ case AF_LOCAL: ++ return strndup(sun->sun_path, sizeof(sun->sun_path)); ++ case AF_INET: ++ if (inet_ntop(AF_INET, (const void *)&sin->sin_addr.s_addr, ++ buf, (socklen_t)sizeof(buf)) == NULL) ++ goto out_err; ++ port = ntohs(sin->sin_port); ++ break; ++ case AF_INET6: ++ if (inet_ntop(AF_INET6, (const void *)&sin6->sin6_addr, ++ buf, (socklen_t)sizeof(buf)) == NULL) ++ goto out_err; ++ port = ntohs(sin6->sin6_port); ++ break; ++ default: ++ goto out_err; ++ } ++ ++ count = sizeof(buf) - strlen(buf); ++ len = snprintf(buf + strlen(buf), count, ".%u.%u", ++ (unsigned)(port >> 8), (unsigned)(port & 0xff)); ++ /* before glibc 2.0.6, snprintf(3) could return -1 */ ++ if (len < 0 || (size_t)len > count) ++ goto out_err; ++ ++ result = strdup(buf); ++ return result; ++ ++out_err: ++ return NULL; ++} ++ ++static int rpc_universal2port(const char *uaddr) ++{ ++ char *addrstr; ++ char *p, *endptr; ++ unsigned long portlo, porthi; ++ int port = -1; ++ ++ addrstr = strdup(uaddr); ++ if (!addrstr) ++ return -1; ++ ++ p = strrchr(addrstr, '.'); ++ if (!p) ++ goto out; ++ ++ portlo = strtoul(p + 1, &endptr, 10); ++ if (*endptr != '\0' || portlo > 255) ++ goto out; ++ *p = '\0'; ++ ++ p = strrchr(addrstr, '.'); ++ if (!p) ++ goto out; ++ ++ porthi = strtoul(p + 1, &endptr, 10); ++ if (*endptr != '\0' || porthi > 255) ++ goto out; ++ *p = '\0'; ++ ++ port = (porthi << 8) | portlo; ++ ++out: ++ free(addrstr); ++ return port; ++} ++ ++static enum clnt_stat rpc_rpcb_getport(CLIENT *client, ++ struct rpcb *parms, ++ struct timeval timeout, ++ unsigned short *port) ++{ ++ rpcvers_t rpcb_version; ++ struct rpc_err rpcerr; ++ int s_port = 0; ++ ++ for (rpcb_version = RPCBVERS_4; ++ rpcb_version >= RPCBVERS_3; ++ rpcb_version--) { ++ enum clnt_stat status; ++ char *uaddr = NULL; ++ ++ CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version); ++ status = CLNT_CALL(client, (rpcproc_t) RPCBPROC_GETADDR, ++ (xdrproc_t) xdr_rpcb, (void *) parms, ++ (xdrproc_t) xdr_wrapstring, (void *) &uaddr, ++ timeout); ++ ++ switch (status) { ++ case RPC_SUCCESS: ++ if ((uaddr == NULL) || (uaddr[0] == '\0')) ++ return RPC_PROGNOTREGISTERED; ++ ++ s_port = rpc_universal2port(uaddr); ++ xdr_free((xdrproc_t) xdr_wrapstring, (char *) &uaddr); ++ if (s_port == -1) { ++ return RPC_N2AXLATEFAILURE; ++ } ++ *port = s_port; ++ return RPC_SUCCESS; ++ ++ case RPC_PROGVERSMISMATCH: ++ clnt_geterr(client, &rpcerr); ++ if (rpcerr.re_vers.low > RPCBVERS4) ++ return status; ++ continue; ++ ++ case RPC_PROGUNAVAIL: ++ continue; ++ ++ case RPC_PROGNOTREGISTERED: ++ continue; ++ ++ default: ++ /* Most likely RPC_TIMEDOUT or RPC_CANTRECV */ ++ return status; ++ } ++ } ++ ++ return RPC_PROGNOTREGISTERED; ++} ++ ++static enum clnt_stat rpc_getport(struct conn_info *info, ++ struct pmap *parms, CLIENT *client, ++ unsigned short *port) ++{ ++ enum clnt_stat status; ++ struct sockaddr *paddr, addr; ++ struct rpcb rpcb_parms; ++ char *netid, *raddr; ++ ++ if (info->addr) ++ paddr = info->addr; ++ else { ++ if (!clnt_control(client, CLGET_SERVER_ADDR, (char *) &addr)) ++ return RPC_UNKNOWNADDR; ++ paddr = &addr; ++ } ++ ++ netid = NULL; ++ status = rpc_get_netid(paddr->sa_family, info->proto, &netid); ++ if (status != RPC_SUCCESS) ++ return status; ++ ++ raddr = rpc_sockaddr2universal(paddr); ++ if (!raddr) { ++ free(netid); ++ return RPC_UNKNOWNADDR; ++ } ++ ++ memset(&rpcb_parms, 0, sizeof(rpcb_parms)); ++ rpcb_parms.r_prog = parms->pm_prog; ++ rpcb_parms.r_vers = parms->pm_vers; ++ rpcb_parms.r_netid = netid; ++ rpcb_parms.r_addr = raddr; ++ rpcb_parms.r_owner = ""; ++ ++ status = rpc_rpcb_getport(client, &rpcb_parms, info->timeout, port); ++ ++ free(netid); ++ free(raddr); ++ ++ if (status == RPC_PROGNOTREGISTERED) { ++ /* Last chance, version 2 uses a different procedure */ ++ rpcvers_t rpcb_version = PMAPVERS; ++ CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version); ++ status = clnt_call(client, PMAPPROC_GETPORT, ++ (xdrproc_t) xdr_pmap, (caddr_t) parms, ++ (xdrproc_t) xdr_u_short, (caddr_t) port, ++ info->timeout); ++ } ++ ++ return status; ++} + #endif + + #if defined(HAVE_GETRPCBYNAME) || defined(HAVE_GETSERVBYNAME) +@@ -380,7 +649,7 @@ static unsigned short rpc_getrpcbport(const int proto) + done: + pthread_mutex_unlock(&rpcb_mutex); + #endif +- return (unsigned short) PMAPPORT; ++ return (unsigned short) htons(PMAPPORT); + } + + /* +@@ -412,6 +681,12 @@ static int create_client(struct conn_info *info, CLIENT **client) + goto done; + if (ret == -EHOSTUNREACH) + goto out_close; ++ if (ret == -EINVAL) { ++ char buf[MAX_ERR_BUF]; ++ char *estr = strerror_r(-ret, buf, MAX_ERR_BUF); ++ error(LOGOPT_ANY, "connect() failed: %s", estr); ++ goto out_close; ++ } + + if (!info->client && fd != RPC_ANYSOCK) { + close(fd); +@@ -618,6 +893,8 @@ int rpc_portmap_getport(struct conn_info *info, + + memset(&pmap_info, 0, sizeof(struct conn_info)); + ++ pmap_info.proto = proto; ++ + if (proto == IPPROTO_TCP) + pmap_info.timeout.tv_sec = PMAP_TOUT_TCP; + else +@@ -647,20 +924,7 @@ int rpc_portmap_getport(struct conn_info *info, + return ret; + } + +- /* +- * Check to see if server is up otherwise a getport will take +- * forever to timeout. +- */ +- status = clnt_call(client, PMAPPROC_NULL, +- (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0, +- pmap_info.timeout); +- +- if (status == RPC_SUCCESS) { +- status = clnt_call(client, PMAPPROC_GETPORT, +- (xdrproc_t) xdr_pmap, (caddr_t) parms, +- (xdrproc_t) xdr_u_short, (caddr_t) port, +- pmap_info.timeout); +- } ++ status = rpc_getport(&pmap_info, parms, client, port); + + if (!info->client) { + /* +@@ -867,6 +1131,11 @@ static int rpc_get_exports_proto(struct conn_info *info, exports *exp) + clnt_control(client, CLSET_RETRY_TIMEOUT, (char *) &info->timeout); + + client->cl_auth = authunix_create_default(); ++ if (client->cl_auth == NULL) { ++ error(LOGOPT_ANY, "auth create failed"); ++ clnt_destroy(client); ++ return 0; ++ } + + vers_entry = 0; + while (1) { +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ab1e8c..04b1da7 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -846,20 +846,20 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu + return 0; + } + +-#ifdef WITH_SASL + /* + * For plain text, login and digest-md5 authentication types, we need + * user and password credentials. + */ + int authtype_requires_creds(const char *authtype) + { ++#ifdef WITH_SASL + if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) || + !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) || + !strncmp(authtype, "LOGIN", strlen("LOGIN"))) + return 1; ++#endif + return 0; + } +-#endif + + /* + * Returns: +diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c +index 319f2e4..61aec70 100644 +--- a/modules/mount_autofs.c ++++ b/modules/mount_autofs.c +@@ -116,17 +116,17 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, + while (*comma != '\0' && *comma != ',') + comma++; + +- if (strncmp(cp, "nobrowse", 8) == 0) ++ if (_strncmp(cp, "nobrowse", 8) == 0) + ghost = 0; +- else if (strncmp(cp, "nobind", 6) == 0) ++ else if (_strncmp(cp, "nobind", 6) == 0) + nobind = 1; +- else if (strncmp(cp, "browse", 6) == 0) ++ else if (_strncmp(cp, "browse", 6) == 0) + ghost = 1; +- else if (strncmp(cp, "symlink", 7) == 0) ++ else if (_strncmp(cp, "symlink", 7) == 0) + symlnk = 1; +- else if (strncmp(cp, "hosts", 5) == 0) ++ else if (_strncmp(cp, "hosts", 5) == 0) + hosts = 1; +- else if (strncmp(cp, "timeout=", 8) == 0) { ++ else if (_strncmp(cp, "timeout=", 8) == 0) { + char *val = strchr(cp, '='); + unsigned tout; + if (val) { +diff --git a/modules/mount_bind.c b/modules/mount_bind.c +index 2b70104..a70bf3a 100644 +--- a/modules/mount_bind.c ++++ b/modules/mount_bind.c +@@ -107,7 +107,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + end--; + + o_len = end - cp + 1; +- if (strncmp("symlink", cp, o_len) == 0) ++ if (_strncmp("symlink", cp, o_len) == 0) + symlnk = 1; + } + } +diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c +index 1edf347..1bc429d 100644 +--- a/modules/mount_ext2.c ++++ b/modules/mount_ext2.c +@@ -77,7 +77,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + + if (options && options[0]) { + for (p = options; (p1 = strchr(p, ',')); p = p1) +- if (!strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro")) ++ if (!_strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro")) + ro = 1; + if (!strcmp(p, "ro")) + ro = 1; +diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c +index 5a582ef..315fc99 100644 +--- a/modules/mount_nfs.c ++++ b/modules/mount_nfs.c +@@ -126,32 +126,32 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + + o_len = end - cp + 1; + +- if (strncmp("proto=rdma", cp, o_len) == 0 || +- strncmp("rdma", cp, o_len) == 0) ++ if (_strncmp("proto=rdma", cp, o_len) == 0 || ++ _strncmp("rdma", cp, o_len) == 0) + rdma = 1; + +- if (strncmp("nosymlink", cp, o_len) == 0) { ++ if (_strncmp("nosymlink", cp, o_len) == 0) { + warn(ap->logopt, MODPREFIX + "the \"nosymlink\" option is depricated " + "and will soon be removed, " + "use the \"nobind\" option instead"); + nosymlink = 1; +- } else if (strncmp("nobind", cp, o_len) == 0) { ++ } else if (_strncmp("nobind", cp, o_len) == 0) { + nobind = 1; +- } else if (strncmp("no-use-weight-only", cp, o_len) == 0) { ++ } else if (_strncmp("no-use-weight-only", cp, o_len) == 0) { + flags &= ~MOUNT_FLAG_USE_WEIGHT_ONLY; +- } else if (strncmp("use-weight-only", cp, o_len) == 0) { ++ } else if (_strncmp("use-weight-only", cp, o_len) == 0) { + flags |= MOUNT_FLAG_USE_WEIGHT_ONLY; + } else { +- if (strncmp("vers=4", cp, o_len) == 0 || +- strncmp("nfsvers=4", cp, o_len) == 0) ++ if (_strncmp("vers=4", cp, o_len) == 0 || ++ _strncmp("nfsvers=4", cp, o_len) == 0) + vers = NFS4_VERS_MASK | TCP_SUPPORTED; +- else if (strncmp("vers=3", cp, o_len) == 0 || +- strncmp("nfsvers=3", cp, o_len) == 0) { ++ else if (_strncmp("vers=3", cp, o_len) == 0 || ++ _strncmp("nfsvers=3", cp, o_len) == 0) { + vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); + vers |= NFS3_REQUESTED; +- } else if (strncmp("vers=2", cp, o_len) == 0 || +- strncmp("nfsvers=2", cp, o_len) == 0) { ++ } else if (_strncmp("vers=2", cp, o_len) == 0 || ++ _strncmp("nfsvers=2", cp, o_len) == 0) { + vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); + vers |= NFS2_REQUESTED; + } else if (strstr(cp, "port=") == cp && +@@ -164,16 +164,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + if (port < 0) + port = 0; + port_opt = cp; +- } else if (strncmp("proto=udp", cp, o_len) == 0 || +- strncmp("udp", cp, o_len) == 0) { ++ } else if (_strncmp("proto=udp", cp, o_len) == 0 || ++ _strncmp("udp", cp, o_len) == 0) { + vers &= ~TCP_SUPPORTED; +- } else if (strncmp("proto=tcp", cp, o_len) == 0 || +- strncmp("tcp", cp, o_len) == 0) { ++ } else if (_strncmp("proto=tcp", cp, o_len) == 0 || ++ _strncmp("tcp", cp, o_len) == 0) { + vers &= ~UDP_SUPPORTED; + } + /* Check for options that also make sense + with bind mounts */ +- else if (strncmp("ro", cp, o_len) == 0) ++ else if (_strncmp("ro", cp, o_len) == 0) + ro = 1; + /* and jump over trailing white space */ + memcpy(nfsp, cp, comma - cp + 1); +diff --git a/modules/parse_sun.c b/modules/parse_sun.c +index 30820b5..9a877c8 100644 +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -511,29 +511,29 @@ static int sun_mount(struct autofs_point *ap, const char *root, + while (*comma != '\0' && *comma != ',') + comma++; + +- if (strncmp("fstype=", cp, 7) == 0) { ++ if (_strncmp("fstype=", cp, 7) == 0) { + int typelen = comma - (cp + 7); + fstype = alloca(typelen + 1); + memcpy(fstype, cp + 7, typelen); + fstype[typelen] = '\0'; +- } else if (strncmp("nonstrict", cp, 9) == 0) { ++ } else if (_strncmp("nonstrict", cp, 9) == 0) { + nonstrict = 1; +- } else if (strncmp("strict", cp, 6) == 0) { ++ } else if (_strncmp("strict", cp, 6) == 0) { + nonstrict = 0; +- } else if (strncmp("nobrowse", cp, 8) == 0 || +- strncmp("browse", cp, 6) == 0 || +- strncmp("timeout=", cp, 8) == 0) { ++ } else if (_strncmp("nobrowse", cp, 8) == 0 || ++ _strncmp("browse", cp, 6) == 0 || ++ _strncmp("timeout=", cp, 8) == 0) { + if (strcmp(fstype, "autofs") == 0 || + strstr(cp, "fstype=autofs")) { + memcpy(np, cp, comma - cp + 1); + np += comma - cp + 1; + } +- } else if (strncmp("no-use-weight-only", cp, 18) == 0) { ++ } else if (_strncmp("no-use-weight-only", cp, 18) == 0) { + use_weight_only = -1; +- } else if (strncmp("use-weight-only", cp, 15) == 0) { ++ } else if (_strncmp("use-weight-only", cp, 15) == 0) { + use_weight_only = MOUNT_FLAG_USE_WEIGHT_ONLY; +- } else if (strncmp("bg", cp, 2) == 0 || +- strncmp("nofg", cp, 4) == 0) { ++ } else if (_strncmp("bg", cp, 2) == 0 || ++ _strncmp("nofg", cp, 4) == 0) { + continue; + } else { + memcpy(np, cp, comma - cp + 1); +@@ -862,7 +862,7 @@ static int validate_location(unsigned int logopt, char *loc) + *ptr == '-' || *ptr == '.' || *ptr == '_' || + *ptr == ',' || *ptr == '(' || *ptr == ')' || + *ptr == '#' || *ptr == '@' || *ptr == ':' || +- *ptr == '[' || *ptr == ']')) { ++ *ptr == '[' || *ptr == ']' || *ptr == '%')) { + error(logopt, "invalid character \"%c\" " + "found in location %s", *ptr, loc); + return 0; +diff --git a/modules/replicated.c b/modules/replicated.c +index 5fdd9d9..2463235 100644 +--- a/modules/replicated.c ++++ b/modules/replicated.c +@@ -444,9 +444,12 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, + host->name, proto, version); + + rpc_info->proto = proto; +- if (port < 0) +- rpc_info->port = NFS_PORT; +- else if (port > 0) ++ if (port < 0) { ++ if (version & NFS4_REQUESTED) ++ rpc_info->port = NFS_PORT; ++ else ++ port = 0; ++ } else if (port > 0) + rpc_info->port = port; + + memset(&parms, 0, sizeof(struct pmap)); diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index 37045a227..c677e53cb 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100668 2013-11-08 00:08:48Z seblu $ +# $Id: PKGBUILD 105129 2014-02-01 10:10:45Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.4-P1 -pkgver=${_pkgver//-/.} +_pkgver=9.9.5 +pkgver=9.9.5 pkgrel=1 pkgdesc='The ISC BIND nameserver' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc} 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('35dd28de21626fd6327230c38d0f164dd2263bed' +sha1sums=('f3fe8000628ec57f332aec1ad9587b767208a38f' 'SKIP' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' diff --git a/community/bip/PKGBUILD b/community/bip/PKGBUILD new file mode 100644 index 000000000..52879dd91 --- /dev/null +++ b/community/bip/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 104918 2014-01-28 11:06:38Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> + +pkgname=bip +pkgver=0.8.9 +pkgrel=1 +pkgdesc="Multiuser IRC proxy that supports replaying of logged conversations." +arch=('i686' 'x86_64') +url="http://bip.milkypond.org/" +license=('GPL') +depends=('openssl') +source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.gz/04158ad020db221ed87cdc03660ef6c9//$pkgname-$pkgver.tar.gz" + ${pkgname}.service) +md5sums=('04158ad020db221ed87cdc03660ef6c9' + 'e9a445ed7b0cf12e57d77cf42021160c') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Don't treat warnings as errors. + sed -i 's/-Werror//g' Makefile.in + # Make the sample configuration reflect the PKGBUILD defaults + sed -i 's:/var/proxy/logs:/var/log/bip:' samples/$pkgname.conf +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m755 ${srcdir}/${pkgname}-${pkgver}/scripts/bipgenconfig "${pkgdir}"/usr/bin/bipgenconfig + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.conf "${pkgdir}"/usr/share/$pkgname/$pkgname.conf.sample + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/samples/$pkgname.vim "${pkgdir}"/usr/share/vim/syntax/$pkgname.vim + install -D -m 0644 ../${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" +} diff --git a/community/bip/bip.install b/community/bip/bip.install new file mode 100644 index 000000000..5c7857aff --- /dev/null +++ b/community/bip/bip.install @@ -0,0 +1,27 @@ +post_install() { + if ! getent passwd bip > /dev/null; then + echo "==> Creating bip user" + usr/bin/useradd --comment "Bip IRC Proxy" --shell /bin/sh --home /var/lib/bip --system --user-group bip + fi + + mkdir -p /var/run/bip 2 > /dev/null + chown -R bip:bip /var/run/bip + + mkdir -p /var/log/bip 2 > /dev/null + chown -R bip:bip /var/log/bip + systemctl daemon-reload +} + +post_upgrade() { + post_install +} + +pre_remove() { + systemctl stop bip + echo "==> Removing bip user and group" + userdel bip + if getent group bip > /dev/null; then + groupdel bip + fi + rm -rf /var/run/bip +} diff --git a/community/bip/bip.service b/community/bip/bip.service new file mode 100644 index 000000000..299866088 --- /dev/null +++ b/community/bip/bip.service @@ -0,0 +1,13 @@ +[Unit] +Description=Bip IRC Proxy Server +After=network.target +ConditionPathExists=/etc/bip.conf + +[Service] +User=bip +Type=forking +PIDFile=/var/run/bip/bip.pid +ExecStart=/usr/bin/bip -f /etc/bip.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 24a8d44e8..a3d3c0cbe 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102409 2013-12-10 14:39:27Z tredaelli $ +# $Id: PKGBUILD 105855 2014-02-16 14:27:32Z bpiotrowski $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') pkgver=0.8.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD index 27475c9c4..a0c30709c 100644 --- a/community/bmake/PKGBUILD +++ b/community/bmake/PKGBUILD @@ -3,14 +3,16 @@ # Contributor: Imanol Celaya <ilcra1989@gmail.com> pkgname=bmake -pkgver=20131001 -pkgrel=2 +pkgver=20140214 +pkgrel=1 pkgdesc="Portable version of the NetBSD 'make' build tool" arch=('i686' 'x86_64') url="http://www.crufty.net/help/sjg/bmake.html" license=('BSD') source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz") sha256sums=('0a91ac60b82270c4b4f21a43e66eb51c32b4df55e01ea592e42eb323909a559b') +sha256sums=('0f7ecadb6dcd5e4902a03137daba6fd7756f54e82942b524f3b38d7406b6d83e') +sha256sums=('2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de') prepare() { cd "$srcdir/$pkgname" diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD index 26072c4b7..c629c7a3f 100644 --- a/community/bti/PKGBUILD +++ b/community/bti/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 94095 2013-07-14 11:36:26Z jlichtblau $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 105299 2014-02-04 18:30:49Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: uvok <uvok at online dot de> # Contributor: Urist <9362773 at gmail.com> pkgname=bti -pkgver=033 +pkgver=034 pkgrel=1 pkgdesc='Console client for Twitter and identi.ca' arch=('i686' 'x86_64' 'mips64el') url='http://gregkh.github.com/bti/' license=('GPL') depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c') -makedepends=('git') source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753') +sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 7b6ef15b7..fcb5c00c0 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93409 2013-07-03 10:50:24Z spupykin $ +# $Id: PKGBUILD 104422 2014-01-20 13:27:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.21.1 +pkgver=1.22.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') @@ -13,8 +13,8 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('795394f83903b5eec6567d51eebb417e' - '3fbd88dc6327ff0455c17409efdbab79') +md5sums=('337d1a15ab1cb1d4ed423168b1eb7d7e' + 'e7c697e37b2120f0e0a354c48180cde4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/busybox/config b/community/busybox/config index b89c59b12..276cf9f63 100644 --- a/community/busybox/config +++ b/community/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.21.1 -# Wed Jul 3 14:35:32 2013 +# Busybox version: 1.22.0 +# Fri Jan 3 01:07:04 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_Z=y CONFIG_AR=y CONFIG_FEATURE_AR_LONG_FILENAMES=y CONFIG_FEATURE_AR_CREATE=y +CONFIG_UNCOMPRESS=y +CONFIG_GUNZIP=y CONFIG_BUNZIP2=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y @@ -143,7 +150,6 @@ CONFIG_FEATURE_CPIO_O=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set CONFIG_GZIP_FAST=0 @@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set # CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y # @@ -186,6 +186,7 @@ CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -363,7 +364,16 @@ CONFIG_WHICH=y # # Editors # +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set @@ -378,14 +388,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -CONFIG_CMP=y -CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -528,6 +530,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -614,26 +617,27 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities @@ -651,6 +655,7 @@ CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +CONFIG_RFKILL=y CONFIG_SETSERIAL=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -658,6 +663,7 @@ CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +CONFIG_WALL=y CONFIG_ADJTIMEX=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -714,7 +720,6 @@ CONFIG_MOUNTPOINT=y CONFIG_MT=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y -CONFIG_RFKILL=y CONFIG_RUNLEVEL=y CONFIG_RX=y CONFIG_SETSID=y @@ -725,7 +730,6 @@ CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y -CONFIG_WALL=y CONFIG_WATCHDOG=y # diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 669983619..30cc37e56 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102095 2013-12-05 08:00:44Z giovanni $ +# $Id: PKGBUILD 105838 2014-02-16 09:04:54Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.21 +pkgver=2.0.22 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!docs' '!emptydirs') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('98f5f211907c89dd978255e48d31a9ca') +md5sums=('c00afed7f58c6d71e38d226f9447266a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index 19d1e76af..e5e736130 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99702 2013-10-30 23:07:09Z alucryd $ +# $Id: PKGBUILD 105391 2014-02-06 16:23:43Z andyrtr $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor: Tofe <chris dot chapuis at gmail dot com> # Contributor: zhuqin <zhuqin83 at gmail dot com> @@ -7,7 +7,7 @@ pkgname=cairo-dock-plugins pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Cairo-Dock' arch=('i686' 'x86_64') url="https://launchpad.net/${pkgname%-*}-plug-ins" diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 9ca661ed0..6c5e3ee9f 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,62 +1,28 @@ -# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $ +# $Id: PKGBUILD 104409 2014-01-20 11:01:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=calc -pkgver=2.12.4.8 +pkgver=2.12.4.13 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64 'mips64el') url="http://www.isthe.com/chongo/tech/comp/calc/" license=('GPL') -depends=(glibc) +depends=('readline') +makedepends=('chrpath') #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) -md5sums=('38694f375e172f0b830d4dbf9d6f2dcc') +md5sums=('7955e52ebd6b4f8482ef2b31c490eb35') build() { cd $srcdir/calc-$pkgver - - patch -p0 Makefile <<EOF -1146c1146 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1180c1180 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR} -1233c1233 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1275c1275 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1312c1312 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1350c1350 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1406c1406 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1443c1443 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -EOF - - make -j1 + make USE_READLINE="-DUSE_READLINE" READLINE_LIB="-lreadline" READLINE_EXTRAS="-lhistory -lncurses" -j1 } package() { cd $srcdir/calc-$pkgver make T=$pkgdir install mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ + chrpath -d $pkgdir/usr/bin/calc } diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index ff78a7dcd..70a109677 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 101406 2013-11-24 23:10:10Z cinelli $ +# $Id: PKGBUILD 103640 2014-01-08 16:42:15Z bgyorgy $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=1.1.3 +pkgver=1.2.2 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') -depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'taglib-extras') +depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'qjson' 'taglib-extras') optdepends=('perl-uri: dynamic playlist' 'mpd: playback') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") -md5sums=('22691c1ba9e0f94200f6cdb849be726a') +sha1sums=('89d84736ba4a43be7dc892af6fcbad5957075e19') + build() { cd "$srcdir/$pkgname-$pkgver" mkdir build @@ -25,7 +26,7 @@ build() { cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_PHONON=ON + -DENABLE_HTTP_STREAM_PLAYBACK=ON make } diff --git a/community/caps/PKGBUILD b/community/caps/PKGBUILD index b6000f4fa..ed8be7116 100644 --- a/community/caps/PKGBUILD +++ b/community/caps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96214 2013-08-21 19:31:33Z speps $ +# $Id: PKGBUILD 104536 2014-01-22 13:01:55Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=caps -pkgver=0.9.10 +pkgver=0.9.16 pkgrel=1 pkgdesc="The LADSPA C* Audio Plugin Suite" arch=('i686' 'x86_64') @@ -12,20 +12,20 @@ license=('GPL3') groups=('ladspa-plugins') depends=('ladspa') source=("http://quitte.de/dsp/caps_$pkgver.tar.bz2") -md5sums=('dac87bf3a967b6f6ddcea1d90b6f4808') +md5sums=('85e79596f22636b154b152efe54d05ce') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # use a minimum of optimization required to build export _CFLAGS='-msse -mfpmath=sse' } build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make PREFIX="$pkgdir/usr" install } diff --git a/community/ccfits/PKGBUILD b/community/ccfits/PKGBUILD new file mode 100644 index 000000000..7ab94bfd9 --- /dev/null +++ b/community/ccfits/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: <clu> +# Contributor: Jose San Juan <sanjuan@tng.iac.es> + +pkgname=ccfits +pkgver=2.4 +pkgrel=4 +pkgdesc="Object Oriented Interface to the CFITSIO Library" +arch=('i686' 'x86_64') +url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/" +license=('custom') +depends=('cfitsio') +source=(http://heasarc.gsfc.nasa.gov/docs/software/fitsio/${pkgname}/CCfits-${pkgver}.tar.gz) +md5sums=('dd9a11d964590dd5f3fd5a3491b2c1ce') + +build() { + cd "${srcdir}"/CCfits + + ./configure --with-cfitsio-libdir=/usr/lib --prefix=/usr + make +} + +package() { + cd "${srcdir}"/CCfits + + make DESTDIR="${pkgdir}" install + +#install license + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/$pkgname/License.txt" +} diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index f8328af12..0b5fec4d5 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 102093 2013-12-05 07:50:08Z giovanni $ +# $Id: PKGBUILD 105836 2014-02-16 08:59:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') url="http://pcsclite.alioth.debian.org/ccid.html" license=('LGPL' 'GPL') -depends=('pcsclite' 'libusbx') +depends=('pcsclite' 'libusbx' 'flex') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/file/3971/${pkgname}-${pkgver}.tar.bz2") -md5sums=('4596f82e85e2996f7877e892b5c18382') +source=("https://alioth.debian.org/frs/download.php/file/3989/${pkgname}-${pkgver}.tar.bz2") +md5sums=('c195333c953f5530bc04a194b5ac1b71') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cgal/PKGBUILD b/community/cgal/PKGBUILD new file mode 100644 index 000000000..eba147901 --- /dev/null +++ b/community/cgal/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 105550 2014-02-10 04:57:25Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Dmitriy Morozov <foxcub> + +pkgname=cgal +pkgver=4.3 +pkgrel=2 +_pkgid=32995 +pkgdesc="Computational Geometry Algorithms Library" +arch=('i686' 'x86_64') +url="http://www.cgal.org" +license=('GPL' 'LGPL') +source=(http://gforge.inria.fr/frs/download.php/$_pkgid/CGAL-$pkgver.tar.xz) +depends=('mpfr' 'boost-libs' 'gmp' 'mesa' 'glu') +optdepends=('qt4: for CGAL_Qt4' + 'eigen: for some packages, see the CGAL manual') +makedepends=('cmake' 'qt4' 'eigen' 'boost') +md5sums=('c0af5e3a56300b0c92ebd3a1f0df9149') + +# consider building with swig for python stuff + +build() { + cd "$srcdir/CGAL-$pkgver" + mkdir build + cd build + cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/CGAL-$pkgver/build" + make install DESTDIR="$pkgdir" + + # The tarball still has all theese licenses included + for _license in LICENSE{,.FREE_USE,.GPL,.LGPL}; do + install -D -m644 "$srcdir/CGAL-$pkgver/$_license" "$pkgdir/usr/share/licenses/$pkgname/$_license" + done +} diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 6e2356a17..92131c0ad 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,44 +1,44 @@ -# $Id: PKGBUILD 95633 2013-08-15 09:46:14Z spupykin $ +# $Id: PKGBUILD 104414 2014-01-20 11:04:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> -# Previous Maintainer: Loui Chang <louipc.ist at gmail com> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Patrick Palka <patrick@parcs.ath.cx> +# Contributor: Loui Chang <louipc.ist at gmail com> # Contributor: Andreas Baumann <abaumann at yahoo dot com> -# Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.2 -_gitver=1.8.3 -pkgrel=2 +pkgver=0.10 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') -url="http://hjemli.net/git/cgit" +url="http://git.zx2c4.com/cgit/" license=('GPL2') -depends=('openssl') +depends=('openssl' 'luajit') makedepends=('zlib' 'curl' 'asciidoc') install=cgit.install source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" - "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('fe11018eff8d79caad112f4fac64b90f' - '73224d3dc86c4999cc49484b49c9acc4' +md5sums=('19944c17ecea1b1d1944718ce8ce6b61' 'bd5696bea0654bfcf98f249b1a36737d') +prepare() { + cd "$pkgname-$pkgver" + make get-git +} + build() { cd "$pkgname-$pkgver" - _cgit_gitver=`grep 'GIT_VER = ' Makefile | cut -f3 -d\ ` - [ "x${_gitver}" == "x${_cgit_gitver}" ] || { msg "Bad git version"; return 1; } - rm -rf git/* - mv ../git-${_gitver}/* git/ make make doc-man } package() { cd "$pkgname-$pkgver" - make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" install install-man + + make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" prefix=/usr install install-man + install -vd "$pkgdir/var/cache/$pkgname" - install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/cgit/apache.example.conf - mkdir -p $pkgdir/usr/lib/cgit - mv $pkgdir/usr/share/webapps/cgit/cgit.cgi $pkgdir/usr/lib/cgit - ln -sf ../../../lib/cgit/cgit.cgi $pkgdir/usr/share/webapps/cgit/cgit.cgi + install -vDm0644 "$srcdir/apache.example.conf" "$pkgdir/etc/webapps/cgit/apache.example.conf" + mkdir -p "$pkgdir/usr/lib/cgit" + mv "$pkgdir/usr/share/webapps/cgit/cgit.cgi" "$pkgdir/usr/lib/cgit" + ln -sf ../../../lib/cgit/cgit.cgi "$pkgdir/usr/share/webapps/cgit/cgit.cgi" } diff --git a/community/cgit/cgit.install b/community/cgit/cgit.install index 7d696ada9..d45792886 100644 --- a/community/cgit/cgit.install +++ b/community/cgit/cgit.install @@ -1,7 +1,5 @@ post_install() { - echo -n "Setting ownership of /var/cache/cgit to http:http ... " chown -v http:http var/cache/cgit - echo "done." - echo -n "cgit looks at /etc/cgitrc for configuration. there is " - echo "an example configuration file in its manpage." + echo "==> cgit looks at /etc/cgitrc for configuration. There is" + echo "==> an example configuration file in the cgitrc(5) man page." } diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index d5030ee63..0dc231df3 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,52 +1,47 @@ -# $Id: PKGBUILD 96436 2013-08-28 21:03:26Z lcarlier $ +# $Id: PKGBUILD 103375 2014-01-04 11:27:06Z bpiotrowski $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=2.0.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>21.0' 'xulrunner<24.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>21.0' 'xulrunner<27.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') -#source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver -#source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip -source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz +source=(https://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz chmsee) install=chmsee.install md5sums=('c6a6ce009395c72ecf0530500ecda37c' '1787edd1de8aa75bd9fa75a5ab319e85') -build() { - cd ${srcdir}/chmsee-*/src +prepare() { + cd $pkgname-$pkgver + sed -i -e 's/^\(MaxVersion=\).*/\126.*/' application.ini +} +build() { + cd $pkgname-$pkgver/src cp Makefile.arch Makefile - #sed -i -e 's/17.*/18.0/g' ../application.ini - #sed -i -e 's/21.*/22.*/g' ../application.ini - - # xpcom has been merged into xul in xulrunner 22.0 - # sed -i -e 's/-lxpcom/-lxul/' common.mk - make -j1 } package() { - cd ${srcdir}/chmsee-* + cd $pkgname-$pkgver - install -d ${pkgdir}/usr/share/chmsee - cp -a * ${pkgdir}/usr/share/chmsee - rm -r ${pkgdir}/usr/share/chmsee/src + install -d "$pkgdir"/usr/share/chmsee + cp -a * "$pkgdir"/usr/share/chmsee + rm -r "$pkgdir"/usr/share/chmsee/src install -Dm644 data/chmsee.desktop.in \ - ${pkgdir}/usr/share/applications/chmsee.desktop + "$pkgdir"/usr/share/applications/chmsee.desktop + # Fix FS#25152 - sed -i -e 's/_//g' ${pkgdir}/usr/share/applications/chmsee.desktop - # - install -d ${pkgdir}/usr/share/pixmaps - install -Dm644 data/chmsee-icon.png ${pkgdir}/usr/share/pixmaps - install -Dm755 ${srcdir}/chmsee ${pkgdir}/usr/bin/chmsee -# install -d ${pkgdir}/usr/share/icons -# cp -a data/icons/* ${pkgdir}/usr/share/icons/ + sed -i -e 's/_//g' "$pkgdir"/usr/share/applications/chmsee.desktop + + install -d "$pkgdir"/usr/share/pixmaps + install -Dm644 data/chmsee-icon.png "$pkgdir"/usr/share/pixmaps + install -Dm755 ${srcdir}/chmsee "$pkgdir"/usr/bin/chmsee } diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD index 6991ac9d9..1801df6bd 100644 --- a/community/chntpw/PKGBUILD +++ b/community/chntpw/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 64647 2012-02-17 13:33:11Z lfleischer $ +# $Id: PKGBUILD 105665 2014-02-13 09:45:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=chntpw -pkgver=110511 -pkgrel=2 -pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file.' +pkgver=140201 +pkgrel=1 +pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database file' arch=('i686' 'x86_64' 'mips64el') url='http://pogostick.net/~pnh/ntpasswd/' license=('GPL' 'LGPL') makedepends=('openssl') source=("http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip") -md5sums=('a3fb358d1adec589cd6bc8dedf68896c') +md5sums=('d60bc657206b07ad84d926649d6417dc') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's/^CFLAGS= \(.*\) -m32 $/CFLAGS= \1/' Makefile +} - [ "$CARCH" != "i686" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile +build() { + cd "${srcdir}/${pkgname}-${pkgver}" make } diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index e54a0f628..3446c4752 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99445 2013-10-29 00:06:24Z thestinger $ +# $Id: PKGBUILD 105122 2014-01-31 23:52:20Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -8,8 +8,8 @@ # Contributor: Elisamuel Resto <ryuji@simplysam.us> pkgname=chrony -pkgver=1.29 -pkgrel=2 +pkgver=1.29.1 +pkgrel=1 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64' 'mips64el') url="http://chrony.tuxfamily.org/" @@ -19,7 +19,7 @@ depends=('readline' 'libcap') backup=('etc/chrony.conf') source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) -sha256sums=('c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b' +sha256sums=('658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27' 'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc') build() { diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD index 834e131c7..42ee3ef43 100644 --- a/community/cinnamon-settings-daemon/PKGBUILD +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -1,14 +1,14 @@ -# $Id$ +# $Id: PKGBUILD 103670 2014-01-09 06:32:51Z fyan $ # Maintainer: Alexandre Filgueira (faidoc) <alexfilgueira@antergos.com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=cinnamon-settings-daemon pkgver=2.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('cinnamon-desktop' 'ibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower') +depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower' 'libnotify') makedepends=('intltool' 'docbook-xsl' 'gnome-common') options=('!emptydirs') install=cinnamon-settings-daemon.install diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 9507b9290..77c9902bd 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' 'mips64el') 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/clamz/PKGBUILD b/community/clamz/PKGBUILD index 6cab64df8..8c3e452d3 100644 --- a/community/clamz/PKGBUILD +++ b/community/clamz/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57215 2011-10-24 18:32:20Z lfleischer $ +# $Id: PKGBUILD 103908 2014-01-13 17:16:39Z andyrtr $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=clamz pkgver=0.5 -pkgrel=1.1 +pkgrel=2 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store." arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/clamz/' diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index ff7aafaca..f853bab21 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99713 2013-10-30 23:11:42Z allan $ +# $Id: PKGBUILD 104636 2014-01-23 16:30:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ url="http://clanlib.org/" license=('zlib') depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl') makedepends=('doxygen' 'graphviz' 'mesa') -source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz) -md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3') +source=(http://www.clanlib.org/download/releases-3.0/ClanLib-${pkgver}.tgz) +md5sums=('29f2ce542019c6d5d8793cdf4811e4f9') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD index 3b9f09e1e..270acf835 100644 --- a/community/clearsilver/PKGBUILD +++ b/community/clearsilver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102895 2013-12-23 15:16:31Z spupykin $ +# $Id: PKGBUILD 104882 2014-01-28 03:34:09Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Aaron Griffin <aaron@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clearsilver pkgver=0.10.5 -pkgrel=12 +pkgrel=13 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64' 'mips64el') url='http://www.clearsilver.net' diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index b611c8908..6a17da8dc 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97815 2013-09-30 02:36:29Z xyne $ +# $Id: PKGBUILD 104366 2014-01-19 16:29:30Z bpiotrowski $ # Maintainer: Xyne <ca dot archlinux at xyne, backwards> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=cmus pkgver=2.5.0 -pkgrel=4 +pkgrel=5 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD index fe480af51..f945efbd2 100644 --- a/community/codeblocks/PKGBUILD +++ b/community/codeblocks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103157 2013-12-28 06:25:03Z bpiotrowski $ +# $Id: PKGBUILD 103790 2014-01-11 20:08:22Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Robert Hollencamp <rhollencamp@gmail.com> # Contributor: Daniel J Griffiths <griffithsdj@inbox.com> @@ -6,13 +6,13 @@ pkgname=codeblocks pkgver=13.12 -pkgrel=1 +pkgrel=2 pkgdesc='Open source and cross-platform C/C++ IDE' arch=('i686' 'x86_64' 'mips64el') url='http://www.codeblocks.org' license=('GPL3') depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache' - 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk' 'libsm') + 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk2.8' 'libsm') makedepends=('boost' 'zip') install=codeblocks.install source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz) @@ -20,6 +20,7 @@ md5sums=('4b450f620d9f1875ecf6882ab3c11402') build() { cd $pkgname-$pkgver + export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 ./configure --prefix=/usr --with-contrib-plugins=all make } diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index f9328104c..133830cd5 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99715 2013-10-30 23:12:24Z allan $ +# $Id: PKGBUILD 103909 2014-01-13 17:16:40Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -61,7 +61,6 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --sbindir=/usr/bin \ - --disable-static \ --with-python=/usr/bin/python2 make all } diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 4bf3244cc..1edfee031 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 102949 2013-12-24 22:58:06Z dwallace $ +#$Id: PKGBUILD 105262 2014-02-03 16:31:33Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.20 +pkgver=1.21 pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" @@ -15,9 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices' 'wpa_supplicant: For WiFi devices' 'pptpclient: for ppp support') makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp') -source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'allow_group_network.diff') -md5sums=('5e4c7b61321994a772ddccbb5835684d' +md5sums=('483633162b819c8b99fec970f92e311d' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 610f58c41..a653f603c 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102097 2013-12-05 08:05:48Z giovanni $ +# $Id: PKGBUILD 105507 2014-02-09 12:50:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.6.6 +pkgver=0.6.7 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('500c5aedec23a13e119ad0ece1ebca1d') +md5sums=('325fbb2dafeae826efe1c2b8fdca823c') build() { cd "${srcdir}" diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 28fb38e4b..4f834922d 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98518 2013-10-12 16:47:42Z jelle $ +# $Id: PKGBUILD 103687 2014-01-09 16:14:18Z jelle $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.62.1 -pkgrel=1 +pkgver=1.63.1 +pkgrel=2 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') url="http://cppcheck.wiki.sourceforge.net/" @@ -11,18 +11,17 @@ license=('GPL') depends=('qt5-base') makedepends=('docbook-xsl') source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz) -sha1sums=('2494a603bd505cc6ae5bd67286410a66cf7996b2') - +sha1sums=('19ad7251603356a82dc75a836dfad9629a3d12a0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make + make CFGDIR=/usr/share/cppcheck/cfg make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man cd gui export HAVE_RULES=yes qmake - make + make } package() { @@ -32,4 +31,8 @@ package() { install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1 install -m755 gui/cppcheck-gui "${pkgdir}"/usr/bin + + for _f in cfg/*; do + install -D -p -m 644 $_f "${pkgdir}"/usr/share/"${pkgname}"/$_f + done } diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD index 0b2f938e0..09cb60a01 100644 --- a/community/cuetools/PKGBUILD +++ b/community/cuetools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 98850 2013-10-20 09:41:43Z stativ $ +# $Id: PKGBUILD 103244 2013-12-31 11:13:25Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cuetools pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cue and toc file parsers and utilities" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/svend/cuetools" @@ -10,14 +10,16 @@ url="https://github.com/svend/cuetools" license=('GPL') depends=('glibc') source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz" - "fix_build_with_automake-1.12.diff") + "cuetag-fix_spaces.diff" "fix_build_with_automake-1.12.diff") md5sums=('4492dae2b3f9e077f6455a1f1cddef3b' + '60f4aba26e529e48dbedd2adef917117' '67a3b32711d1a1f508be6ed0f1bdadf3') prepare() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true + patch -Np1 < "$srcdir/cuetag-fix_spaces.diff" || true aclocal autoheader diff --git a/community/cuetools/cuetag-fix_spaces.diff b/community/cuetools/cuetag-fix_spaces.diff new file mode 100644 index 000000000..f240e9d37 --- /dev/null +++ b/community/cuetools/cuetag-fix_spaces.diff @@ -0,0 +1,46 @@ +From 21ee6cc40f02693928efbc4f3beeb681950c16b5 Mon Sep 17 00:00:00 2001 +From: Svend Sorensen <svend@ciffer.net> +Date: Sat, 23 Nov 2013 17:23:01 -0800 +Subject: [PATCH] cuetag: Fix handling of spaces in file names + +Fixes #14 +--- + src/tools/cuetag.sh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh +index f26fa20..448920f 100755 +--- a/src/tools/cuetag.sh ++++ b/src/tools/cuetag.sh +@@ -182,16 +182,15 @@ main() + ntrack=$(cueprint -d '%N' "$cue_file") + trackno=1 + +- FILES= FIELDS= ++ NUM_FILES=0 FIELDS= + for arg in "$@"; do + case "$arg" in +- *.*) FILES="$FILES $arg";; ++ *.*) NUM_FILES=$(expr $NUM_FILES + 1);; + *) FIELDS="$FIELDS $arg";; + esac + done + +- set -- $FILES +- if [ $# -ne $ntrack ]; then ++ if [ $NUM_FILES -ne $ntrack ]; then + echo "warning: number of files does not match number of tracks" + fi + +@@ -209,7 +208,7 @@ main() + *.[Tt][Xx][Tt]) + vorbis $trackno "$file" + ;; +- *) ++ *.*) + echo "$file: uknown file type" + ;; + esac +-- +1.8.5.1 + diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index ac6ae0c6b..3171442d3 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98721 2013-10-17 12:42:56Z spupykin $ +# $Id: PKGBUILD 105633 2014-02-12 12:40:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.19.2 +pkgver=0.20.1 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') @@ -12,14 +12,10 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-setuptools' 'python2-setuptools') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('4af1218346510b464c0a6bf15500d0e2') - -build() { - true -} +md5sums=('52431696c64e618036537c4d9aa79d99') package_cython() { - depends=('python') + depends=('python' 'python-setuptools') cd $srcdir/Cython-$pkgver python setup.py install --root=$pkgdir @@ -28,7 +24,7 @@ package_cython() { } package_cython2() { - depends=('python2') + depends=('python2' 'python2-setuptools') cd $srcdir/Cython-$pkgver python2 setup.py install --root=$pkgdir diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 9776702f8..e31faa832 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 95671 2013-08-15 12:15:55Z spupykin $ +# $Id: PKGBUILD 104831 2014-01-27 09:59:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat -pkgver=3.0.716 -pkgrel=2 +pkgver=3.0.718 +pkgrel=1 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") @@ -14,7 +14,7 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 darkstat.service darkstat.conf) install=darkstat.install -md5sums=('f334d3b8acd45cd06b5929a249abebe2' +md5sums=('1fb31ac01d4689493c917fa622a002e7' 'e28c56657502ce3e62c1fc6bf5ce59f7' 'aa9a9effd1e8f08860afcd6439fc94c5') options=(!makeflags !distcc) diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index e3181d4ed..143fdfcb7 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103146 2013-12-27 15:54:52Z spupykin $ +# $Id: PKGBUILD 105573 2014-02-10 13:31:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.4 +pkgver=1.4.1 _pkgver=1.4 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('896416931ded4579f528cd11edad470c') +md5sums=('78252618bb7b1df30109ef5484d46f3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD index d4ad316cc..f353194ca 100644 --- a/community/dart/PKGBUILD +++ b/community/dart/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100999 2013-11-14 15:05:53Z arodseth $ +# $Id: PKGBUILD 105737 2014-02-14 17:58:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: T. Jameson Little <t.jameson.little at gmail dot com> # Contributor: Usagi Ito <usagi@WonderRabbitProject.net> @@ -6,7 +6,7 @@ # Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com> pkgname=dart -pkgver=1.0 +pkgver=1.1.3 pkgrel=1 pkgdesc='The dart programming language SDK' arch=('x86_64' 'i686') @@ -17,14 +17,14 @@ makedepends=('setconf') options=('!strip') if [[ $CARCH == x86_64 ]]; then - source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip" - "license.html::https://code.google.com/intl/no/google_bsd_license.html") - sha256sums=('9bc14660399c3570fddd262eb9aa11b3e6e19b7a3c547d3b10d60ad905c52c9b' + source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip" + 'license.html::https://code.google.com/intl/no/google_bsd_license.html') + sha256sums=('5019225dd58ffba9ae726f100993345e2801f7b59f6b49edbb5020ec3621e67a' 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') else - source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip" - "license.html::https://code.google.com/intl/no/google_bsd_license.html") - sha256sums=('131afed9a220b2035375aee71e6b791248e6de51ee2612a21be3f6797e5bbfe6' + source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip" + 'license.html::https://code.google.com/intl/no/google_bsd_license.html') + sha256sums=('de33b20167727d50903c1cf33d86320472d728f93641ec37a541a233e377acc4' 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650') fi diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 388b6a5db..10925c65a 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102778 2013-12-19 17:41:26Z spupykin $ +# $Id: PKGBUILD 105591 2014-02-10 18:05:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.8 +pkgver=3.1.10 pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 817547e0b..bf8e3e027 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103173 2013-12-28 18:20:21Z lfleischer $ +# $Id: PKGBUILD 105335 2014-02-05 13:36:53Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc='A GTK+ audio player for GNU/Linux.' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,8 @@ url='http://deadbeef.sourceforge.net' license=('GPL2') depends=('gtk3' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' - 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate') + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate' + 'ffmpeg') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') optdepends=('libsamplerate: for Resampler plugin' 'libvorbis: for Ogg Vorbis playback' @@ -28,10 +29,11 @@ optdepends=('libsamplerate: for Resampler plugin' 'pulseaudio: for PulseAudio output plugin' 'libx11: for global hotkeys plugin' 'zlib: for Audio Overload plugin' - 'libzip: for vfs_zip plugin') + 'libzip: for vfs_zip plugin' + 'ffmpeg: for ffmpeg plugin') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f1bbb1a0164ed7bcba9c0c8cd1dddcb5') +md5sums=('dab446bde519ae95581885ff63a418c7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/deadbeef/deadbeef.install b/community/deadbeef/deadbeef.install index fcdbf15fb..eaf1b9a69 100644 --- a/community/deadbeef/deadbeef.install +++ b/community/deadbeef/deadbeef.install @@ -7,11 +7,6 @@ post_install() { post_upgrade() { post_install - - cat <<EOF -==> ffmpeg support was disabled in this deadbeef release due to -==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon. -EOF } post_remove() { diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index b2dfe16cd..a461cfc56 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99728 2013-10-30 23:21:11Z allan $ +# $Id: PKGBUILD 103318 2014-01-03 10:52:34Z bpiotrowski $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=17 +pkgrel=18 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD index 9d745438d..575707a27 100644 --- a/community/dispcalgui/PKGBUILD +++ b/community/dispcalgui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99412 2013-10-28 11:55:41Z tredaelli $ +# $Id: PKGBUILD 105728 2014-02-14 14:41:06Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Cedric Girard <girard.cedric@gmail.com> # Contributor: foxbunny <bg.branko@gmail.com> pkgname=dispcalgui -pkgver=1.5.3.1 +pkgver=1.7.5.7 pkgrel=1 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" arch=('i686' 'x86_64') @@ -14,11 +14,14 @@ makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'python2-setuptools depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy') optdepends=('gksu: For running as root') install=${pkgname}.install -source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") -md5sums=('1b7542ecee8f39a49b90197613a46a73') +source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz" + dispcalGUI-1.5.3.1-wxgtk3.patch) +md5sums=('7a66051d244f1b734448a865b50fae01' + 'b8001e5cbbb849f9ba95e0ef9fb1d073') prepare() { cd "${srcdir}"/dispcalGUI-${pkgver} + patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} + } diff --git a/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch new file mode 100644 index 000000000..e5c556031 --- /dev/null +++ b/community/dispcalgui/dispcalGUI-1.5.3.1-wxgtk3.patch @@ -0,0 +1,16 @@ +--- a/dispcalGUI/dispcalGUI.py ++++ b/dispcalGUI/dispcalGUI.py +@@ -1544,9 +1544,10 @@ + for lstr, lcode in llist: + menuitem = languages.Append(-1, "&" + lstr, kind=wx.ITEM_RADIO) + if (lcode.upper().replace("EN", "US") in flagart.catalog): +- menuitem.SetBitmap( +- flagart.catalog[lcode.upper().replace("EN", +- "US")].getBitmap()) ++ bitmap = flagart.catalog[lcode.upper().replace("EN", ++ "US")].getBitmap() ++ if menuitem.GetKind() == wx.ITEM_NORMAL: ++ menuitem.SetBitmap(bitmap) + if lang.getcode() == lcode: + menuitem.Check() + font = menuitem.Font diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index 9215782e4..d8cd387e3 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 102652 2013-12-17 09:06:19Z seblu $ +# $Id: PKGBUILD 105357 2014-02-05 21:59:10Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=0.7.2 +_truever=0.8.0 +pkgver=${_truever%.*} pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -10,11 +11,12 @@ arch=('x86_64') url='http://www.docker.io/' license=('Apache') depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd') -makedepends=('git' 'go') +makedepends=('git' 'go' 'btrfs-progs') +optdepends=('btrfs-progs: btrfs backend support') # don't strip binaries! A sha1 is used to check binary consistency. options=('!strip') install=$pkgname.install -source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver") +source=("git+https://github.com/dotcloud/docker.git#tag=v$_truever") md5sums=('SKIP') # magic harcoded path _magic=src/github.com/dotcloud @@ -38,8 +40,8 @@ check() { package() { cd "$_magic/docker" - install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker" - install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit" + install -Dm755 "bundles/$_truever/dynbinary/docker-$_truever" "$pkgdir/usr/bin/docker" + install -Dm755 "bundles/$_truever/dynbinary/dockerinit-$_truever" "$pkgdir/usr/lib/docker/dockerinit" # completion install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker" install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker" diff --git a/community/docker/docker.service b/community/docker/docker.service deleted file mode 100644 index b96d19ddb..000000000 --- a/community/docker/docker.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=http://docs.docker.io -After=network.target - -[Service] -ExecStartPre=/usr/bin/mount --make-rprivate / -ExecStart=/usr/bin/docker -d - -[Install] -WantedBy=multi-user.target diff --git a/community/dolphin-emu/PKGBUILD b/community/dolphin-emu/PKGBUILD index 1dbe03bb0..db96fd674 100644 --- a/community/dolphin-emu/PKGBUILD +++ b/community/dolphin-emu/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dolphin-emu pkgver=4.0.2 -pkgrel=1 +pkgrel=4 epoch=1 pkgdesc='A Gamecube / Wii / Triforce emulator' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://dolphin-emu.org' license=('GPL2') makedepends=('cmake' 'git' 'opencl-headers') -depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.9') +depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk') optdepends=('pulseaudio: PulseAudio backend') source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}" diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD index 9de493d2e..ee7ee3070 100644 --- a/community/dos2unix/PKGBUILD +++ b/community/dos2unix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83060 2013-01-27 09:35:12Z bpiotrowski $ +# $Id: PKGBUILD 103260 2013-12-31 20:20:56Z jelle $ # Maintainer: Bartłomiej Piotrowski # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom> # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com> pkgname=dos2unix -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=1 pkgdesc='Text file format converter' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('glibc') makedepends=('perl') conflicts=('hd2u') source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha256sums=('f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04') +sha256sums=('66bd224d4a7fbe13a3b61aa7083b5ef74cf6448a3670606c669f46a84bb9b37a') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD index c6cf9a28f..be3a98ef4 100644 --- a/community/dunst/PKGBUILD +++ b/community/dunst/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $ +# $Id: PKGBUILD 103648 2014-01-08 18:46:24Z bgyorgy $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: feuri pkgname=dunst pkgver=1.0.0 -pkgrel=1 -pkgdesc="a dmenu-ish notification system " +pkgrel=2 +pkgdesc="Customizable and lightweight notification-daemon" arch=('i686' 'x86_64' 'mips64el') -url="http://knopwob.github.com/dunst" -license=(MIT) +url="http://www.knopwob.org/dunst/" +license=(BSD) depends=(libxinerama libxss libxdg-basedir pango) -optdepends=("libnotify: notify-send" - "dbus: start dunst on demand") -makedepends=(libnotify dbus 'perl') +makedepends=(libnotify) provides=(notification-daemon) -source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2") +source=("http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2") +md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723') build() { make -C "$srcdir/$pkgname-$pkgver" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 @@ -24,5 +23,5 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="${pkgdir}" PREFIX=/usr install install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + # vim:set ts=2 sw=2 et: -md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723') diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 537eb1c89..d756f7ab1 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 96719 2013-09-03 12:45:13Z lfleischer $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 105459 2014-02-08 15:39:11Z bgyorgy $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.22 -pkgrel=1 +pkgver=0.6.23 +pkgrel=3 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') -depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko') +depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile') optdepends=('lftp: FTPS backend' 'python2-boto: Amazon S3 backend' 'python2-gobject: GIO backend' @@ -18,9 +19,18 @@ optdepends=('lftp: FTPS backend' 'python2-httplib2: Ubuntu One backend' 'python2-oauthlib: Ubuntu One backend' 'rsync: rsync backend') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('5b035359a6bb7b2f3f3b9829c6c071e1' - 'SKIP') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + "gpg-encode.patch") +md5sums=('ae0e84446bcf114735de1057ed53c977' + 'SKIP' + '366555c73aeebf7f15f6f37ec65176ce') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix gpg encrypted backup (FS#38838, upstream revision 961, will be fixed in 0.6.24). + patch -Np0 -i ../gpg-encode.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/duplicity/gpg-encode.patch b/community/duplicity/gpg-encode.patch new file mode 100644 index 000000000..f9159a3ca --- /dev/null +++ b/community/duplicity/gpg-encode.patch @@ -0,0 +1,216 @@ +=== modified file 'bin/duplicity' +--- bin/duplicity 2014-01-21 21:04:27 +0000 ++++ bin/duplicity 2014-02-05 02:57:13 +0000 +@@ -27,7 +27,7 @@ + # Please send mail to me or the mailing list if you find bugs or have + # any suggestions. + +-import getpass, gzip, os, sys, time, types ++import gzip, os, sys, time, types + import traceback, platform, statvfs, resource, re + import threading + from datetime import datetime +@@ -37,9 +37,6 @@ + if os.path.exists(os.path.join(pwd, "../duplicity")): + sys.path.insert(0, os.path.abspath(os.path.join(pwd, "../."))) + +-import gettext +-gettext.install('duplicity', codeset='utf8') +- + from duplicity import log + log.setup() + +@@ -65,6 +62,13 @@ + # If exit_val is not None, exit with given value at end. + exit_val = None + ++def getpass_safe(message): ++ # getpass() in Python 2.x will call str() on our prompt. So we can't pass ++ # in non-ascii characters. ++ import getpass, locale ++ message = message.encode(locale.getpreferredencoding(), 'replace') ++ return getpass.getpass(message) ++ + def get_passphrase(n, action, for_signing = False): + """ + Check to make sure passphrase is indeed needed, then get +@@ -160,19 +164,19 @@ + if use_cache and globals.gpg_profile.signing_passphrase: + pass1 = globals.gpg_profile.signing_passphrase + else: +- pass1 = getpass.getpass(_("GnuPG passphrase for signing key:")+" ") ++ pass1 = getpass_safe(_("GnuPG passphrase for signing key:")+" ") + else: + if use_cache and globals.gpg_profile.passphrase: + pass1 = globals.gpg_profile.passphrase + else: +- pass1 = getpass.getpass(_("GnuPG passphrase:")+" ") ++ pass1 = getpass_safe(_("GnuPG passphrase:")+" ") + + if n == 1: + pass2 = pass1 + elif for_signing: +- pass2 = getpass.getpass(_("Retype passphrase for signing key to confirm: ")) ++ pass2 = getpass_safe(_("Retype passphrase for signing key to confirm: ")) + else: +- pass2 = getpass.getpass(_("Retype passphrase to confirm: ")) ++ pass2 = getpass_safe(_("Retype passphrase to confirm: ")) + + if not pass1 == pass2: + print _("First and second passphrases do not match! Please try again.") + +=== modified file 'bin/rdiffdir' +--- bin/rdiffdir 2013-12-27 06:39:00 +0000 ++++ bin/rdiffdir 2014-02-05 02:57:13 +0000 +@@ -27,9 +27,6 @@ + + import sys, getopt, gzip, os + +-import gettext +-gettext.install('duplicity', codeset='utf8') +- + from duplicity import diffdir + from duplicity import patchdir + from duplicity import log + +=== added directory 'testing/overrides' +=== added file 'testing/overrides/gettext.py' +--- testing/overrides/gettext.py 1970-01-01 00:00:00 +0000 ++++ testing/overrides/gettext.py 2014-02-05 02:57:13 +0000 +@@ -0,0 +1,34 @@ ++# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf8 -*- ++# ++# Copyright 2014 Michael Terry <mike@mterry.name> ++# ++# This file is part of duplicity. ++# ++# Duplicity is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation; either version 2 of the License, or (at your ++# option) any later version. ++# ++# Duplicity is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with duplicity; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++# This is just a small override to the system gettext.py which allows us to ++# always return a string with fancy unicode characters, which will notify us ++# if we ever get a unicode->ascii translation by accident. ++ ++def translation(*args, **kwargs): ++ class Translation: ++ ZWSP = u"" # ZERO WIDTH SPACE, basically an invisible space separator ++ def install(self, **kwargs): ++ import __builtin__ ++ __builtin__.__dict__['_'] = lambda x: x + self.ZWSP ++ def ungettext(self, one, more, n): ++ if n == 1: return one + self.ZWSP ++ else: return more + self.ZWSP ++ return Translation() + +=== modified file 'testing/run-tests' +--- testing/run-tests 2011-11-24 01:49:53 +0000 ++++ testing/run-tests 2014-02-05 02:57:13 +0000 +@@ -25,9 +25,9 @@ + + THISDIR=$(pwd) + export TZ=US/Central +-export LANG= ++export LANG=en_US.UTF-8 + # up for 'duplicity' module and here for 'helper.py' +-export PYTHONPATH="$(dirname $THISDIR):$THISDIR/helpers" ++export PYTHONPATH="$THISDIR/overrides:$(dirname $THISDIR):$THISDIR/helpers" + export GNUPGHOME="$THISDIR/gnupg" + export PATH="$(dirname $THISDIR)/bin:$PATH" + + +=== modified file 'testing/tests/finaltest.py' +--- testing/tests/finaltest.py 2012-11-24 19:45:09 +0000 ++++ testing/tests/finaltest.py 2014-02-05 02:57:13 +0000 +@@ -20,6 +20,7 @@ + # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + import helper ++import pexpect + import sys, os, unittest + + import duplicity.backend +@@ -50,7 +51,8 @@ + """ + Test backup/restore using duplicity binary + """ +- def run_duplicity(self, arglist, options = [], current_time = None): ++ def run_duplicity(self, arglist, options = [], current_time = None, ++ passphrase_input = None): + """Run duplicity binary with given arguments and options""" + options.append("--archive-dir testfiles/cache") + cmd_list = ["duplicity"] +@@ -62,22 +64,23 @@ + cmd_list.extend(arglist) + cmdline = " ".join(cmd_list) + #print "Running '%s'." % cmdline +- if not os.environ.has_key('PASSPHRASE'): ++ if passphrase_input is None and not os.environ.has_key('PASSPHRASE'): + os.environ['PASSPHRASE'] = 'foobar' +- return_val = os.system(cmdline) ++ (output, return_val) = pexpect.run(cmdline, withexitstatus=True, ++ events={'passphrase.*:': passphrase_input}) + if return_val: + raise CmdError(return_val) + +- def backup(self, type, input_dir, options = [], current_time = None): ++ def backup(self, type, input_dir, options = [], **kwargs): + """Run duplicity backup to default directory""" + options = options[:] + if type == "full": + options.insert(0, 'full') + args = [input_dir, "'%s'" % backend_url] +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def restore(self, file_to_restore = None, time = None, options = [], +- current_time = None): ++ **kwargs): + options = options[:] # just nip any mutability problems in bud + assert not os.system("rm -rf testfiles/restore_out") + args = ["'%s'" % backend_url, "testfiles/restore_out"] +@@ -85,17 +88,17 @@ + options.extend(['--file-to-restore', file_to_restore]) + if time: + options.extend(['--restore-time', str(time)]) +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def verify(self, dirname, file_to_verify = None, time = None, options = [], +- current_time = None): ++ **kwargs): + options = ["verify"] + options[:] + args = ["'%s'" % backend_url, dirname] + if file_to_verify: + options.extend(['--file-to-restore', file_to_verify]) + if time: + options.extend(['--restore-time', str(time)]) +- self.run_duplicity(args, options, current_time) ++ self.run_duplicity(args, options, **kwargs) + + def deltmp(self): + """Delete temporary directories""" +@@ -255,6 +258,12 @@ + assert chain.start_time == 30000, chain.start_time + assert chain.end_time == 40000, chain.end_time + ++ def test_piped_password(self): ++ """Make sure that prompting for a password works""" ++ self.backup("full", "testfiles/empty_dir", ++ passphrase_input="foobar\nfoobar\n") ++ self.restore(passphrase_input="foobar\n") ++ + class FinalTest1(FinalTest, unittest.TestCase): + def setUp(self): + assert not os.system("tar xzf testfiles.tar.gz > /dev/null 2>&1") + diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index cb43d7cf8..2272dff16 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 98737 2013-10-17 14:01:43Z andyrtr $ +# $Id: PKGBUILD 103699 2014-01-10 10:25:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff -pkgver=2.0.4 -pkgrel=5 +pkgver=2.0.9 +pkgrel=1 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") -md5sums=('1bb69cbfb76583f69c6912f925fc4cec') +md5sums=('f8364e1257011cc9dfe349775a651606') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD index edcc42159..eb45c7f30 100644 --- a/community/elasticsearch/PKGBUILD +++ b/community/elasticsearch/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102806 2013-12-20 13:45:23Z mtorromeo $ +# $Id: PKGBUILD 105667 2014-02-13 10:14:53Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost> # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer> pkgname=elasticsearch -pkgver=0.90.8 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') url="http://www.elasticsearch.org/" @@ -15,7 +15,9 @@ install='elasticsearch.install' source=( "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz" elasticsearch.service + elasticsearch@.service elasticsearch-tmpfile.conf + elasticsearch-sysctl.conf ) backup=('etc/elasticsearch/elasticsearch.yml' @@ -34,7 +36,7 @@ prepare() { done done - sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh + sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh bin/plugin echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh @@ -66,10 +68,14 @@ package() { install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh" install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service" + install -Dm644 "$srcdir/elasticsearch@.service" "$pkgdir/usr/lib/systemd/system/elasticsearch@.service" install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf" + install -Dm644 "$srcdir/elasticsearch-sysctl.conf" "$pkgdir/usr/lib/sysctl.d/elasticsearch.conf" } -sha256sums=('4006e9aa9382f386e79a1c44a14c1aef34765eb5480fb6b29a2facf62ab3a321' - '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb' - '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f') +sha256sums=('0150bc7609c885eb2868bd27b817051e08b4bbe50a8aad5a51698c43283cd51b' + 'ab13ccda28bf90a10b570e095afc47ddef68da7e45546b2d45e74722c9095f0a' + 'a04ac09172158611a03dda096b670fe6586ae11b6b3d4de7965ed2b90cb3319f' + '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f' + 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c') diff --git a/community/elasticsearch/elasticsearch-sysctl.conf b/community/elasticsearch/elasticsearch-sysctl.conf new file mode 100644 index 000000000..32da2c91c --- /dev/null +++ b/community/elasticsearch/elasticsearch-sysctl.conf @@ -0,0 +1 @@ +vm.max_map_count=262144
\ No newline at end of file diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service index 28364b878..4121332af 100644 --- a/community/elasticsearch/elasticsearch.service +++ b/community/elasticsearch/elasticsearch.service @@ -1,12 +1,15 @@ [Unit] Description=ElasticSearch +Documentation=http://www.elasticsearch.org After=network.target [Service] User=elasticsearch Type=forking PIDFile=/run/elasticsearch/elasticsearch.pid -ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid +ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid +LimitNOFILE=65535 +TimeoutStopSec=20 Restart=on-failure [Install] diff --git a/community/elasticsearch/elasticsearch@.service b/community/elasticsearch/elasticsearch@.service new file mode 100644 index 000000000..093f7df59 --- /dev/null +++ b/community/elasticsearch/elasticsearch@.service @@ -0,0 +1,16 @@ +[Unit] +Description=ElasticSearch +Documentation=http://www.elasticsearch.org +After=network.target + +[Service] +User=elasticsearch +Type=forking +PIDFile=/run/elasticsearch/%I.pid +ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml +LimitNOFILE=65535 +TimeoutStopSec=20 +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index 5d1d861f5..4a1ca91a7 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102244 2013-12-07 10:36:28Z bpiotrowski $ +# $Id: PKGBUILD 103792 2014-01-11 20:08:25Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=12 +pkgrel=14 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') +depends=('curl' 'flam3' 'ffmpeg' 'wxgtk' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') makedepends=('boost' 'mesa' 'glu' 'tinyxml') optdepends=('xscreensaver: to use electricsheep with xscreensaver') options=('!emptydirs') @@ -36,7 +36,6 @@ mksource() { prepare() { cd ${pkgname}-${pkgver} - sed -i 's/wx-config/wx-config-2.9/g' configure.ac sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac sed -i '12 i\ #include <cstdio>' Common/Singleton.h diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index 2a204e520..7f518f162 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99737 2013-10-30 23:24:24Z allan $ +# $Id: PKGBUILD 103880 2014-01-13 09:10:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bj?indeijer <bjorn@lindeijer.nl> pkgname=enet -pkgver=1.3.9 +pkgver=1.3.11 pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://enet.bespin.org/' license=('custom') depends=('glibc') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('c188e380024f346758376290ad80a1c89e206171') +sha1sums=('f1b2e49aa2bbdd7d75e889f3f6d3b0c1a56b6080') build() { cd "${pkgname}-${pkgver}" diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index c90038f3c..aeef7e0ff 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102627 2013-12-16 21:55:26Z arodseth $ +# $Id: PKGBUILD 105465 2014-02-08 18:44:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R16B03 -pkgrel=2 +pkgver=R16B03_1 +pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') url='http://www.erlang.org/' @@ -25,27 +25,27 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" 'epmd.service' 'epmd.socket' 'epmd.conf') -sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06' - 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452' +sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7' + '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d' 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') build() { - cd "otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_/-}" ./configure --prefix=/usr --enable-smp-support --with-odbc make } package() { - cd "otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_/-}" make DESTDIR="$pkgdir" install # Documentation install -d "$pkgdir/usr/share/doc/erlang" - install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \ + install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \ "$srcdir"/{README,COPYRIGHT} \ "$pkgdir/usr/share/doc/erlang" @@ -54,7 +54,7 @@ package() { cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" # License - install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \ + install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" # Remove files that are packaged as erlang-unixodbc diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 729afd716..09df10d21 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102626 2013-12-16 21:55:05Z arodseth $ +# $Id: PKGBUILD 105463 2014-02-08 18:29:03Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,26 +8,26 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R16B03 -pkgrel=2 +pkgver=R16B03_1 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://www.erlang.org/' license=('custom') -makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9') +makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'glu') options=('staticlibs') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz" 'epmd.service' 'epmd.socket' 'epmd.conf') -sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06' - 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452' +sha256sums=('17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7' + '0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d' 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e' '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34' '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2') build() { - cd "otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_/-}" ./configure --prefix=/usr --enable-smp-support --with-odbc make @@ -35,20 +35,20 @@ build() { package_erlang() { pkgdesc='General-purpose concurrent functional programming language developed by Ericsson' - depends=('ncurses' 'glu' 'wxgtk' 'wxgtk2.9' 'openssl') + depends=('ncurses' 'glu' 'wxgtk' 'openssl') optdepends=('erlang-unixodbc: database support' 'java-environment: for Java support' 'lksctp-tools: for SCTP support') provides=('erlang-nox') conflicts=('erlang-nox') - cd "otp_src_${pkgver/_1/}" + cd "otp_src_${pkgver/_/-}" make DESTDIR="$pkgdir" install # Documentation install -d "$pkgdir/usr/share/doc/erlang" - install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \ + install -m0644 "$srcdir/otp_src_${pkgver/_/-}/README.md" \ "$srcdir"/{README,COPYRIGHT} \ "$pkgdir/usr/share/doc/erlang" @@ -57,7 +57,7 @@ package_erlang() { cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang/" # License - install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \ + install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" # Move over files that will be packaged as erlang-unixodbc @@ -82,7 +82,7 @@ package_erlang-unixodbc() { mv "$srcdir/odbc.3.gz" "$pkgdir/usr/lib/erlang/man/man3/" # License - install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \ + install -Dm0644 "$srcdir/otp_src_${pkgver/_/-}/EPLICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index 614d786da..adaf8d9e0 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99738 2013-10-30 23:24:51Z allan $ +# $Id: PKGBUILD 103822 2014-01-11 20:36:36Z bgyorgy $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') pkgver=0.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.github.com/ettercap/" license=('GPL') @@ -48,25 +48,8 @@ package_ettercap-gtk() { backup=('etc/ettercap/etter.conf') conflicts=('ettercap') provides=('ettercap') - optdepends=('polkit-gnome') - install='ettercap-gtk.install' + optdepends=('polkit: to run ettercap directly from menu') - install -d $pkgdir/usr/share/polkit-1/actions/ cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build make DESTDIR="${pkgdir}" install - -#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" -#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" - - # Install policy file - #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" - - # We need rename the original script - #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" - - # Install launcher script - #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap - #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap - #chmod 755 ${pkgdir}/usr/bin/ettercap - } diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install deleted file mode 100644 index e8f6bed8f..000000000 --- a/community/ettercap/ettercap-gtk.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 9cf53929f..d519edf26 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 100541 2013-11-05 17:38:22Z fyan $ +# $Id: PKGBUILD 103671 2014-01-09 06:33:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> ## Mozc compile option _bldtype=Release -_zipcoderel=201310 +_zipcoderel=201312 _protobuf_ver=2.5.0 -_gyp_rev=1774 +_gyp_rev=1828 _pkgbase=mozc _revision=178 pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" -pkgver=1.12.1599.102 +pkgver=1.13.1651.102 _patchver=${pkgver}.1 -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/mozc/" license=('custom') @@ -23,9 +23,9 @@ depends=('qt4' 'fcitx' 'zinnia') makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn') replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx') -source=(svn+http://mozc.googlecode.com/svn#revision=$_revision +source=(mozc::svn+http://mozc.googlecode.com/svn/trunk/src#revision=$_revision gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev - http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip + http://downloads.sourceforge.net/pnsft-aur/x-ken-all${_zipcoderel}.zip http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch @@ -41,7 +41,7 @@ build() { CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden" - cd svn/trunk/src + cd mozc # Apply fcitx patch rm unix/fcitx -rf @@ -57,7 +57,7 @@ build() { # Generate zip code seed msg "Generating zip code seed..." - python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt + python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt msg "Done." # Copy gyp @@ -81,7 +81,7 @@ build() { } package() { - cd svn/trunk/src + cd mozc install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server" install -m 755 out_linux/${_bldtype}/mozc_tool "${pkgdir}/usr/lib/mozc/mozc_tool" @@ -114,8 +114,8 @@ package() { sha512sums=('SKIP' 'SKIP' - 'f4ba607dc8d8ad6b12fbf47e6a9b56e1dee5552db65bb6a21e55b3db8567601df4e916f88ee039bb4f84dd7ad9994ad9e7b494fbb06d14b8ce6c8ca316e3a571' - '551fd2ee44a0cdf317885351528d5248fc56c261e73b793ac46c8f043a6f5461e1e4400df67cd151a01891217185fc12993a6a0d727d9f8217947d9b23d7b69c' + 'f05c779257c8bc6e51ba8ab9fddec918a6de29d45c756bd3b83d42cb99265ada85313e980518096338ebcadcd0fe6433cbd9ad20a74f4116975eb7c168b72d81' + '87e8733cfc11528fa698b0a48f4e89c0dd02e2d79c804025219531fad4776cfcba720d720003d83a65401b4631c9ae1adc3395d18965066d232a76794ae3d54f' '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee' - 'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc' + 'cd879029d87fd80a70796bd83ac67decbb58b181acafcee22110cb46a50c371c82b67babcfe80b1c05fa9beef3d3a7ddd580105a70c411795cf8c9ef745661e2' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a') diff --git a/community/fdkaac/PKGBUILD b/community/fdkaac/PKGBUILD new file mode 100644 index 000000000..4fb2b731a --- /dev/null +++ b/community/fdkaac/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 105355 2014-02-05 21:53:04Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: PelPix <kylebloss@pelpix.info> + +pkgname=fdkaac +pkgver=0.5.1 +pkgrel=2 +pkgdesc='Command line encoder frontend for libfdk-aac' +arch=('i686' 'x86_64') +url="https://github.com/nu774/${pkgname}" +license=('custom') +depends=('libfdk-aac') +source=("${url}/archive/v${pkgver}.tar.gz") +sha256sums=('95d6e9675ab03f42aa3cb642a686ffaced782a7b440563bd37ef2d4517391348') + +build() { + cd ${pkgname}-${pkgver} + + autoreconf -if + ./configure --prefix='/usr' --disable-rpath + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/ +} + +# vim: ts=2 sw=2 et: diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD index 74d0e96b1..9223888cc 100644 --- a/community/ffms2/PKGBUILD +++ b/community/ffms2/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 99739 2013-10-30 23:25:12Z allan $$ +# $Id: PKGBUILD 105637 2014-02-12 15:41:55Z alucryd $$ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ffms2 pkgver=2.19 -pkgrel=1 -pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" +pkgrel=2 +pkgdesc='A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access' arch=('i686' 'x86_64') -url="https://github.com/FFMS/ffms2" -license=('MIT') +url='https://github.com/FFMS/ffms2' +license=('GPL') depends=('ffmpeg') -replaces=('ffmpegsource') +provides=('vapoursynth-plugin-ffms2') source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz") sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811') build() { cd ${pkgname}-${pkgver} - ./configure --prefix='/usr' --enable-shared --disable-static + ./configure --prefix='/usr' --enable-shared --disable-static --enable-avresample make } @@ -25,9 +25,8 @@ package() { make DESTDIR="${pkgdir}" install -# License - install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING + install -dm 755 "${pkgdir}"/usr/lib/vapoursynth + ln -s ../libffms2.so "${pkgdir}"/usr/lib/vapoursynth/ } # vim: ts=2 sw=2 et: diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index e2c69f28e..8e23f62bb 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 95254 2013-08-07 20:59:40Z bluewind $ +# $Id: PKGBUILD 105647 2014-02-12 18:26:37Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.3 +pkgver=3.7.4.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') url="http://filezilla-project.org/" license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' '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") build() { cd "${pkgname}-${pkgver}" - ./autogen.sh + export WX_CONFIG_PATH='/usr/bin/wx-config-2.8' + export WXRC='/usr/bin/wxrc-2.8' + ./autogen.sh ./configure \ --prefix=/usr \ --disable-manualupdatecheck \ @@ -31,4 +33,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('df7828739a852ac3adbc1c010303115d') +md5sums=('e6c24c4ddc0fe5470fe890b5b2f5b49a') diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD index cd21e0fe9..a0e19b885 100644 --- a/community/flickcurl/PKGBUILD +++ b/community/flickcurl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100106 2013-11-01 17:15:29Z spupykin $ +# $Id: PKGBUILD 103303 2014-01-02 22:42:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=flickcurl -pkgver=1.24 -pkgrel=2 +pkgver=1.25 +pkgrel=1 pkgdesc="C library for the Flickr API" arch=(i686 x86_64 'mips64el') url="http://librdf.org/flickcurl/" license=('GPL') depends=('raptor' 'curl') source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) -md5sums=('7cf6a627465471d76a5f4dc31099d9cf') +md5sums=('9598526f2b9a0a4619d1f1563300e72a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 0c9058a7d..e7f9ffa3b 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100324 2013-11-02 09:25:51Z spupykin $ +# $Id: PKGBUILD 103884 2014-01-13 10:05:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD index f85c65c46..4ea8fd0a9 100644 --- a/community/fswebcam/PKGBUILD +++ b/community/fswebcam/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 93773 2013-07-10 07:27:13Z bpiotrowski $ +# $Id: PKGBUILD 105615 2014-02-11 18:34:43Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Philipp Robbel <robbel@gmail.com> pkgname=fswebcam -pkgver=20110717 -pkgrel=3 +pkgver=20140113 +pkgrel=1 pkgdesc="Tiny and flexible webcam app." arch=('i686' 'x86_64' 'mips64el') url="http://www.firestorm.cx/fswebcam" license=('GPL') depends=('gd') backup=("etc/$pkgname.conf") -source=("$url/files/$pkgname-$pkgver.tar.gz") -md5sums=('6e09f1f31cf7cd0ac1d4d688a0acbe41') +source=("$url/files/$pkgname-$pkgver.tar.xz") +md5sums=('1bfdb21904e816f100370ec8f4df986b') +sha1sums=('6c1f3e3c8cf3189f0e2a5d4f8c9534c855c02e0a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index 3cba40d6c..c1e5219fc 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,31 +1,51 @@ -# $Id: PKGBUILD 92890 2013-06-18 08:47:35Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 104578 2014-01-23 04:23:17Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Alexander Fehr <pizzapunk gmail com> -pkgname=galculator +pkgbase=galculator +pkgname=(galculator galculator-gtk2) pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64' 'mips64el') url='http://galculator.sourceforge.net/' license=('GPL') -depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') +depends=('gtk3' 'gtk2') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) sha256sums=('23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b') build() { + # GTK3 version + cd $pkgname-$pkgver + [ -e gtk3 ] || mkdir gtk3 + cd gtk3 + ../configure --prefix=/usr + make + + # GTK2 version cd $srcdir/$pkgname-$pkgver - - LDFLAGS+=' -lm' - ./configure --prefix=/usr + [ -e gtk2 ] || mkdir gtk2 + cd gtk2 + ../configure --prefix=/usr --disable-gtk3 make } -package() { - cd $srcdir/$pkgname-$pkgver +package_galculator() { + depends=('gtk3') + + cd $pkgbase-$pkgver/gtk3 + make DESTDIR="$pkgdir" install +} + +package_galculator-gtk2() { + pkgdesc+=' (GTK2 version)' + depends=('gtk2') + conflicts=('galculator') + cd $pkgbase-$pkgver/gtk2 make DESTDIR="$pkgdir" install } diff --git a/community/galculator/galculator.install b/community/galculator/galculator.install index fe845ffb1..1a05f573e 100644 --- a/community/galculator/galculator.install +++ b/community/galculator/galculator.install @@ -1,11 +1,11 @@ post_install() { - update-desktop-database -q - [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { post_install } + post_remove() { post_install } diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index c80f85c19..347487bad 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101792 2013-12-01 09:52:05Z andyrtr $ +# $Id: PKGBUILD 104508 2014-01-22 06:40:19Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') -pkgver=3.5.1 -pkgrel=2 +pkgver=3.5.2 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -31,7 +31,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti 'gmime') options=('!emptydirs' 'libtool') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('40f9057cd3686020fbe66a043a2ea400') +md5sums=('685b7214453c1ae9133a46411b12ed8d') create_dirs() { install -dm755 ${pkgdir}/usr/lib/gambas3 diff --git a/community/gambit-c/PKGBUILD b/community/gambit-c/PKGBUILD new file mode 100644 index 000000000..e4eef8645 --- /dev/null +++ b/community/gambit-c/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Christian Babeux <christian.babeux@0x80.ca> + +_distname=gambc-v4_7_1 +pkgname=gambit-c +pkgver=4.7.1 +pkgrel=2 +pkgdesc='Scheme R5RS interpreter and compiler (via C)' +arch=('x86_64' 'i686') +url='http://dynamo.iro.umontreal.ca/wiki/index.php/Main_Page' +license=('LGPL2.1' 'Apache') +install="$pkgname.install" +source=(http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/${_distname}.tgz) +sha256sums=('6b7d58f1e28169d2c873386a1cf7e321e96d23ffd4b3238b105d66ca6bdd7472') + +build() { + cd "$_distname" + + ./configure --prefix=/usr --docdir=/usr/share/doc/gambit-c \ + --infodir=/usr/share/info --libdir=/usr/lib/gambit-c \ + --enable-gcc-opts --enable-single-host + make +} + +package() { + make -C "$_distname" install DESTDIR="$pkgdir" + # gsc conflicts with the one provided by ghostscript + mv "$pkgdir/usr/bin/gsc" "$pkgdir/usr/bin/gambitc" + ln -sf /usr/bin/gambitc "$pkgdir/usr/bin/gsc-script" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gambit-c/gambit-c.install b/community/gambit-c/gambit-c.install new file mode 100644 index 000000000..ed08d59db --- /dev/null +++ b/community/gambit-c/gambit-c.install @@ -0,0 +1,16 @@ +_infodir=/usr/share/info +_iinfoargs="$_infodir/gambit-c.info.gz $_infodir/dir" + +post_install() { + install-info ${_iinfoargs} +} + +post_upgrade() { + post_install $@ +} + +pre_remove() { + install-info --delete ${_iinfoargs} +} + +# vim:set ts=2 sw=2 et: diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 93e6f1412..fc8972627 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 100632 2013-11-06 16:42:49Z foutrelis $ +# $Id: PKGBUILD 103779 2014-01-11 14:29:12Z bgyorgy $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris pkgver=13.11 -pkgrel=1 +pkgrel=2 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64' 'mips64el') url="http://gcompris.net/" license=('GPL3') -depends=('pygtk' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins') +depends=('pygtk' 'librsvg' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' 'tuxpaint: for the painting activity') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext') +makedepends=('texinfo' 'texi2html' 'intltool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha256sums=('418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57') @@ -30,7 +30,7 @@ build() { } package() { - depends+=("gcompris-data=$pkgver-$pkgrel") + depends+=("gcompris-data=$pkgver") cd $pkgname-$pkgver make DESTDIR="$pkgdir" install-exec diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index 52450d1dd..bb1b0a372 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 102765 2013-12-19 13:49:34Z fyan $ +# $Id: PKGBUILD 103623 2014-01-08 12:17:02Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal -pkgver=1.10.0 -pkgrel=6 +pkgver=1.10.1 +pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gdal.org/" license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') makedepends=('perl' 'swig' 'chrpath') optdepends=('postgresql: postgresql database support' 'mariadb: mariadb database support' @@ -19,7 +19,7 @@ optdepends=('postgresql: postgresql database support' changelog=$pkgname.changelog source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz gdal-1.5.1-python-install.patch) -sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487' +sha256sums=('9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea' '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6') build() { @@ -39,7 +39,7 @@ build() { ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \ --with-geotiff --with-mysql --with-python --without-libtool --with-curl \ - --with-hdf5 --with-perl --with-geos --with-png + --with-hdf5 --with-perl --with-geos --with-png --with-poppler # workaround for bug #13646 sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 3ed37cf9a..01aeea0fe 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.2 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -17,7 +17,7 @@ source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' - '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') + '82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -72,7 +72,7 @@ package_gdc() depends=('gcc' 'binutils') optdepends=('libgphobos-devel: D standard library, GDC version') provides=("d-compiler") - pkgdesc="Compiler for D programming language wich uses gcc backend" + pkgdesc="Compiler for D programming language which uses gcc backend (2.064.2 frontend version)" install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d @@ -86,20 +86,21 @@ package_libgphobos-devel() depends=('gdc') # druntime - install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di - cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core - cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc + install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di + install -D $srcdir/gdc/libphobos/libdruntime/__entrypoint.di ${pkgdir}/usr/include/dlang/gdc/__entrypoint.di + cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/core + cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/gcc # workaround for auto-generated libbacktrace issue # script needs to be re-written to first call normal gcc instalaltion targets to # avoid such problems in future - cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/$pkgver/gcc - rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in + cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/ + rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in # phobos - cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d - cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std - cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc + cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/ + cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std + cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a } diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index 05fc9991a..625d844b0 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,5 +1,22 @@ +diff --git a/libphobos/configure.ac b/libphobos/configure.ac +index 51d9b86..6ff04f1 100644 +--- a/libphobos/configure.ac ++++ b/libphobos/configure.ac +@@ -239,9 +239,9 @@ else + fi + + if test "${gdc_host}" != "${gdc_target}"; then +- gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d ++ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang + else +- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gdc + fi + AC_SUBST(gdc_include_dir) + AC_ARG_WITH([cross-host], + diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in -index 9570bf3..52addc0 100644 +index 17e5c45..8a656b1 100644 --- a/gcc/d/Make-lang.in +++ b/gcc/d/Make-lang.in @@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor @@ -7,27 +24,11 @@ index 9570bf3..52addc0 100644 # This should be configured ifeq ($(host), $(target)) - D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version) -+ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version) ++ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir) else - gcc_d_include_dir = $(libsubdir)/include/d + gcc_d_include_dir = $(libsubdir)/include/dlang/gdc endif - - -diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index dfb8fec..0b88ff4 100644 ---- a/libphobos/configure.ac -+++ b/libphobos/configure.ac -@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on - # will have to modify gcc/configure.ac .. - # For now, basic workaround for cross compilers .. - if test "${host}" != "${build}"; then -- gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d -+ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/ - else -- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} - fi - AC_SUBST(gdc_include_dir) - AC_ARG_WITH([cross-host], + + diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD index f0f325628..894a79528 100644 --- a/community/gearmand/PKGBUILD +++ b/community/gearmand/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102452 2013-12-11 14:33:31Z mtorromeo $ +# $Id: PKGBUILD 105677 2014-02-13 14:56:45Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Lev Lybin <lev.lybin@gmail.com> # Contributor: Vadym Abramchuk <abramm@gmail.com> # Contributor: John Gerritse <reaphsharc@gmail.com> pkgname=gearmand -pkgver=1.1.11 +pkgver=1.1.12 pkgrel=1 pkgdesc="Distributed job queue server." arch=('i686' 'x86_64') @@ -45,6 +45,6 @@ package() { install -Dm644 gearmand.conf "$pkgdir/etc/gearmand.conf" } -sha256sums=('a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825' +sha256sums=('973d7a3523141a84c7b757c6f243febbc89a3631e919b532c056c814d8738acb' 'dee38ad4e614969047253b8c4996b8cdf33c981b0df215b6627356fd4cbafa33' '6c14fdcd94105338e13bdd59dbed4f9b77430a517b2c125ac2e6d3bc43bdf506') diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index 7a1f56786..400936f8a 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 102595 2013-12-16 08:40:54Z alucryd $ -# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# $Id: PKGBUILD 105421 2014-02-07 11:42:11Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor : sebikul <sebikul@gmail.com> # Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=geary -pkgver=0.5.0 -pkgrel=1 +pkgver=0.5.1 +pkgrel=2 pkgdesc='A lightweight email client for the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.yorba.org/projects/geary/' license=('GPL3') -depends=('desktop-file-utils' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk') +depends=('gmime' 'gnome-keyring' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk') makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') install="${pkgname}.install" source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af') +sha256sums=('12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1') build() { cd ${pkgname}-${pkgver} diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog index e5b3226a9..a9c6f92d3 100644 --- a/community/geda-gaf/ChangeLog +++ b/community/geda-gaf/ChangeLog @@ -1,3 +1,7 @@ +2014-01-24 Kyle Keen <keenerd@gmail.com> + * 1.8.2-1 + - Version bump + 2013-09-17 Kyle Keen <keenerd@gmail.com> * 1.8.1-3 - Update url diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD index ac4362130..938f113f6 100644 --- a/community/geda-gaf/PKGBUILD +++ b/community/geda-gaf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99104 2013-10-24 12:53:47Z kkeen $ +# $Id: PKGBUILD 104743 2014-01-25 15:14:59Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=geda-gaf -pkgver=1.8.1 -pkgrel=4 +pkgver=1.8.2 +pkgrel=1 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project" arch=('i686' 'x86_64' 'mips64el') url="http://geda-project.org/" @@ -17,7 +17,7 @@ optdepends=('python2: for two of the commands (garchive, tragesym)' replaces=('geda-suite' 'geda-libs') install=geda-gaf.install source=(http://ftp.geda-project.org/geda-gaf/stable/v1.8/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('3c5ef297e403b493fdf7a5d47bbeeb73') +md5sums=('fa8a807615decf47027e22a217dd0ded') build () { diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index c86c15bb8..44d2377a5 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99758 2013-10-30 23:32:00Z allan $ +# $Id: PKGBUILD 103320 2014-01-03 10:52:48Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=geos pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="C++ port of the Java Topology Suite" arch=('i686' 'x86_64' 'mips64el') url="http://trac.osgeo.org/geos/" diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD index 5adf7b8b2..969390369 100644 --- a/community/gimp-ufraw/PKGBUILD +++ b/community/gimp-ufraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90037 2013-05-06 19:37:26Z foutrelis $ +# $Id: PKGBUILD 104795 2014-01-26 12:17:33Z andyrtr $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Martin Sugioarto <nakal@web.de> pkgname=gimp-ufraw pkgver=0.19 -pkgrel=2 +pkgrel=3 pkgdesc='Converter for raw files; utility and GIMP plugin' url='http://ufraw.sourceforge.net/' arch=('x86_64' 'i686') diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 80f832fe0..75cddd629 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $ +# $Id: PKGBUILD 103691 2014-01-09 23:58:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('623977c096b28c25528e3c958e9fb3fd') +md5sums=('133a9faed6f1fbd527551a7e42aeb4f9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD index e9d48d351..38e01c866 100644 --- a/community/gloox/PKGBUILD +++ b/community/gloox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100444 2013-11-04 12:11:53Z spupykin $ +# $Id: PKGBUILD 103910 2014-01-13 17:16:40Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gloox pkgver=1.0.9 -pkgrel=1 +pkgrel=3 pkgdesc="C++ libraries for development of Jabber client/component/server" arch=(i686 x86_64 'mips64el') url="http://camaya.net/gloox" diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 7a5ca0534..c7d4a4f36 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 102127 2013-12-05 14:49:23Z spupykin $ +# $Id: PKGBUILD 103705 2014-01-10 10:51:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller <henning@orgizm.net> pkgname=glusterfs -pkgver=3.4.1 +pkgver=3.4.2 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=2 +pkgrel=1 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64 mips64el) url='http://www.gluster.org/' @@ -15,7 +15,7 @@ license=(GPL2 LGPL3) depends=(fuse python2 libxml2) makedepends=(flex bison) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz) -md5sums=('dce3d066b7351b360454ea9ca4cabe4c') +md5sums=('7c05304a9aca3c85ff27458461783623') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index ef4e533f1..c36348ce4 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99767 2013-10-30 23:35:23Z allan $ +# $Id: PKGBUILD 104368 2014-01-19 16:29:32Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index a0a3a160f..e0339fde1 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102358 2013-12-09 12:50:15Z spupykin $ +# $Id: PKGBUILD 105557 2014-02-10 11:18:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.8.0 +pkgver=1.5.8.3 pkgrel=1 arch=("i686" "x86_64" "mips64el") url="http://gmic.sourceforge.net" @@ -15,20 +15,20 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') #options=('!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz" "opencv-buildfix.patch") -md5sums=('286d99392a80aaaf2dbcda2ec95f021e' +md5sums=('ee80a2dc1a2441a6c0adf92e9bea623b' '120319b0d6c81c5af186abe2281b79ca') prepare() { cd "${srcdir}/gmic-${pkgver}" patch -p1 -i "${srcdir}/opencv-buildfix.patch" - find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; - find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; - sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile + sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|g' src/Makefile + sed -i 's|/usr/bin/qmake|/usr/bin/qmake-qt4|g' zart/Makefile } build() { cd "${srcdir}/gmic-${pkgver}" make -C src all + make -C zart all } package_gmic() { @@ -47,9 +47,8 @@ package_zart() { depends=("opencv" "fftw" "qt4") cd "${srcdir}/gmic-${pkgver}" - make -C src install DESTDIR="$pkgdir" USR="/usr" + install -Dm755 zart/zart "${pkgdir}/usr/bin/zart" install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}} } package_gimp-plugin-gmic() { diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index f2ef8ee2d..06eb7ecb3 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103047 2013-12-25 19:18:23Z jlichtblau $ +# $Id: PKGBUILD 104056 2014-01-14 22:32:49Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,18 +6,19 @@ # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.16 +pkgver=1.2.8.17 pkgrel=1 pkgdesc='Graphical two-pane filemanager for Gnome' arch=('i686' 'x86_64' 'mips64el') -url='http://www.nongnu.org/gcmd/' +url='http://gcmd.github.io/' license=('GPL') depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm') -makedepends=('perlxml' 'gnome-doc-utils' 'intltool') +makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool') install=$pkgname.install +changelog=$pkgname.changelog source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz gnome-commander-1.2.8.15-build.patch) -sha256sums=('84d653fab2eaec233b6d899f339099c2fa2d2d5cbdb7a33bd7022c34ed901347' +sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606' '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088') # mips64el patch diff --git a/community/gnome-commander/gnome-commander.changelog b/community/gnome-commander/gnome-commander.changelog new file mode 100644 index 000000000..a562c5ae7 --- /dev/null +++ b/community/gnome-commander/gnome-commander.changelog @@ -0,0 +1,2 @@ +2014-01-14 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * gnome-commander 1.2.8.17-1 diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD index eea49c48f..93f8ff58a 100644 --- a/community/gnome-do/PKGBUILD +++ b/community/gnome-do/PKGBUILD @@ -1,30 +1,23 @@ -# $Id: PKGBUILD 99772 2013-10-30 23:37:16Z allan $ +# $Id: PKGBUILD 105487 2014-02-09 06:17:37Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Doehni <dohny@gmx.de> pkgname=gnome-do -pkgver=0.9 -pkgrel=2 +pkgver=0.95.1 +pkgrel=1 pkgdesc="Quickly search for many items present on your desktop or the web, and perform useful actions on those items" arch=('i686' 'x86_64') -url="http://do.davebsd.com/" +url="https://launchpad.net/do" license=('GPL3') -depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'libgnome-sharp' 'gio-sharp') +depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'gkeyfile-sharp' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'gio-sharp') install=$pkgname.install -source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz - gio-gnomedesktop.patch) -md5sums=('d360e56953915d9585c0ee71f433129c' - 'e9ac5e4510c1475d61a20c5d94594d98') +source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('1f61376718d75d3defcdf81958754296') build() { cd "$srcdir/$pkgname-$pkgver" - - # https://code.launchpad.net/~ballogy/do/gio-gnomedesktop-port/+merge/95842 - patch -Np1 -i "$srcdir/gio-gnomedesktop.patch" - - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas @@ -33,6 +26,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/gnome-do/gio-gnomedesktop.patch b/community/gnome-do/gio-gnomedesktop.patch deleted file mode 100644 index 358b0b731..000000000 --- a/community/gnome-do/gio-gnomedesktop.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff -Naur gnome-do-0.9.orig/configure.ac gnome-do-0.9/configure.ac ---- gnome-do-0.9.orig/configure.ac 2012-03-04 08:46:12.000000000 +0100 -+++ gnome-do-0.9/configure.ac 2012-06-24 19:31:49.150955445 +0200 -@@ -60,17 +60,29 @@ - PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0]) - PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0]) - PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0]) -+ -+dnl gio-sharp is an unstable api library -+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0]) -+files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`" -+for file in $files; do -+ GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file" -+ GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)" -+ [[ -r "$file.config" ]] && GIO_SHARP_SOURCE_ASSEMBLIES="$GIO_SHARP_SOURCE_ASSEMBLIES $file.config" -+ [[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config" -+ -+ GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)" -+done -+AC_SUBST([GIO_SHARP_SOURCE_ASSEMBLIES]) -+AC_SUBST([GIO_SHARP_ASSEMBLIES]) -+AC_SUBST([GIO_SHARP_LIBS]) -+ - PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0]) - PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0]) --PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0]) --PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0]) - PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0]) --PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0]) - PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins]) - PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui]) - PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup]) - PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp]) --PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0]) - - - AC_SUBST([GCONF_SHARP_20_LIBS]) -@@ -78,10 +90,7 @@ - AC_SUBST([GLIB_SHARP_20_LIBS]) - AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS]) - AC_SUBST([GNOME_KEYRING_SHARP_LIBS]) --AC_SUBST([GNOME_SHARP_20_LIBS]) --AC_SUBST([GNOME_VFS_SHARP_20_LIBS]) - AC_SUBST([GTK_SHARP_20_LIBS]) --AC_SUBST([LIBRSVG_SHARP_LIBS]) - AC_SUBST([MONO_ADDINS_LIBS]) - AC_SUBST([MONO_ADDINS_GUI_LIBS]) - AC_SUBST([MONO_ADDINS_SETUP_LIBS]) -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in ---- gnome-do-0.9.orig/Do.Platform.Linux/Do.Platform.Linux.dll.config.in 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/Do.Platform.Linux.dll.config.in 2012-06-24 19:31:49.124289904 +0200 -@@ -1,3 +1,4 @@ - <configuration> - <dllmap dll="libdo" target="@expanded_libdir@/@PACKAGE@/libdo.so"/> -+ <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2.so.17"/> - </configuration> -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am gnome-do-0.9/Do.Platform.Linux/Makefile.am ---- gnome-do-0.9.orig/Do.Platform.Linux/Makefile.am 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/Makefile.am 2012-06-24 19:31:49.127623096 +0200 -@@ -27,6 +27,8 @@ - src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs \ - src/Do.Universe/ApplicationItem.cs \ - src/Do.Universe/CategoryItem.cs \ -+ src/Do.Universe/Desktop.cs \ -+ src/Do.Universe/DesktopThumbnailSize.cs \ - src/Do.Universe/NullApplicationItem.cs \ - src/Do.Universe/FileItem.cs \ - src/Do.Universe/ApplicationItemSource.cs \ -@@ -54,7 +56,7 @@ - Mono.Posix \ - $(GTK_SHARP_20_LIBS) \ - $(GNOME_KEYRING_SHARP_LIBS) \ -- $(GNOME_SHARP_20_LIBS) \ -+ $(GIO_SHARP_LIBS) \ - $(GNOME_DESKTOP_SHARP_20_LIBS) \ - $(GCONF_SHARP_20_LIBS) \ - $(MONO_ADDINS_LIBS) \ -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2012-06-24 19:31:49.130956287 +0200 -@@ -166,7 +166,8 @@ - - string AutoStartUri { - get { -- return Gnome.Vfs.Uri.GetUriFromLocalPath (AutoStartFileName); -+ var uri = new Uri(AutoStartFileName).ToString(); -+ return uri; - } - } - -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/Desktop.cs 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/Desktop.cs 2012-06-24 19:31:49.134289478 +0200 -@@ -0,0 +1,76 @@ -+// This file was generated by the Gtk# code generator. -+// Any changes made will be lost if regenerated. -+ -+namespace Gnome { -+ -+ using System; -+ using System.Runtime.InteropServices; -+ -+#region Autogenerated code -+ public class Desktop { -+ -+ [DllImport("gnome-desktop-2")] -+ static extern void gnome_desktop_prepend_terminal_to_vector(out int argc, IntPtr argv); -+ -+ public static int PrependTerminalToVector(string argv) { -+ int argc; -+ gnome_desktop_prepend_terminal_to_vector(out argc, GLib.Marshaller.StringToPtrGStrdup(argv)); -+ return argc; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern bool gnome_desktop_thumbnail_has_uri(IntPtr pixbuf, IntPtr uri); -+ -+ public static bool ThumbnailHasUri(Gdk.Pixbuf pixbuf, string uri) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ bool raw_ret = gnome_desktop_thumbnail_has_uri(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri); -+ bool ret = raw_ret; -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_scale_down_pixbuf(IntPtr pixbuf, int dest_width, int dest_height); -+ -+ public static Gdk.Pixbuf ThumbnailScaleDownPixbuf(Gdk.Pixbuf pixbuf, int dest_width, int dest_height) { -+ IntPtr raw_ret = gnome_desktop_thumbnail_scale_down_pixbuf(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, dest_width, dest_height); -+ Gdk.Pixbuf ret = GLib.Object.GetObject(raw_ret) as Gdk.Pixbuf; -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_path_for_uri(IntPtr uri, int size); -+ -+ public static string ThumbnailPathForUri(string uri, Gnome.DesktopThumbnailSize size) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ IntPtr raw_ret = gnome_desktop_thumbnail_path_for_uri(native_uri, (int) size); -+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern bool gnome_desktop_thumbnail_is_valid(IntPtr pixbuf, IntPtr uri, IntPtr mtime); -+ -+ public static bool ThumbnailIsValid(Gdk.Pixbuf pixbuf, string uri, System.DateTime mtime) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ bool raw_ret = gnome_desktop_thumbnail_is_valid(pixbuf == null ? IntPtr.Zero : pixbuf.Handle, native_uri, GLib.Marshaller.DateTimeTotime_t (mtime)); -+ bool ret = raw_ret; -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+ [DllImport("gnome-desktop-2")] -+ static extern IntPtr gnome_desktop_thumbnail_md5(IntPtr uri); -+ -+ public static string ThumbnailMd5(string uri) { -+ IntPtr native_uri = GLib.Marshaller.StringToPtrGStrdup (uri); -+ IntPtr raw_ret = gnome_desktop_thumbnail_md5(native_uri); -+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); -+ GLib.Marshaller.Free (native_uri); -+ return ret; -+ } -+ -+#endregion -+ } -+} -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/DesktopThumbnailSize.cs 2012-06-24 19:31:49.137622670 +0200 -@@ -0,0 +1,16 @@ -+// This file was generated by the Gtk# code generator. -+// Any changes made will be lost if regenerated. -+ -+namespace Gnome { -+ -+ using System; -+ using System.Runtime.InteropServices; -+ -+#region Autogenerated code -+ public enum DesktopThumbnailSize { -+ -+ Normal, -+ Large, -+ } -+#endregion -+} -diff -Naur gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs ---- gnome-do-0.9.orig/Do.Platform.Linux/src/Do.Universe/FileItem.cs 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Do.Platform.Linux/src/Do.Universe/FileItem.cs 2012-06-24 19:31:49.140955864 +0200 -@@ -63,8 +63,6 @@ - - static FileItem () - { -- Gnome.Vfs.Vfs.Initialize (); -- - // Initialize SpecialFolderIcons by expanding paths in - // SpecialFolderIconsXDG. - // -@@ -130,7 +128,11 @@ - } - - public string MimeType { -- get { return Gnome.Vfs.Global.GetMimeType (Path); } -+ get { -+ GLib.File file = GLib.FileFactory.NewFromCommandlineArg(Path); -+ var info = file.QueryInfo ("standard::content-type", GLib.FileQueryInfoFlags.None, null); -+ return info.ContentType; -+ } - } - - public override string Icon { -@@ -142,8 +144,8 @@ - icon = MaybeGetSpecialFolderIconForPath (Path); - if (icon != null) return icon; - -- string large_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Large); -- string normal_thumb = Thumbnail.PathForUri (Uri, ThumbnailSize.Normal); -+ string large_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Large); -+ string normal_thumb = Desktop.ThumbnailPathForUri (Uri, DesktopThumbnailSize.Normal); - - // Generating the thumbnail ourself is too slow for large files. - // Suggestion: generate thumbnails asynchronously. Banshee's -diff -Naur gnome-do-0.9.orig/Makefile.am gnome-do-0.9/Makefile.am ---- gnome-do-0.9.orig/Makefile.am 2012-01-14 14:49:58.000000000 +0100 -+++ gnome-do-0.9/Makefile.am 2012-06-24 19:31:56.837297364 +0200 -@@ -2,6 +2,22 @@ - - ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock - -+# Install copied assemblies to our libdir -+copiedlibsdir = $(pkglibdir) -+copiedlibs_DATA = \ -+ $(GIO_SHARP_ASSEMBLIES) -+ -+$(GIO_SHARP_ASSEMBLIES): $(GIO_SHARP_SOURCE_ASSEMBLIES) -+ @mkdir -p $(top_builddir)/build -+ @for file in $@ ; do \ -+ for source in $? ; do \ -+ if [ $$(basename $$source) == $$(basename $$file) ] ; then \ -+ echo " CP " $$(basename $$file) ; \ -+ cp $$source $$file ; \ -+ fi ;\ -+ done ; \ -+ done -+ - SUBDIRS = \ - . \ - data \ diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index c44dd68ba..c69f64577 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99780 2013-10-30 23:40:28Z allan $ +# $Id: PKGBUILD 103912 2014-01-13 17:16:43Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.5 -pkgrel=2 +pkgver=0.10.0 +pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" @@ -12,7 +12,7 @@ license=('GPL') depends=('gnunet' 'glade' 'adns') makedepends=('pkgconfig') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('2e48a1e92de99b14c936a270bb05309a') +md5sums=('1a036f1956460cc1ea4c34f1b19bb6b1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index e0f871c9b..924c6b61d 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 99779 2013-10-30 23:40:06Z allan $ +# $Id: PKGBUILD 105576 2014-02-10 13:48:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.5_a +pkgver=0.10.0 pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" license=('GPL') -depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'curl' +depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'gnurl' 'libmicrohttpd' 'libunistring' 'libidn') -makedepends=('gettext' 'pkgconfig') +makedepends=('gettext' 'pkgconfig' + 'bluez-libs' 'python' 'glpk' 'libpulse') +optdepends=('bluez-libs' + 'python' + 'glpk' + 'libpulse') backup=(etc/gnunetd.conf) options=('!makeflags') install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz gnunet.service defaults.conf) -md5sums=('b0e204cf9711f9799baaeb477992e66a' +md5sums=('8bff8280c90780b17786fd8b95f12f72' '54cce3d2415d95b2e5bd1bd88db3a0ea' '0fe23b2ca5b3fc47a0b5645e04406da0') diff --git a/community/gnurl/PKGBUILD b/community/gnurl/PKGBUILD new file mode 100644 index 000000000..d4e36360c --- /dev/null +++ b/community/gnurl/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 105578 2014-02-10 13:48:16Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=gnurl +pkgver=7.34.0 +pkgrel=1 +pkgdesc="fork of libcurl, which is mostly for GNUnet" +arch=(i686 x86_64) +url="https://gnunet.org/gnurl" +license=('MIT') +depends=() +makedepends=() +source=(https://gnunet.org/sites/default/files/gnurl-$pkgver.tar.bz2) +md5sums=('c9b0faf03b9286aace01fefb62069088') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --with-gssapi \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + rm -rf $pkgdir/usr/share/man \ + $pkgdir/usr/bin/curl \ + $pkgdir/usr/share/aclocal + mkdir -p $pkgdir/usr/include/gnurl + mv $pkgdir/usr/include/curl $pkgdir/usr/include/gnurl/curl + sed -i 's|includedir=.*|includedir=/usr/include/gnurl|g' $pkgdir/usr/lib/pkgconfig/libgnurl.pc +} diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index 12929567e..192957150 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98739 2013-10-17 14:01:46Z andyrtr $ +# $Id: PKGBUILD 103913 2014-01-13 17:16:45Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base pkgver=1.24.5 -pkgrel=3 +pkgrel=5 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 52f9e77a8..d3bbcd4c0 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101866 2013-12-02 13:37:29Z arodseth $ +# $Id: PKGBUILD 104859 2014-01-27 16:24:41Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,7 +10,7 @@ pkgname=go pkgver=1.2 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') @@ -24,15 +24,11 @@ install="$pkgname.install" backup=('usr/lib/go/bin') if [ "$CARCH" == 'x86_64' ]; then - source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" - "$pkgname.sh") - sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2' - 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz") + sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2') else - source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" - "$pkgname.sh") - sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651' - 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a') + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz") + sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651') fi build() { @@ -41,10 +37,9 @@ build() { export GOROOT_FINAL=/usr/lib/go # - # Arch Linux doesn't support SSE2 for i686. - # - # Use "go-sse2" from AUR if you have am i686 CPU that supports SSE2. - # It is highly likely that it does, and the SSE2 version is _a lot_ faster. + # Arch Linux doesn't support SSE2 for i686 (to support older CPUs) + # The SSE2 version is _a lot_ faster for i686. + # This line disables it. # export GO386=387 @@ -134,9 +129,6 @@ package() { install -Dm644 src/pkg/runtime/cgocall.h \ "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" - # For packages that source /etc/profile.d/go.sh - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" - # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" diff --git a/community/go/go.install b/community/go/go.install index e0610f3c5..286aaf9dd 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -1,10 +1,13 @@ post_install() { # Friendly message for new users - echo "Example use of the \"go\" tool:" - echo ' mkdir ~/mygoproject' - echo ' export GOPATH=~/mygoproject' - echo ' export PATH=\$PATH:\$GOPATH/bin' - echo ' go get github.com/codegangsta/martini' + echo + echo 'Example use of the "go" tool:' + echo + echo ' mkdir ~/go' + echo ' export GOPATH=~/go' + echo ' export PATH=$PATH:~/go/bin' + echo ' go get code.google.com/p/go-tour/gotour' + echo } # vim:set ts=2 sw=2 et: diff --git a/community/go/go.sh b/community/go/go.sh deleted file mode 100644 index 8393dc8d2..000000000 --- a/community/go/go.sh +++ /dev/null @@ -1 +0,0 @@ -export GOROOT=/usr/lib/go diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index bb3df682f..3f0bc2b55 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81309 2012-12-17 10:05:29Z spupykin $ +# $Id: PKGBUILD 103914 2014-01-13 17:16:46Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=gogglesmm pkgver=0.12.7 -pkgrel=1 +pkgrel=3 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/gogglesmm/" diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD index 595f70f28..9f0f7a8d0 100644 --- a/community/gq/PKGBUILD +++ b/community/gq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65588 2012-02-21 09:13:40Z spupykin $ +# $Id: PKGBUILD 103915 2014-01-13 17:16:47Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=gq pkgver=1.3.4 -pkgrel=2.1 +pkgrel=3 pkgdesc="interactive graphical LDAP browser" url="http://sourceforge.net/projects/gqclient" license=("GPL") @@ -13,14 +13,22 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') arch=('i686' 'x86_64' 'mips64el') install=gq.install source=(http://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver.tar.gz - glib-includes.patch) + glib-headers-fix.patch) md5sums=('d7b1e183a3ecbd77aceea02d27f36b3e' - 'fa7d0f5f40953324dba108993d004807') + '4a98232c5a908c86216c7d9e235d4c0b') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/glib-headers-fix.patch +} build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i "$srcdir/glib-includes.patch" LDFLAGS=-lcrypto ./configure --prefix=/usr --disable-debugging --disable-update-mimedb make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/gq/glib-headers-fix.patch b/community/gq/glib-headers-fix.patch new file mode 100644 index 000000000..19e0846d7 --- /dev/null +++ b/community/gq/glib-headers-fix.patch @@ -0,0 +1,124 @@ +diff -wbBur gq-1.3.4/src/glib-helpers.h gq-1.3.4.my/src/glib-helpers.h +--- gq-1.3.4/src/glib-helpers.h 2008-01-09 19:35:12.000000000 +0300 ++++ gq-1.3.4.my/src/glib-helpers.h 2013-12-25 18:53:46.695364792 +0400 +@@ -24,7 +24,7 @@ + #ifndef GLIB_HELPERS_H + #define GLIB_HELPERS_H + +-#include <glib/glist.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -wbBur gq-1.3.4/src/gq-hash.h gq-1.3.4.my/src/gq-hash.h +--- gq-1.3.4/src/gq-hash.h 2008-01-09 19:35:12.000000000 +0300 ++++ gq-1.3.4.my/src/gq-hash.h 2013-12-25 18:54:12.485364495 +0400 +@@ -24,7 +24,7 @@ + #ifndef GQ_ENCRYPTION_H + #define GQ_ENCRYPTION_H + +-#include <glib/garray.h> ++#include <glib.h> + #include "gq-utilities.h" + + G_BEGIN_DECLS +diff -wbBur gq-1.3.4/src/gq-ldap.h gq-1.3.4.my/src/gq-ldap.h +--- gq-1.3.4/src/gq-ldap.h 2008-02-14 00:15:05.000000000 +0300 ++++ gq-1.3.4.my/src/gq-ldap.h 2013-12-25 16:28:25.672131705 +0400 +@@ -24,7 +24,7 @@ + #ifndef GQ_LDAP_H + #define GQ_LDAP_H + +- ++#define LDAP_DEPRECATED 1 + + #include <ldap.h> + +diff -wbBur gq-1.3.4/src/gq-main-loop.h gq-1.3.4.my/src/gq-main-loop.h +--- gq-1.3.4/src/gq-main-loop.h 2008-01-09 19:35:12.000000000 +0300 ++++ gq-1.3.4.my/src/gq-main-loop.h 2013-12-25 18:54:29.135364303 +0400 +@@ -24,7 +24,7 @@ + #ifndef GQ_MAIN_LOOP_H + #define GQ_MAIN_LOOP_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -wbBur gq-1.3.4/src/gq-marshallers.c gq-1.3.4.my/src/gq-marshallers.c +--- gq-1.3.4/src/gq-marshallers.c 2008-01-09 20:44:57.000000000 +0300 ++++ gq-1.3.4.my/src/gq-marshallers.c 2013-12-25 16:28:26.202131699 +0400 +@@ -5,7 +5,7 @@ + + #ifdef G_ENABLE_DEBUG + #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +-#define g_marshal_value_peek_char(v) g_value_get_char (v) ++#define g_marshal_value_peek_char(v) g_value_get_schar (v) + #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) + #define g_marshal_value_peek_int(v) g_value_get_int (v) + #define g_marshal_value_peek_uint(v) g_value_get_uint (v) +@@ -22,6 +22,7 @@ + #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) + #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) + #define g_marshal_value_peek_object(v) g_value_get_object (v) ++#define g_marshal_value_peek_variant(v) g_value_get_variant (v) + #else /* !G_ENABLE_DEBUG */ + /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. + * Do not access GValues directly in your code. Instead, use the +@@ -45,16 +46,17 @@ + #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer + #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer + #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer ++#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer + #endif /* !G_ENABLE_DEBUG */ + + + /* VOID:OBJECT,INT (gq-marshallers.list:1) */ + void + gq_marshal_VOID__OBJECT_INT (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__OBJECT_INT) (gpointer data1, +diff -wbBur gq-1.3.4/src/gq-stack.h gq-1.3.4.my/src/gq-stack.h +--- gq-1.3.4/src/gq-stack.h 2008-01-09 19:35:12.000000000 +0300 ++++ gq-1.3.4.my/src/gq-stack.h 2013-12-25 18:54:46.318697439 +0400 +@@ -24,7 +24,7 @@ + #ifndef GQ_STACK_H + #define GQ_STACK_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -wbBur gq-1.3.4/src/gq-tab.h gq-1.3.4.my/src/gq-tab.h +--- gq-1.3.4/src/gq-tab.h 2008-01-09 19:35:12.000000000 +0300 ++++ gq-1.3.4.my/src/gq-tab.h 2013-12-25 18:55:10.392030496 +0400 +@@ -24,7 +24,7 @@ + #ifndef GQ_TAB_H + #define GQ_TAB_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -wbBur gq-1.3.4/src/syntax.h gq-1.3.4.my/src/syntax.h +--- gq-1.3.4/src/syntax.h 2008-01-09 19:35:13.000000000 +0300 ++++ gq-1.3.4.my/src/syntax.h 2013-12-25 18:53:19.428698438 +0400 +@@ -27,7 +27,7 @@ + #ifndef GQ_SYNTAX_H_INCLUDED + #define GQ_SYNTAX_H_INCLUDED + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index 9b557fac7..895dfbe84 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,49 +2,50 @@ pkgname=gsmartcontrol pkgver=0.8.7 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64' 'mips64el') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') -depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme' 'polkit') -optdepends=('polkit-gnome: to run gsmartcontrol directly from menu') +depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme') +optdepends=('polkit: to run gsmartcontrol directly from menu') install=${pkgname}.install source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 - org.archlinux.pkexec.gsmartcontrol.policy) + org.archlinux.pkexec.gsmartcontrol.policy + gsmartcontrol_polkit) md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30' - 'e403f8e06e6b8a3d1a99da5e584b2257') + '503989a7e6a9a287d81e91243d03f162' + '33bdda04d8db1525f2507485f3f2a663') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Modify desktop file + sed -i "s|^Exec=.*|Exec="@prefix@/bin/gsmartcontrol_polkit"|" \ + data/gsmartcontrol.desktop.in +} build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - # We need rename the original binary - mv "${pkgdir}/usr/bin/gsmartcontrol" "${pkgdir}/usr/bin/gsmartcontrol.elf" - # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/bin/gsmartcontrol - echo 'pkexec --disable-internal-agent "/usr/bin/gsmartcontrol.elf" "$@"' \ - >> ${pkgdir}/usr/bin/gsmartcontrol - chmod 755 ${pkgdir}/usr/bin/gsmartcontrol - - # Modify desktop file - sed -i -e "s|^Exec=.*|Exec=/usr/bin/gsmartcontrol|" \ - "${pkgdir}/usr/share/applications/gsmartcontrol.desktop" + install -m755 ${srcdir}/gsmartcontrol_polkit \ + "${pkgdir}/usr/bin/gsmartcontrol_polkit" # Install policy file - install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \ - $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy + install -Dm644 ${srcdir}/org.archlinux.pkexec.gsmartcontrol.policy \ + "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy" } diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop deleted file mode 100644 index e65a26ef6..000000000 --- a/community/gsmartcontrol/gsmartcontrol.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=GSmartControl -GenericName=Hard Disk Health Inspection -Comment=Monitor and control SMART data on hard disks -Icon=gsmartcontrol -Exec=pkexec /usr/bin/gsmartcontrol -Type=Application -Categories=GTK;GNOME;System;Filesystem; diff --git a/community/gsmartcontrol/gsmartcontrol.install b/community/gsmartcontrol/gsmartcontrol.install index f636406f2..b711352cb 100644 --- a/community/gsmartcontrol/gsmartcontrol.install +++ b/community/gsmartcontrol/gsmartcontrol.install @@ -1,14 +1,11 @@ post_install() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install $1 } post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + post_install $1 } diff --git a/community/gsmartcontrol/gsmartcontrol_polkit b/community/gsmartcontrol/gsmartcontrol_polkit new file mode 100644 index 000000000..fa7ec8557 --- /dev/null +++ b/community/gsmartcontrol/gsmartcontrol_polkit @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $(which pkexec) ]; then + pkexec --disable-internal-agent "/usr/bin/gsmartcontrol" "$@" +else + /usr/bin/gsmartcontrol "$@" +fi diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy index b71db7904..471cd0e86 100644 --- a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy +++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol.elf</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index a3e1f8e85..8e8018c24 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101476 2013-11-26 09:44:41Z spupykin $ +# $Id: PKGBUILD 104560 2014-01-22 19:43:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.16 -pkgrel=3 +pkgver=2.8.17 +pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('autoconf' 'automake') options=('staticlibs') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('274d16bea12b111681bcac2283c4c24a' +md5sums=('381affd6e3ba59effb35725166143014' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD index fb5ceaf50..5ccaf30a9 100644 --- a/community/gtkimageview/PKGBUILD +++ b/community/gtkimageview/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 102159 2013-12-06 11:35:48Z giovanni $ +# $Id: PKGBUILD 103868 2014-01-12 20:31:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan Blazek <appolito@gmail.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> pkgname=gtkimageview pkgver=1.6.4 -pkgrel=3.2 +pkgrel=4 pkgdesc="Simple image viewer widget for GTK2" arch=('i686' 'x86_64' 'mips64el') -url="http://trac.bjourne.webfactional.com/" +url="https://github.com/GNOME/gtkimageview" license=('LGPL2.1') depends=('gtk2') -makedepends=('pkgconfig') -source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw") +makedepends=('pkg-config') +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('501367b3f50e69a12208dc9c6ad00b18') build() { @@ -20,6 +20,7 @@ build() { ./configure --prefix=/usr \ --disable-static + make } @@ -27,5 +28,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/usr/share" } diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD index 025697fc8..167beb14b 100644 --- a/community/gtypist/PKGBUILD +++ b/community/gtypist/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92635 2013-06-10 09:42:13Z spupykin $ +# $Id: PKGBUILD 105230 2014-02-03 09:21:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ben Mazer <blm@groknil.org> # Contributor: Mike Douglas <code_monkey@gooeylinux.org> pkgname=gtypist -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=1 pkgdesc="universal typing tutor" arch=('i686' 'x86_64' 'mips64el') @@ -15,15 +15,19 @@ makedepends=('emacs') install=gtypist.install source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz ncurses.patch) -md5sums=('e26c29be0adf345604a802be81712bee' - 'e37a2e8fe90c6c0c684c1a12d016ee03') +md5sums=('1b6acd602996b86f8967ab7693b06ec8' + 'a836141e70941b7e0d3477bc8ecdecdf') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/ncurses.patch aclocal automake --add-missing autoreconf +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch index 9fa484ffd..a1c144562 100644 --- a/community/gtypist/ncurses.patch +++ b/community/gtypist/ncurses.patch @@ -1,7 +1,7 @@ -diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac ---- gtypist-2.9.3/configure.ac 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/configure.ac 2013-06-10 13:32:54.284038071 +0400 -@@ -44,14 +44,14 @@ +diff -wbBur gtypist-2.9.4/configure.ac gtypist-2.9.4.my/configure.ac +--- gtypist-2.9.4/configure.ac 2014-02-02 15:38:40.000000000 +0400 ++++ gtypist-2.9.4.my/configure.ac 2014-02-03 13:08:53.085983684 +0400 +@@ -44,20 +44,20 @@ AC_FUNC_STRTOD AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul]) @@ -18,12 +18,19 @@ diff -wbBur gtypist-2.9.3/configure.ac gtypist-2.9.3.q/configure.ac else - echo -e "Error: both library and header files for the ncursesw library\n"\ + echo -e "Error: both library and header files for the ncurses library\n"\ - "are required to build this package. See INSTALL file for"\ - "further information. On Debian/Ubuntu you need to install libncursesw5-dev." + "are required to build this package. See INSTALL file for"\ + "further information. On Debian/Ubuntu you need to install libncursesw5-dev." exit 1; -diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c ---- gtypist-2.9.3/src/cursmenu.c 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/src/cursmenu.c 2013-06-10 13:33:16.610704480 +0400 + fi + AC_SEARCH_LIBS(cbreak, tinfo, [], +- [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])]) ++ [AC_MSG_ERROR([Can't find cbreak() in -lncurses or -ltinfo])]) + + + # iconv +diff -wbBur gtypist-2.9.4/src/cursmenu.c gtypist-2.9.4.my/src/cursmenu.c +--- gtypist-2.9.4/src/cursmenu.c 2013-08-18 18:36:14.000000000 +0400 ++++ gtypist-2.9.4.my/src/cursmenu.c 2014-02-03 13:09:04.669316878 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -33,9 +40,9 @@ diff -wbBur gtypist-2.9.3/src/cursmenu.c gtypist-2.9.3.q/src/cursmenu.c #endif #include "error.h" -diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c ---- gtypist-2.9.3/src/error.c 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/src/error.c 2013-06-10 13:33:26.124037704 +0400 +diff -wbBur gtypist-2.9.4/src/error.c gtypist-2.9.4.my/src/error.c +--- gtypist-2.9.4/src/error.c 2013-08-18 18:36:14.000000000 +0400 ++++ gtypist-2.9.4.my/src/error.c 2014-02-03 13:09:04.669316878 +0400 @@ -25,7 +25,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -45,9 +52,9 @@ diff -wbBur gtypist-2.9.3/src/error.c gtypist-2.9.3.q/src/error.c #endif #include <stdlib.h> -diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c ---- gtypist-2.9.3/src/gtypist.c 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/src/gtypist.c 2013-06-10 13:33:18.844037788 +0400 +diff -wbBur gtypist-2.9.4/src/gtypist.c gtypist-2.9.4.my/src/gtypist.c +--- gtypist-2.9.4/src/gtypist.c 2013-08-18 18:36:14.000000000 +0400 ++++ gtypist-2.9.4.my/src/gtypist.c 2014-02-03 13:09:04.669316878 +0400 @@ -31,7 +31,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -57,9 +64,9 @@ diff -wbBur gtypist-2.9.3/src/gtypist.c gtypist-2.9.3.q/src/gtypist.c #endif #include <time.h> -diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c ---- gtypist-2.9.3/src/script.c 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/src/script.c 2013-06-10 13:33:21.067371095 +0400 +diff -wbBur gtypist-2.9.4/src/script.c gtypist-2.9.4.my/src/script.c +--- gtypist-2.9.4/src/script.c 2013-08-18 18:36:14.000000000 +0400 ++++ gtypist-2.9.4.my/src/script.c 2014-02-03 13:09:04.669316878 +0400 @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> @@ -69,9 +76,9 @@ diff -wbBur gtypist-2.9.3/src/script.c gtypist-2.9.3.q/src/script.c #endif #include "error.h" -diff -wbBur gtypist-2.9.3/src/utf8.c gtypist-2.9.3.q/src/utf8.c ---- gtypist-2.9.3/src/utf8.c 2013-06-05 22:50:00.000000000 +0400 -+++ gtypist-2.9.3.q/src/utf8.c 2013-06-10 13:33:23.604037733 +0400 +diff -wbBur gtypist-2.9.4/src/utf8.c gtypist-2.9.4.my/src/utf8.c +--- gtypist-2.9.4/src/utf8.c 2013-08-18 18:36:14.000000000 +0400 ++++ gtypist-2.9.4.my/src/utf8.c 2014-02-03 13:09:04.669316878 +0400 @@ -23,7 +23,7 @@ #ifdef HAVE_PDCURSES #include <curses.h> diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD index 7d0863cec..7ef2cdb4d 100755 --- a/community/guayadeque/PKGBUILD +++ b/community/guayadeque/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 86605 2013-03-20 15:17:37Z alucryd $ +# $Id: PKGBUILD 103795 2014-01-11 20:08:28Z eric $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Sial <sial@cpan.org> # Contributor: Martin Herndl <martin.herndl@gmail.com> pkgname=guayadeque pkgver=0.3.5 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight music player" arch=('i686' 'x86_64' 'mips64el') url="http://guayadeque.org/" license=('GPL3') -depends=('curl' 'dbus' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk') +depends=('curl' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk2.8') makedepends=('cmake') optdepends=('gstreamer0.10-good-plugins: Support for additional file formats' 'gvfs: Support for external devices') @@ -18,17 +18,25 @@ install=$pkgname.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") sha256sums=('8281286a715731b567097238e1c0aaf962e052fbc7e2761b10f36407eb6ec4d5') +prepare() { + cd ${pkgname}-${pkgver}/src + + xgettext -d guayadeque -o guayadeque.pot -C --keyword=_ *.cpp + mv guayadeque.pot ../po +} + build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + + rm -rf build + mkdir build && cd build -# Build - ./build + cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver}/build -# Install make DESTDIR="${pkgdir}" install } diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index 999632594..953ef85a2 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99807 2013-10-30 23:50:53Z allan $ +# $Id: PKGBUILD 103916 2014-01-13 17:16:48Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar pkgver=4.3.3 _dnrel=67 -pkgrel=2 +pkgrel=4 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64 'mips64el') url="http://www.aquamaniac.de" diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index 0232eb2c1..c1bd00b18 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89297 2013-04-28 16:52:18Z td123 $ +# $Id: PKGBUILD 103336 2014-01-03 11:09:18Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.5 @@ -12,9 +12,10 @@ url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' sh) +install=${pkgname}.install +options=('staticlibs') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz '0001-update-build-deps-for-ghc-7.6.1.patch') -install=${pkgname}.install md5sums=('4da812ca7a1640a5fdcc676009ab160c' '662056adcb79efe8898298c271b49600') diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index 7cd9ccb27..e23e3426b 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89304 2013-04-28 16:52:25Z td123 $ +# $Id: PKGBUILD 103338 2014-01-03 11:10:00Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 @@ -12,8 +12,9 @@ url="http://hackage.haskell.org/package/haskeline" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3' 'haskell-terminfo=0.3.2.5-3') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install +options=('staticlibs') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) md5sums=('3a78043dc80b5510202e71e77c0a9923') build() { diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index e35f7da1a..bbd5e49f5 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89323 2013-04-28 16:52:45Z td123 $ +# $Id: PKGBUILD 103340 2014-01-03 11:10:44Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -11,6 +11,7 @@ url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh') +options=('staticlibs') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index cd4ef71eb..a1ccfe497 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 103142 2013-12-27 12:15:28Z spupykin $ +# $Id: PKGBUILD 104154 2014-01-16 11:39:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.20 +pkgver=0.9.20.5 pkgrel=1 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the antics of pink hedgehogs with attitude as they battle from the depths of hell @@ -23,11 +23,11 @@ makedepends=('fpc' 'cmake' 'haskell-random') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.png) -md5sums=('7ee1b23e51053d34feb84464184f60fa' +md5sums=('c61eb01466e86da656e1e74ad70a3217' 'eeb14d50df39063549ac5eca9dbc65d1') build() { - cd $pkgname-src-$pkgver + cd $pkgname-src-* cmake \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -37,7 +37,7 @@ build() { } package() { - cd $pkgname-src-$pkgver + cd $pkgname-src-* make DESTDIR=$pkgdir install diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD index 53dc19714..fdad4d440 100755 --- a/community/higan-gtk/PKGBUILD +++ b/community/higan-gtk/PKGBUILD @@ -1,83 +1,58 @@ -# $Id: PKGBUILD 96210 2013-08-21 19:09:14Z alucryd $ +# $Id: PKGBUILD 104429 2014-01-20 19:23:37Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=higan-gtk -pkgver=093 -pkgrel=2 -pkgdesc="Nintendo multi-system emulator - GTK version" +pkgver=094 +pkgrel=1 +pkgdesc='Nintendo multi-system emulator' arch=('i686' 'x86_64') -url="http://code.google.com/p/higan/" +url='http://byuu.org/' license=('GPL3') depends=('libao' 'libpulse' 'libxv' 'openal' 'sdl' 'xdialog') -makedepends=('gendesk' 'mesa') +makedepends=('mesa') optdepends=('beat: Delta patcher') conflicts=('higan-qt') -source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz" - "http://higan.googlecode.com/files/purify_v03-source.tar.xz" +source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz" 'higan') -sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538' - '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38' +sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b' 'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048') -_profiles="accuracy balanced performance" +_profiles='accuracy balanced performance' prepare() { - gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u' - gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify' - cd higan_v${pkgver}-source - sed -i "s/flags += -I. -O3 -fomit-frame-pointer/flags += -I. -fomit-frame-pointer -std=gnu++11/ - s/flags += -march=native/flags += $CXXFLAGS/g" Makefile + sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile } build() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# libananke - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke + make phoenix=gtk -C ananke -# higan for _profile in ${_profiles}; do - make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile} + make phoenix=gtk profile=${_profile} mv out/higan{,-${_profile}} make clean done - -# purify - cd "${srcdir}"/purify_v03-source/purify - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic' } package() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# Common files install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}} install -m 755 {..,"${pkgdir}"/usr/bin}/higan - install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop - install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png + install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/ cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/ cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/ -# libananke install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1 ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so -# higan for _profile in ${_profiles}; do install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile} done - -# purify - cd "${srcdir}"/purify_v03-source/purify - install -m 755 {,"${pkgdir}"/usr/bin/}purify - install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop - ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png - -# Fix permissions - find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} + - find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} + } # vim: ts=2 sw=2 et: diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD index 212caebf4..db655bca5 100755 --- a/community/higan-qt/PKGBUILD +++ b/community/higan-qt/PKGBUILD @@ -1,88 +1,60 @@ -# $Id: PKGBUILD 96212 2013-08-21 19:22:00Z alucryd $ +# $Id: PKGBUILD 104431 2014-01-20 19:37:01Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=higan-qt -pkgver=093 -pkgrel=2 -pkgdesc="Nintendo multi-system emulator - Qt version" +pkgver=094 +pkgrel=1 +pkgdesc='Nintendo multi-system emulator' arch=('i686' 'x86_64') -url="http://code.google.com/p/higan/" +url='http://byuu.org/' license=('GPL3') depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog') -makedepends=('gendesk' 'mesa') +makedepends=('mesa') optdepends=('beat: Delta patcher') conflicts=('higan-gtk') -source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz" - "http://higan.googlecode.com/files/purify_v03-source.tar.xz" +source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz" 'higan') -sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538' - '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38' +sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b' 'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048') -_profiles="accuracy balanced performance" +_profiles='accuracy balanced performance' prepare() { - gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u' - gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify' + cd higan_v${pkgver}-source - cd "${srcdir}"/higan_v${pkgver}-source + sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp - sed -i "s/flags += -I. -O3 -fomit-frame-pointer/flags += -I. -fomit-frame-pointer -std=gnu++11/ - s/flags += -march=native/flags += $CXXFLAGS/g" Makefile - - cd "${srcdir}"/purify_v03-source - - moc-qt4 -i -Ipurify/phoenix/qt/ -o purify/phoenix/qt/platform.moc purify/phoenix/qt/platform.moc.hpp } build() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# libananke - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke + make phoenix=qt -C ananke -# higan for _profile in ${_profiles}; do - make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile} + make phoenix=qt profile=${_profile} mv out/higan{,-${_profile}} make clean done - -# purify - cd "${srcdir}"/purify_v03-source/purify - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic' } package() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# Common files install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}} install -m 755 {..,"${pkgdir}"/usr/bin}/higan - install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop - install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png + install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/ cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/ cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/ -# libananke install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1 ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so -# higan for _profile in ${_profiles}; do install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile} done - -# purify - cd "${srcdir}"/purify_v03-source/purify - install -m 755 {,"${pkgdir}"/usr/bin/}purify - install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop - ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png - -# Fix permissions - find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} + - find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} + } # vim: ts=2 sw=2 et: diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 7f1101e51..2ef68e82a 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100546 2013-11-05 19:47:43Z bluewind $ +# $Id: PKGBUILD 104278 2014-01-16 20:21:07Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.16.1 +pkgver=3.17 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt4 lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('688bb537db149dc720b9ef1ffc796ced' +md5sums=('52babb37da6a69867dc295e31d8a721e' 'SKIP') build() { diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index baf1ff193..de28490b3 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100085 2013-11-01 13:55:56Z eric $ +# $Id: PKGBUILD 105296 2014-02-04 18:24:40Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank -pkgver=4.5.4 -pkgrel=2 +pkgver=4.5.5 +pkgrel=1 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64' 'mips64el') url="http://homebank.free.fr/" @@ -14,17 +14,17 @@ makedepends=('intltool') install=$pkgname.install changelog=$pkgname.changelog source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) -sha256sums=('b3dd7df29d1de38b04c3bce3ade1f6266c1dc91aefa1106e37852edeab39b083') +sha256sums=('6f3a26075c4da67cf3521a407e90685be9aac2ef3e41614cfece2c8d4f226416') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog index f2e6255c2..8eddc34ad 100644 --- a/community/homebank/homebank.changelog +++ b/community/homebank/homebank.changelog @@ -1,3 +1,6 @@ +2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5.5-1 + 2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * homebank 4.5.4-1 diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index a85b6d751..01bc9eab5 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 90673 2013-05-13 14:26:11Z spupykin $ +# $Id: PKGBUILD 105700 2014-02-14 09:18:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=2.0 -pkgrel=6 +pkgver=2.1 +pkgrel=2 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64' 'mips64el') url="http://w1.fi/hostapd/" license=('custom') depends=('openssl' 'libnl') backup=('etc/hostapd/hostapd.conf' - 'etc/conf.d/hostapd' 'etc/hostapd/hlr_auc_gw.milenage_db' 'etc/hostapd/hostapd.accept' 'etc/hostapd/hostapd.deny' @@ -24,8 +23,8 @@ install=hostapd.install source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz config hostapd.service) -md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee' - '5d7ee10b04e33f22c37be56a4c33dddb' +md5sums=('bb9c50e87c5af6f89f387e63911effac' + 'eab3ae853869f832965f59898bb04a52' 'a0a16879eed5e4e41ae6b225a4809955') build() { diff --git a/community/hostapd/config b/community/hostapd/config index a11ebd587..55c6ed257 100644 --- a/community/hostapd/config +++ b/community/hostapd/config @@ -90,3 +90,5 @@ CONFIG_DRIVER_NL80211=y CONFIG_IEEE80211N=y CONFIG_LIBNL32=y + +CONFIG_ACS=y diff --git a/community/hostapd/hostapd.install b/community/hostapd/hostapd.install index d838c6a47..072cde845 100644 --- a/community/hostapd/hostapd.install +++ b/community/hostapd/hostapd.install @@ -1,7 +1,3 @@ post_install() { echo "> More info: https://wiki.archlinux.org/index.php/Software_Access_Point" } - -post_upgrade() { - post_install -} diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 07c280b4b..ab29b5369 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90497 2013-05-12 23:11:39Z arodseth $ +# $Id: PKGBUILD 103280 2014-01-02 12:43:36Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> @@ -8,23 +8,22 @@ # Contributor: ninja_pt pkgname=hwinfo -pkgver=20.1 -_subver=3.10 -pkgrel=2 +pkgver=21.0 +_subver=1.2 +pkgrel=1 pkgdesc='Hardware detection tool from openSUSE' arch=('i686' 'x86_64' 'mips64el') url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('GPL2') depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') +options=('!emptydirs') source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm" 'custom_ioctl.patch') -sha256sums=('b0e2e51b4dd754071fb40843deaaafb0755388de5335b1d2c4c081d0f6393841' +sha256sums=('4126875621a935a450cf616b69a1f922047f241cedc3ac02ece54cd78b23a9fb' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') prepare() { - cd "$srcdir" - rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm" tar jxf $pkgname-$pkgver.tar.bz2 cd "$pkgname-$pkgver" @@ -32,17 +31,14 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" LIBDIR=/usr/lib + make -C "$pkgname-$pkgver" -j1 \ + CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" \ + LIBDIR=/usr/lib } package() { - cd "$srcdir/$pkgname-$pkgver" - - make LIBDIR=/usr/lib DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" - rmdir "$pkgdir/sbin" } # vim:set ts=2 sw=2 et: diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 221086e01..61e1fb220 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $ +# $Id: PKGBUILD 104713 2014-01-24 20:05:37Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.7 +pkgver=4.7.2 pkgrel=1 pkgdesc='An improved dynamic tiling window manager' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.' options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc") -md5sums=('34dade2bc69e241ab3e3ffaa81122266' +md5sums=('64141f7c23f97cd1e52c52918476c1c8' 'SKIP') build() { diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index a2ba5074f..33030d657 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85172 2013-02-27 14:41:02Z ttoepper $ +# $Id: PKGBUILD 105366 2014-02-06 05:24:12Z bisson $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3status -pkgver=2.7 -pkgrel=1 -pkgdesc="Generates status bar to use with dzen2 or xmobar" +pkgver=2.8 +pkgrel=2 +pkgdesc='Generates status bar to use with i3bar, dzen2 or xmobar' arch=('i686' 'x86_64' 'mips64el') -url="http://i3.zekjur.net/i3status/" +url='http://i3.zekjur.net/i3status/' license=('BSD') groups=('i3') depends=('wireless_tools' 'confuse' 'alsa-lib' 'yajl') @@ -14,8 +14,10 @@ makedepends=('asciidoc') backup=('etc/i3status.conf') install=i3status.install options=('docs') -source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") -md5sums=('f0a39e84aebb65496af3dcec9d8cfeb8') +source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2" + "http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2.asc") +md5sums=('68d944e9c1f48183356c9ea15b5b4e3b' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index b1341ae81..5c74912c1 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96438 2013-08-28 21:10:55Z lcarlier $ +# $Id: PKGBUILD 104510 2014-01-22 06:49:46Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20130823 +pkgver=20140114 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!makeflags') #install=iasl.install source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('7846a62551352d7dae6f93f8255e9d99' +md5sums=('77d5aaa723b98314dae80cac1b33514d' '8615526144f69ea4e870d9bc37df9b29') build() { @@ -24,14 +24,14 @@ build() { #sed -i -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' Makefile.config - if [[ $CARCH == i686 ]]; then - make BITS=32 - elif [[ $CARCH == x86_64 ]]; then - make BITS=64 - else - sed -i 's|$(BITSFLAG)||g' Makefile.config - make - fi + make clean + make + +# if [[ $CARCH == i686 ]]; then +# make BITS=32 +# else +# make BITS=64 +# fi } package() { @@ -41,5 +41,3 @@ package() { install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('cc7528ecd185ff779c6b58bfede091b2' - '8615526144f69ea4e870d9bc37df9b29') diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index 56f79bc4e..ba855670e 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102761 2013-12-19 11:22:34Z fyan $ +# $Id: PKGBUILD 104344 2014-01-18 10:47:03Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> @@ -6,7 +6,7 @@ # Contributor: Hiroshi Yui <hiroshiyui@gmail.com> pkgname=ibus-chewing -pkgver=1.4.4 +pkgver=1.4.7 pkgrel=1 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') @@ -23,6 +23,7 @@ build() { -DSYSCONF_INSTALL_DIR=/usr/share \ -DLIBEXEC_DIR=/usr/lib/ibus make + make translations } package() { @@ -34,4 +35,4 @@ package() { rm -r "$pkgdir/etc" } -sha512sums=('47581bca46d1a8f0f10f13887d5db37cf1ca3531e1a05fea516ea10fec59d4b0c2f629b5a291b1aed77e642efa3d456670c8f7fcaff460b187e3b7fc8220f2d6') +sha512sums=('70e9c4950ac846c2f0087200d3b42f845ef8f911962d3f6bf37a3a0054606fa0fc061daa5dac390d022dbd29801fbcae596d2c5126270eb6e9843a9e0af4486e') diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD index 4cd95e129..5eb35b0d8 100644 --- a/community/iftop/PKGBUILD +++ b/community/iftop/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 96466 2013-08-30 08:54:27Z fyan $ -# Maintainer: Daenyth <Daenyth+Arch at gmail dot com> +# $Id: PKGBUILD 104526 2014-01-22 10:17:20Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> # Contributor: slubman <slubman@slubman.net> pkgname=iftop -pkgver=1.0pre2 +pkgver=1.0pre4 pkgrel=1 pkgdesc="Display bandwidth usage on an interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.ex-parrot.com/~pdw/iftop/" license=('GPL') depends=('libpcap' 'ncurses') -#options=('!makeflags') source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz") build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --build=$CHOST make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -sha512sums=('708172baa00a94671b494f33e7290af9ed4e0f764fabb500187855ee39840e379590274802e9ef360c128e881cfe0cefe7a12a9bfdcf9cfa7ffb49746b02300a') + +sha512sums=('abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22') diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index b04c1fb55..268ae3c53 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94126 2013-07-14 18:31:12Z spupykin $ +# $Id: PKGBUILD 105061 2014-01-30 20:23:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=1.9.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc="a quest interpreter" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/instead/" @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://downloads.sourceforge.net/project/instead/instead/${pkgver}/instead_${pkgver}.tar.gz) -md5sums=('fe925715e48ce06ddce9eeeec380b881') +md5sums=('040d8378df4695aed771d6699e1cd7d8') build() { cd "${srcdir}/instead-${pkgver}" @@ -24,5 +24,5 @@ package() { cd "${srcdir}/instead-${pkgver}" make DESTDIR="${pkgdir}" PREFIX=/usr install - cp -a doc/*.{html,txt,pdf} doc/examples $pkgdir/usr/share/doc/instead/ + cp -a doc/*.{html,pdf} doc/instead.txt doc/examples $pkgdir/usr/share/doc/instead/ } diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index f808fc005..a0b3660fb 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102772 2013-12-19 14:18:19Z stativ $ +# $Id: PKGBUILD 105255 2014-02-03 11:44:27Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=13.0.1 -_pkgver=133.331 +pkgver=13.0.2 +_pkgver=133.696 pkgrel=1 pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('Apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('14ca0ad374cfd96ec4b8d3d3bfec9e76') +md5sums=('ee07c8647c525a1b4ef1fb25550f7598') package() { [ $CARCH == "x86_64" ] && SUFFIX=64 diff --git a/community/ipmitool/PKGBUILD b/community/ipmitool/PKGBUILD new file mode 100644 index 000000000..1b48c5230 --- /dev/null +++ b/community/ipmitool/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Florian Pritz <bluewind@xinu.at> +# Contributor: Florian Dejonckheere <florian@floriandejonckheere.be> +# Contributor: gori + +pkgname=ipmitool +pkgver=1.8.13 +pkgrel=2 +pkgdesc="Command-line interface to IPMI-enabled devices" +arch=('i686' 'x86_64') +url="http://ipmitool.sourceforge.net" +depends=('openssl') +license=('BSD') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('64f36baea740f701c5f287805da968a2') + +build(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sbindir=/usr/bin --with-kerneldir + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # Install license + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD new file mode 100644 index 000000000..08a4c6115 --- /dev/null +++ b/community/ipsec-tools/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 100178 2013-11-01 20:59:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Allan Henriksen <allan.henriksen@gmail.com> + +pkgname=ipsec-tools +pkgver=0.8.1 +pkgrel=5 +pkgdesc="KAME IPSec tools ported to Linux" +arch=('i686' 'x86_64') +url="http://ipsec-tools.sourceforge.net/" +depends=('readline' 'openssl' 'krb5') +makedepends=('linux-headers') +license=('GPL') +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 + racoon.service + ipsec.service + ipsec-tools-linux-3.7-compat.patch) +md5sums=('d38b39f291ba2962387c3232e7335dd8' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' + 'ae1dd20c83dcfce3dedb46ee73e83613') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch + sed -i 's#-Werror##' configure.ac + + ./bootstrap + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ + --enable-adminport --enable-gssapi \ + --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service + install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service +} diff --git a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch new file mode 100644 index 000000000..46b11ee51 --- /dev/null +++ b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch @@ -0,0 +1,50 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -74,9 +74,10 @@ case "$host_os" in + [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) + + AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , +- [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, +- KERNEL_INCLUDE=/usr/src/linux/include , +- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ++ [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , ++ [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, ++ KERNEL_INCLUDE=/usr/src/linux/include , ++ [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) + AC_SUBST(KERNEL_INCLUDE) + # We need the configure script to run with correct kernel headers. + # However we don't want to point to kernel source tree in compile time, +@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif +-], [kernel_natt="yes"]) ++], [kernel_natt="yes"], [ ++ AC_EGREP_CPP(yes, ++ [#include <uapi/linux/pfkeyv2.h> ++ #ifdef SADB_X_EXT_NAT_T_TYPE ++ yes ++ #endif ++ ], [kernel_natt="yes"]) ++]) + ;; + freebsd*|netbsd*) + # NetBSD case +--- a/src/include-glibc/Makefile.am ++++ b/src/include-glibc/Makefile.am +@@ -1,14 +1,7 @@ +- +-.includes: ${top_builddir}/config.status +- ln -snf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes +- + EXTRA_DIST = \ + glibc-bugs.h \ + net/pfkeyv2.h \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service new file mode 100644 index 000000000..483a5b58d --- /dev/null +++ b/community/ipsec-tools/ipsec.service @@ -0,0 +1,12 @@ +[Unit] +Description=Load IPSec Security Policy Database +After=syslog.target network.target + +[Service] +Type=oneshot +RemainAfterExit=true +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F + +[Install] +WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service new file mode 100644 index 000000000..95324bd5d --- /dev/null +++ b/community/ipsec-tools/racoon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Racoon IKEv1 key management daemon for IPSEC +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/bin/racoon + +[Install] +WantedBy=multi-user.target diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index aa5475044..2abcb9856 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' 'mips64el') 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/jalv/PKGBUILD b/community/jalv/PKGBUILD index 3efe760d3..0318a58d5 100644 --- a/community/jalv/PKGBUILD +++ b/community/jalv/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 95410 2013-08-11 23:09:01Z speps $ +# $Id: PKGBUILD 104788 2014-01-26 03:57:57Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=jalv -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="A simple but fully featured LV2 host for Jack" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('qt4: Qt 4.x frontend' 'gtk3: Gtk+ 3.x frontend' 'gtkmm: Gtk++ 2.x frontend') source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('a649bbe71ecb54563764f4acbdcc84f6' +md5sums=('56aea296a43b2906cc930c1727b3835c' 'SKIP') build() { diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD index 8531768e4..9aab7741c 100644 --- a/community/jemalloc/PKGBUILD +++ b/community/jemalloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99648 2013-10-30 17:30:37Z mtorromeo $ +# $Id: PKGBUILD 104634 2014-01-23 14:58:20Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Kovivchak Evgen <oneonfire@gmail.com> pkgname=jemalloc -pkgver=3.4.1 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="General-purpose scalable concurrent malloc implementation" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -18,7 +18,7 @@ source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + CFLAGS="$CFLAGS -std=gnu11" ./configure --prefix=/usr make } @@ -30,4 +30,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb') +sha256sums=('5b13dbef27c46e9efbe19b5eef574e298409ed9dbbde85ec805e29d04c05e473') diff --git a/community/julius/PKGBUILD b/community/julius/PKGBUILD new file mode 100644 index 000000000..8e14904d7 --- /dev/null +++ b/community/julius/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 103609 2014-01-08 10:39:22Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Matt Harrison <matt at mistbyte dot com> +# Contributor: Muhammad Qadri <Muhammad dot A dot Qadri at gmail dot com> + +pkgname=julius +pkgver=4.3 +pkgrel=1 +pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software" +arch=("i686" "x86_64") +url="http://julius.sourceforge.jp/" +license=("custom") +depends=("libpulse") +optdepends=("voxforge-am-julius: acoustic models") +source=("http://iij.dl.sourceforge.jp/${pkgname}/60153/${pkgname}-${pkgver}.tar.gz") +md5sums=("48b36e9104b55c409a60947f7ba05bb3") + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # replace /lib/cpp with /usr/bin/cpp since Arch Linux doesn't have /lib/cpp anymore + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "julius/configure" + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "jcontrol/configure" + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libjulius/configure" + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "gramtools/configure" + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libsent/configure" + sed -i "s|/lib/cpp|/usr/bin/cpp|g" "configure" + + # Add -02 to CPPFLAGS to prevent issue with -D_FORTIFY_SOURCE=2 + CPPFLAGS="$CPPFLAGS -O2" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + ./configure \ + --prefix="/usr/" \ + --mandir='${prefix}/share/man' \ + --enable-words-int \ + --enable-msd \ + --enable-gmm-vad \ + --enable-decoder-vad \ + --enable-power-reject \ + --enable-wpair + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + make prefix="${pkgdir}/usr" install + install -D "LICENSE.txt" "${pkgdir}/usr/share/licenses/julius/LICENSE" + # remove empty lib directory + rm -r "${pkgdir}/usr/lib" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD index 972707a20..4763b652a 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' 'mips64el') 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/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD index 9bac69f64..c92ab49f8 100644 --- a/community/kbibtex/PKGBUILD +++ b/community/kbibtex/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 87529 2013-04-02 15:44:34Z schiv $ +# $Id: PKGBUILD 103296 2014-01-02 21:08:34Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Antonio Rojas <nqn1976 @ gmail.com> # Contributor: cmorlok <christianmorlok@web.de> pkgname=kbibtex -pkgver=0.4.1 -_branch=0.4 -pkgrel=2 +pkgver=0.5 +_branch=0.5 +pkgrel=1 pkgdesc="A BibTeX editor for KDE" arch=('i686' 'x86_64' 'mips64el') url='http://home.gna.org/kbibtex/' license=('GPL') -depends=('kdebase-runtime' 'kdegraphics-okular') +depends=('kdebase-runtime') +optdepends=('kdegraphics-okular: Document preview') makedepends=('cmake' 'automoc4') install=$pkgname.install -source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2") -md5sums=('657eda1da48198a3c336ff268ce46d6f') +source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.xz") +md5sums=('bbd2affd1edfb8f02a077c2c7cfc2038') build() { cd "$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } diff --git a/community/kbibtex/kbibtex.install b/community/kbibtex/kbibtex.install index 139cb5694..3f22aadfb 100644 --- a/community/kbibtex/kbibtex.install +++ b/community/kbibtex/kbibtex.install @@ -1,15 +1,15 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } # vim:set ts=2 sw=2 et: diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 8096339be..b8d37909f 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100797 2013-11-11 03:42:38Z seblu $ +# $Id: PKGBUILD 105469 2014-02-08 19:27:45Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.9 +pkgver=1.2.12 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf') depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.service') -md5sums=('adfad98a2cc34230867d794ebc633492' +md5sums=('60f2564acc1e1faa0237b53cf4392d1f' '0a5171f4298528315e8a8004b55befb7') build() { diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD index 36ac427e8..3383462e8 100644 --- a/community/keepassx/PKGBUILD +++ b/community/keepassx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101314 2013-11-22 17:06:59Z spupykin $ +# $Id: PKGBUILD 104304 2014-01-17 11:43:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Greg Bouzakis <gregbouzakis@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=keepassx pkgver=0.4.3 -pkgrel=5 +pkgrel=6 pkgdesc='Password manager' arch=('i686' 'x86_64' 'mips64el') url='http://www.keepassx.org' @@ -17,15 +17,19 @@ install=keepassx.install source=(http://downloads.sourceforge.net/keepassx/$pkgname-$pkgver.tar.gz) md5sums=('1df67bb22b2e08df49f09e61d156f508') -build() { - cd $srcdir/$pkgname-$pkgver +prepare() { + cd $pkgname-$pkgver sed -i '1,1i#include <unistd.h>' src/lib/random.cpp + find -name '*.png' -exec optipng -quiet -force -fix {} \; +} + +build() { + cd $pkgname-$pkgver qmake-qt4 make - find -name '*.png' -exec optipng -quiet -force -fix {} \; } package() { - cd $srcdir/$pkgname-$pkgver - make INSTALL_ROOT=$pkgdir install + cd $pkgname-$pkgver + make INSTALL_ROOT="$pkgdir" install } diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 6818b5de5..2d1b3ea43 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92569 2013-06-08 18:17:35Z kkeen $ +# $Id: PKGBUILD 103943 2014-01-13 20:00:42Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Marq Schneider <queueRAM@gmail.com> @@ -6,25 +6,34 @@ pkgname=kicad pkgver=20130518 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} _pkgbzr=4017 -pkgrel=1 +pkgrel=3 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64' 'mips64el') url="http://iut-tice.ujf-grenoble.fr/kicad/" license=('GPL') -depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('glu' 'wxgtk2.8' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm') makedepends=('cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip - kicad-boost-polygon-declare-gtlsort-earlier.patch) + kicad-boost-polygon-declare-gtlsort-earlier.patch + wxgtk3.0.patch) md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79' - 'a2c39704238946e74a5ed0c38326345f') + 'a2c39704238946e74a5ed0c38326345f' + 'ec3e7581c814ca2b76becc7b30a8529f') + +#source=(https://launchpad.net/ubuntu/trusty/+source/kicad/0.${pkgver}+bzr${_pkgbzr}-2/+files/kicad_0.${pkgver}+bzr${_pkgbzr}.orig.tar.gz) +# patches from https://launchpad.net/ubuntu/trusty/+source/kicad/0.20130727+bzr4024-2/+files/kicad_0.20130727+bzr4024-2.debian.tar.gz ? build() { cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}" + # kicad-boost-polygon-declare-gtlsort-earlier.patch + #sed -i '20i #include "detail/polygon_sort_adaptor.hpp"' include/boost/polygon/polygon.hpp patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch" + #patch -p1 < "$srcdir/wxgtk3.0.patch" + #sed -i 's/wxStandardPaths/&::Get/' common/edaappl.cpp # harmless build blocking error # see https://lists.launchpad.net/kicad-developers/msg07841.html @@ -37,9 +46,13 @@ build() { # build and install kicad mkdir -p build/Release cd build/Release + # STABLE_VERSION gets removed, eventually + # gets ported to wxgtk3, eventually cmake ../.. -DKICAD_STABLE_VERSION=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \ + -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' make } @@ -52,3 +65,4 @@ package() { #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/" } + diff --git a/community/kicad/wxgtk3.0.patch b/community/kicad/wxgtk3.0.patch new file mode 100644 index 000000000..532fd5da9 --- /dev/null +++ b/community/kicad/wxgtk3.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/common/edaappl.cpp b/common/edaappl.cpp +--- a/common/edaappl.cpp 2013-03-09 21:07:56.000000000 +0000 ++++ b/common/edaappl.cpp 2014-01-07 07:49:38.984938912 +0000 +@@ -451,7 +451,7 @@ bool EDA_APP::SetBinDir() + + // Linux and Unix + #elif defined(__UNIX__) +- m_BinDir = wxStandardPaths().GetExecutablePath(); ++ m_BinDir = wxStandardPaths::Get().GetExecutablePath(); + #else + m_BinDir = argv[0]; + #endif // __UNIX__ diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD index feb6e9870..c051870d9 100644 --- a/community/kiwi/PKGBUILD +++ b/community/kiwi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85550 2013-03-03 03:09:38Z cinelli $ +# $Id: PKGBUILD 105127 2014-02-01 09:34:22Z lfleischer $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=kiwi pkgver=1.9.29 -pkgrel=2 +pkgrel=3 pkgdesc="A set of classes and wrappers for PyGTK" arch=('i686' 'x86_64' 'mips64el') url="http://www.async.com.br/projects/kiwi" diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 9448a2af0..17ff9bd8e 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 98040 2013-10-04 13:46:45Z stativ $ +# $Id: PKGBUILD 105247 2014-02-03 11:23:55Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=klavaro -pkgver=2.00 +pkgver=3.00 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64' 'mips64el') url="http://klavaro.sourceforge.net/" license=('GPL2') -depends=('curl' 'gtkdatabox' 'hicolor-icon-theme') +depends=('curl' 'gtk3' 'hicolor-icon-theme') makedepends=('intltool') optdepends=('espeakup: voice output') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('f7c804fbad7f9a053dfcfbea6d91dce6') +md5sums=('254559632d4ae26aa22b80be9f01cb47') build() { cd "$srcdir"/$pkgname-$pkgver @@ -24,6 +24,10 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install + # remove the gtkdatabox shared library + # klavaro links to it statically due to some incompatibility wioth GTK3 + rm -r "$pkgdir/usr/lib" + sed -i 's|/usr/share/icons/hicolor/24x24/apps/klavaro.png|klavaro|' \ "$pkgdir"/usr/share/applications/$pkgname.desktop } diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index 293e964d8..05ccc5c1a 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97032 2013-09-11 02:13:11Z bgyorgy $ -# Maintainer: +# $Id: PKGBUILD 103917 2014-01-13 17:16:49Z andyrtr $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=4 +pkgrel=5 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64' 'mips64el') url='http://kmess.sourceforge.net/' diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index 4cd33a88f..7838449ca 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $ +# $Id: PKGBUILD 105367 2014-02-06 05:24:13Z bisson $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=knemo pkgver=0.7.6 -pkgrel=3 +pkgrel=4 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=12956" @@ -15,25 +15,26 @@ depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl' 'gtk-update-icon-cach makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') -source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") +source=(https://launchpad.net/ubuntu/+archive/primary/+files/knemo_$pkgver.orig.tar.bz2) md5sums=('42b35d4d48698a2f514adeb2ca872408') -build() { - cd ${srcdir} - +prepare() { mkdir build +} + +build() { cd build + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/build - - make DESTDIR=${pkgdir} install + cd build + make DESTDIR="${pkgdir}" install # remove knemo autostart # rm -rf ${pkgdir}/usr/share/autostart diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index 11375c709..1c12378c8 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103167 2013-12-28 11:16:04Z lcarlier $ +# $Id: PKGBUILD 104796 2014-01-26 12:17:34Z andyrtr $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -7,7 +7,7 @@ pkgname=kphotoalbum pkgver=4.4 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/krename/PKGBUILD b/community/krename/PKGBUILD index e7fdfe295..2ef6e1696 100644 --- a/community/krename/PKGBUILD +++ b/community/krename/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74836 2012-08-06 23:09:01Z andrea $ +# $Id: PKGBUILD 104797 2014-01-26 12:17:35Z andyrtr $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=krename pkgver=4.0.9 -pkgrel=2 -pkgdesc="A very powerfull batch file renamer for KDE" +pkgrel=3 +pkgdesc="A very powerful batch file renamer for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.krename.net" license=('GPL') @@ -16,16 +16,15 @@ source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/$ sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-I/usr/include/freetype2" make } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index 8f65fc769..18a9a0e63 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $ +# $Id: PKGBUILD 103918 2014-01-13 17:16:50Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Danial Olsen <do@meyl.fo> pkgname=kvpnc pkgver=0.9.6a -pkgrel=4 +pkgrel=5 pkgdesc="A KDE Desktop Environment frontend for various vpn clients" arch=(i686 x86_64 'mips64el') url="http://home.gna.org/kvpnc/" diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 8333b1a01..e69b7ecff 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100182 2013-11-01 21:05:03Z spupykin $ +# $Id: PKGBUILD 105237 2014-02-03 10:02:21Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.69 -pkgrel=9 +pkgrel=10 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.leptonica.com/" diff --git a/community/libaacs/PKGBUILD b/community/libaacs/PKGBUILD new file mode 100644 index 000000000..9c3e01eef --- /dev/null +++ b/community/libaacs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104040 2014-01-14 17:14:01Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> +# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> +# Contributor: Dirk Berg <berg1981@googlemail.com> + +pkgname=libaacs +pkgver=0.7.0 +pkgrel=2 +pkgdesc="Advanced Access Content System" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://www.videolan.org/developers/libaacs.html" +depends=('libgcrypt') +source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +provides=('libaacs') +conflicts=('libaacs-git') +md5sums=('8da0da893d1f266b31bf8a8fc7c84a84') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 KEYDB.cfg "${pkgdir}/usr/share/doc/${pkgname}"/KEYDB.cfg + install -Dm644 README.txt "${pkgdir}/usr/share/doc/${pkgname}"/README.txt +} diff --git a/community/libc++/PKGBUILD b/community/libc++/PKGBUILD index 6a4f8c0df..fc27155d1 100644 --- a/community/libc++/PKGBUILD +++ b/community/libc++/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: MThinkCpp <mtc.maintainer[at]outlook.com> pkgname=libc++ -pkgver=3.3 -pkgrel=3 +pkgver=3.4 +pkgrel=1 pkgdesc='A new implementation of the C++ standard library, targeting C++11.' url='http://libcxx.llvm.org' license=('custom:University of Illinois/NCSA Open Source License') @@ -11,19 +11,19 @@ arch=('i686' 'x86_64') depends=('glibc' 'libc++abi' 'gcc-libs') makedepends=('clang' 'subversion' 'cmake') source=("http://www.llvm.org/releases/${pkgver}/libcxx-${pkgver}.src.tar.gz") -md5sums=('59006e659ffb33f5222a7b79d4cd071e') +md5sums=('85c3c4e2233893b037256bf9f7077857') install=${pkgname}.install build() { - mkdir -p libcxx-${pkgver}.src/build - cd libcxx-${pkgver}.src/build + mkdir -p libcxx-${pkgver}/build + cd libcxx-${pkgver}/build CC=clang CXX=clang++ cmake -G "Unix Makefiles" -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_LIBCXXABI_INCLUDE_PATHS=/usr/include \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/libcxx-${pkgver}.src" + -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/libcxx-${pkgver}" make } package() { - install -Dm644 libcxx-${pkgver}.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/license.txt" - cd libcxx-${pkgver}.src/build + install -Dm644 libcxx-${pkgver}/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/license.txt" + cd libcxx-${pkgver}/build make DESTDIR="$pkgdir" install } diff --git a/community/libdivecomputer/PKGBUILD b/community/libdivecomputer/PKGBUILD new file mode 100644 index 000000000..128d186c5 --- /dev/null +++ b/community/libdivecomputer/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 105692 2014-02-14 05:51:19Z bisson $ +# Contributor: Francois Boulogne <fboulogne at april dot org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=libdivecomputer +pkgver=0.4.2 +pkgrel=2 +pkgdesc='Library for communication with dive computers' +url='http://www.libdivecomputer.org/' +license=('LGPL') +arch=('i686' 'x86_64') +source=("http://www.libdivecomputer.org/releases/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a57176ae6a7bd5e0ad4d19a39e5aebcfba818acc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --program-prefix="${pkgname}-" \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD index 92112d78b..f6f402dcc 100644 --- a/community/libesmtp/PKGBUILD +++ b/community/libesmtp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99832 2013-10-31 01:58:40Z allan $ +# $Id: PKGBUILD 103322 2014-01-03 10:52:59Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libesmtp pkgver=1.0.6 -pkgrel=2.1 +pkgrel=3 pkgdesc='A library to manage posting mail to a preconfigured MTA.' arch=('i686' 'x86_64' 'mips64el') url='http://www.stafford.uklinux.net/libesmtp/' diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD index f293b35a9..286ae1f22 100644 --- a/community/libev/PKGBUILD +++ b/community/libev/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99834 2013-10-31 01:59:20Z allan $ +# $Id: PKGBUILD 103324 2014-01-03 10:53:10Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Thomas Haider <t.haider@vcnc.org> pkgname=libev pkgver=4.15 -pkgrel=1 +pkgrel=2 pkgdesc="A full-featured and high-performance event loop" arch=('i686' 'x86_64' 'mips64el') url="http://software.schmorp.de/pkg/libev.html" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index c77f0539e..92e1d1d25 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99836 2013-10-31 02:00:00Z allan $ +# $Id: PKGBUILD 104798 2014-01-26 12:17:36Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=1.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD index a43fbb58b..c5e306d70 100644 --- a/community/libfaketime/PKGBUILD +++ b/community/libfaketime/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103175 2013-12-28 18:39:16Z lfleischer $ +# $Id: PKGBUILD 105112 2014-01-31 20:29:28Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Dan Serban # Contributor: Ross Melin <rdmelin@gmail.com> pkgname=libfaketime pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.' arch=('i686' 'x86_64' 'mips64el') url='http://www.code-wizards.com/projects/libfaketime/' @@ -15,7 +15,7 @@ md5sums=('89b5c71e6c6a93b1c6feba374ac37719') build() { cd "${pkgname}-${pkgver}" - make + make PREFIX=/usr } package() { diff --git a/community/libfdk-aac/PKGBUILD b/community/libfdk-aac/PKGBUILD new file mode 100644 index 000000000..0a6cf737b --- /dev/null +++ b/community/libfdk-aac/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 105354 2014-02-05 21:49:32Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: PelPix <kylebloss@pelpix.info> +# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> + +pkgname=libfdk-aac +pkgver=0.1.3 +pkgrel=2 +pkgdesc='Fraunhofer FDK AAC codec library' +arch=('i686' 'x86_64') +url='http://sourceforge.net/projects/opencore-amr/' +license=('custom') +depends=('glibc') +source=("http://downloads.sourceforge.net/opencore-amr/${pkgname#lib}-${pkgver}.tar.gz") +sha256sums=('a9cb872802cfb7a2aff7a549c114c547d1e518dd60c2f85942229cc20c0d0c8d') + +build() { + cd ${pkgname#lib}-${pkgver} + + ./configure --prefix='/usr' --disable-static + make +} + +package () { + cd ${pkgname#lib}-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/ +} + +# vim: ts=2 sw=2 et: diff --git a/community/libftdi/PKGBUILD b/community/libftdi/PKGBUILD new file mode 100644 index 000000000..047615a8e --- /dev/null +++ b/community/libftdi/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 105529 2014-02-09 17:42:22Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> + +pkgname=libftdi +pkgver=1.1 +pkgrel=2 +pkgdesc="A library to talk to FTDI chips" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.intra2net.com/en/developer/libftdi/download.php" +license=('GPL2' 'LGPL2.1') +depends=('libusbx') +makedepends=('boost' 'cmake') +source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig}) +sha1sums=('f05ade5614aa31e64f91a30ce3782f7ca3704d18' + 'SKIP') + +prepare() { + cd "${pkgname}1-$pkgver" + sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt +} + +build() { + cd "${pkgname}1-$pkgver" + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \ + -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=OFF + make +} + +package() { + cd "${pkgname}1-$pkgver/build" + make DESTDIR="$pkgdir" install +} diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD index a391e2128..0f8da267c 100644 --- a/community/libgeotiff/PKGBUILD +++ b/community/libgeotiff/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99840 2013-10-31 02:01:25Z allan $ +# $Id: PKGBUILD 103326 2014-01-03 10:53:25Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org @@ -6,7 +6,7 @@ pkgname=libgeotiff pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A TIFF based interchange format for georeferenced raster imagery" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/geotiff" diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD index 9adbc5efb..760c679f0 100644 --- a/community/libgexiv2/PKGBUILD +++ b/community/libgexiv2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100330 2013-11-02 11:06:06Z arodseth $ +# $Id: PKGBUILD 104799 2014-01-26 12:17:37Z andyrtr $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=libgexiv2 pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc='GObject-based wrapper around the Exiv2 library' arch=('x86_64' 'i686' 'mips64el') # http://yorba.org/download/gexiv2/ diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD index bb1484a33..9cc31aa13 100644 --- a/community/libgit2-glib/PKGBUILD +++ b/community/libgit2-glib/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 99843 2013-10-31 02:02:27Z allan $ +# $Id: PKGBUILD 104880 2014-01-28 00:44:20Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libgit2-glib -pkgver=0.0.6 +pkgver=0.0.10 pkgrel=1 pkgdesc="GLib wrapper for libgit2" -url="http://live.gnome.org/Libgit2-glib" +url="http://wiki.gnome.org/Projects/Libgit2-glib" license=(LGPL2.1) arch=(i686 x86_64) -depends=(glib2 libgit2 gobject-introspection) +depends=(glib2 libgit2) +makedepends=(gobject-introspection) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6') +sha256sums=('3d9dc3c2ca7fab21aa005100b102e085f4d864e507c424d46de451e9d40bfeff') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD index 37fe82c0e..4c7c48313 100644 --- a/community/libgit2/PKGBUILD +++ b/community/libgit2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93245 2013-06-29 19:05:07Z thestinger $ +# $Id: PKGBUILD 104861 2014-01-27 17:22:44Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Hilton Medeiros <medeiros.hilton@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=libgit2 -pkgver=0.19.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="A linkable library for Git" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ url="http://libgit2.github.com/" depends=(zlib openssl libssh2) makedepends=(cmake python) license=('GPL2') -source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") -md5sums=('df1c1e058b2d0f46b1b73dc78d551ea1') +source=("https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz") +md5sums=('e35f613a37e11354f34249f2faa68237') build() { cd $pkgname-* diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 81c623de6..c5aa21815 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100198 2013-11-01 21:12:34Z spupykin $ +# $Id: PKGBUILD 105374 2014-02-06 09:23:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gregory Haynes <greg@greghaynes.net> pkgname=libinfinity -pkgver=0.5.4 -pkgrel=2 +pkgver=0.5.5 +pkgrel=1 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64' 'mips64el') url="http://gobby.0x539.de" @@ -15,7 +15,7 @@ makedepends=('gtk-doc' 'pkgconfig') optdepends=('avahi: zeroconf support' 'gtk2: gtk support') source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1e83ec8b3ed3159d0c883c056b153429') +md5sums=('93a0cd2b73c9298aa77ee37503d2bc5f') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD deleted file mode 100644 index 7c558a7f5..000000000 --- a/community/liblinebreak/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 100200 2013-11-01 21:12:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Orivej Desh <smpuj@bk.ru> - -pkgname=liblinebreak -pkgver=2.1 -pkgrel=2 -pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24" -arch=("i686" "x86_64" 'mips64el') -url="http://vimgadgets.sourceforge.net/liblinebreak/" -license=("custom:zlib/libpng") -depends=("glibc") -source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz") -md5sums=('9fe73b4b230434765be2305e50f8fe45') - -build() { - cd "$srcdir/liblinebreak-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/liblinebreak-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - diff --git a/community/liblogging/PKGBUILD b/community/liblogging/PKGBUILD new file mode 100644 index 000000000..9c2c94f39 --- /dev/null +++ b/community/liblogging/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 105659 2014-02-13 09:26:42Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Denis Wernert <deniswernert@gmail.com> + +pkgname=liblogging +pkgver=1.0.1 +pkgrel=1 +pkgdesc="easy to use, portable, open source library for system logging" +url="http://www.liblogging.org/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('git') +options=('strip' 'zipman' '!libtool') +source=("http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz") +#source=("git://git.adiscon.com/git/liblogging.git") +md5sums=('1db6bef59157a5676f8fad49be6e5d9d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + +# libtoolize --force --copy +# aclocal +# autoheader +# automake --add-missing --copy +# autoconf + + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/libmatekbd/PKGBUILD b/community/libmatekbd/PKGBUILD new file mode 100644 index 000000000..e351ce4b3 --- /dev/null +++ b/community/libmatekbd/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104170 2014-01-16 15:09:15Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=libmatekbd +pkgver=1.6.2 +pkgrel=1 +pkgdesc="MATE keyboard library" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('dconf' 'gtk2' 'iso-codes' 'libxklavier') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('224eba31dbf6d44f69ae3b75712a0bb90717df68') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libmatekbd/libmatekbd.install b/community/libmatekbd/libmatekbd.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/libmatekbd/libmatekbd.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/libmatekeyring/PKGBUILD b/community/libmatekeyring/PKGBUILD new file mode 100644 index 000000000..54fb88865 --- /dev/null +++ b/community/libmatekeyring/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104159 2014-01-16 13:02:33Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=libmatekeyring +pkgver=1.6.1 +pkgrel=3 +pkgdesc="MATE keyring client library" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('dbus' 'glib2' 'libgcrypt') +makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('ad6a5d029506348094e0147a9be9cc4555ed87a4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/mate-keyring \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libmateweather/PKGBUILD b/community/libmateweather/PKGBUILD new file mode 100644 index 000000000..82d54aebe --- /dev/null +++ b/community/libmateweather/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104174 2014-01-16 15:20:18Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=libmateweather +pkgver=1.6.2 +pkgrel=5 +pkgdesc="Provides access to weather information from the net" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('dconf' 'gtk2' 'libsoup' 'pygtk' 'python2-gobject2') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('56f30e35345864954a37228ad8103350f4bc3651') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-python \ + --enable-locations-compression + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libmateweather/libmateweather.install b/community/libmateweather/libmateweather.install new file mode 100644 index 000000000..d6813b0f7 --- /dev/null +++ b/community/libmateweather/libmateweather.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/libmatewnck/PKGBUILD b/community/libmatewnck/PKGBUILD new file mode 100644 index 000000000..2c967fb94 --- /dev/null +++ b/community/libmatewnck/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104295 2014-01-17 10:05:11Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=libmatewnck +pkgver=1.6.1 +pkgrel=6 +pkgdesc="Window Navigator Construction Kit for MATE." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk2' 'libxres' 'startup-notification') +makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('10e2def928dd74529c49a624803187098ea2b0f6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-static \ + --enable-gtk-doc \ + --enable-startup-notification \ + --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index b8cf31a36..4e5579e26 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102393 2013-12-10 10:04:03Z spupykin $ +# $Id: PKGBUILD 104514 2014-01-22 06:55:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.32 +pkgver=0.9.33 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('LGPL') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('29dcc1c201c36044be2c3f816c64a5bb') +md5sums=('013b10f9de1cda5448b29c81305354a3') build() { cd ${pkgname}-${pkgver} diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD index dd73bbe83..e08478350 100644 --- a/community/libmilter/PKGBUILD +++ b/community/libmilter/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 88321 2013-04-16 13:29:18Z spupykin $ +# $Id: PKGBUILD 105609 2014-02-11 17:57:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mutantmonkey <mutantmonkey@gmail.com> pkgname=libmilter -pkgver=8.14.6 +pkgver=8.14.8 pkgrel=1 pkgdesc="libmilter" arch=(i686 x86_64 mips64el) url="http://www.postfix.org/MILTER_README.html" +options=('staticlibs') license=('custom:Sendmail open source license') source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz" -md5sums=('9eeed3d1baecbf4e17d829d2ec005553') +md5sums=('73bfc621c75dbdd3d719e54685d92577') options=(staticlibs) build(){ diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index e4bc6184b..f83af59e4 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' 'mips64el') @@ -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/liboobs/PKGBUILD b/community/liboobs/PKGBUILD new file mode 100644 index 000000000..8ca3cea23 --- /dev/null +++ b/community/liboobs/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 104269 2014-01-16 18:45:11Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> + +pkgname=liboobs +pkgver=3.0.0 +pkgrel=3 +pkgdesc="GObject based interface to system-tools-backends - shared library" +arch=('i686' 'x86_64') +url="http://developer.gnome.org/liboobs/" +license=('GPL2') +depends=('system-tools-backends') +source=("ftp://ftp.gnome.org/pub/GNOME/sources/liboobs/3.0/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('1e7a327df7dcfa30e0cd3e0d2ffcd9a2c91c7870291dd30434b5da907945c00a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-static + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD deleted file mode 100644 index 82c85b7a9..000000000 --- a/community/libpaper/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 99872 2013-10-31 02:12:23Z allan $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: royrocks <royrocks13@gmail.com> - -pkgname=libpaper -pkgver=1.1.24 -pkgrel=6 -pkgdesc='Library for handling paper characteristics' -arch=('x86_64' 'i686' 'mips64el') -url='http://packages.debian.org/unstable/source/libpaper' -license=('GPL') -depends=('sh') -source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz") -sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') - -build() { - cd "$pkgname-$pkgver+nmu2" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin - make -} - -package() { - make -C "$pkgname-$pkgver+nmu2" DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD index e33eaf34f..d51796f9e 100644 --- a/community/libuhd/PKGBUILD +++ b/community/libuhd/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 102256 2013-12-07 10:36:40Z bpiotrowski $ +# $Id: PKGBUILD 105585 2014-02-10 16:15:17Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dominik Heidler <dheidler@gmail.com> pkgname=libuhd -pkgver=3.5.4 -_verstring=003_005_004 -pkgrel=4 +pkgver=3.6.2 +_verstring=003_006_002 +pkgrel=1 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver" arch=('x86_64' 'i686') url="http://code.ettus.com/redmine/ettus/projects/uhd/wiki" license=('GPL') depends=('boost-libs' 'orc' 'libusbx') +optdepends=('python2: usrp utils') makedepends=('cmake' 'boost' 'python2-cheetah') -source=("libuhd-$pkgver.tar.gz::https://codeload.github.com/EttusResearch/uhd/tar.gz/release_$_verstring") -md5sums=('e90c95483a52b75cacc85f4fb0ef63ed') +source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/release_${_verstring}.tar.gz") +md5sums=('50a25b95dc08dd3946988c5da98814a9') build() { cd "$srcdir/uhd-release_$_verstring/host" # fix for py2 - find -name "*.py" | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find -name "*.py" -or -name '*.py.in' | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + mkdir -p build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \ @@ -29,6 +31,7 @@ build() { -DENABLE_TESTS=OFF \ -DENABLE_E100=ON # e100 is disabled by default for now, check that on future releases + make } @@ -40,5 +43,5 @@ check() { package() { cd "$srcdir/uhd-release_$_verstring/host/build" make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/uhd/utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules" + install -Dm644 "../utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules" } diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD index b5f7deb53..6134346c9 100644 --- a/community/libvdpau-va-gl/PKGBUILD +++ b/community/libvdpau-va-gl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101594 2013-11-28 16:02:19Z bpiotrowski $ +# $Id: PKGBUILD 105035 2014-01-30 12:39:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Behem0th <grantipak@gmail.com> pkgname=libvdpau-va-gl -pkgver=0.2.1 +pkgver=0.3.2 pkgrel=1 pkgdesc='VDPAU driver with OpenGL/VAAPI backend' arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url='https://github.com/i-rinat/libvdpau-va-gl' license=('LGPL3') depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu') makedepends=('cmake') -source=('https://github.com/i-rinat/${pkgname}/archive/v'${pkgver}'.zip') -md5sums=('bb14c2ec9763c025b1abde96df845512') +source=(https://github.com/i-rinat/$pkgname/archive/v$pkgver.tar.gz) +md5sums=('3fea8e94a67cd54c2f1d3ce1907c910a') build() { cd $pkgname-$pkgver diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD index 3e592fdfd..27eba642e 100644 --- a/community/libvirt-python/PKGBUILD +++ b/community/libvirt-python/PKGBUILD @@ -3,31 +3,25 @@ # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt-python -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="libvirt python binding" arch=('i686' 'x86_64') url="http://libvirt.org/" license=('LGPL') depends=('python2' 'libvirt') +makedepends=('git') options=('emptydirs') install="libvirt-python.install" -source=("ftp://libvirt.org/libvirt/python/$pkgname-$pkgver.tar.gz" - "python-fix.patch::http://libvirt.org/git/?p=libvirt-python.git;a=patch;h=9d9e2513c09e7ba7474c94455e5f82b3d00e6396") -md5sums=('38158e5740be65f17eef9f99ffa5dadf' - 'ba2e5b0d5906a25a6e8a857156d55b61') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/python-fix.patch -} +source=("$pkgname::git://libvirt.org/libvirt-python.git#tag=v1.2.1") +md5sums=('SKIP') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" python2 setup.py build } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" python2 setup.py install --root=$pkgdir } diff --git a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch b/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch deleted file mode 100644 index 70a613820..000000000 --- a/community/libvirt/0001-Also-store-user-group-ID-values-in-virIdentity.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 02432e3afa32e9866fbf1317069b422ef552d1d4 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 22 Aug 2013 16:00:01 +0100
-Subject: [PATCH 1/3] Also store user & group ID values in virIdentity
-
-Future improvements to the polkit code will require access to
-the numeric user ID, not merely user name.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/rpc/virnetserverclient.c | 18 ++++++++++++++++++
- src/util/viridentity.c | 23 +++++++++++++++++++----
- src/util/viridentity.h | 2 ++
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
-index 83d5cf1..f30dd08 100644
---- a/src/rpc/virnetserverclient.c
-+++ b/src/rpc/virnetserverclient.c
-@@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
- char *processid = NULL;
- char *processtime = NULL;
- char *username = NULL;
-+ char *userid = NULL;
- char *groupname = NULL;
-+ char *groupid = NULL;
- #if WITH_SASL
- char *saslname = NULL;
- #endif
-@@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
-
- if (!(username = virGetUserName(uid)))
- goto cleanup;
-+ if (virAsprintf(&userid, "%d", uid) < 0)
-+ goto cleanup;
- if (!(groupname = virGetGroupName(gid)))
- goto cleanup;
-+ if (virAsprintf(&userid, "%d", gid) < 0)
-+ goto cleanup;
- if (virAsprintf(&processid, "%llu",
- (unsigned long long)pid) < 0)
- goto cleanup;
-@@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
- VIR_IDENTITY_ATTR_UNIX_USER_NAME,
- username) < 0)
- goto error;
-+ if (userid &&
-+ virIdentitySetAttr(ret,
-+ VIR_IDENTITY_ATTR_UNIX_USER_ID,
-+ userid) < 0)
-+ goto error;
- if (groupname &&
- virIdentitySetAttr(ret,
- VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
- groupname) < 0)
- goto error;
-+ if (groupid &&
-+ virIdentitySetAttr(ret,
-+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
-+ groupid) < 0)
-+ goto error;
- if (processid &&
- virIdentitySetAttr(ret,
- VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
-@@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
-
- cleanup:
- VIR_FREE(username);
-+ VIR_FREE(userid);
- VIR_FREE(groupname);
-+ VIR_FREE(groupid);
- VIR_FREE(processid);
- VIR_FREE(processtime);
- VIR_FREE(seccontext);
-diff --git a/src/util/viridentity.c b/src/util/viridentity.c
-index 781f660..03c375b 100644
---- a/src/util/viridentity.c
-+++ b/src/util/viridentity.c
-@@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident)
- virIdentityPtr virIdentityGetSystem(void)
- {
- char *username = NULL;
-+ char *userid = NULL;
- char *groupname = NULL;
-+ char *groupid = NULL;
- char *seccontext = NULL;
- virIdentityPtr ret = NULL;
- #if WITH_SELINUX
-@@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void)
-
- if (!(username = virGetUserName(getuid())))
- goto cleanup;
-+ if (virAsprintf(&userid, "%d", (int)getuid()) < 0)
-+ goto cleanup;
-+
- if (!(groupname = virGetGroupName(getgid())))
- goto cleanup;
-+ if (virAsprintf(&groupid, "%d", (int)getgid()) < 0)
-+ goto cleanup;
-
- #if WITH_SELINUX
- if (getcon(&con) < 0) {
-@@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void)
- if (!(ret = virIdentityNew()))
- goto cleanup;
-
-- if (username &&
-- virIdentitySetAttr(ret,
-+ if (virIdentitySetAttr(ret,
- VIR_IDENTITY_ATTR_UNIX_USER_NAME,
- username) < 0)
- goto error;
-- if (groupname &&
-- virIdentitySetAttr(ret,
-+ if (virIdentitySetAttr(ret,
-+ VIR_IDENTITY_ATTR_UNIX_USER_ID,
-+ userid) < 0)
-+ goto error;
-+ if (virIdentitySetAttr(ret,
- VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
- groupname) < 0)
- goto error;
-+ if (virIdentitySetAttr(ret,
-+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
-+ groupid) < 0)
-+ goto error;
- if (seccontext &&
- virIdentitySetAttr(ret,
- VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-@@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void)
-
- cleanup:
- VIR_FREE(username);
-+ VIR_FREE(userid);
- VIR_FREE(groupname);
-+ VIR_FREE(groupid);
- VIR_FREE(seccontext);
- VIR_FREE(processid);
- return ret;
-diff --git a/src/util/viridentity.h b/src/util/viridentity.h
-index 4bae8d6..a240c2d 100644
---- a/src/util/viridentity.h
-+++ b/src/util/viridentity.h
-@@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr;
-
- typedef enum {
- VIR_IDENTITY_ATTR_UNIX_USER_NAME,
-+ VIR_IDENTITY_ATTR_UNIX_USER_ID,
- VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
-+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
- VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
- VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
- VIR_IDENTITY_ATTR_SASL_USER_NAME,
---
-1.8.3.1
-
diff --git a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch b/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch deleted file mode 100644 index 1fba7d56c..000000000 --- a/community/libvirt/0002-Ensure-system-identity-includes-process-start-time.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f26b6e44bf0c3efe8167a528141224ccb7623b4a Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Wed, 28 Aug 2013 15:22:05 +0100
-Subject: [PATCH 2/3] Ensure system identity includes process start time
-
-The polkit access driver will want to use the process start
-time field. This was already set for network identities, but
-not for the system identity.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/util/viridentity.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/util/viridentity.c b/src/util/viridentity.c
-index 03c375b..f681f85 100644
---- a/src/util/viridentity.c
-+++ b/src/util/viridentity.c
-@@ -35,6 +35,7 @@
- #include "virthread.h"
- #include "virutil.h"
- #include "virstring.h"
-+#include "virprocess.h"
-
- #define VIR_FROM_THIS VIR_FROM_IDENTITY
-
-@@ -142,11 +143,20 @@ virIdentityPtr virIdentityGetSystem(void)
- security_context_t con;
- #endif
- char *processid = NULL;
-+ unsigned long long timestamp;
-+ char *processtime = NULL;
-
- if (virAsprintf(&processid, "%llu",
- (unsigned long long)getpid()) < 0)
- goto cleanup;
-
-+ if (virProcessGetStartTime(getpid(), ×tamp) < 0)
-+ goto cleanup;
-+
-+ if (timestamp != 0 &&
-+ virAsprintf(&processtime, "%llu", timestamp) < 0)
-+ goto cleanup;
-+
- if (!(username = virGetUserName(getuid())))
- goto cleanup;
- if (virAsprintf(&userid, "%d", (int)getuid()) < 0)
-@@ -198,6 +208,11 @@ virIdentityPtr virIdentityGetSystem(void)
- VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
- processid) < 0)
- goto error;
-+ if (processtime &&
-+ virIdentitySetAttr(ret,
-+ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
-+ processtime) < 0)
-+ goto error;
-
- cleanup:
- VIR_FREE(username);
-@@ -206,6 +221,7 @@ cleanup:
- VIR_FREE(groupid);
- VIR_FREE(seccontext);
- VIR_FREE(processid);
-+ VIR_FREE(processtime);
- return ret;
-
- error:
---
-1.8.3.1
-
diff --git a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch b/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch deleted file mode 100644 index 8882f1227..000000000 --- a/community/libvirt/0003-Add-support-for-using-3-arg-pkcheck-syntax-for-proce.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 4a061ec8fe94857dd21acf401c66195ec51b1234 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Wed, 28 Aug 2013 15:25:40 +0100
-Subject: [PATCH 3/3] Add support for using 3-arg pkcheck syntax for process
-
-With the existing pkcheck (pid, start time) tuple for identifying
-the process, there is a race condition, where a process can make
-a libvirt RPC call and in another thread exec a setuid application,
-causing it to change to effective UID 0. This in turn causes polkit
-to do its permission check based on the wrong UID.
-
-To address this, libvirt must get the UID the caller had at time
-of connect() (from SO_PEERCRED) and pass a (pid, start time, uid)
-triple to the pkcheck program.
-
-Signed-off-by: Colin Walters <walters@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- configure.ac | 8 ++++++++
- daemon/remote.c | 21 +++++++++++++++++---
- src/access/viraccessdriverpolkit.c | 40 +++++++++++++++++++++++++++++++++-----
- 3 files changed, 61 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94a2e19..3dfbb4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1184,6 +1184,14 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then
- AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])
- if test "x$PKCHECK_PATH" != "x" ; then
- AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])
-+ AC_MSG_CHECKING([whether pkcheck supports uid value])
-+ pkcheck_supports_uid=$($PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1)
-+ if test "x$pkcheck_supports_uid" = "xtrue"; then
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
- AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,
- [use PolicyKit for UNIX socket access checks])
- AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,
-diff --git a/daemon/remote.c b/daemon/remote.c
-index 03d5557..6132091 100644
---- a/daemon/remote.c
-+++ b/daemon/remote.c
-@@ -2731,10 +2731,12 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
- int status = -1;
- char *ident = NULL;
- bool authdismissed = 0;
-+ bool supportsuid = 0;
- char *pkout = NULL;
- struct daemonClientPrivate *priv =
- virNetServerClientGetPrivateData(client);
- virCommandPtr cmd = NULL;
-+ static bool polkitInsecureWarned = false;
-
- virMutexLock(&priv->lock);
- action = virNetServerClientGetReadonly(client) ?
-@@ -2756,14 +2758,27 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
- goto authfail;
- }
-
-+ if (timestamp == 0) {
-+ VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time",
-+ (long long)callerPid);
-+ goto authfail;
-+ }
-+
- VIR_INFO("Checking PID %lld running as %d",
- (long long) callerPid, callerUid);
-
- virCommandAddArg(cmd, "--process");
-- if (timestamp != 0) {
-- virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);
-+# ifdef PKCHECK_SUPPORTS_UID
-+ supportsuid = 1;
-+# endif
-+ if (supportsuid) {
-+ virCommandAddArgFormat(cmd, "%lld,%llu,%lu", (long long) callerPid, timestamp, (unsigned long) callerUid);
- } else {
-- virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);
-+ if (!polkitInsecureWarned) {
-+ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");
-+ polkitInsecureWarned = true;
-+ }
-+ virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);
- }
- virCommandAddArg(cmd, "--allow-user-interaction");
-
-diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
-index 4c76e64..d980820 100644
---- a/src/access/viraccessdriverpolkit.c
-+++ b/src/access/viraccessdriverpolkit.c
-@@ -72,8 +72,12 @@ static char *
- virAccessDriverPolkitFormatProcess(const char *actionid)
- {
- virIdentityPtr identity = virIdentityGetCurrent();
-- const char *process = NULL;
-+ const char *callerPid = NULL;
-+ const char *callerTime = NULL;
-+ const char *callerUid = NULL;
- char *ret = NULL;
-+ bool supportsuid = 0;
-+ static bool polkitInsecureWarned = false;
-
- if (!identity) {
- virAccessError(VIR_ERR_ACCESS_DENIED,
-@@ -81,17 +85,43 @@ virAccessDriverPolkitFormatProcess(const char *actionid)
- actionid);
- return NULL;
- }
-- if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &process) < 0)
-+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0)
-+ goto cleanup;
-+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0)
-+ goto cleanup;
-+ if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0)
- goto cleanup;
-
-- if (!process) {
-+ if (!callerPid) {
- virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("No UNIX process ID available"));
- goto cleanup;
- }
--
-- if (VIR_STRDUP(ret, process) < 0)
-+ if (!callerTime) {
-+ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-+ _("No UNIX process start time available"));
-+ goto cleanup;
-+ }
-+ if (!callerUid) {
-+ virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-+ _("No UNIX caller UID available"));
- goto cleanup;
-+ }
-+
-+#ifdef PKCHECK_SUPPORTS_UID
-+ supportsuid = 1;
-+#endif
-+ if (supportsuid) {
-+ if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)
-+ goto cleanup;
-+ } else {
-+ if (!polkitInsecureWarned) {
-+ VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");
-+ polkitInsecureWarned = true;
-+ }
-+ if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0)
-+ goto cleanup;
-+ }
-
- cleanup:
- virObjectUnref(identity);
---
-1.8.3.1
-
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 2d81f175d..eb275f3f0 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101981 2013-12-03 09:49:12Z spupykin $ +# $Id: PKGBUILD 105708 2014-02-14 09:37:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.2.0 -pkgrel=1 +pkgver=1.2.1 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -13,30 +13,65 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' 'iproute2' 'libnl' 'libx11' 'audit' 'numactl') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' 'openbsd-netcat: for remote management over ssh' 'qemu' 'radvd' - 'ebtables') + 'ebtables' + 'pm-utils: host power management') [ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode') options=('emptydirs') -backup=('etc/conf.d/libvirtd' - 'etc/conf.d/libvirt-guests' - 'etc/libvirt/libvirtd.conf' +backup=('etc/conf.d/libvirt-guests' + 'etc/conf.d/libvirtd' 'etc/libvirt/libvirt.conf' + 'etc/libvirt/libvirtd.conf' + 'etc/libvirt/lxc.conf' + 'etc/libvirt/nwfilter/allow-arp.xml' + 'etc/libvirt/nwfilter/allow-dhcp-server.xml' + 'etc/libvirt/nwfilter/allow-dhcp.xml' + 'etc/libvirt/nwfilter/allow-incoming-ipv4.xml' + 'etc/libvirt/nwfilter/allow-ipv4.xml' + 'etc/libvirt/nwfilter/clean-traffic.xml' + 'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml' + 'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml' + 'etc/libvirt/nwfilter/no-arp-spoofing.xml' + 'etc/libvirt/nwfilter/no-ip-multicast.xml' + 'etc/libvirt/nwfilter/no-ip-spoofing.xml' + 'etc/libvirt/nwfilter/no-mac-broadcast.xml' + 'etc/libvirt/nwfilter/no-mac-spoofing.xml' + 'etc/libvirt/nwfilter/no-other-l2-traffic.xml' + 'etc/libvirt/nwfilter/no-other-rarp-traffic.xml' + 'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml' + 'etc/libvirt/nwfilter/qemu-announce-self.xml' + 'etc/libvirt/qemu-lockd.conf' 'etc/libvirt/qemu.conf' + 'etc/libvirt/qemu/networks/autostart/default.xml' + 'etc/libvirt/qemu/networks/default.xml' + 'etc/libvirt/virt-login-shell.conf' + 'etc/libvirt/virtlockd.conf' + 'etc/logrotate.d/libvirtd' + 'etc/logrotate.d/libvirtd.lxc' + 'etc/logrotate.d/libvirtd.qemu' + 'etc/logrotate.d/libvirtd.uml' 'etc/sasl2/libvirt.conf') install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d) -md5sums=('f74f78059def4e68d69b975ad6e6c3e2' + libvirt.tmpfiles.d + "FS#38546.patch::http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=7f0fd427413fe04963b1bcb158cf70e980ad1842") +md5sums=('cce374220f67895afb6331bd2ddedbfd' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f') + '020971887442ebbf1b6949e031c8dd3f' + 'f579805e75956d32992c6934346ee740') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <"$srcdir/FS#38546.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,7 +89,7 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface + --without-netcf --with-interface --with-lxc make sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install index efb652a88..b75d85ec8 100644 --- a/community/libvirt/libvirt.install +++ b/community/libvirt/libvirt.install @@ -13,7 +13,3 @@ post_upgrade() { echo ">>> libvirt runs qemu from nobody:nobody by default" echo ">>> change it in /etc/libvirt/qemu.conf" } - -post_remove() { - rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc -} diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD index c9973fa49..e9cd2338b 100644 --- a/community/libx86emu/PKGBUILD +++ b/community/libx86emu/PKGBUILD @@ -1,36 +1,31 @@ -# $Id: PKGBUILD 67396 2012-03-11 10:52:58Z lcarlier $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 104103 2014-01-15 17:01:05Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> pkgname=libx86emu pkgver=1.1 -_pkgver=$pkgver-15.3 -pkgrel=29 +_pkgver=$pkgver-21.4 +pkgrel=30 pkgdesc='x86 emulation library' arch=('i686' 'x86_64' 'mips64el') -url='http://www.opensuse.org/' +url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('BSD') depends=('glibc') makedepends=('rpmextract') source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm") -md5sums=('ba6a0fc46307dd79078579140aab2f02') +sha256sums=('d94a9b2e00e995856bf71a1db8d97ba2a622d3f447248f53cd4e175d491c6a1b') build() { - cd "${srcdir}" - rpmextract.sh "${pkgname}-${_pkgver}.src.rpm" - tar -xjf $pkgname-$pkgver.tar.bz2 - - cd "${srcdir}/${pkgname}-${pkgver}" - - make LIBDIR=/usr/lib + tar jxvf "$pkgname-$pkgver.tar.bz2" + make -C "$pkgname-$pkgver" LIBDIR=/usr/lib } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make LIBDIR=/usr/lib DESTDIR=$pkgdir install - - install -Dm644 LICENSE \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install + install -Dm644 "$pkgname-$pkgver/LICENSE" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD index 1a089307a..3d8d94c98 100644 --- a/community/libxdg-basedir/PKGBUILD +++ b/community/libxdg-basedir/PKGBUILD @@ -3,26 +3,26 @@ pkgname=libxdg-basedir pkgver=1.2.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="An implementation of the XDG Base Directory specifications." arch=('i686' 'x86_64' 'mips64el') url="http://n.ethz.ch/student/nevillm/download/libxdg-basedir" license=('MIT') depends=('glibc') -source=(http://n.ethz.ch/student/nevillm/download/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'LICENSE') -sha1sums=('b924afe4e29c52358ad67476887e9ca0dcf90f7c' +source=(https://github.com/devnev/$pkgname/archive/$pkgname-$pkgver.tar.gz + 'LICENSE') +sha1sums=('e671b01b17c8cf785d95dd3aefa93e7cf31e56a5' 'c76efede60d0632d4241d718919d8b4ec62056b3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/$pkgname-$pkgname-$pkgver" - ./configure --prefix=/usr + ./autogen.sh --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/$pkgname-$pkgname-$pkgver" make DESTDIR=${pkgdir} install # Install MIT license diff --git a/community/libxnvctrl/10_libxnvctrl_so_0.diff b/community/libxnvctrl/10_libxnvctrl_so_0.diff new file mode 100644 index 000000000..02673675a --- /dev/null +++ b/community/libxnvctrl/10_libxnvctrl_so_0.diff @@ -0,0 +1,55 @@ +Author: Andreas Beckmann <debian@abeckmann.de> +Description: build a shared library for libXNVCtrl +Bug-Debian: http://bugs.debian.org/666909 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -79,6 +79,9 @@ + + XNVCTRL_DIR ?= libXNVCtrl + XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a ++XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0 ++#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE) ++XNVCTRL_LIB ?= $(XNVCTRL_SHARED) + XCONFIG_PARSER_DIR ?= XF86Config-parser + COMMON_UTILS_DIR ?= common-utils + COMMON_UNIX_DIR ?= common-unix +@@ -179,9 +182,12 @@ + $(MKDIR) $(BINDIR) + $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<) + +-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE) ++$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED): ++ $(MAKE) -C $(XNVCTRL_DIR) ++ ++$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) + $(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \ +- $(XNVCTRL_ARCHIVE) $(LIBS) ++ $(XNVCTRL_LIB) $(LIBS) + $(call quiet_cmd,STRIP_CMD) $@ + + # define the rule to build each object file +--- a/src/libXNVCtrl/Makefile ++++ b/src/libXNVCtrl/Makefile +@@ -22,12 +22,21 @@ + RANLIB ?= ranlib + CFLAGS += -fPIC + ++all: libXNVCtrl.a libXNVCtrl.so ++ + libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o) + $(RANLIB) $@ + ++libXNVCtrl.so: NVCtrl.o ++ $(RM) $@ $@.* ++ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11 ++ ln -s $@.0.0.0 $@.0 ++ ln -s $@.0 $@ ++ + NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h + .INTERMEDIATE: NVCtrl.o + + clean :: + rm -f libXNVCtrl.a *.o ++ rm -f libXNVCtrl.so libXNVCtrl.so.* + .PHONY: clean diff --git a/community/libxnvctrl/PKGBUILD b/community/libxnvctrl/PKGBUILD new file mode 100644 index 000000000..e5f3cf25b --- /dev/null +++ b/community/libxnvctrl/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 104297 2014-01-17 10:20:00Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> +# Contributor: Alessio Sergi <asergi at archlinux dot us> + +pkgname=libxnvctrl +pkgver=331.38 +pkgrel=2 +pkgdesc="NVIDIA X Ctrl library" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +license=('GPL2') +depends=('libxext') +source=("http://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2" + "10_libxnvctrl_so_0.diff") +sha1sums=('ad3fd407dcf8678c770d6202651eb08162fd5e5d' + '84146494a08d4b691e2cff84d1551210eee584dd') + +prepare() { + cd "nvidia-settings-$pkgver" + patch -Np1 -i "${srcdir}/10_libxnvctrl_so_0.diff" +} + +build() { + cd "nvidia-settings-$pkgver/src/libXNVCtrl" + make clean + make +} + +package() { + cd "nvidia-settings-$pkgver/src/libXNVCtrl" + # install libXNVCtrl and headers + install -d -m 755 "$pkgdir"/usr/{include/NVCtrl,lib} + install -m 644 nv_control.h NVCtrl{,Lib}.h "$pkgdir"/usr/include/NVCtrl/ + install -m 644 libXNVCtrl.so.0.0.0 "$pkgdir"/usr/lib/ + cd "$pkgdir"/usr/lib/ + ln -s libXNVCtrl.so.0.0.0 libXNVCtrl.so.0 + ln -s libXNVCtrl.so.0 libXNVCtrl.so +} diff --git a/community/libyaml/PKGBUILD b/community/libyaml/PKGBUILD index b8802167e..39e2f5acc 100644 --- a/community/libyaml/PKGBUILD +++ b/community/libyaml/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100114 2013-11-01 17:16:45Z spupykin $ +# $Id: PKGBUILD 105278 2014-02-04 12:27:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Bozon <michal.bozon__at__gmail.com> pkgname=libyaml -pkgver=0.1.4 -pkgrel=3 +pkgver=0.1.5 +pkgrel=1 pkgdesc="YAML 1.1 library" arch=('i686' 'x86_64' 'mips64el') url="http://pyyaml.org/wiki/LibYAML" license=('MIT') source=(http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz) -md5sums=('36c852831d02cf90508c29852361d01b') +md5sums=('24f6093c1e840ca5df2eb09291a1dbf1') build() { cd "$srcdir/yaml-$pkgver" diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index d3e64d514..6da2c7bf9 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 98452 2013-10-10 20:04:45Z alucryd $ +# $Id: PKGBUILD 105741 2014-02-14 18:30:58Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter -pkgver=1.6.1 +pkgver=1.8.1 pkgrel=1 epoch=1 -pkgdesc="GTK+ greeter for LightDM" +pkgdesc='GTK+ greeter for LightDM' arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/lightdm-gtk-greeter" +url='https://launchpad.net/lightdm-gtk-greeter' license=('GPL3' 'LGPL3') depends=('gtk2' 'lightdm') 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') +install="${pkgname/2/}.install" +source=("https://launchpad.net/${pkgname/2/}/${pkgver%.?}/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") +sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab') build() { cd ${pkgname/2/}-${pkgver} diff --git a/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install new file mode 100644 index 000000000..b72f4439b --- /dev/null +++ b/community/lightdm-gtk2-greeter/lightdm-gtk-greeter.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_update() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index e85df609b..7c406fdf3 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 98450 2013-10-10 19:59:15Z alucryd $ +# $Id: PKGBUILD 105739 2014-02-14 18:25:52Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.6.1 +pkgver=1.8.1 pkgrel=1 epoch=1 -pkgdesc="GTK+ greeter for LightDM" +pkgdesc='GTK+ greeter for LightDM' arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/lightdm-gtk-greeter" +url='https://launchpad.net/lightdm-gtk-greeter' license=('GPL3' 'LGPL3') depends=('gtk3' 'lightdm') 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') +install="${pkgname/3/}.install" +source=("https://launchpad.net/${pkgname/3/}/${pkgver%.?}/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") +sha256sums=('dac5ce9ac54a6b3c1ef9f9cc056f13f01352c2a897c5bed11e52505132610bab') build() { cd ${pkgname/3/}-${pkgver} diff --git a/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install new file mode 100644 index 000000000..b72f4439b --- /dev/null +++ b/community/lightdm-gtk3-greeter/lightdm-gtk-greeter.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_update() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 899aad3e2..de8099c1b 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 101357 2013-11-23 12:07:27Z alucryd $ +# $Id: PKGBUILD 104558 2014-01-22 19:29:43Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.8.5 -pkgrel=2 +pkgver=1.8.6 +pkgrel=1 epoch=1 -pkgdesc="A lightweight display manager" +pkgdesc='A lightweight display manager' arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/lightdm" +url='https://launchpad.net/lightdm' license=('GPL3' 'LGPL3') makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base') source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" @@ -20,7 +20,7 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas 'lightdm.rules' 'lightdm-default-config.patch' 'Xsession') -sha256sums=('c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2' +sha256sums=('111760e65d9f29e4bfe41a8affc9d8aa4163d92832a0d2be03ccae4618603b9e' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' @@ -88,7 +88,7 @@ install="${pkgbase}.install" } package_liblightdm-qt4() { -pkgdesc=('LightDM Qt client library') +pkgdesc='LightDM Qt client library' depends=('lightdm' 'qt4') options+=('!emptydirs') @@ -103,7 +103,7 @@ options+=('!emptydirs') } package_liblightdm-qt5() { -pkgdesc=('LightDM Qt client library') +pkgdesc='LightDM Qt client library' depends=('lightdm' 'qt5-base') options+=('!emptydirs') diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 13d35b6a8..65b84c033 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 103224 2013-12-30 15:18:05Z bgyorgy $ +# $Id: PKGBUILD 103308 2014-01-02 22:45:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.16.2 -pkgrel=5 +pkgver=2.18.0 +pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org" @@ -16,12 +16,8 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') #install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz - lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch - lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch) -md5sums=('6db27f17d47e4f66a3b0716c65db3041' - '121ac86f1004338ae20ad55a5690c0ad' - 'fa5073506f0e4dd96fb1858e3a75e08e') +source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz) +md5sums=('5696fec935c616fb437693bed477cc27') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -38,8 +34,8 @@ prepare() { rm -rf lily/out/ python/out/ # Fix build - patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" - patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch" +# patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" +# patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch" } build() { diff --git a/community/linux-tools/01-fix-perf-python.patch b/community/linux-tools/01-fix-perf-python.patch new file mode 100644 index 000000000..d46bd773c --- /dev/null +++ b/community/linux-tools/01-fix-perf-python.patch @@ -0,0 +1,12 @@ +--- a/tools/perf/config/feature-checks/Makefile 2014-01-21 01:58:25.444339009 +0100 ++++ b/tools/perf/config/feature-checks/Makefile 2014-01-21 01:46:58.081780576 +0100 +@@ -103,9 +103,6 @@ + test-libperl: + $(BUILD) $(FLAGS_PERL_EMBED) + +-override PYTHON := python +-override PYTHON_CONFIG := python-config +- + escape-for-shell-sq = $(subst ','\'',$(1)) + shell-sq = '$(escape-for-shell-sq)' + diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index 9a061562f..bce68a7bd 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,15 +1,20 @@ -# $Id: PKGBUILD 102150 2013-12-05 21:53:38Z seblu $ +# $Id: PKGBUILD 104448 2014-01-21 01:11:29Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools -pkgname=('linux-tools-meta' - 'libtraceevent' - 'perf' - 'cpupower' - 'x86_energy_perf_policy' - 'usbip') -pkgver=3.12 -pkgrel=2 +pkgname=( + 'acpidump' + 'cgroup_event_listener' + 'cpupower' + 'libtraceevent' + 'linux-tools-meta' + 'perf' + 'tmon' + 'usbip' + 'x86_energy_perf_policy' +) +pkgver=3.13 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -18,63 +23,67 @@ options=('!strip') # kernel source deps makedepends=('asciidoc' 'xmlto') # perf deps -makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') +makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl') # cpupower deps makedepends+=('pciutils') # usbip deps makedepends+=('glib2' 'sysfsutils') +# tmon deps +makedepends+=('ncurses') groups=("$pkgbase") source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" - "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz" + #"http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz" 'cpupower.default' 'cpupower.systemd' 'cpupower.service' - 'usbipd.service') + 'usbipd.service' + '01-fix-perf-python.patch') # http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc -sha256sums=('2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02' - '22f2f3249e9014693a487c9734dc4142d89ed8bd9e3b2a74128208f5ea7e47d6' +sha256sums=('4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f' + 'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a') -#prepare() { -# # apply stable patching set -# cd linux-$pkgver -# patch -N -p1 -i "$srcdir/patch-$pkgver.5" -#} +prepare() { + cd linux-$pkgver + #patch -N -p1 -i "$srcdir/patch-$pkgver.5" + patch -N -p1 -i "$srcdir/01-fix-perf-python.patch" +} build() { - msg2 'Build libtraceevent' + msg2 'libtraceevent' pushd linux-$pkgver/tools/lib/traceevent make popd - msg2 'Build perf' + msg2 'perf' pushd linux-$pkgver/tools/perf make \ WERROR=0 \ DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ all man popd - msg2 'Build cpupower' + msg2 'cpupower' pushd linux-$pkgver/tools/power/cpupower # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} + #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} make VERSION=$pkgver-$pkgrel popd - msg2 'Build x86_energy_perf_policy' + msg2 'x86_energy_perf_policy' pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy make popd - msg2 'Build usbip' + msg2 'usbip' pushd linux-$pkgver/drivers/staging/usbip/userspace # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am @@ -82,12 +91,37 @@ build() { ./configure --prefix=/usr --sbindir=/usr/bin make popd + + msg2 'tmon' + pushd linux-$pkgver/tools/thermal/tmon + make + popd + + msg2 'acpidump' + pushd linux-$pkgver/tools/power/acpi + make + popd + + msg2 'cgroup_event_listener' + pushd linux-$pkgver/tools/cgroup + make + popd } package_linux-tools-meta() { pkgdesc='Linux kernel tools meta package' groups=() - depends=('libtraceevent' 'perf' 'cpupower' 'x86_energy_perf_policy' 'usbip') + depends=( + 'acpidump' + 'cgroup_event_listener' + 'cpupower' + 'libtraceevent' + 'linux-tools-meta' + 'perf' + 'tmon' + 'usbip' + 'x86_energy_perf_policy' + ) } package_libtraceevent() { @@ -101,7 +135,8 @@ package_libtraceevent() { package_perf() { pkgdesc='Linux kernel performance auditing tool' - depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils') + depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils' + 'numactl') cd linux-$pkgver/tools/perf make \ @@ -109,6 +144,7 @@ package_perf() { DESTDIR="$pkgdir/usr" \ perfexecdir='lib/perf' \ PYTHON=python2 \ + PYTHON_CONFIG=python2-config \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ install install-man @@ -163,4 +199,30 @@ package_usbip() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } +package_tmon() { + pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem' + depends=('glibc' 'ncurses') + + cd linux-$pkgver/tools/thermal/tmon + make install INSTALL_ROOT="$pkgdir" +} + +package_acpidump() { + pkgdesc='Dump system ACPI tables to an ASCII file' + depends=('glibc') + conflicts=('iasl') + + cd linux-$pkgver/tools/power/acpi + install -Dm755 acpidump "$pkgdir/usr/bin/acpidump" + install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8" +} + +package_cgroup_event_listener() { + pkgdesc='Simple listener of cgroup events' + depends=('glibc') + + cd linux-$pkgver/tools/cgroup + install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener" +} + # vim:set ts=2 sw=2 et: diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD index 25cc6a165..fea043e12 100644 --- a/community/lomoco/PKGBUILD +++ b/community/lomoco/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99898 2013-10-31 02:21:19Z allan $ +# $Id: PKGBUILD 104089 2014-01-15 13:38:02Z spupykin $ # Maintainer: Jeff Mickey <j@codemac.net> # Contributor: Shadowhand <woody.gilk@gmail.com> pkgname=lomoco pkgver=1.0 -pkgrel=8 +pkgrel=9 url="http://www.lomoco.org/" pkgdesc="Logitech USB mouse configuration program" license=('GPL') @@ -14,19 +14,30 @@ arch=('i686' 'x86_64' 'mips64el') backup=(etc/udev/lomoco_mouse.conf) source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz "lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163" + "lomoco_mxair.patch::https://bugs.archlinux.org/task/36657?getfile=10920" lomoco_mouse.conf lomoco.sh) md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d' '87aeccb99413faf9e49453215c3d0b8a' + 'd0390dfcadae6e54a4af3e6227d24201' '182b10a7e4a1828a93c1d55ef7f81b97' 'bc92f661641265b33b27895ef24028fd') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 <$srcdir/lomoco_mx518.patch + patch -p0 <$srcdir/lomoco_mxair.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} ./autogen.sh --prefix=/usr --mandir=/usr/share/man make make udev-rules +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install # Fix and install udev rules and helpers diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index 07bad5022..bba8b6e1e 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 81391 2012-12-19 13:27:48Z seblu $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> +# $Id: PKGBUILD 104485 2014-01-21 17:41:26Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgbase=luafilesystem pkgname=(lua-filesystem lua51-filesystem) pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luafilesystem/' @@ -18,12 +19,13 @@ md5sums=('4e7ec93678c760c4e42cea7d28aafa13' 'beb2b58c4b5c2782304a5b0267a5651b') build() { - msg2 "Building $pkgbase with lua 5.1" + msg2 "Building $pkgbase with Lua 5.1" cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51 cd $pkgbase-$pkgver-51 make LUA_INC=/usr/include/lua5.1 - msg2 "Building $pkgbase with lua 5.2" - cd "$srcdir/$pkgbase-$pkgver" + + msg2 "Building $pkgbase with Lua 5.2" + cd "$srcdir"/$pkgbase-$pkgver make } @@ -31,8 +33,8 @@ package_lua-filesystem() { depends=('lua') cd $pkgbase-$pkgver - make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install - install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } package_lua51-filesystem() { @@ -41,6 +43,6 @@ package_lua51-filesystem() { replaces=('luafilesystem') cd $pkgbase-$pkgver-51 - make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install - install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make PREFIX="$pkgdir"/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install + install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 36e8b0902..0f8b6248e 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 105053 2014-01-30 18:41:11Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=5 -pkgdesc='Fast, small, webkit based browser framework extensible by Lua' +pkgrel=7 +pkgdesc='Fast, small, Webkit based browser framework extensible by Lua' arch=('i686' 'x86_64' 'mips64el') url='http://mason-larobina.github.com/luakit/' license=('GPL3') -depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') -makedepends=('git' 'help2man') +depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') +makedepends=('help2man') +backup=(etc/xdg/luakit/binds.lua etc/xdg/luakit/globals.lua + etc/xdg/luakit/modes.lua etc/xdg/luakit/rc.lua etc/xdg/luakit/theme.lua + etc/xdg/luakit/webview.lua etc/xdg/luakit/window.lua) options=(!makeflags) -install='luakit.install' +install=luakit.install source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver) md5sums=('77b02e6d19ba021409f1778fddd94a42') -build() { +prepare() { cd mason-larobina-luakit-* - - # use luajit to run script needed at build sed -i '1s,lua,luajit,' build-utils/gentokens.lua +} +build() { + cd mason-larobina-luakit-* make USE_LUAJIT=1 PREFIX=/usr all } package() { cd mason-larobina-luakit-* - make PREFIX=/usr DESTDIR=$pkgdir install + make PREFIX=/usr DESTDIR="$pkgdir" install - chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938 + chmod -x "$pkgdir"/usr/share/pixmaps/luakit.png # FS#32938 } diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index bb3f199a5..28dc95608 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 98944 2013-10-21 14:45:17Z spupykin $ +# $Id: PKGBUILD 105499 2014-02-09 10:04:32Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Dwayne Bent <dbb.1@liqd.org> +# Contributor: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgbase=luasec pkgname=(lua-sec lua51-sec) -pkgver=20131021git +pkgver=0.5 pkgrel=1 +epoch=1 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' arch=('i686' 'x86_64' 'mips64el') url='https://github.com/brunoos/luasec/wiki' license=('MIT') -makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'git') -source=("luasec::git://github.com/brunoos/luasec.git") -md5sums=('SKIP') +makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') +options=('!buildflags') +source=("https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz") +md5sums=('0518f4524f399f33424c6f450e1d06db') -build() { - cp -a luasec luasec-51 - - unset CFLAGS - unset LDFLAGS +prepare() { + cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51 +} +build() { msg2 'Building with lua 5.2' - cd luasec + cd luasec-luasec-$pkgver make linux msg2 'Building with lua 5.1' - cd ../luasec-51 + cd ../luasec-luasec-$pkgver-51 find . -type f -name \*.[ch] -exec sed -i \ -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ @@ -40,7 +41,7 @@ package_lua-sec() { depends=('openssl' 'lua' 'lua-socket') install -dm755 "$pkgdir/usr/lib/lua/5.2" - cd luasec + cd luasec-luasec-$pkgver make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -51,9 +52,9 @@ package_lua51-sec() { replaces=('luasec') install -dm755 "$pkgdir/usr/lib/lua/5.1" - cd luasec-51 + cd luasec-luasec-$pkgver-51 make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim:set ts=4 sw=4 et: +# vim:set ts=2 sw=2 et: diff --git a/community/lucene++/PKGBUILD b/community/lucene++/PKGBUILD new file mode 100644 index 000000000..d5a9410d2 --- /dev/null +++ b/community/lucene++/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 105669 2014-02-13 11:02:33Z spupykin $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Rafael Ferreira <josephgbr@archlinux.info> + +pkgname=lucene++ +pkgver=3.0.5 +pkgrel=2 +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') +makedepends=('boost' 'cmake') +source=(https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_$pkgver.tar.gz) +md5sums=('da785510716a759d7d37a2ee52cb8140') + +prepare() { + mkdir build + sed -i \ + -e 's#SET(LUCENE++_VERSION_REVISION.*#SET(LUCENE++_VERSION_REVISION "5")#' \ + -e 's#SET(LUCENE++_VERSION_PATCH.*#SET(LUCENE++_VERSION_PATCH "0")#' \ + $srcdir/LucenePlusPlus-rel_$pkgver/CMakeLists.txt +} + +build() { + 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/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index b60dffd51..ba47bbb0e 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 92941 2013-06-19 21:09:46Z bpiotrowski $ +# $Id: PKGBUILD 105320 2014-02-04 22:24:07Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr -pkgver=2.3.1 -pkgrel=3 +pkgver=2.4.0 +pkgrel=1 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit') -makedepends=('cmake' 'boost' 'gtest') +depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt5-webkit' 'ccfits') +makedepends=('cmake' 'boost' 'gtest' 'qt5-tools') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) -sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b') +sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401') build() { - cd "${srcdir}" + cd "${srcdir}"/luminance-hdr-${pkgver} # x86-specific options. sed -i '/ADD_DEFINITIONS(-ffast-math -msse2 -msse)/d' cmake/CompilerSettings.cmake @@ -29,7 +29,7 @@ build() { } package() { - cd "${srcdir}" + cd "${srcdir}"/luminance-hdr-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index ab6898db8..cf004a39d 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,9 @@ +2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.4.0-1 + +2014-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.1-4 libraw rebuild + 2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.3.1-3 libraw rebuild diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 28cddd8cf..0589e5989 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 101232 2013-11-20 09:52:30Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +#$Id: PKGBUILD 103634 2014-01-08 14:31:20Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance -pkgver=0.5.3 -pkgrel=2 +pkgver=0.5.5 +pkgrel=1 pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -13,8 +13,8 @@ url='http://lxde.org/' groups=('lxde') depends=('gtk2' 'dbus-glib') makedepends=('intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5') +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.xz) +md5sums=('a67113681d9d0a6d936289909aed5782') build() { cd $pkgname-$pkgver diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index f0583f4d6..16ac7d949 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103083 2013-12-26 10:01:37Z spupykin $ +# $Id: PKGBUILD 105711 2014-02-14 09:37:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -8,7 +8,7 @@ pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=5 +pkgrel=6 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://linuxcontainers.org" @@ -22,10 +22,11 @@ source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz" "lxc@.service") md5sums=('8552a4479090616f4bc04d8473765fc9' 'df94c9fb8a753011c86ee664e9f521ff' - '8003139e60ea66c05460660f31780706') + '32db4ef06b27f36e15ff4b67c049dfeb') prepare() { cd "$srcdir/$pkgname-${pkgver/_/-}" + sed -i 's|sbin/init none bind|sbin/init none ro,bind|' templates/lxc-sshd.in sed -i \ -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \ -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \ diff --git a/community/lxc/lxc@.service b/community/lxc/lxc@.service index 7bc87b5dd..4c0c34e3e 100644 --- a/community/lxc/lxc@.service +++ b/community/lxc/lxc@.service @@ -1,11 +1,11 @@ [Unit] -Description=%I LXC +Description=%i LXC After=network.target [Service] Type=forking -ExecStart=/usr/bin/lxc-start -d -n %I -ExecStop=/usr/bin/lxc-stop -n %I +ExecStart=/usr/bin/lxc-start -d -n %i +ExecStop=/usr/bin/lxc-stop -n %i [Install] WantedBy=multi-user.target diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 36bdde8c8..7383a4eaf 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98054 2013-10-04 17:26:39Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 105368 2014-02-06 05:24:14Z bisson $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight X11 desktop panel for LXDE' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -22,7 +22,7 @@ build() { CFLAGS+=' -lgmodule-2.0' ./configure \ --sysconfdir=/etc \ --prefix=/usr \ - --enable-man + --enable-man make } diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index 526fbfd53..0c2b318ce 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 56901 2011-10-16 07:43:53Z bpiotrowski $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 104479 2014-01-21 17:24:15Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=lxtask pkgver=0.1.4 -pkgrel=3.2 -pkgdesc="Task manager of the LXDE Desktop" +pkgrel=4 +pkgdesc='Task manager of the LXDE Desktop' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2') makedepends=('pkgconfig' 'intltool') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac - autoreconf - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index 0fc508a3f..afdbcf888 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103238 2013-12-30 22:18:53Z seblu $ +# $Id: PKGBUILD 105324 2014-02-04 23:27:29Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=110 +pkgver=113 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD index c5b08cbfc..1eb7e5b86 100644 --- a/community/madman/PKGBUILD +++ b/community/madman/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 87994 2013-04-09 21:36:20Z eric $ +# $Id: PKGBUILD 104837 2014-01-27 10:33:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Hugo Ideler <hugoideler@dse.nl> # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=madman -pkgver=0.94beta1.20060611 -pkgrel=3 +pkgver=0.94beta1.20080906 +pkgrel=1 pkgdesc="I-tunes like music player" arch=('i686' 'x86_64' 'mips64el') url="http://madman.sourceforge.net/" license=('GPL') depends=('qt3' 'xmms' 'gtk' 'taglib') -makedepends=('python2' 'scons') -source=(ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver.orig.tar.gz - ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver-2.diff.gz +makedepends=('python2' 'scons' 'git') +source=(git+http://git.tiker.net/trees/madman.git ftp://ftp.archlinux.org/other/community/madman/madman.desktop ftp://ftp.archlinux.org/other/community/madman/madman_logo.png ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png fake-g++.sh) -md5sums=('36e7a4619ebe83ed939c7ae09c16d535' - '26de942ae2465fb805748d3bea9a8a17' +md5sums=('SKIP' '591354b69235d5a4b5a09591d04db266' 'd4546f77857a6ccdabb2036eb6a0da07' '2d54bb8eceed283edc88a3e4553d2483' '3c2da1b1800fb372e225ae38fa1398e8' '685a6fb13c861b82950dd6a77fd02120') -build() { - cd $srcdir/$pkgname-$pkgver.orig - - patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff +prepare() { + cd $srcdir/$pkgname mkdir -p ,build/release/designer touch ,build/release/designer/tsonglistview.h \ ,build/release/designer/tsetlistview.h \ @@ -39,16 +35,19 @@ build() { ,build/release/designer/tacceleratorlineedit.h \ ,build/release/designer/tsonglistview.h \ ,build/release/designer/tsetlistview.h - sed -i '26,1i#include <memory>' utility/base.h sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag +} + +build() { + cd $srcdir/$pkgname + echo -e '\n\n' | ./configure install -m755 $srcdir/fake-g++.sh ./g++ export PATH=.:$PATH - scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 } package() { - cd $srcdir/$pkgname-$pkgver.orig + cd $srcdir/$pkgname scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \ install_to=$pkgdir/usr prefix=/usr install diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index cf6cb2416..4521cf19c 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100116 2013-11-01 17:17:05Z spupykin $ +# $Id: PKGBUILD 103921 2014-01-13 17:16:54Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=9 +pkgrel=10 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/mailutils/" diff --git a/community/marisa/ChangeLog b/community/marisa/ChangeLog deleted file mode 100644 index b7f4b062d..000000000 --- a/community/marisa/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2013-05-28 ponsfoot <cabezon dot hashimoto at gmail dot com> - - * marisa 0.2.4-2 - - Separate bindings to another packages - -2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> - - * marisa 0.2.4-1 - - Initial release on AUR - diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD index fcd7fec2a..6bfc6f8bf 100644 --- a/community/marisa/PKGBUILD +++ b/community/marisa/PKGBUILD @@ -1,15 +1,15 @@ +# $Id: PKGBUILD 104883 2014-01-28 03:34:13Z td123 $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> pkgbase=marisa pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa') pkgver=0.2.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="https://code.google.com/p/marisa-trie/" license=('BSD' 'LGPL') makedepends=('python2' 'ruby' 'perl') -changelog=ChangeLog source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz) sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d') @@ -95,8 +95,8 @@ package_ruby-marisa() { depends=('ruby' 'marisa') cd "${pkgbase}-${pkgver}/bindings/ruby" - _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.0` - _arch=`pkg-config --variable=arch ruby-2.0` + _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.1` + _arch=`pkg-config --variable=arch ruby-2.1` make DESTDIR="$pkgdir" install \ hdrdir="$_hdrdir" \ arch_hdrdir="${_hdrdir}/${_arch}" \ diff --git a/community/mate-applet-lockkeys/PKGBUILD b/community/mate-applet-lockkeys/PKGBUILD new file mode 100644 index 000000000..190ad0bb5 --- /dev/null +++ b/community/mate-applet-lockkeys/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104265 2014-01-16 18:34:55Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-applet-lockkeys +pkgver=0.2.3 +pkgrel=1 +pkgdesc="A MATE panel applet that shows which of the CapsLock, NumLock and ScrollLock keys are on and which are off." +url="http://www.zavedil.com/mate-lock-keys-applet/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'mate-panel') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +source=("http://www.zavedil.com/wp-content/uploads/2013/12/${pkgname}-${pkgver}.tar.gz") +md5sums=('84515b805609daf1998590ee5f1fcb6a') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled" +} diff --git a/community/mate-applet-lockkeys/mate-applet-lockkeys.install b/community/mate-applet-lockkeys/mate-applet-lockkeys.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-applet-lockkeys/mate-applet-lockkeys.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-applet-softupd/PKGBUILD b/community/mate-applet-softupd/PKGBUILD new file mode 100644 index 000000000..962ac9b1f --- /dev/null +++ b/community/mate-applet-softupd/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104262 2014-01-16 18:29:31Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-applet-softupd +pkgver=0.2.10 +pkgrel=2 +pkgdesc="A MATE panel applet to notify when software updates become available." +url="http://www.zavedil.com/mate-software-updates-applet/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-packagekit' 'gtk2' 'libnotify' 'mate-panel') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +source=("http://www.zavedil.com/wp-content/uploads/2013/10/${pkgname}-${pkgver}.tar.gz") +md5sums=('f15f61c05a6701d8f987179f61c7bc0f') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled" +} diff --git a/community/mate-applet-softupd/mate-applet-softupd.install b/community/mate-applet-softupd/mate-applet-softupd.install new file mode 100644 index 000000000..71d138f2d --- /dev/null +++ b/community/mate-applet-softupd/mate-applet-softupd.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-applet-streamer/PKGBUILD b/community/mate-applet-streamer/PKGBUILD new file mode 100644 index 000000000..a50677f44 --- /dev/null +++ b/community/mate-applet-streamer/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104264 2014-01-16 18:30:19Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-applet-streamer +pkgver=0.0.5 +pkgrel=1 +pkgdesc="A MATE panel applet to let you play your favourite online radio station with a single click." +url="http://www.zavedil.com/online-radio-applet/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gst-plugins-base' 'gtk2' 'libnotify' 'mate-panel' 'sqlite') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +source=("http://www.zavedil.com/wp-content/uploads/2013/12/${pkgname}-${pkgver}.tar.gz") +md5sums=('c974612d6ef8138c472511dbc6587013') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled" +} diff --git a/community/mate-applet-streamer/mate-applet-streamer.install b/community/mate-applet-streamer/mate-applet-streamer.install new file mode 100644 index 000000000..71d138f2d --- /dev/null +++ b/community/mate-applet-streamer/mate-applet-streamer.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-applets/PKGBUILD b/community/mate-applets/PKGBUILD new file mode 100644 index 000000000..67c628807 --- /dev/null +++ b/community/mate-applets/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 104220 2014-01-16 17:30:37Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-applets +pkgver=1.6.2 +pkgrel=1 +pkgdesc="Applets for MATE panel" +arch=('i686' 'x86_64') +url="http://mate-desktop.org" +license=('GPL') +depends=('mate-character-map' 'mate-panel' 'python2-dbus' 'python2-gobject' + 'upower') +makedepends=('docbook2x' 'docbook-xsl' 'mate-common' 'mate-doc-utils' + 'networkmanager' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" + "https://github.com/mate-desktop/mate-applets/commit/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff" + "https://github.com/mate-desktop/mate-applets/commit/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff") +sha1sums=('2978918a0b995b3f3dd98ad7ca159b0d7bcd245a' + 'c4d7f2d7952b53d8ac616ced55a4cf3da25c0fc4' + '36c4507e54b21fbcff49732077912dbc5283807a') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + #upower: fix upower version + patch -Np1 -i "${srcdir}/98dfd949e9209eefc0722fb232761f01b4fe2d7e.diff" + #battstat: use g_signal notify for upower-1.0 + patch -Np1 -i "${srcdir}/6fca38a74cc9e6b4ce107496f2e0e7d203c43d2b.diff" + # Use python2 + sed -i 's/env python/env python2/' invest-applet/invest/{chart.py,invest-applet.py,mate-invest-chart} + sed -i 's/env python/env python2/' timer-applet/src/timer-applet +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/${pkgname} \ + --enable-polkit \ + --enable-networkmanager \ + --enable-ipv6 \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-applets/mate-applets.install b/community/mate-applets/mate-applets.install new file mode 100644 index 000000000..fd1a71ca6 --- /dev/null +++ b/community/mate-applets/mate-applets.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-calc/PKGBUILD b/community/mate-calc/PKGBUILD new file mode 100644 index 000000000..d48ea6d52 --- /dev/null +++ b/community/mate-calc/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104914 2014-01-28 10:51:00Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-calc +pkgver=1.6.1 +pkgrel=1 +pkgdesc="Calculator for the Mate desktop environment" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL' 'GPL') +depends=('dconf' 'gtk2') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('dca1568748e42d4a019d7cf8effe1be80b20b82b') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-calc/mate-calc.install b/community/mate-calc/mate-calc.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-calc/mate-calc.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-character-map/PKGBUILD b/community/mate-character-map/PKGBUILD new file mode 100644 index 000000000..f7e511a3d --- /dev/null +++ b/community/mate-character-map/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104218 2014-01-16 17:20:32Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-character-map +pkgver=1.6.0 +pkgrel=5 +pkgdesc="MATE Unicode Charmap" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'gtk2' 'pygtk' 'python2') +makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs' ) +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('e378e26ebe493d3f849771d10930504b8980448e') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./autogen.sh \ + --prefix=/usr \ + --enable-charmap \ + --enable-python-bindings \ + --enable-introspection \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-character-map/mate-character-map.install b/community/mate-character-map/mate-character-map.install new file mode 100644 index 000000000..9f6e9c08b --- /dev/null +++ b/community/mate-character-map/mate-character-map.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-color-manager/PKGBUILD b/community/mate-color-manager/PKGBUILD new file mode 100644 index 000000000..048949ce1 --- /dev/null +++ b/community/mate-color-manager/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 105579 2014-02-10 13:50:05Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-color-manager +pkgver=1.6.1 +pkgrel=3 +pkgdesc="Color management application for MATE." +url="https://github.com/NiceandGently/${pkgname}" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus' 'desktop-file-utils' 'exiv2' 'gtk2' 'lcms2' 'libcanberra' 'libcups' 'libexif' 'libnotify' 'libtiff' + 'libunique' 'mate-desktop' 'sane' 'vte') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz" + "https://github.com/NiceandGently/mate-color-manager/commit/cb80f549af83a703243eae4afad841d564743afb.diff") +sha1sums=('6a8d18a3a7e3fb22e03cd319556575b9482c6f04' + '283c767591956206f5c7229ee1eff86faea253c0') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Get udevrulesdir from pkg-config + patch -Np1 -i "${srcdir}/cb80f549af83a703243eae4afad841d564743afb.diff" + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/${pkgname} \ + --disable-static \ + --disable-scrollkeeper + + #Work around a problem where the .sgml fail to parse. + sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-color-manager/mate-color-manager.install b/community/mate-color-manager/mate-color-manager.install new file mode 100644 index 000000000..4e09ba484 --- /dev/null +++ b/community/mate-color-manager/mate-color-manager.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-control-center/PKGBUILD b/community/mate-control-center/PKGBUILD new file mode 100644 index 000000000..94620fbaa --- /dev/null +++ b/community/mate-control-center/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 104207 2014-01-16 16:54:02Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> +# Contributor: hekel <hekel@archlinux.info> + +pkgname=mate-control-center +pkgver=1.6.2 +pkgrel=1 +pkgdesc="The Control Center for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas' + 'gtk2' 'mate-desktop' 'mate-file-manager' 'mate-icon-theme' 'mate-menus' + 'mate-settings-daemon' 'mate-window-manager' 'libgtop' 'libmatekbd' + 'libunique' 'librsvg' 'libxss' 'libxt' 'startup-notification') +makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('d3aa9434dde63bd176e995cbb8408fd673f6eed5') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --disable-static \ + --disable-scrollkeeper \ + --disable-update-mimedb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache" +} diff --git a/community/mate-control-center/mate-control-center.install b/community/mate-control-center/mate-control-center.install new file mode 100644 index 000000000..d5a70db20 --- /dev/null +++ b/community/mate-control-center/mate-control-center.install @@ -0,0 +1,14 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + update-mime-database /usr/share/mime/ > /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-desktop/PKGBUILD b/community/mate-desktop/PKGBUILD new file mode 100644 index 000000000..caeed6036 --- /dev/null +++ b/community/mate-desktop/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 104842 2014-01-27 11:23:45Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-desktop +pkgver=1.6.2 +pkgrel=2 +pkgdesc="Library with common API for various MATE modules" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=(GPL LGPL) +depends=('dconf' 'gtk2' 'hicolor-icon-theme' 'libunique' 'python2' + 'startup-notification' 'ttf-dejavu') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +optdepends=('lightdm-gtk2-greeter: A lightweight display manager') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('413ef92f1aedf0ffbbf232ce6907211f0f4722a2') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-compile \ + --enable-gtk-doc \ + --with-omf-dir=/usr/share/omf/${pkgname} + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-desktop/mate-desktop.install b/community/mate-desktop/mate-desktop.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-desktop/mate-desktop.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-dialogs/PKGBUILD b/community/mate-dialogs/PKGBUILD new file mode 100644 index 000000000..8feff3f1d --- /dev/null +++ b/community/mate-dialogs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104188 2014-01-16 16:13:01Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-dialogs +pkgver=1.6.2 +pkgrel=3 +pkgdesc="Display graphical dialog boxes from shell scripts" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk2' 'libnotify') +makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('64601ae71671911dbc83d1fab2a837da0b218cf9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-disk-utility/PKGBUILD b/community/mate-disk-utility/PKGBUILD new file mode 100644 index 000000000..e1dedca5f --- /dev/null +++ b/community/mate-disk-utility/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 105605 2014-02-11 17:24:56Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-disk-utility +pkgver=1.6.2 +pkgrel=2 +pkgdesc="Disk management application for MATE." +url="https://github.com/NiceandGently/mate-disk-utility" +arch=('i686' 'x86_64') +license=('GPL') +depends=('avahi' 'dbus' 'gtk2' 'libatasmart' 'libgnome-keyring' 'libnotify' + 'libunique' 'mate-file-manager' 'udisks') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('ff3b520a06c367124558cdd252f1956d') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/${pkgname} \ + --enable-gnome-keyring \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-disk-utility/mate-disk-utility.install b/community/mate-disk-utility/mate-disk-utility.install new file mode 100644 index 000000000..94794eb8d --- /dev/null +++ b/community/mate-disk-utility/mate-disk-utility.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/mate + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-file-manager-gksu/PKGBUILD b/community/mate-file-manager-gksu/PKGBUILD new file mode 100644 index 000000000..c9e407950 --- /dev/null +++ b/community/mate-file-manager-gksu/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 104226 2014-01-16 17:40:52Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-file-manager-gksu +pkgver=1.6.0 +pkgrel=7 +pkgdesc="A Caja extension for executing files with elevated privileges." +url="http://mate-desktop.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gksu' 'gtk2' 'mate-file-manager') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('fd6e6268e5e00706fbe5d20090aff94d2ce57302') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager-image-converter/PKGBUILD b/community/mate-file-manager-image-converter/PKGBUILD new file mode 100644 index 000000000..85b106344 --- /dev/null +++ b/community/mate-file-manager-image-converter/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 104228 2014-01-16 17:41:51Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-file-manager-image-converter +pkgver=1.6.0 +pkgrel=6 +pkgdesc="A Caja extension for simple image conversions." +url="http://mate-desktop.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'imagemagick' 'mate-file-manager') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('ab3b248e93f4c7322296d5856a8439d0a2515f53') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager-open-terminal/PKGBUILD b/community/mate-file-manager-open-terminal/PKGBUILD new file mode 100644 index 000000000..e40d19b16 --- /dev/null +++ b/community/mate-file-manager-open-terminal/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104828 2014-01-27 09:49:50Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-file-manager-open-terminal +pkgver=1.6.1 +pkgrel=1 +pkgdesc="A Caja extension for opening terminals in arbitrary local paths." +url="http://mate-desktop.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'mate-desktop' 'mate-file-manager') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('958a213572e99cf734aeae75c604a9193abe07de') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install b/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-file-manager-open-terminal/mate-file-manager-open-terminal.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-file-manager-sendto/PKGBUILD b/community/mate-file-manager-sendto/PKGBUILD new file mode 100644 index 000000000..e986477b5 --- /dev/null +++ b/community/mate-file-manager-sendto/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104232 2014-01-16 17:43:59Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-file-manager-sendto +pkgver=1.6.0 +pkgrel=4 +pkgdesc="A Caja extension for sending files." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'gupnp' 'gtk2' 'mate-file-manager') +makedepends=('mate-common' 'perl-xml-parser') +optdepends=('pidgin: Support for sending to instant messaging networks.' + 'gajim: Support for sending to Jabber.' + 'mate-bluetooth: Support for sending to bluetooth.') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('cf81a12d6d5d90f431d96fd67eed893f472b36f0') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr \ + --with-plugins=gajim,pidgin,removable-devices,upnp,emailclient + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager-sendto/mate-file-manager-sendto.install b/community/mate-file-manager-sendto/mate-file-manager-sendto.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-file-manager-sendto/mate-file-manager-sendto.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-file-manager-share/PKGBUILD b/community/mate-file-manager-share/PKGBUILD new file mode 100644 index 000000000..96e1668a7 --- /dev/null +++ b/community/mate-file-manager-share/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 104234 2014-01-16 17:45:59Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-file-manager-share +pkgver=1.6.0 +pkgrel=7 +pkgdesc="A Caja extension to quickly share a folder." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('mate-file-manager' 'samba') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('28e8ec54330e41aa44866107c23f48b47ea198e4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./autogen.sh \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager/PKGBUILD b/community/mate-file-manager/PKGBUILD new file mode 100644 index 000000000..0203916d6 --- /dev/null +++ b/community/mate-file-manager/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 104181 2014-01-16 15:54:41Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-file-manager +pkgver=1.6.3 +pkgrel=1 +pkgdesc="The MATE shell and file manager" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' + 'libunique' 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification') +makedepends=('gobject-introspection' 'mate-common' 'pangox-compat') +optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('ea52cfef3d728e4d5e135bff88452c02de05e960') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/caja \ + --enable-unique \ + --enable-introspection \ + --disable-static \ + --disable-update-mimedb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-file-manager/mate-file-manager.install b/community/mate-file-manager/mate-file-manager.install new file mode 100644 index 000000000..d5a70db20 --- /dev/null +++ b/community/mate-file-manager/mate-file-manager.install @@ -0,0 +1,14 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + update-mime-database /usr/share/mime/ > /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-image-viewer/PKGBUILD b/community/mate-image-viewer/PKGBUILD new file mode 100644 index 000000000..6d17b27cb --- /dev/null +++ b/community/mate-image-viewer/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 104205 2014-01-16 16:49:55Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-image-viewer +pkgver=1.6.2 +pkgrel=1 +pkgdesc="An image viewing and cataloging program for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'exempi' 'lcms' 'libexif' + 'libjpeg-turbo' 'mate-desktop' 'mate-icon-theme' 'pygtk' 'python2' + 'python2-gobject2' 'startup-notification' 'zlib') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" + "https://github.com/mate-desktop/eom/commit/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff") +sha1sums=('37e638790329350bb772a40549741f89ed43952c' + 'a2f0810a48d81023e9bae29d80b682ae0fe9faac') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + #Use GETTEXT_PACKAGE instead of PACKAGE + patch -Np1 -i "${srcdir}/e62ed087493c8a529d4eeab46c7d68a2047ac81a.diff" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-image-viewer/mate-image-viewer.install b/community/mate-image-viewer/mate-image-viewer.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/community/mate-image-viewer/mate-image-viewer.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-keyring/PKGBUILD b/community/mate-keyring/PKGBUILD new file mode 100644 index 000000000..7b67fa117 --- /dev/null +++ b/community/mate-keyring/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 104168 2014-01-16 15:04:52Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-keyring +pkgver=1.6.1 +pkgrel=3 +pkgdesc="MATE Password Management daemon" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('dbus' 'dconf' 'gtk2' 'libtasn1' 'pam') +makedepends=('docbook-xml' 'mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('7b2e0201d4f4eb0f728dbf1626d5aa05b2d05675') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Prevent gck conflict with gnome gcr lib + sed -e 's/DOC_MODULE=gck/DOC_MODULE=mate-gck/' -i docs/reference/gck/Makefile.am + autoreconf -fi + intltoolize -c -f +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-pam-dir=/usr/lib/security \ + --with-root-certs=/etc/ssl/certs \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-keyring/mate-keyring.install b/community/mate-keyring/mate-keyring.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-keyring/mate-keyring.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-media/PKGBUILD b/community/mate-media/PKGBUILD new file mode 100644 index 000000000..33c3510e2 --- /dev/null +++ b/community/mate-media/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 104197 2014-01-16 16:38:43Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgbase=mate-media +pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer") +pkgver=1.6.1 +pkgrel=1 +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra-pulse' 'libunique' + 'mate-desktop' 'mate-window-manager' 'pulseaudio') +makedepends=('mate-common' 'mate-doc-utils' 'mate-panel' + 'mate-settings-daemon-gstreamer' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('39acbf670a384325b5f68487e62bb1bdddb7d68f') + +build() { + cd "${srcdir}" + cp -a ${pkgbase}-${pkgver}{,-gstreamer} + + # build for pulseaudio + cd "${srcdir}/${pkgbase}-${pkgver}" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/${pkgbase} \ + --localstatedir=/var \ + --enable-pulseaudio \ + --disable-gstmix \ + --disable-gst-mixer-applet \ + --disable-static \ + --disable-scrollkeeper + make + + # build for gstreamer + cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/${pkgbase} \ + --localstatedir=/var \ + --enable-gstmix \ + --enable-gst-mixer-applet \ + --enable-deprecated \ + --disable-pulseaudio \ + --disable-static \ + --disable-scrollkeeper + make +} + +package_mate-media-pulseaudio() { + groups=('mate-extra') + pkgdesc="MATE Media Tools (pulseaudio)" + depends=('libcanberra-pulse' 'libunique' 'mate-desktop' 'mate-window-manager' + 'pulseaudio') + conflicts=("${pkgbase}-gstreamer" 'mate-settings-daemon-gstreamer') + provides=("${pkgbase}") + replaces=("${pkgbase}") + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_mate-media-gstreamer() { + pkgdesc="MATE Media Tools (GStreamer)" + depends=('gstreamer0.10-base-plugins' 'gtk2' 'libcanberra' 'mate-desktop' + 'mate-window-manager') + optdepends=('mate-panel: Volume control for the panel') + conflicts=("${pkgbase}-pulseaudio" 'mate-settings-daemon-pulseaudio') + provides=("${pkgbase}") + install=${pkgbase}-gstreamer.install + cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-media/mate-media-gstreamer.install b/community/mate-media/mate-media-gstreamer.install new file mode 100644 index 000000000..d6813b0f7 --- /dev/null +++ b/community/mate-media/mate-media-gstreamer.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-menus/PKGBUILD b/community/mate-menus/PKGBUILD new file mode 100644 index 000000000..d236e328e --- /dev/null +++ b/community/mate-menus/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 104193 2014-01-16 16:26:41Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-menus +pkgver=1.6.0 +pkgrel=3 +pkgdesc="MATE menu specifications" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glib2' 'python2') +makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('798e1e96e8dea48d93f1db90b6fbe69d0a3f3ea5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-python \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-mplayer/PKGBUILD b/community/mate-mplayer/PKGBUILD new file mode 100644 index 000000000..119b0ab70 --- /dev/null +++ b/community/mate-mplayer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 104685 2014-01-24 16:26:27Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-mplayer +pkgver=1.0.8 +pkgrel=3 +pkgdesc="Mplayer GUI for MATE" +url="https://github.com/NiceandGently/mate-mplayer" +arch=('i686' 'x86_64') +license=('GPL') +depends=('curl' 'dbus-glib' 'gmtk' 'gtk2' 'libgpod' 'libnotify' 'libmusicbrainz3' + 'mate-file-manager') +optdepends=('mplayer: required to actually play any media') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('05a5571f9ffc8493a0814065b78faa11') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-mplayer/mate-mplayer.install b/community/mate-mplayer/mate-mplayer.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/community/mate-mplayer/mate-mplayer.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-netbook/PKGBUILD b/community/mate-netbook/PKGBUILD new file mode 100644 index 000000000..eaba0ab36 --- /dev/null +++ b/community/mate-netbook/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 104240 2014-01-16 17:53:25Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-netbook +pkgver=1.6.1 +pkgrel=1 +pkgdesc="A simple window management tool." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'libfakekey' 'libmatewnck' 'libunique' 'mate-panel') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('8aa6f4802bbe5ef7aef9d601a4172d1304d6bb86') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexec=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-netbook/mate-netbook.install b/community/mate-netbook/mate-netbook.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-netbook/mate-netbook.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-netspeed/PKGBUILD b/community/mate-netspeed/PKGBUILD new file mode 100644 index 000000000..883a6a108 --- /dev/null +++ b/community/mate-netspeed/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 105369 2014-02-06 05:24:15Z bisson $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-netspeed +pkgver=1.6.1 +pkgrel=2 +pkgdesc="A MATE applet that shows how much traffic occurs on a specified network device." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'libgtop' 'mate-panel' 'wireless_tools') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('4b9c8b7f7ff59ef8ad989821fe360f5f459c66ed') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-netspeed/mate-netspeed.install b/community/mate-netspeed/mate-netspeed.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-netspeed/mate-netspeed.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-nettool/PKGBUILD b/community/mate-nettool/PKGBUILD new file mode 100644 index 000000000..da3b56e32 --- /dev/null +++ b/community/mate-nettool/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 105607 2014-02-11 17:55:05Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-nettool +pkgver=1.8.1 +pkgrel=7 +pkgdesc="MATE interface for various networking tools." +url="https://github.com/NiceandGently/mate-nettool" +arch=('i686' 'x86_64') +license=('GPL') +depends=('coreutils' 'gtk3' 'libgtop' 'net-tools') +makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools') +optdepends=('dnsutils: Required for DNS queries' + 'iputils: Required for ping, traceroute and finger' + 'nmap: Required for network discovery and security audits' + 'whois: Required for WHOIS queries' + 'yelp: for reading help documents') +options=('!emptydirs') +source=("https://github.com/NiceandGently/${pkgname}/archive/v${pkgver}.tar.gz") +md5sums=('c05c525fee4d70c03ebad7e9bb9b7e4c') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-nettool/mate-nettool.install b/community/mate-nettool/mate-nettool.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/community/mate-nettool/mate-nettool.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-notification-daemon/PKGBUILD b/community/mate-notification-daemon/PKGBUILD new file mode 100644 index 000000000..0201510a6 --- /dev/null +++ b/community/mate-notification-daemon/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 104203 2014-01-16 16:45:28Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-notification-daemon +pkgver=1.6.1 +pkgrel=3 +pkgdesc="Notification daemon for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('dconf' 'dbus-glib' 'gtk2' 'libcanberra' 'libmatewnck' 'libnotify') +makedepends=('mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +provides=('notification-daemon') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('b911efdc4e37dc0b521165168fee03889f776c12') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-notification-daemon/mate-notification-daemon.install b/community/mate-notification-daemon/mate-notification-daemon.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-notification-daemon/mate-notification-daemon.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD new file mode 100644 index 000000000..9fa14e4a8 --- /dev/null +++ b/community/mate-panel/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-panel +pkgver=1.6.2 +pkgrel=1 +pkgdesc="The MATE Panel" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'dconf' 'gtk2' 'libmatewnck' 'libcanberra' 'libice' + 'libmateweather' 'librsvg' 'libsm' + 'libsoup' 'libxau' 'mate-desktop' 'mate-file-manager' + 'mate-menus' 'mate-session-manager' 'mate-window-manager') +makedepends=('gobject-introspection' 'mate-common' 'mate-doc-utils' + 'networkmanager' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('a02d8a678b9235f231002feb4ecef7171939161e') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-introspection \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-panel/mate-panel.install b/community/mate-panel/mate-panel.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-panel/mate-panel.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-polkit/PKGBUILD b/community/mate-polkit/PKGBUILD new file mode 100644 index 000000000..67d8f1963 --- /dev/null +++ b/community/mate-polkit/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104183 2014-01-16 15:57:10Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-polkit +pkgver=1.6.1 +pkgrel=1 +pkgdesc="PolicyKit integration for the MATE desktop" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk2' 'polkit') +makedepends=('gobject-introspection' 'mate-common' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('43afbbb0a9e4c1295bdd0f788ad7effd776dccf2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/polkit-mate \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-introspection \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-power-manager/PKGBUILD b/community/mate-power-manager/PKGBUILD new file mode 100644 index 000000000..74d83b619 --- /dev/null +++ b/community/mate-power-manager/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 104214 2014-01-16 17:11:58Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> +# Contributor: hekel <hekel@archlinux.info> + +pkgname=mate-power-manager +pkgver=1.6.3 +pkgrel=3 +pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system for Mate Desktop" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'dconf' 'libcanberra' 'libmatekeyring' 'libnotify' + 'libunique' 'upower') +makedepends=('docbook2x' 'docbook-xml' 'mate-common' 'mate-doc-utils' + 'mate-panel' 'perl-xml-parser' 'xmlto') +optdepends=('mate-panel: Set brightness and inhibit power management from the panel') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('a949e34494cb70bcb2fa349dcc35847f022be187') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + #Work around a problem where the .sgml fail to parse. + sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --enable-applets \ + --enable-unique \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-power-manager/mate-power-manager.install b/community/mate-power-manager/mate-power-manager.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-power-manager/mate-power-manager.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-screensaver/PKGBUILD b/community/mate-screensaver/PKGBUILD new file mode 100644 index 000000000..3ff0d4b0b --- /dev/null +++ b/community/mate-screensaver/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-screensaver +pkgver=1.6.2 +pkgrel=3 +pkgdesc='Screensaver for MATE' +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'libmatekbd' 'libnotify' 'libxss' 'mate-desktop' + 'mate-menus' 'mate-session-manager') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser' 'xmlto') +optdepends=('mate-power-manager: Add power management support.' + 'mate-screensaver-hacks: Additional screensavers.' + 'rss-glx: Really slick screensavers.') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('f8101af15e909ca40c1546bda637712e00458a67') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/lib/xscreensaver \ + --with-mit-ext \ + --with-libnotify \ + --enable-locking \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-screensaver/mate-screensaver.install b/community/mate-screensaver/mate-screensaver.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-screensaver/mate-screensaver.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-sensors-applet/PKGBUILD b/community/mate-sensors-applet/PKGBUILD new file mode 100644 index 000000000..c78432fa8 --- /dev/null +++ b/community/mate-sensors-applet/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 104246 2014-01-16 18:03:24Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=mate-sensors-applet +pkgver=1.6.1 +pkgrel=1 +pkgdesc="A MATE Panel applet to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus' 'gtk2' 'libatasmart' 'libnotify' 'libxnvctrl' 'lm_sensors' 'mate-panel' ) +makedepends=('docbook-xml' 'mate-common' 'mate-doc-utils' 'perl-xml-parser' 'rarian') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('3b57d8e4b47ff2b25bbcee465c0ef7c37bcff1f7') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-sensors-applet/mate-sensors-applet.install b/community/mate-sensors-applet/mate-sensors-applet.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-sensors-applet/mate-sensors-applet.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-session-manager/PKGBUILD b/community/mate-session-manager/PKGBUILD new file mode 100644 index 000000000..e493b23eb --- /dev/null +++ b/community/mate-session-manager/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 105093 2014-01-31 12:59:35Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-session-manager +pkgver=1.6.1 +pkgrel=10 +pkgdesc="The MATE Session Handler" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('dbus-glib' 'gtk2' 'libsm' 'libxtst' 'mate-desktop' 'mate-polkit' + 'mate-settings-daemon' 'xdg-user-dirs') +makedepends=('mate-common' 'perl-xml-parser' 'xmlto') +optdepends=('xdg-user-dirs-gtk: Add autostart that prompts to rename user directories when switching locales') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" + f0b5b1ab78879d64f80117415aacf029359afea5.diff + e934e91226e9a93956121c9c84ecf3664fcd68be.diff) +sha1sums=('46188f6c02cc5978688af9d5db4be09f1b9199a5' + '20fb99c29731d05191cd0029d0573db784b06ccf' + '4312495bcd12ca5a20f7d5442b7517902605534c') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix systemd-login1 support for hibernate/suspend + # https://github.com/mate-desktop/mate-session-manager/commit/f0b5b1ab78879d64f80117415aacf029359afea5 + patch -Np1 -i "${srcdir}/f0b5b1ab78879d64f80117415aacf029359afea5.diff" + + # Make upower optional + # https://github.com/mate-desktop/mate-session-manager/commit/e934e91226e9a93956121c9c84ecf3664fcd68be + patch -Np1 -i "${srcdir}/e934e91226e9a93956121c9c84ecf3664fcd68be.diff" + + # Recreate the build system because configure.ac was patched. + autoreconf -fi +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-upower + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff b/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff new file mode 100644 index 000000000..bd42a4722 --- /dev/null +++ b/community/mate-session-manager/e934e91226e9a93956121c9c84ecf3664fcd68be.diff @@ -0,0 +1,293 @@ +diff --git a/configure.ac b/configure.ac +index 37bb191..a9e20ef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,7 +70,6 @@ PKG_CHECK_MODULES(MATE_SESSION, + gio-2.0 >= $GIO_REQUIRED + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- upower-glib >= $UPOWER_REQUIRED + ) + + PKG_CHECK_MODULES(SESSION_PROPERTIES, +@@ -128,6 +127,24 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes") + AC_SUBST(HAVE_SYSTEMD) + + dnl ==================================================================== ++dnl UPOWER ++dnl ==================================================================== ++ ++AC_ARG_ENABLE(upower, ++ AS_HELP_STRING([--enable-upower], ++ [Use upower to suspend/hibernate]), ++ enable_upower=$enableval, ++ enable_upower=yes) ++if test "x$enable_upower" = "xyes"; then ++ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes, has_upower=no) ++ AC_DEFINE(HAVE_UPOWER, 1, [upower support]) ++ AC_SUBST(UPOWER_CFLAGS) ++ AC_SUBST(UPOWER_LIBS) ++fi ++AM_CONDITIONAL(HAVE_UPOWER, test "x$enable_upower" = "xyes") ++AC_SUBST(HAVE_UPOWER) ++ ++dnl ==================================================================== + dnl X development libraries check + dnl ==================================================================== + +@@ -385,6 +402,7 @@ echo " + GTK+ version: ${with_gtk} + Default WM: ${with_default_wm} + Systemd support: ${use_systemd} ++ Upower support: ${enable_upower} + IPv6 support: ${have_full_ipv6} + Backtrace support: ${have_backtrace} + XRender support: ${have_xrender} +diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am +index f37a0e2..53f0fc7 100644 +--- a/mate-session/Makefile.am ++++ b/mate-session/Makefile.am +@@ -7,6 +7,7 @@ noinst_PROGRAMS = \ + AM_CPPFLAGS = \ + $(MATE_SESSION_CFLAGS) \ + $(SYSTEMD_CFLAGS) \ ++ $(UPOWER_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + + AM_CFLAGS = $(WARN_CFLAGS) +@@ -76,6 +77,7 @@ mate_session_LDADD = \ + $(XEXT_LIBS) \ + $(MATE_SESSION_LIBS) \ + $(SYSTEMD_LIBS) \ ++ $(UPOWER_LIBS) \ + $(EXECINFO_LIBS) + + libgsmutil_la_SOURCES = \ +diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c +index 1a79875..323f123 100644 +--- a/mate-session/gsm-logout-dialog.c ++++ b/mate-session/gsm-logout-dialog.c +@@ -27,7 +27,9 @@ + #include <glib/gi18n.h> + #include <gtk/gtk.h> + ++#ifdef HAVE_UPOWER + #include <upower.h> ++#endif + + #include "gsm-logout-dialog.h" + #ifdef HAVE_SYSTEMD +@@ -52,8 +54,9 @@ + struct _GsmLogoutDialogPrivate + { + GsmDialogLogoutType type; +- ++#ifdef HAVE_UPOWER + UpClient *up_client; ++#endif + #ifdef HAVE_SYSTEMD + GsmSystemd *systemd; + #endif +@@ -147,9 +150,9 @@ enum { + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_stick (GTK_WINDOW (logout_dialog)); +- ++#ifdef HAVE_UPOWER + logout_dialog->priv->up_client = up_client_new (); +- ++#endif + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + logout_dialog->priv->systemd = gsm_get_systemd (); +@@ -176,12 +179,12 @@ enum { + g_source_remove (logout_dialog->priv->timeout_id); + logout_dialog->priv->timeout_id = 0; + } +- ++#ifdef HAVE_UPOWER + if (logout_dialog->priv->up_client) { + g_object_unref (logout_dialog->priv->up_client); + logout_dialog->priv->up_client = NULL; + } +- ++#endif + #ifdef HAVE_SYSTEMD + if (logout_dialog->priv->systemd) { + g_object_unref (logout_dialog->priv->systemd); +@@ -201,13 +204,17 @@ enum { + gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) + { + gboolean ret; ++ ret = FALSE; + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + else + #endif ++#ifdef HAVE_UPOWER + ret = up_client_get_can_suspend (logout_dialog->priv->up_client); +- ++#endif + return ret; + } + +@@ -215,13 +222,17 @@ enum { + gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) + { + gboolean ret; ++ ret = FALSE; + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) + ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + else + #endif ++#ifdef HAVE_UPOWER + ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); +- ++#endif + return ret; + } + +diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +index 79d0829..17a20b8 100644 +--- a/mate-session/gsm-manager.c ++++ b/mate-session/gsm-manager.c +@@ -38,7 +38,9 @@ + #include <dbus/dbus-glib.h> + #include <dbus/dbus-glib-lowlevel.h> + ++#ifdef HAVE_UPOWER + #include <upower.h> ++#endif + + #include <gtk/gtk.h> /* for logout dialog */ + #include <gio/gio.h> /* for gsettings */ +@@ -144,9 +146,10 @@ struct GsmManagerPrivate + + DBusGProxy *bus_proxy; + DBusGConnection *connection; +- ++#ifdef HAVE_UPOWER + /* Interface with other parts of the system */ + UpClient *up_client; ++#endif + }; + + enum { +@@ -1097,10 +1100,11 @@ enum { + static void + manager_attempt_hibernate (GsmManager *manager) + { ++#ifdef HAVE_UPOWER + gboolean can_hibernate; + GError *error; + gboolean ret; +- ++#endif + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) { + +@@ -1113,8 +1117,11 @@ enum { + + gsm_systemd_attempt_hibernate (systemd); + } ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + else { + #endif ++#ifdef HAVE_UPOWER + can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); + if (can_hibernate) { + +@@ -1129,7 +1136,8 @@ enum { + g_error_free (error); + } + } +-#ifdef HAVE_SYSTEMD ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + } + #endif + } +@@ -1137,10 +1145,11 @@ enum { + static void + manager_attempt_suspend (GsmManager *manager) + { ++#ifdef HAVE_UPOWER + gboolean can_suspend; + GError *error; + gboolean ret; +- ++#endif + #ifdef HAVE_SYSTEMD + if (LOGIND_RUNNING()) { + +@@ -1153,8 +1162,11 @@ enum { + + gsm_systemd_attempt_suspend (systemd); + } ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + else { + #endif ++#ifdef HAVE_UPOWER + can_suspend = up_client_get_can_suspend (manager->priv->up_client); + if (can_suspend) { + +@@ -1169,7 +1181,8 @@ enum { + g_error_free (error); + } + } +-#ifdef HAVE_SYSTEMD ++#endif ++#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) + } + #endif + } +@@ -2341,12 +2354,12 @@ enum { + g_object_unref (manager->priv->settings_screensaver); + manager->priv->settings_screensaver = NULL; + } +- ++#ifdef HAVE_UPOWER + if (manager->priv->up_client != NULL) { + g_object_unref (manager->priv->up_client); + manager->priv->up_client = NULL; + } +- ++#endif + G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); + } + +@@ -2553,9 +2566,9 @@ enum { + "status-changed", + G_CALLBACK (on_presence_status_changed), + manager); +- ++#ifdef HAVE_UPOWER + manager->priv->up_client = up_client_new (); +- ++#endif + g_signal_connect (manager->priv->settings_session, + "changed", + G_CALLBACK (on_gsettings_key_changed), +@@ -3224,12 +3237,12 @@ enum { + #endif + gboolean can_suspend; + gboolean can_hibernate; +- ++#ifdef HAVE_UPOWER + g_object_get (manager->priv->up_client, + "can-suspend", &can_suspend, + "can-hibernate", &can_hibernate, + NULL); +- ++#endif + g_debug ("GsmManager: CanShutdown called"); + + g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); diff --git a/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff b/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff new file mode 100644 index 000000000..ffbe19a5d --- /dev/null +++ b/community/mate-session-manager/f0b5b1ab78879d64f80117415aacf029359afea5.diff @@ -0,0 +1,271 @@ +diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c +index 2d2947c..1a79875 100644 +--- a/mate-session/gsm-logout-dialog.c ++++ b/mate-session/gsm-logout-dialog.c +@@ -200,13 +200,29 @@ enum { + static gboolean + gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) + { +- return up_client_get_can_suspend (logout_dialog->priv->up_client); ++ gboolean ret; ++#ifdef HAVE_SYSTEMD ++ if (LOGIND_RUNNING()) ++ ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); ++ else ++#endif ++ ret = up_client_get_can_suspend (logout_dialog->priv->up_client); ++ ++ return ret; + } + + static gboolean + gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) + { +- return up_client_get_can_hibernate (logout_dialog->priv->up_client); ++ gboolean ret; ++#ifdef HAVE_SYSTEMD ++ if (LOGIND_RUNNING()) ++ ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); ++ else ++#endif ++ ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); ++ ++ return ret; + } + + static gboolean +diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c +index 8143d1f..b4986ac 100644 +--- a/mate-session/gsm-manager.c ++++ b/mate-session/gsm-manager.c +@@ -1109,6 +1109,20 @@ enum { + GError *error; + gboolean ret; + ++#ifdef HAVE_SYSTEMD ++ if (LOGIND_RUNNING()) { ++ ++ GsmSystemd *systemd; ++ ++ systemd = gsm_get_systemd (); ++ ++ /* lock the screen before we suspend */ ++ manager_perhaps_lock (manager); ++ ++ gsm_systemd_attempt_hibernate (systemd); ++ } ++ else { ++#endif + can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); + if (can_hibernate) { + +@@ -1123,6 +1137,9 @@ enum { + g_error_free (error); + } + } ++#ifdef HAVE_SYSTEMD ++ } ++#endif + } + + static void +@@ -1132,6 +1149,20 @@ enum { + GError *error; + gboolean ret; + ++#ifdef HAVE_SYSTEMD ++ if (LOGIND_RUNNING()) { ++ ++ GsmSystemd *systemd; ++ ++ systemd = gsm_get_systemd (); ++ ++ /* lock the screen before we suspend */ ++ manager_perhaps_lock (manager); ++ ++ gsm_systemd_attempt_suspend (systemd); ++ } ++ else { ++#endif + can_suspend = up_client_get_can_suspend (manager->priv->up_client); + if (can_suspend) { + +@@ -1146,6 +1177,9 @@ enum { + g_error_free (error); + } + } ++#ifdef HAVE_SYSTEMD ++ } ++#endif + } + + static void +diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c +index 377f026..dbe8ea0 100644 +--- a/mate-session/gsm-systemd.c ++++ b/mate-session/gsm-systemd.c +@@ -725,6 +725,141 @@ static void gsm_systemd_on_name_owner_changed (DBusGProxy *bus_proxy, + return can_stop; + } + ++gboolean ++gsm_systemd_can_hibernate (GsmSystemd *manager) ++{ ++ gboolean res; ++ gchar *value; ++ gboolean can_hibernate; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) { ++ g_warning ("Could not connect to Systemd: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy, ++ "CanHibernate", ++ INT_MAX, ++ &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &value, ++ G_TYPE_INVALID); ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ can_hibernate = g_strcmp0 (value, "yes") == 0 || ++ g_strcmp0 (value, "challenge") == 0; ++ g_free (value); ++ return can_hibernate; ++} ++ ++gboolean ++gsm_systemd_can_suspend (GsmSystemd *manager) ++{ ++ gboolean res; ++ gchar *value; ++ gboolean can_suspend; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) { ++ g_warning ("Could not connect to Systemd: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy, ++ "CanSuspend", ++ INT_MAX, ++ &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &value, ++ G_TYPE_INVALID); ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ can_suspend = g_strcmp0 (value, "yes") == 0 || ++ g_strcmp0 (value, "challenge") == 0; ++ g_free (value); ++ return can_suspend; ++} ++ ++void ++gsm_systemd_attempt_hibernate (GsmSystemd *manager) ++{ ++ gboolean res; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) { ++ g_warning ("Could not connect to Systemd: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy, ++ "Hibernate", ++ INT_MAX, ++ &error, ++ G_TYPE_BOOLEAN, TRUE, /* interactive */ ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++} ++ ++void ++gsm_systemd_attempt_suspend (GsmSystemd *manager) ++{ ++ gboolean res; ++ GError *error; ++ ++ error = NULL; ++ ++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) { ++ g_warning ("Could not connect to Systemd: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy, ++ "Suspend", ++ INT_MAX, ++ &error, ++ G_TYPE_BOOLEAN, TRUE, /* interactive */ ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++ if (res == FALSE) { ++ g_warning ("Could not make DBUS call: %s", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++} ++ + gchar * + gsm_systemd_get_current_session_type (GsmSystemd *manager) + { +diff --git a/mate-session/gsm-systemd.h b/mate-session/gsm-systemd.h +index 8e886ba..e0e21c4 100644 +--- a/mate-session/gsm-systemd.h ++++ b/mate-session/gsm-systemd.h +@@ -89,10 +89,18 @@ enum _GsmSystemdError { + + gboolean gsm_systemd_can_restart (GsmSystemd *manager); + ++gboolean gsm_systemd_can_hibernate (GsmSystemd *manager); ++ ++gboolean gsm_systemd_can_suspend (GsmSystemd *manager); ++ + void gsm_systemd_attempt_stop (GsmSystemd *manager); + + void gsm_systemd_attempt_restart (GsmSystemd *manager); + ++void gsm_systemd_attempt_hibernate (GsmSystemd *manager); ++ ++void gsm_systemd_attempt_suspend (GsmSystemd *manager); ++ + void gsm_systemd_set_session_idle (GsmSystemd *manager, + gboolean is_idle); + diff --git a/community/mate-session-manager/mate-session-manager.install b/community/mate-session-manager/mate-session-manager.install new file mode 100644 index 000000000..b30edffe9 --- /dev/null +++ b/community/mate-session-manager/mate-session-manager.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-settings-daemon/PKGBUILD b/community/mate-settings-daemon/PKGBUILD new file mode 100644 index 000000000..307271771 --- /dev/null +++ b/community/mate-settings-daemon/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 105085 2014-01-31 11:55:11Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgbase=mate-settings-daemon +pkgname=("${pkgbase}-pulseaudio" "${pkgbase}-gstreamer") +pkgver=1.6.2 +pkgrel=6 +pkgdesc="The MATE Settings daemon" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2' + 'libcanberra-pulse' 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' + 'nss' 'polkit' 'pulseaudio-alsa') +makedepends=('mate-common' 'perl-xml-parser') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('76c50bddcffd6b0415b058c828784bcd11c034ee') +install=${pkgbase}.install + +build() { + cd "${srcdir}" + cp -a ${pkgbase}-${pkgver}{,-gstreamer} + + # build for pulseaudio + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgbase} \ + --sysconfdir=/etc \ + --enable-polkit \ + --enable-pulse \ + --disable-gstreamer \ + --disable-static + make + + # build for gstreamer + cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgbase} \ + --sysconfdir=/etc \ + --enable-polkit \ + --enable-gstreamer \ + --disable-pulse \ + --disable-static + make +} + +package_mate-settings-daemon-pulseaudio() { + groups=('mate') + pkgdesc="The MATE Settings daemon (pulseaudio)" + depends=('dbus-glib' 'dconf' 'fontconfig' 'gtk2' 'libcanberra-pulse' + 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit' + 'pulseaudio-alsa') + conflicts=("${pkgbase}-gstreamer" 'mate-media-gstreamer') + provides=("${pkgbase}") + replaces=("${pkgbase}") + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_mate-settings-daemon-gstreamer() { + pkgdesc="The MATE Settings daemon (GStreamer)" + depends=('dbus-glib' 'dconf' 'fontconfig' 'gstreamer0.10-base' 'gtk2' + 'libmatekbd' 'libnotify' 'libxt' 'mate-desktop' 'nss' 'polkit') + conflicts=("${pkgbase}-pulseaudio" 'mate-media-pulseaudio') + provides=("${pkgbase}") + cd "${srcdir}/${pkgbase}-${pkgver}-gstreamer" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-settings-daemon/mate-settings-daemon.install b/community/mate-settings-daemon/mate-settings-daemon.install new file mode 100644 index 000000000..d6813b0f7 --- /dev/null +++ b/community/mate-settings-daemon/mate-settings-daemon.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-system-monitor/PKGBUILD b/community/mate-system-monitor/PKGBUILD new file mode 100644 index 000000000..9741948c9 --- /dev/null +++ b/community/mate-system-monitor/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104271 2014-01-16 18:56:12Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-system-monitor +pkgver=1.6.1 +pkgrel=6 +pkgdesc="A system monitor for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'dbus-glib' 'glibmm' 'gtk2' 'gtkmm' 'libgtop' 'libmatewnck' 'librsvg' + 'mate-icon-theme') +makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('84b6e8f3557bdadada026aeb349f6e9e90b59c6a') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --localstatedir=/var \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-system-monitor/mate-system-monitor.install b/community/mate-system-monitor/mate-system-monitor.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-system-monitor/mate-system-monitor.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-system-tools/PKGBUILD b/community/mate-system-tools/PKGBUILD new file mode 100644 index 000000000..c3301560e --- /dev/null +++ b/community/mate-system-tools/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 105370 2014-02-06 05:24:16Z bisson $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-system-tools +pkgver=1.6.0 +pkgrel=9 +pkgdesc="Suite of tools for MATE to simplify configuring workstations." +url="http://mate-desktop.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'gtk2' 'liboobs' 'mate-polkit' 'system-tools-backends' + 'wireless_tools') +makedepends=('mate-common' 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser') +optdepends=('ntp: Automatic time synchronisation.' + 'mate-file-manager: provides Caja Shares extension') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('89d53c22171f6181ad4fb89387d4fa3300bb27b2') +install=${pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Modify the groups for Arch + # - https://wiki.archlinux.org/index.php/Users_and_Groups + # - https://wiki.archlinux.org/index.php/Systemd#Supplementary_information + # - https://bbs.archlinux.org/viewtopic.php?pid=1183332 + # Desktop user + sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video/adm,log,sys,users,uucp/' src/users/user-profiles.conf.in + # Administrator + sed -i 's/cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,admin,sambashare,lpadmin,video/adm,disk,locate,log,sys,users,uucp,wheel/' src/users/user-profiles.conf.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-scrollkeeper \ + LIBS="-lm" # Required for MATE 1.6 but can be removed in MATE 1.7/1.8 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-system-tools/mate-system-tools.install b/community/mate-system-tools/mate-system-tools.install new file mode 100644 index 000000000..d6813b0f7 --- /dev/null +++ b/community/mate-system-tools/mate-system-tools.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-terminal/PKGBUILD b/community/mate-terminal/PKGBUILD new file mode 100644 index 000000000..8787ef79a --- /dev/null +++ b/community/mate-terminal/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 104248 2014-01-16 18:05:57Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-terminal +pkgver=1.6.2 +pkgrel=1 +pkgdesc="The MATE Terminal Emulator" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dbus' 'dconf' 'gtk2' 'libsm' 'mate-desktop' 'vte') +makedepends=('docbook2x' 'mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('951c006c5ee31da0d0da1ebad4d1e6648fe0e41b') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-terminal/mate-terminal.install b/community/mate-terminal/mate-terminal.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-terminal/mate-terminal.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-text-editor/PKGBUILD b/community/mate-text-editor/PKGBUILD new file mode 100644 index 000000000..2c384761e --- /dev/null +++ b/community/mate-text-editor/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104251 2014-01-16 18:10:47Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-text-editor +pkgver=1.6.2 +pkgrel=1 +pkgdesc="A powerful text editor for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'enchant' 'gtk2' 'gtksourceview2' 'iso-codes' + 'libsm' 'mate-desktop' 'mate-file-manager' 'python2' 'python2-gobject2' + 'pygtksourceview2') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('64e34ae5724608fcc5adff195515b74e1e3e5bd6') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-python \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-text-editor/mate-text-editor.install b/community/mate-text-editor/mate-text-editor.install new file mode 100644 index 000000000..ed73415a4 --- /dev/null +++ b/community/mate-text-editor/mate-text-editor.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-text-editor/pluma_gettext_fix.diff b/community/mate-text-editor/pluma_gettext_fix.diff new file mode 100644 index 000000000..b6829835a --- /dev/null +++ b/community/mate-text-editor/pluma_gettext_fix.diff @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index be832f7..485c574 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -155,10 +155,11 @@ dnl Gettext stuff. + dnl ================================================================ + + IT_PROG_INTLTOOL([0.40.0]) +-AC_SUBST([GETTEXT_PACKAGE], [pluma]) ++GETTEXT_PACKAGE=pluma ++AC_SUBST([GETTEXT_PACKAGE]) + AM_GNU_GETTEXT_VERSION([0.17]) + AM_GLIB_GNU_GETTEXT +-AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME], [Define to the gettext package name.]) ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name]) + + dnl ================================================================ + dnl Use gvfs metadata or the old xml file store. diff --git a/community/mate-user-share/PKGBUILD b/community/mate-user-share/PKGBUILD new file mode 100644 index 000000000..ccf81858d --- /dev/null +++ b/community/mate-user-share/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 105613 2014-02-11 18:11:20Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> + +pkgname=mate-user-share +pkgver=1.6.1 +pkgrel=7 +pkgdesc="User level public file sharing via WebDAV." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('apache' 'dbus-glib' 'dconf' 'libunique' 'mod_dnssd') +makedepends=('libcanberra' 'libnotify' 'mate-common' 'mate-doc-utils' + 'mate-file-manager' 'perl-xml-parser') +options=('!emptydirs') +install=${pkgname}.install +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz" + "https://github.com/mate-desktop/mate-user-share/commit/7a0305478295e9e7c284372677a4cbc382444482.diff") +sha1sums=('83f161dee79ea0ae4345c54a5b1339f673f68e8f' + 'ffa10ae69f5edf08d605418182f3c5bc975eb3cf') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # do not use download dir for incoming bluetooth downloads if mate-bluetooth isn't installed + patch -Np1 -i "${srcdir}/7a0305478295e9e7c284372677a4cbc382444482.diff" +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --libexec=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --disable-static \ + --disable-scrollkeeper \ + --disable-bluetooth + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/mate-user-share/dav_user_2.0.conf" +} diff --git a/community/mate-user-share/mate-user-share.install b/community/mate-user-share/mate-user-share.install new file mode 100644 index 000000000..7af080f58 --- /dev/null +++ b/community/mate-user-share/mate-user-share.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff b/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff new file mode 100644 index 000000000..fd71dbb57 --- /dev/null +++ b/community/mate-utils/422504e251442ca9921c4218151cffb6548280e6.diff @@ -0,0 +1,62 @@ +diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c +index 63ec5d9..6510f7f 100644 +--- a/mate-screenshot/mate-screenshot.c ++++ b/mate-screenshot/mate-screenshot.c +@@ -809,13 +809,14 @@ enum + finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle) + { + ScreenshotDialog *dialog; ++ gboolean include_mask = (!take_window_shot && !take_area_shot); + + /* always disable window border for full-desktop or selected-area screenshots */ + if (!take_window_shot) +- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE); ++ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask); + else + { +- screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border); ++ screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask); + + switch (border_effect[0]) + { +diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c +index b41ae4b..faed676 100644 +--- a/mate-screenshot/screenshot-utils.c ++++ b/mate-screenshot/screenshot-utils.c +@@ -670,7 +670,8 @@ + screenshot_get_pixbuf (GdkWindow *window, + GdkRectangle *rectangle, + gboolean include_pointer, +- gboolean include_border) ++ gboolean include_border, ++ gboolean include_mask) + { + GdkWindow *root; + GdkPixbuf *screenshot; +@@ -738,7 +739,11 @@ + x_orig, y_orig, 0, 0, + width, height); + +- mask_monitors (screenshot, root); ++ /* ++ * Masking currently only works properly with full-screen shots ++ */ ++ if (include_mask) ++ mask_monitors (screenshot, root); + + #ifdef HAVE_X11_EXTENSIONS_SHAPE_H + if (include_border) +diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h +index 0af2ba3..5404bde 100644 +--- a/mate-screenshot/screenshot-utils.h ++++ b/mate-screenshot/screenshot-utils.h +@@ -36,7 +36,8 @@ gboolean screenshot_select_area (int *px, + GdkPixbuf *screenshot_get_pixbuf (GdkWindow *win, + GdkRectangle *rectangle, + gboolean include_pointer, +- gboolean include_border); ++ gboolean include_border, ++ gboolean include_mask); + + void screenshot_show_error_dialog (GtkWindow *parent, + const gchar *message, diff --git a/community/mate-utils/PKGBUILD b/community/mate-utils/PKGBUILD new file mode 100644 index 000000000..66b8ddd6c --- /dev/null +++ b/community/mate-utils/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 104256 2014-01-16 18:15:52Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-utils +pkgver=1.6.1 +pkgrel=1 +pkgdesc="Common MATE utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'libcanberra' 'libgtop' 'libsm' 'mate-desktop' 'zlib') +makedepends=('mate-common' 'mate-doc-utils' 'mate-panel' 'perl-xml-parser' + 'rarian') +optdepends=('mate-panel: Look up words in dictionaries from the panel') +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('c765c53cd4b279155d30ed057a78a584e5b2addc') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-utils/mate-utils.install b/community/mate-utils/mate-utils.install new file mode 100644 index 000000000..d6813b0f7 --- /dev/null +++ b/community/mate-utils/mate-utils.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/mate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mate-utils/patch.diff b/community/mate-utils/patch.diff new file mode 100644 index 000000000..6971c219e --- /dev/null +++ b/community/mate-utils/patch.diff @@ -0,0 +1,34 @@ +From a59fda7d006b856ac5982750f2ffdefd24191be0 Mon Sep 17 00:00:00 2001 +From: Stefano Karapetsas <stefano@karapetsas.com> +Date: Thu, 11 Jul 2013 11:14:38 +0000 +Subject: mate-screenshot: Fix save path selection + +Closes #32 +https://github.com/mate-desktop/mate-utils/issues/32 + +Fix from https://bugzilla.gnome.org/show_bug.cgi?id=579232 +--- +diff --git a/mate-screenshot/screenshot-dialog.c b/mate-screenshot/screenshot-dialog.c +index bcac343..b5b2be5 100644 +--- a/mate-screenshot/screenshot-dialog.c ++++ b/mate-screenshot/screenshot-dialog.c +@@ -338,7 +338,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog) + gchar *uri, *file, *tmp; + GError *error; + +- folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget)); ++ folder = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget)); + file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry)); + + error = NULL; +@@ -366,7 +366,7 @@ screenshot_dialog_get_uri (ScreenshotDialog *dialog) + char * + screenshot_dialog_get_folder (ScreenshotDialog *dialog) + { +- return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget)); ++ return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog->save_widget)); + } + + GdkPixbuf * +-- +cgit diff --git a/community/mate-window-manager/PKGBUILD b/community/mate-window-manager/PKGBUILD new file mode 100644 index 000000000..fa498c203 --- /dev/null +++ b/community/mate-window-manager/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 104189 2014-01-16 16:18:35Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Giovanni Ricciardi <kar98k.sniper@gmail.com> + +pkgname=mate-window-manager +pkgver=1.6.2 +pkgrel=4 +pkgdesc="A window manager for MATE" +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2' 'libcanberra' 'libgtop' 'libice' 'libsm' 'libxt' 'mate-desktop' + 'mate-dialogs' 'startup-notification') +makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') +options=('!emptydirs') +groups=('mate') +source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz") +sha1sums=('dce0fd1953d75b4aad88d4818228eac677fb1d7b') +install=${pkgname}.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-startup-notification \ + --disable-static \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mate-window-manager/mate-window-manager.install b/community/mate-window-manager/mate-window-manager.install new file mode 100644 index 000000000..3a06d45b9 --- /dev/null +++ b/community/mate-window-manager/mate-window-manager.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mayavi/PKGBUILD b/community/mayavi/PKGBUILD index df6dee64e..81832fa16 100644 --- a/community/mayavi/PKGBUILD +++ b/community/mayavi/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 96082 2013-08-20 06:32:22Z lcarlier $ +# $Id: PKGBUILD 105092 2014-01-31 12:47:02Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> pkgname=mayavi -pkgver=4.3.0 -pkgrel=2 +pkgver=4.3.1 +pkgrel=1 pkgdesc="A 3-dimensional visualizer of scientific data" arch=('i686' 'x86_64') url="https://github.com/enthought/mayavi" license=('BSD') -depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython') +depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython2.8') makedepends=('python2-setuptools' 'python2-sphinx' 'xorg-server-xvfb' 'twisted') replaces=('python2-mayavi') provides=('python2-mayavi') options=(!emptydirs) source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/archive/${pkgver}.tar.gz") -md5sums=('7708d85a77c427c8dfbeb914630d31be') +md5sums=('93677c77f0a835537bd210c493740b03') build() { cd "$srcdir"/mayavi-$pkgver + # force selection of wxpython 2.8 + sed -e "s/wxversion.ensureMinimal('2.8')/wxversion.select('2.8')/g" -i $(find . -name '*.py') + # Use python2-sphinx provided sphinx-build2 sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile* diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 583cda1f5..5dd6cffc7 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 101328 2013-11-22 17:36:49Z spupykin $ +# $Id: PKGBUILD 103859 2014-01-12 19:04:40Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui pkgver=0.7.65 -pkgrel=1 +pkgrel=6 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" license=('GPL') -depends=('libmediainfo' 'wxgtk') -makedepends=('libtool' 'automake' 'autoconf') +depends=('libmediainfo' 'wxgtk' 'libsm' 'desktop-file-utils') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) md5sums=('19d7992a7d0cba0f5f731f993e8c537c') build() { - cd $srcdir/MediaInfo/Project/GNU/GUI + cd MediaInfo/Project/GNU/GUI sh ./autogen ./configure --prefix=/usr make } package() { - cd $srcdir/MediaInfo/Project/GNU/GUI - make DESTDIR=$pkgdir install - install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ - $pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png - install -D -m 644 $srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png \ - $pkgdir/usr/share/pixmaps/mediainfo-gui.png - install -D -m 644 $srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop \ - $pkgdir/usr/share/applications/mediainfo-gui.desktop + cd MediaInfo/Project/GNU/GUI + make DESTDIR="$pkgdir" install + install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \ + "$pkgdir/usr/share/icons/hicolor/128x128/apps/mediainfo.png" + install -D -m 644 "$srcdir/MediaInfo/Source/Resource/Image/MediaInfo.png" \ + "$pkgdir/usr/share/pixmaps/mediainfo-gui.png" + install -D -m 644 "$srcdir/MediaInfo/Project/GNU/GUI/mediainfo-gui.desktop" \ + "$pkgdir/usr/share/applications/mediainfo-gui.desktop" } diff --git a/community/mediainfo-gui/mediainfo-gui.install b/community/mediainfo-gui/mediainfo-gui.install index 28d8f7815..678df2aef 100644 --- a/community/mediainfo-gui/mediainfo-gui.install +++ b/community/mediainfo-gui/mediainfo-gui.install @@ -1,5 +1,6 @@ post_install() { which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD index 58bcc33f5..89a9d4dd9 100644 --- a/community/medit/PKGBUILD +++ b/community/medit/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 75884 2012-09-04 15:31:23Z spupykin $ +# $Id: PKGBUILD 104071 2014-01-15 09:49:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=medit pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK text editor" arch=('i686' 'x86_64' 'mips64el') url="http://mooedit.sourceforge.net" options=('!emptydirs') license=('GPL') -depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs') +depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs' 'gamin') optdepends=('ctags' 'vte: terminal emulator') makedepends=(pkgconfig perlxml intltool gcc-objc) install=medit.install @@ -20,7 +20,7 @@ md5sums=('9ea0d396a3bf3ee6ce220365bffb7358') build() { cd $srcdir/medit-$pkgver export PYTHON=/usr/bin/python2 - [ -f Makefile ] || ./configure --prefix=/usr + [ -f Makefile ] || ./configure --prefix=/usr --with-fam make } diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index b00f681b3..e7284e3c4 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97157 2013-09-14 14:43:41Z jsteel $ +# $Id: PKGBUILD 104369 2014-01-19 16:29:32Z bpiotrowski $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: megadriver <megadriver at gmx dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -7,9 +7,9 @@ # Contributor: Hans-Kristian Arntzen <maister@archlinux.us> pkgname=mednafen -pkgver=0.9.32 +pkgver=0.9.32.1 _pkgver=$pkgver-wip -pkgrel=1 +pkgrel=2 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net" license=('GPL') @@ -19,7 +19,7 @@ makedepends=('mesa' 'glu') replaces=('mednafen-wip') install="$pkgname.install" source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2) -md5sums=('ffdf4f4bb4498df38e6aaaf316be40f5') +md5sums=('ee9edeece554755e762a6d140fad21e9') build() { cd "$srcdir"/$pkgname diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index eabe06044..851acdae4 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,38 +1,38 @@ -# $Id: PKGBUILD 101155 2013-11-18 15:23:29Z svenstaro $ +# $Id: PKGBUILD 105859 2014-02-16 14:27:59Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.9.0 -_pkgver=3.9.0 -pkgrel=1 -pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." +pkgver=3.9.2 +pkgrel=2 +pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew' -'libircclient' 'miniupnpc' 'wxgtk' 'glu') -makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") -md5sums=('b599e8a71376640bc0d191d6c92c9073') +'libircclient' 'miniupnpc' 'wxgtk2.8' 'glu') +makedepends=('ftjam' 'cmake' 'mesa' 'git') +source=("git+https://github.com/MegaGlest/megaglest-source.git#tag=${pkgver}") +md5sums=('SKIP') build() { - cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ + cd megaglest-source [[ -d build ]] && rm -r build mkdir build && cd build cmake .. \ - -DWANT_SVN_STAMP=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DWANT_GIT_STAMP=0 \ + -DwxWidgets_CONFIG_EXECUTABLE="/usr/bin/wx-config-2.8" \ + -DwxWidgets_wxrc_EXECUTABLE="/usr/bin/wxrc-2.8" make } package() { - cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ + cd megaglest-source/build - cd build make DESTDIR="$pkgdir" install } diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD index f54209b0f..f5a6bea71 100644 --- a/community/minetest/PKGBUILD +++ b/community/minetest/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 101392 2013-11-24 18:49:30Z lcarlier $ +# $Id: PKGBUILD 104382 2014-01-19 17:35:53Z bgyorgy $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Konsta Kokkinen <kray@tsundere.fi> pkgname=minetest -pkgver=0.4.8 -pkgrel=1 +pkgver=0.4.9 +pkgrel=2 pkgdesc='An Infiniminer/Minecraft inspired game' arch=('i686' 'x86_64') url='http://minetest.net/' license=('GPL') -depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme') +depends=('sqlite' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme') makedepends=('cmake') install=minetest.install source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} - ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}) -md5sums=('90dd6a3c2c587a3e55df59ba4458cd65' - 'df88f4a28ad10e9ab8c445bd28a504e2') + ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver} + optional-opengles.patch) +md5sums=('2a2629befa86ef72924bcc0e489730c7' + '097666443a71988cf2d41ebd9be31ec9' + '116de5a70e13dbd0e2419fc7fb59ee3b') + +prepare() { + cd "$srcdir"/minetest-minetest-* + + # Fix rendering with NVIDIA driver (FS#37918) + patch -Np1 -i "$srcdir"/optional-opengles.patch +} build() { cd "$srcdir"/minetest-minetest-* diff --git a/community/minetest/optional-opengles.patch b/community/minetest/optional-opengles.patch new file mode 100644 index 000000000..2481b42c5 --- /dev/null +++ b/community/minetest/optional-opengles.patch @@ -0,0 +1,30 @@ +From 160e2b7b7d1edc7630db0eb0ebbd796a66aab89a Mon Sep 17 00:00:00 2001 +From: Sfan5 <sfan5@live.de> +Date: Fri, 3 Jan 2014 10:17:01 +0100 +Subject: [PATCH] Add option to link to OpenGL ES, fixes #1051 + +--- + src/CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 90f5867..6418b3b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -170,7 +170,12 @@ endif() + + find_package(Sqlite3 REQUIRED) + find_package(Json REQUIRED) +-find_package(OpenGLES2) ++ ++option(ENABLE_GLES "Enable OpenGL ES support" 0) ++mark_as_advanced(ENABLE_GLES) ++if(ENABLE_GLES) ++ find_package(OpenGLES2) ++endif(ENABLE_GLES) + + if(USE_FREETYPE) + find_package(Freetype REQUIRED) +-- +1.8.5.1 + diff --git a/community/mingw-w64-binutils/PKGBUILD b/community/mingw-w64-binutils/PKGBUILD index 469ced17d..28ba518b0 100644 --- a/community/mingw-w64-binutils/PKGBUILD +++ b/community/mingw-w64-binutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101172 2013-11-18 17:41:58Z spupykin $ +# $Id: PKGBUILD 104091 2014-01-15 13:38:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com @@ -6,7 +6,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-binutils pkgver=2.23.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils" @@ -15,8 +15,10 @@ groups=('mingw-w64-toolchain' 'mingw-w64') depends=('zlib') options=('!libtool' '!emptydirs') source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz" - "binutils-2.23.2-texinfo-5.0.patch.txt") + "windres.patch::https://bugs.archlinux.org/task/38111?getfile=11313" + "binutils-2.23.2-texinfo-5.0.patch.txt") md5sums=('cda9dcc08c86ff2fd3f27e4adb250f6f' + '2b653bdfd2ddda9ff36b4695b2d9bc8c' '34e439ce23213a91e2af872dfbb5094c') prepare() { @@ -24,6 +26,7 @@ prepare() { # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch.txt + patch -p1 -i ${srcdir}/windres.patch #do not install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in diff --git a/community/mingw-w64-gcc/PKGBUILD b/community/mingw-w64-gcc/PKGBUILD index 999fc9584..c89263432 100644 --- a/community/mingw-w64-gcc/PKGBUILD +++ b/community/mingw-w64-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101210 2013-11-19 19:03:58Z spupykin $ +# $Id: PKGBUILD 105245 2014-02-03 11:09:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com @@ -6,7 +6,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-gcc pkgver=4.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler" arch=('i686' 'x86_64') url="http://gcc.gnu.org" @@ -46,7 +46,7 @@ build() { for _target in ${_targets}; do mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target} - ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \ + ${srcdir}/gcc-${pkgver}/configure --prefix=/usr --libexecdir=/usr/lib \ --target=${_target} \ --enable-languages=c,lto,c++,objc,obj-c++,fortran,ada \ --enable-shared --enable-static \ @@ -65,8 +65,11 @@ package() { make DESTDIR=${pkgdir} install ${_target}-strip ${pkgdir}/usr/${_target}/lib/*.dll strip ${pkgdir}/usr/bin/${_target}-* - strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*} + strip ${pkgdir}/usr/lib/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*} ln -s ${_target}-gcc $pkgdir/usr/bin/${_target}-cc + # mv dlls + mkdir -p $pkgdir/usr/${_target}/bin/ + mv $pkgdir/usr/${_target}/lib/*.dll $pkgdir/usr/${_target}/bin/ done strip ${pkgdir}/usr/bin/* # remove unnecessary files diff --git a/community/minicom/PKGBUILD b/community/minicom/PKGBUILD index 2b8e06a05..ff398e1ab 100644 --- a/community/minicom/PKGBUILD +++ b/community/minicom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102303 2013-12-07 19:40:29Z giovanni $ +# $Id: PKGBUILD 103744 2014-01-11 10:02:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com> pkgname=minicom -pkgver=2.6.2 -pkgrel=2 +pkgver=2.7 +pkgrel=1 pkgdesc="A serial communication program" arch=('i686' 'x86_64' 'mips64el') url="http://alioth.debian.org/projects/minicom/" @@ -14,8 +14,8 @@ license=('GPL') depends=('bash') optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols') backup=('etc/minirc.dfl') -source=("https://alioth.debian.org/frs/download.php/file/3869/${pkgname}-${pkgver}.tar.gz") -md5sums=('203c56c4b447f45e2301b0cc4e83da3c') +source=("https://alioth.debian.org/frs/download.php/file/3977/${pkgname}-${pkgver}.tar.gz") +md5sums=('7044ca3e291268c33294f171d426dc2d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index ce08d5b60..1abb5e533 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97545 2013-09-23 20:44:05Z speps $ +# $Id: PKGBUILD 103290 2014-01-02 16:08:02Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=minitube -pkgver=2.1.3 +pkgver=2.1.5 pkgrel=1 pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,16 @@ url='http://flavio.tordini.org/minitube' license=('GPL3') depends=('phonon') install="$pkgname.install" -source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b43df4358de2e170d7e22370b39bd1ec') +source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz" + "$pkgname-missing-locale.patch") +md5sums=('e52933f3ae5200f83aa39ac71ac13bfb' + '70cdaa1d3df700cf90243be5a0d55443') + +prepare() { + cd $pkgname + # remove missing translations + patch -p1 -i ../${source[1]} +} build() { cd $pkgname diff --git a/community/minitube/minitube-missing-locale.patch b/community/minitube/minitube-missing-locale.patch new file mode 100644 index 000000000..5288120e4 --- /dev/null +++ b/community/minitube/minitube-missing-locale.patch @@ -0,0 +1,12 @@ +diff -aur minitube/locale/locale.pri minitube.patched/locale/locale.pri +--- minitube/locale/locale.pri 2013-12-19 00:37:27.000000000 +0100 ++++ minitube.patched/locale/locale.pri 2013-12-25 00:03:56.783943888 +0100 +@@ -4,7 +4,7 @@ + DEPENDPATH += $$PWD + + # ls -1 *.ts | tr '\n' ' ' +-TRANSLATIONS += ar.ts ast.ts be.ts bg_BG.ts ca.ts ca_ES.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts es_MX.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts vi.ts zh_CN.ts zh_TW.ts ++TRANSLATIONS += ar.ts ast.ts bg_BG.ts ca.ts cs_CZ.ts da.ts de_DE.ts el.ts en.ts es.ts es_AR.ts es_ES.ts fi.ts fi_FI.ts fr.ts gl.ts he_IL.ts hu.ts ia.ts it.ts ja_JP.ts ky.ts ms_MY.ts nb.ts nl.ts pl.ts pl_PL.ts pt_BR.ts ro.ts ru.ts sk.ts sl.ts sq.ts sv_SE.ts tr.ts uk.ts uk_UA.ts zh_CN.ts zh_TW.ts + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 17f29a89f..3210b2b51 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99404 2013-10-28 11:22:46Z tredaelli $ +# $Id: PKGBUILD 105735 2014-02-14 15:45:18Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr" license=('BSD') depends=('sh') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('065bf20a20ebe605c675b7a5aaef340a') +sha256sums=('2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD index d1c7bd977..2cdd0c529 100644 --- a/community/miniupnpd/PKGBUILD +++ b/community/miniupnpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99009 2013-10-22 08:59:17Z tredaelli $ +# $Id: PKGBUILD 104540 2014-01-22 15:25:26Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: fauno <fauno@parabola.nu> pkgname=miniupnpd -pkgver=1.8.20130730 +pkgver=1.8.20131216 pkgrel=1 pkgdesc="Lightweight UPnP IGD daemon" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux') makedepends=('lsb-release') source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz" miniupnpd.systemd) -sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43' +sha256sums=('f016e21d84ecce7887cef4ec74354afe465412022c013473f3ac3e33ca51a8a7' '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c') build() { diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index 397cb6834..60051646e 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92429 2013-06-05 10:08:34Z lfleischer $ +# $Id: PKGBUILD 103651 2014-01-08 19:58:08Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> @@ -6,20 +6,20 @@ pkgname=mixxx pkgver=1.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') url='http://www.mixxx.org' license=('GPL') depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi' - 'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf') + 'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'faad2' 'libmp4v2') makedepends=('mesa' 'scons' 'libshout' 'glu') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") md5sums=('89ee8ba60824919d8dd1194287bda259') build() { cd "${srcdir}/${pkgname}-${pkgver}" - scons qtdir=/usr/lib/qt4 prefix=/usr + scons qtdir=/usr/lib/qt4 prefix=/usr faad=1 } package() { diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index bc0926a8a..1be8c6ef8 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95881 2013-08-18 08:58:15Z ttoepper $ +# $Id: PKGBUILD 103962 2014-01-14 07:07:04Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -_pkgver=R48b -pkgver=48.1 +_pkgver=R49 +pkgver=49 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -14,8 +14,8 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('ab9baa6b5a4de9d0e6a3ce9957c18da0' - '0601617f19e1c0423cbdb8599e16eec3') +md5sums=('e8c205cac72c3dc8540bbc3897421422' + 'fd6f7b5eb01280b0110af736d6188f34') check() { cd "$srcdir/$pkgname" diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 66ca7bc61..ef0b90c05 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102260 2013-12-07 10:36:45Z bpiotrowski $ +# $Id: PKGBUILD 104064 2014-01-15 03:02:11Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,8 +6,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.8 -pkgrel=2 +pkgver=2.4.9 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -65,8 +65,8 @@ package() { --sharedclient \ --full \ --prefix="$pkgdir/usr" - # --use-system-v8 # --use-sasl-client + # --use-system-v8 install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf" install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service" @@ -74,7 +74,7 @@ package() { install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('33202f101d00c796253c5fd333242ce2c5399352bf325e0af1df92d9c291d7a768bbed56f7b7fccfaa3cea2385cec941bd05cb27a635ca034485bd39ef4129a1' +sha512sums=('f9991b30eebdc13e04b553ea9c133f73cb7c0d034ae94e6293a28f3c40e8c93d3e63257e20ff801dfd586a22c95ca52551da8517d0e25534dda62f3ed650aa23' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' 'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84') diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index 2baa5ab47..511c9e03a 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94894 2013-08-01 06:55:12Z bpiotrowski $ +# $Id: PKGBUILD 103886 2014-01-13 10:05:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=10 +pkgrel=11 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -11,6 +11,7 @@ url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') backup=('etc/motion/motion.conf') options=('!makeflags') +install=motion.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz motion.service motion.tmpfiles diff --git a/community/motion/motion.install b/community/motion/motion.install new file mode 100644 index 000000000..f36054033 --- /dev/null +++ b/community/motion/motion.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create motion.conf +} + +post_upgrade() { + systemd-tmpfiles --create motion.conf +} diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index ba55e1e7a..0756bc09a 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103194 2013-12-29 19:04:18Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 105849 2014-02-16 12:44:18Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv -pkgver=0.3.0 +pkgver=0.3.5 pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('mesa' 'python-docutils' 'waf') options=('!emptydirs' '!buildflags') install=mpv.install source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz) -md5sums=('47c9ea5fc8cf0c15cc6a15631bfbc770') +md5sums=('b3fdd3e70d6e53a14c3b1881343d2aca') build() { cd $pkgname-$pkgver diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 3d1a80521..91a551b6c 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99917 2013-10-31 02:27:44Z allan $ +# $Id: PKGBUILD 105350 2014-02-05 20:04:46Z bluewind $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -8,18 +8,18 @@ # to the depends and delete "no-g15" in the configure line below pkgname=mumble -pkgver=1.2.4 -pkgrel=2 +pkgver=1.2.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A voice chat application similar to TeamSpeak" license=('BSD') depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus') -makedepends=('boost' 'mesa' 'avahi') +makedepends=('boost' 'mesa') #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support') install=mumble.install url="http://mumble.sourceforge.net/" source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz") -md5sums=('49bc6abea78f9c54298934c2c28a7c7c') +md5sums=('084ca44252bd5356b68af555f81ba6f6') build() { cd $srcdir/$pkgname-$pkgver @@ -53,5 +53,6 @@ package() { install -m755 -d $pkgdir/usr/share/man/man1 install -m644 -D ./man/mum* $pkgdir/usr/share/man/man1/ install -m644 -D ./icons/mumble.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/mumble.svg + install -m644 -D ./LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } # vim: sw=2:ts=2 et: diff --git a/community/mumble/mumble11x.desktop b/community/mumble/mumble11x.desktop deleted file mode 100644 index 5dba0d0c6..000000000 --- a/community/mumble/mumble11x.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Mumble (1.1.X compatible) -GenericName=Voice Chat -Comment=Voice chat program (compatible with Mumble 1.1.X) -Exec=mumble11x -Icon=mumble -Terminal=false -Type=Application -StartupNotify=false -Categories=Network;Chat;Qt; -Version=1.2.1 diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 709e2c14b..6788ab8ab 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99335 2013-10-27 10:47:47Z bpiotrowski $ +# $Id: PKGBUILD 105051 2014-01-30 18:29:49Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,23 +7,34 @@ pkgname=mupdf pkgver=1.3 -pkgrel=7 +pkgrel=8 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64' 'mips64el') url='http://mupdf.com' license=('GPL3') -depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl') +depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' + 'openssl') install=mupdf.install options=('staticlibs') source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz - mupdf-1.3-system-libcurl.patch) -sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478' - '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42') + mupdf-1.3-system-libcurl.patch + mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch) +md5sums=('fe53c2a56ebd7759f5f965bc4ff66359' + '6d11387e9bb9897f6f1ecc3956f8e2d4' + 'f4d785b28f711e12d4a078ce9b3ed8f5') prepare() { cd $pkgname-$pkgver-source rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec} - patch -Np1 -i ../mupdf-1.3-system-libcurl.patch + patch -p1 -i ../mupdf-1.3-system-libcurl.patch + patch -p1 -i ../mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch + + cd platform/debian + sed -i -e 's/mupdf.xpm/mupdf/' \ + -e 's/application\/x-pdf/application\/x-pdf/' \ + -e 's/mupdf-select-file/mupdf/' \ + -e 's/^$/NoDisplay=true/' \ + mupdf.desktop } build() { @@ -42,11 +53,6 @@ package() { rm "$pkgdir"/usr/bin/mupdf-x11 cd platform/debian - sed -i -e 's/mupdf.xpm/mupdf/' \ - -e 's/application\/x-pdf/application\/x-pdf/' \ - -e 's/mupdf-select-file/mupdf/' \ - -e 's/^$/NoDisplay=true/' \ - mupdf.desktop install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm diff --git a/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch new file mode 100644 index 000000000..bfe86f320 --- /dev/null +++ b/community/mupdf/mupdf-1.3-stack-buffer-overflow-in-xps_parse_color.patch @@ -0,0 +1,135 @@ +From 60dabde18d7fe12b19da8b509bdfee9cc886aafc Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Simon=20B=C3=BCnzli?= <zeniko@gmail.com> +Date: Thu, 16 Jan 2014 22:04:51 +0100 +Subject: [PATCH] Bug 694957: fix stack buffer overflow in xps_parse_color +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +xps_parse_color happily reads more than FZ_MAX_COLORS values out of a +ContextColor array which overflows the passed in samples array. +Limiting the number of allowed samples to FZ_MAX_COLORS and make sure +to use that constant for all callers fixes the problem. + +Thanks to Jean-Jamil Khalifé for reporting and investigating the issue +and providing a sample exploit file. +--- + source/xps/xps-common.c | 22 ++++++++++++++-------- + source/xps/xps-glyphs.c | 2 +- + source/xps/xps-gradient.c | 2 +- + source/xps/xps-path.c | 2 +- + 4 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c +index b780f42..32a30ba 100644 +--- a/source/xps/xps-common.c ++++ b/source/xps/xps-common.c +@@ -89,7 +89,7 @@ xps_begin_opacity(xps_document *doc, const fz_matrix *ctm, const fz_rect *area, + if (scb_color_att) + { + fz_colorspace *colorspace; +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + xps_parse_color(doc, base_uri, scb_color_att, &colorspace, samples); + opacity = opacity * samples[0]; + } +@@ -208,12 +208,13 @@ void + xps_parse_color(xps_document *doc, char *base_uri, char *string, + fz_colorspace **csp, float *samples) + { ++ fz_context *ctx = doc->ctx; + char *p; + int i, n; + char buf[1024]; + char *profile; + +- *csp = fz_device_rgb(doc->ctx); ++ *csp = fz_device_rgb(ctx); + + samples[0] = 1; + samples[1] = 0; +@@ -259,7 +260,7 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + profile = strchr(buf, ' '); + if (!profile) + { +- fz_warn(doc->ctx, "cannot find icc profile uri in '%s'", string); ++ fz_warn(ctx, "cannot find icc profile uri in '%s'", string); + return; + } + +@@ -267,12 +268,17 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + p = strchr(profile, ' '); + if (!p) + { +- fz_warn(doc->ctx, "cannot find component values in '%s'", profile); ++ fz_warn(ctx, "cannot find component values in '%s'", profile); + return; + } + + *p++ = 0; + n = count_commas(p) + 1; ++ if (n > FZ_MAX_COLORS) ++ { ++ fz_warn(ctx, "ignoring %d color components (max %d allowed)", n - FZ_MAX_COLORS, FZ_MAX_COLORS); ++ n = FZ_MAX_COLORS; ++ } + i = 0; + while (i < n) + { +@@ -292,10 +298,10 @@ xps_parse_color(xps_document *doc, char *base_uri, char *string, + /* TODO: load ICC profile */ + switch (n) + { +- case 2: *csp = fz_device_gray(doc->ctx); break; +- case 4: *csp = fz_device_rgb(doc->ctx); break; +- case 5: *csp = fz_device_cmyk(doc->ctx); break; +- default: *csp = fz_device_gray(doc->ctx); break; ++ case 2: *csp = fz_device_gray(ctx); break; ++ case 4: *csp = fz_device_rgb(ctx); break; ++ case 5: *csp = fz_device_cmyk(ctx); break; ++ default: *csp = fz_device_gray(ctx); break; + } + } + } +diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c +index b26e18d..e621257 100644 +--- a/source/xps/xps-glyphs.c ++++ b/source/xps/xps-glyphs.c +@@ -590,7 +590,7 @@ xps_parse_glyphs(xps_document *doc, const fz_matrix *ctm, + + if (fill_att) + { +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + fz_colorspace *colorspace; + + xps_parse_color(doc, base_uri, fill_att, &colorspace, samples); +diff --git a/source/xps/xps-gradient.c b/source/xps/xps-gradient.c +index 7d03f89..76188e9 100644 +--- a/source/xps/xps-gradient.c ++++ b/source/xps/xps-gradient.c +@@ -39,7 +39,7 @@ xps_parse_gradient_stops(xps_document *doc, char *base_uri, fz_xml *node, + struct stop *stops, int maxcount) + { + fz_colorspace *colorspace; +- float sample[8]; ++ float sample[FZ_MAX_COLORS]; + float rgb[3]; + int before, after; + int count; +diff --git a/source/xps/xps-path.c b/source/xps/xps-path.c +index b97ee17..ea84a81 100644 +--- a/source/xps/xps-path.c ++++ b/source/xps/xps-path.c +@@ -826,7 +826,7 @@ xps_parse_path(xps_document *doc, const fz_matrix *ctm, char *base_uri, xps_reso + + fz_stroke_state *stroke = NULL; + fz_matrix transform; +- float samples[32]; ++ float samples[FZ_MAX_COLORS]; + fz_colorspace *colorspace; + fz_path *path = NULL; + fz_path *stroke_path = NULL; +-- +1.7.9.5 + diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index c6a901b1c..c138c9e0c 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92168 2013-06-02 06:18:50Z svenstaro $ +# $Id: PKGBUILD 105352 2014-02-05 20:05:30Z bluewind $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install="murmur.install" source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" "murmur.dbus.conf" "murmur.service") -md5sums=('49bc6abea78f9c54298934c2c28a7c7c' +md5sums=('084ca44252bd5356b68af555f81ba6f6' 'eddea4cdbd0bde4b960a67e16b5d5478' 'd27a9adcd7561859e7b033046729bc0e') @@ -44,6 +44,7 @@ package() { install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1 install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } # vim: sw=2:ts=2 et: diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index fecd2c2ca..13eec8094 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -5,7 +5,7 @@ post_install() { chown -R murmur:murmur /var/lib/murmur echo "You might have to reload dbus before launching murmur:" - echo " systemctl reload bus" + echo " systemctl reload dbus" echo "Don't forget to set the superuser password:" echo " murmurd -ini /etc/murmur.ini -supw <your-password>" } diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index e77fc55e0..bafb7bfe0 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 100340 2013-11-02 11:47:21Z spupykin $ +# $Id: PKGBUILD 104562 2014-01-22 19:43:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml -pkgver=2.7 -pkgrel=2 +pkgver=2.8 +pkgrel=1 pkgdesc="A small XML parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.minixml.org/" license=('LGPL') source=("http://www.msweet.org/files/project3/$pkgname-$pkgver.tar.gz") -md5sums=('76f2ae49bf0f5745d5cb5d9507774dc9') +md5sums=('d85ee6d30de053581242c4a86e79a5d2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index c138d9f78..c53db1f37 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $ +# $Id: PKGBUILD 105021 2014-01-30 10:11:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64 mips64el) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -20,7 +20,7 @@ build() { export LDFLAGS="-lpthread -ldl" cmake -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \ + -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.a \ -DWITH_UNIXODBC=1 . make } diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 211d5ae20..0756f17cd 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102726 2013-12-17 20:17:14Z bgyorgy $ +# $Id: PKGBUILD 104372 2014-01-19 16:29:36Z bpiotrowski $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.27 -pkgrel=4 +pkgrel=5 epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.mythtv.org" diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 6e98f7a9d..b93f3ccb4 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 101824 2013-12-02 01:03:13Z svenstaro $ +# $Id: PKGBUILD 104524 2014-01-22 10:03:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.5 +pkgver=3.7 pkgrel=1 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64' 'mips64el') url="http://nbd.sourceforge.net" license=('GPL') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz config nbd.service) backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('d89133bf9b681c17ed9d09a21b19f1ee' +md5sums=('09a17fd19596b6908bff8b7db74141fc' '2d05d426b8c2708d5f8a0d028fcbae05' '5d1acc143018117174f79eff15afa038') @@ -36,5 +36,5 @@ package() { install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service - install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README + install -D -m644 doc/README "${pkgdir}"/usr/share/doc/nbd/README } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index c5e9f43be..f3088ab79 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99921 2013-10-31 02:29:03Z allan $ +# $Id: PKGBUILD 103761 2014-01-11 12:23:34Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver -pkgver=0.9.4 -pkgrel=5 +pkgver=0.9.5 +pkgrel=1 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desk makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!emptydirs') -sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f') +sha256sums=('33590e3964092cabb629a6ba8415786b054702063a944eca5fe4156048baf8d9') build() { cd "$pkgname-$pkgver" diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 1d2140e30..45c436094 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99926 2013-10-31 02:30:50Z allan $ +# $Id: PKGBUILD 103922 2014-01-13 17:16:55Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index 95bd03b15..3d8bbbed6 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99927 2013-10-31 02:31:10Z allan $ +# $Id: PKGBUILD 104865 2014-01-27 18:21:58Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sven Pfleiderer <pfleidi@roothausen.de> pkgname=newsbeuter -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="A RSS feed reader for the text console with special Podcast support" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ruby') install=$pkgname.install changelog=$pkgname.changelog source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('e6720da7ac3f5ea83bc39cd17bd61ccf458b7167f5a17170ae32c7b6e8ff903a') +sha256sums=('c872a068ec7792680b11126230dff240dee72acdab8f153016ba5ef83c8a7804') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog index 6d5db9fd3..357a7fe19 100644 --- a/community/newsbeuter/newsbeuter.changelog +++ b/community/newsbeuter/newsbeuter.changelog @@ -1,3 +1,6 @@ +2014-01-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * newsbeuter 2.8-1 + 2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * newsbeuter 2.7-1 diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 9f0fdc398..ac0c3aa6b 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102927 2013-12-24 08:43:25Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 105603 2014-02-11 17:09:36Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Maintainer: Sébastien Luttringer # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> pkgname=nginx -pkgver=1.4.4 -pkgrel=2 +pkgver=1.4.5 +pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') url='http://nginx.org' @@ -22,75 +22,78 @@ backup=('etc/nginx/fastcgi.conf' 'etc/nginx/uwsgi_params' 'etc/nginx/win-utf' 'etc/logrotate.d/nginx') -install=install -source=("http://nginx.org/download/nginx-$pkgver.tar.gz" - 'service' - 'logrotate') -sha256sums=('7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9' - '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b' - '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98') +install=nginx.install +source=($url/download/nginx-$pkgver.tar.gz + service + logrotate) +md5sums=('1a635e9543570f0c881b8ec9db0c6898' + 'ce9a06bcaf66ec4a3c4eb59b636e0dfd' + '3441ce77cdd1aab6f0ab7e212698a8a7') build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/etc/nginx \ - --conf-path=/etc/nginx/nginx.conf \ - --sbin-path=/usr/bin/nginx \ - --pid-path=/run/nginx.pid \ - --lock-path=/run/lock/nginx.lock \ - --user=http \ - --group=http \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=stderr \ - --http-client-body-temp-path=/var/lib/nginx/client-body \ - --http-proxy-temp-path=/var/lib/nginx/proxy \ - --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ - --http-scgi-temp-path=/var/lib/nginx/scgi \ - --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ - --with-imap \ - --with-imap_ssl_module \ - --with-ipv6 \ - --with-pcre-jit \ - --with-file-aio \ - --with-http_dav_module \ - --with-http_gunzip_module \ - --with-http_gzip_static_module \ - --with-http_realip_module \ - --with-http_spdy_module \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --with-http_addition_module \ - --with-http_degradation_module \ - --with-http_flv_module \ - --with-http_mp4_module \ - --with-http_secure_link_module \ - --with-http_sub_module - make + cd $pkgname-$pkgver + ./configure \ + --prefix=/etc/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --sbin-path=/usr/bin/nginx \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ + --user=http \ + --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=stderr \ + --http-client-body-temp-path=/var/lib/nginx/client-body \ + --http-proxy-temp-path=/var/lib/nginx/proxy \ + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/scgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \ + --with-imap \ + --with-imap_ssl_module \ + --with-ipv6 \ + --with-pcre-jit \ + --with-file-aio \ + --with-http_dav_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_realip_module \ + --with-http_spdy_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_addition_module \ + --with-http_degradation_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_secure_link_module \ + --with-http_sub_module + + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + sed -e 's|\<user\s\+\w\+;|user html;|g' \ + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + + rm "$pkgdir"/etc/nginx/*.default - sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i "$pkgdir"/etc/nginx/nginx.conf - rm "$pkgdir"/etc/nginx/*.default + install -d "$pkgdir"/var/lib/nginx + install -dm700 "$pkgdir"/var/lib/nginx/proxy - install -d "$pkgdir"/var/lib/nginx - install -dm700 "$pkgdir"/var/lib/nginx/proxy + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx - chmod 750 "$pkgdir"/var/log/nginx - chown http:log "$pkgdir"/var/log/nginx + install -d "$pkgdir"/usr/share/nginx + mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - install -d "$pkgdir"/usr/share/nginx - mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx + install -Dm644 ../logrotate "$pkgdir"/etc/logrotate.d/nginx + install -Dm644 ../service "$pkgdir"/usr/lib/systemd/system/nginx.service + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx - install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - rmdir "$pkgdir/run" + rmdir "$pkgdir/run" } -# vim:set ts=4 sw=4 et: +# vim:set ts=2 sw=2 et: diff --git a/community/nginx/install b/community/nginx/nginx.install index 7c4adf14b..7c4adf14b 100644 --- a/community/nginx/install +++ b/community/nginx/nginx.install diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD index eb18ee629..83426b31f 100644 --- a/community/ngspice/PKGBUILD +++ b/community/ngspice/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88376 2013-04-16 21:34:14Z kkeen $ +# $Id: PKGBUILD 103872 2014-01-12 23:58:12Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Jason Taylor <jftaylor21@gmail.com> # Contributor: Luis Henrique <lmello.009@gmail.com> pkgname=ngspice -pkgver=25 -pkgrel=2 +pkgver=26 +pkgrel=1 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.' url='http://ngspice.sourceforge.net' license=('BSD') @@ -14,8 +14,8 @@ arch=('i686' 'x86_64' 'mips64el') depends=('libxaw' 'libedit' 'gcc-libs') source=("http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-$pkgver.tar.gz" "http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-doc-$pkgver.tar.gz") -sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860' - 'db7a1de7553b4e0d454e6c99b4371677eaf130aa') +sha1sums=('7c043c604b61f76ad1941defeeac6331efc48ad2' + 'bc163a47a2b4987c4617c47b132a30ffdc674350') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index b03915e39..308c12d92 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102828 2013-12-21 15:00:24Z bpiotrowski $ +# $Id: PKGBUILD 104706 2014-01-24 17:24:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.24 +pkgver=0.10.25 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('610cd733186842cb7f554336d6851a61b2d3d956050d62e49fa359a47640377a') +sha256sums=('46eef3b9d5475a2081dc2b2f7cf1f4c3a56824d1fc9b04e7ed1d7a88e8f6b36f') prepare() { cd node-v$pkgver diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD index e34eb3062..02dc4a26e 100644 --- a/community/noise/PKGBUILD +++ b/community/noise/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99111 2013-10-24 13:13:25Z alucryd $ +# $Id: PKGBUILD 103644 2014-01-08 17:47:17Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> pkgname=noise pkgver=0.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Simple, fast, and good looking music player" arch=('i686' 'x86_64') url="https://launchpad.net/noise" diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD index ce73fca29..a409ba992 100644 --- a/community/nomacs/PKGBUILD +++ b/community/nomacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $ +# $Id: PKGBUILD 104801 2014-01-26 12:17:39Z andyrtr $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=nomacs pkgver=1.6.2 -pkgrel=1 +pkgrel=3 pkgdesc="A Qt image viewer" arch=(i686 x86_64) url="http://www.nomacs.org/" diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 934655ccc..341454437 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $ +# $Id: PKGBUILD 105675 2014-02-13 14:16:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20131223 +pkgver=20140213 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -17,73 +17,43 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' provides=('libtu' 'libextl') changelog=ChangleLog source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion" - "$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu" - "$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl" - "$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc" - "$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" - "$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" - "$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" - "$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" - "$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib") + "notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc") md5sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' 'SKIP') prepare() { cd ${srcdir} - sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk - sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk - - for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do - mkdir -p ${srcdir}/notion/$i - cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/ - done - - cd ${srcdir}/notion - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -e 's|/usr/local|/usr|g' \ - -i system-autodetect.mk + cat >notion/build/lua-detect.mk <<EOF +LUA_VERSION := 5.2 +LUA_LIBS := $(pkg-config --libs lua) +LUA_INCLUDES := $(pkg-config --cflags lua) +LUA := $(which lua) +LUAC := $(which luac) +EOF } build() { cd ${srcdir}/notion - - # build notion - make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion - - # build doc and modules - for i in mod_xinerama mod_xkbevents mod_xrandr; do - (cd $i && make -j1 TOPDIR=.. all) - done - - (cd notion-doc && make -j1 TOPDIR=.. all) + make INCLUDES=-I${srcdir}/notion LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion + cd ${srcdir}/notion-doc + make -j1 all } package() { cd ${srcdir}/notion + make DESTDIR=$pkgdir LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion install - # notion - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install + # doc + cd ${srcdir}/notion-doc + make PREFIX=$pkgdir/usr ETCDIR=/etc/notion install # modules - for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do - (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) - done cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/ cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/ # contrib mkdir -p $pkgdir/usr/share/notion/contrib - cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib + cp -a ${srcdir}/$pkgname/contrib/* $pkgdir/usr/share/notion/contrib # license install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index 4ca5f46c1..d5550afcc 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95030 2013-08-03 23:12:06Z dwallace $ +# $Id: PKGBUILD 104884 2014-01-28 03:34:14Z td123 $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: fauno <fauno at kiwwwi.com.ar> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> @@ -6,7 +6,7 @@ pkgbase=notmuch pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime') -pkgver=0.16 +pkgver=0.17 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://notmuchmail.org/" @@ -14,7 +14,7 @@ license=('GPL3') makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc') options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('9de9f8a91eb2323d8503872a059c7f11') +md5sums=('65a6a6f1fe912803b60d5870132e2006') prepare(){ #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index cf9d0322e..bd1542c70 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 104857 2014-01-27 16:23:54Z 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 +pkgver=4.0.1 +pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -15,9 +15,9 @@ makedepends=('flex') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'tmpfiles.d' 'service') -sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369' +sha1sums=('788cc290ade7fc6a61fe4391837d3abddbda4df0' '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/nullmailer/PKGBUILD b/community/nullmailer/PKGBUILD new file mode 100644 index 000000000..7fa8a5a9b --- /dev/null +++ b/community/nullmailer/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 104004 2014-01-14 15:23:43Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Roberto Alsina <ralsina at kde.org> +# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de> + +pkgname=nullmailer +pkgver=1.13 +pkgrel=3 +pkgdesc="Simple relay-only mail transport agent." +arch=('i686' 'x86_64') +url="http://www.untroubled.org/nullmailer/" +license=("GPL") +provides=('smtp-forwarder') +conflicts=('smtp-forwarder' 'smtp-server') +depends=('gnutls') +install=nullmailer.install +source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz" + nullmailer.service) +md5sums=('aaeb8746fbc082917b26d0827ccc9270' + '300f17c52422d4156583f207f2405930') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --enable-tls + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 0644 ../nullmailer.service "${pkgdir}/usr/lib/systemd/system/nullmailer.service" + # Remove pipe and create on install to work around makepkg hang on grep -R + rm -f "${pkgdir}/var/nullmailer/trigger" +} diff --git a/community/nullmailer/nullmailer.install b/community/nullmailer/nullmailer.install new file mode 100644 index 000000000..823df6e27 --- /dev/null +++ b/community/nullmailer/nullmailer.install @@ -0,0 +1,44 @@ +# arg 1: the new package version +post_install() { + if ! getent passwd nullmail > /dev/null; then + echo "==> Creating nullmail user" + usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/nullmailer --system --user-group nullmail + fi + + echo "==> Creating trigger fifo" + rm -f var/nullmailer/trigger && mkfifo -m 600 var/nullmailer/trigger + + echo "==> Fixing permissions" + chown nullmail var/nullmailer/* + chown nullmail usr/bin/nullmailer-queue + chmod u+s usr/bin/nullmailer-queue + chown nullmail usr/bin/mailq + chmod u+s usr/bin/mailq + if ! [ -s etc/nullmailer/me ]; then + echo "==> Configuring" + hostnamectl --static > etc/nullmailer/me + fi + if ! [ -s etc/nullmailer/remotes ]; then + echo "smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass" > etc/nullmailer/remotes + chgrp nullmail etc/nullmailer/remotes + chmod 640 etc/nullmailer/remotes + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + systemctl stop nullmailer + # Leave the 'queue' directory intact + rm -rf var/service/nullmailer/{tmp,trigger} + echo "==> Removing nullmailer user and group" + userdel nullmail + if getent group nullmail > /dev/null; then + groupdel nullmail + fi +} diff --git a/community/nullmailer/nullmailer.service b/community/nullmailer/nullmailer.service new file mode 100644 index 000000000..8adbec076 --- /dev/null +++ b/community/nullmailer/nullmailer.service @@ -0,0 +1,13 @@ +[Unit] +Description=Nullmailer relay-only MTA +After=local-fs.target +ConditionPathExists=/var/nullmailer/queue + +[Install] +WantedBy=multi-user.target + +[Service] +WorkingDirectory=/var/nullmailer +ExecStart=/usr/bin/nullmailer-send +User=nullmail +Restart=always diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index e7c998433..70279e09b 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96729 2013-09-03 15:26:43Z alucryd $ +# $Id: PKGBUILD 104048 2014-01-14 21:30:48Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget -pkgver=11.0 -pkgrel=3 +pkgver=12.0 +pkgrel=1 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686' 'mips64el') url="http://nzbget.sourceforge.net/" license=('GPL') depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python') -changelog="${pkgname}.changelog" -source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") -sha256sums=('27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d') +changelog=${pkgname}.changelog +source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) +sha256sums=('023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e') build() { cd ${pkgname}-${pkgver} diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 8670f51a9..4f48ebf99 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2014-01-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 12.0-1 + 2013-09-03 Maxime Gauduin <alucryd@gmail.com> * Fixed FS#36250 - package built without system CXXFLAGS diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index d3d8ced44..72cc41e1f 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 98970 2013-10-21 20:20:39Z seblu $ +# $Id: PKGBUILD 105649 2014-02-13 00:27:31Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.4.0 -pkgrel=2 +pkgver=2.4.1 +pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/oath-toolkit/' license=('GPL3') depends=('glibc' 'pam' 'xmlsec') -source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('456774fbc37d5267e4e8920694b7ad48' +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('951bafd1d86e6013903c10be3b6623bb' 'SKIP') build() { diff --git a/community/obexftp/PKGBUILD b/community/obexftp/PKGBUILD index c70a26780..9d4a4e4ee 100644 --- a/community/obexftp/PKGBUILD +++ b/community/obexftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102177 2013-12-06 12:11:56Z giovanni $ +# $Id: PKGBUILD 104885 2014-01-28 03:34:16Z td123 $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=obexftp pkgver=0.24 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64' 'mips64el') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" diff --git a/community/ode/PKGBUILD b/community/ode/PKGBUILD index cd6b103a7..e390045cb 100644 --- a/community/ode/PKGBUILD +++ b/community/ode/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102181 2013-12-06 12:14:44Z giovanni $ +# $Id: PKGBUILD 105840 2014-02-16 09:40:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode -pkgver=0.12 -pkgrel=5 +pkgver=0.13 +pkgrel=1 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://www.ode.org" license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") -md5sums=('48fdd41fae1a7e7831feeded09826599') +md5sums=('04b32c9645c147e18caff7a597a19f84') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD deleted file mode 100644 index 517499f23..000000000 --- a/community/opencolorio/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Dumitru Ursu <dima@ceata.org> - -pkgname=opencolorio -pkgver=1.0.9 -pkgrel=1 -pkgdesc="A color management framework for visual effects and animation" -arch=('i686' 'x86_64' 'mips64el') -url="http://opencolorio.org" -license=('BSD') -depends=('python' 'lcms2' 'tinyxml') -makedepends=('cmake') -source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver) -sha1sums=('a015cb51b9b0ea0cdb3989fc23e1c18ad69511e0') - -build() -{ - mv imageworks-OpenColorIO-* $pkgname-$pkgver - cd $pkgname-$pkgver - - [ "$CARCH" = "mips64el" ] && extra=-DOCIO_USE_SSE=OFF - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_EXTERNAL_LCMS=ON -DUSE_EXTERNAL_TINYXML=ON -DPYTHON=/usr/bin/python2 $extra . - make -} - -package() -{ - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 et: diff --git a/community/opencsg/PKGBUILD b/community/opencsg/PKGBUILD new file mode 100644 index 000000000..134300f78 --- /dev/null +++ b/community/opencsg/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 105548 2014-02-10 04:53:52Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Maintainer: Xyne <ca dot archlinux at xyne, backwards> +# Contributor: nikor + +pkgname=opencsg +pkgver=1.3.2 +pkgrel=2 +pkgdesc="Library for image-based CSG rendering using OpenGL." +arch=('i686' 'x86_64') +license=('GPL2') +depends=('glew' 'glut' 'mesa') +url="http://www.opencsg.org" +source=(http://www.opencsg.org/OpenCSG-${pkgver}.tar.gz) +sha1sums=('e2b4abf169ae3e319eb5f6d9ae6136fa96710a05') + +build() { + cd -- "${srcdir}/OpenCSG-${pkgver}" + sed -i 's|-rpath,../lib|-rpath,/usr/lib|' src/Makefile + make +} + +package() { + cd -- "${srcdir}/OpenCSG-${pkgver}" + install -D lib/libopencsg.so.${pkgver} "$pkgdir/usr/lib/libopencsg.so.${pkgver}" + install -D include/opencsg.h "$pkgdir/usr/include/opencsg.h" + cd "$pkgdir/usr/lib/" + ln -s libopencsg.so.${pkgver} libopencsg.so.1.3 + ln -s libopencsg.so.${pkgver} libopencsg.so.1 + ln -s libopencsg.so.${pkgver} libopencsg.so +} + diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index a959593dc..1843931af 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 102395 2013-12-10 10:40:58Z spupykin $ +# $Id: PKGBUILD 105611 2014-02-11 17:57:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim pkgver=2.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64 mips64el) url="http://www.opendkim.org/" license=('BSD' 'custom:Sendmail') -depends=("db" "openssl" "libstrl") +depends=("db" "openssl" "libbsd") makedepends=("libmilter") options=(!emptydirs) backup=(etc/conf.d/opendkim) diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD deleted file mode 100644 index 8f47b1d4d..000000000 --- a/community/openimageio/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 102264 2013-12-07 10:36:49Z bpiotrowski $ -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=openimageio -pkgver=1.2.3 -pkgrel=1 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications" -arch=(i686 x86_64) -url="http://www.openimageio.org/" -license=('custom') -depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb') -makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') -optdepends=('qt4: iv image viewer' - 'python2: bindings support') -source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('20066ae0e9026717242f64f107f7ee8e') - -build() { - cd "$srcdir"/$_pkgname* - - cd src - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \ - -DUSE_EXTERNAL_TBB=ON \ - -DOIIO_BUILD_TESTS=OFF \ - .. - make -} - -package() { - cd "$srcdir"/$_pkgname*/src/build - - make DESTDIR="$pkgdir" install - - # license - cd ../.. - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/openimageio/fix32bit-fail.patch b/community/openimageio/fix32bit-fail.patch deleted file mode 100644 index 5d9bbbe36..000000000 --- a/community/openimageio/fix32bit-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- orig/src/libutil/SHA1.cpp 2012-11-17 01:02:42.000000000 +0200 -+++ fixed/src/libutil/SHA1.cpp 2012-12-14 14:37:37.552042793 +0200 -@@ -8,9 +8,9 @@ - - // If compiling with MFC, you might want to add #include "StdAfx.h" - -+#include "SHA1.h" - #include "hash.h" - #include "dassert.h" --#include "SHA1.h" - - #ifdef SHA1_UTILITY_FUNCTIONS - #define SHA1_MAX_FILE_BUFFER 8000 diff --git a/community/openmw/PKGBUILD b/community/openmw/PKGBUILD new file mode 100644 index 000000000..ebac4c7ea --- /dev/null +++ b/community/openmw/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Sandy Carter <bwrsandman@gmail.com> + +pkgname=openmw +pkgver=0.28.0 +pkgrel=1 +pkgdesc="An open-source engine reimplementation for the role-playing game Morrowind" +arch=('i686' 'x86_64') +url="http://www.openmw.org" +license=('GPL3' 'MIT' 'custom') +depends=('openal' 'ogre' 'mygui' 'bullet' 'qt4' 'ffmpeg' 'sdl2' 'unshield') +makedepends=('cmake' 'boost') +source=("https://github.com/zinnschlag/openmw/archive/${pkgname}-${pkgver}.tar.gz") +sha1sums=('2686b0a588571b9196e691b0ac484c59d8c49bce') + +build() { + cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index cd0412116..ea76814a7 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $ +# $Id: PKGBUILD 103685 2014-01-09 16:10:15Z bgyorgy $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,7 +6,7 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=22 +pkgrel=24 pkgdesc='Free, easy to use implementation of the Network Time Protocol.' url='http://www.openntpd.org/' arch=('x86_64' 'i686' 'mips64el') @@ -47,8 +47,9 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/LICENCE" - sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf + sed -i 's/\*/0.0.0.0/' "$pkgdir/etc/ntpd.conf" + install -d -o 87 -g 87 "$pkgdir/var/lib/ntp" install -Dm644 "$srcdir/openntpd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/openntpd.conf" install -Dm644 "$srcdir/openntpd.service" "$pkgdir/usr/lib/systemd/system/openntpd.service" diff --git a/community/openobex/PKGBUILD b/community/openobex/PKGBUILD new file mode 100644 index 000000000..99225edcf --- /dev/null +++ b/community/openobex/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 103373 2014-01-04 10:26:43Z andrea $ +# Maintainer: +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=openobex +pkgver=1.7.1 +pkgrel=1 +pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" +url="http://dev.zuckschwerdt.org/openobex/" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL') +depends=('libusbx' 'bluez-libs') +makedepends=('cmake' 'libxslt') +options=('staticlibs' '!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) +md5sums=('3181bfed9cb7db591605391068cb0085') + +prepare() { + sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' ${pkgname}-${pkgver}-Source/udev/openobex.rules.in +} + +build() { + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin + make all openobex-apps +} + +package() { + cd build + make DESTDIR="${pkgdir}" install + cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" + install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" +} diff --git a/community/openscad/CHANGELOG b/community/openscad/CHANGELOG new file mode 100644 index 000000000..86c5f542e --- /dev/null +++ b/community/openscad/CHANGELOG @@ -0,0 +1,27 @@ +2014-02-10 Kyle Keen <keenerd@gmail.com> + + * 2013.06-3 + - Moved package to [community] + - Explicit boost depends + - Use official resources + +2014-02-07 Chirantan Ekbote <chirantan.ekbote@gmail.com> + + * 2013.06-2 + - Update makedepends since eigen3 has now become eigen in [extra] + +2013-06-19 Chirantan Ekbote <chirantan.ekbote@gmail.com> + + * 2013.06-1 : + - Updated to version 2013.06 + +2013-03-01 Chirantan Ekbote <chirantan.ekbote@gmail.com> + + * 2013.01-2 : + Dependency qt replaced with qt4 + +2013-01-23 Chirantan Ekbote <chirantan.ekbote@gmail.com> + + * 2013.01-1 : + New upstream release. + Dependency eigen2 repaced by eigen3 diff --git a/community/openscad/PKGBUILD b/community/openscad/PKGBUILD new file mode 100644 index 000000000..0577125f1 --- /dev/null +++ b/community/openscad/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 105552 2014-02-10 05:19:10Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com> +# Contributor: Eric Anderson <ejona86 at gmail.com> +# Contributor: Pierre DOUCET <pierre at equinoxefr.org> +pkgname=openscad +pkgver=2013.06 +pkgrel=3 +pkgdesc="The programmers' solid 3D CAD modeller" +url="http://openscad.org/" +arch=('i686' 'x86_64') +license=('GPL2') +changelog=CHANGELOG +depends=('qt4' 'cgal' 'opencsg' 'boost-libs') +makedepends=('eigen' 'boost' 'imagemagick') +source=("https://openscad.googlecode.com/files/$pkgname-$pkgver.src.tar.gz") +md5sums=('b7b5faecdffc41e28cdf0c1162299de7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + qmake-qt4 PREFIX="/usr" + make + convert "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "icons/$pkgname-128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" +} diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD deleted file mode 100644 index f663d9ac9..000000000 --- a/community/openshadinglanguage/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 102265 2013-12-07 10:36:50Z bpiotrowski $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgname=openshadinglanguage -pkgver=1.4.0 -pkgrel=2 -pkgdesc="Advanced shading language for production GI renderers" -arch=(i686 x86_64) -url="https://github.com/imageworks/OpenShadingLanguage" -license=('custom') -depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm') -makedepends=('boost' 'cmake' 'clang') -source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz) -md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b') - -build() { - cd OpenShadingLanguage-Release-$pkgver - - cd src - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_STATIC=0 \ - ../.. - make -} - -package() { - cd OpenShadingLanguage-Release-$pkgver/src/build - - make DESTDIR="$pkgdir/" install - - mkdir -p "$pkgdir"/usr/share/OSL/ - mkdir -p "$pkgdir"/usr/share/licenses/$pkgname - mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit - mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/ - mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc - mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders -} - -# vim:set ts=2 sw=2 et: diff --git a/community/openshadinglanguage/llvm32.patch b/community/openshadinglanguage/llvm32.patch deleted file mode 100644 index 5eb63bcf3..000000000 --- a/community/openshadinglanguage/llvm32.patch +++ /dev/null @@ -1,71 +0,0 @@ -commit c391ceb1936459b70147d6f8ac389ded26a7e028 -Author: Sven-Hendrik Haase <sh@lutzhaase.com> -Date: Fri Dec 28 09:00:33 2012 +0100 - - Fix for LLVM 3.2 - -diff --git a/src/liboslexec/llvm_headers.h b/src/liboslexec/llvm_headers.h -index 41a7a11..5ff4384 100644 ---- a/src/liboslexec/llvm_headers.h -+++ b/src/liboslexec/llvm_headers.h -@@ -45,10 +45,18 @@ namespace llvm = LLVM_NAMESPACE; - #include <llvm/LLVMContext.h> - #include <llvm/Module.h> - #include <llvm/PassManager.h> -+#if OSL_LLVM_VERSION >= 32 -+#include <llvm/IRBuilder.h> -+#else - #include <llvm/Support/IRBuilder.h> -+#endif - #include <llvm/Support/ManagedStatic.h> - #include <llvm/Support/MemoryBuffer.h> - #include <llvm/Support/raw_ostream.h> -+#if OSL_LLVM_VERSION >= 32 -+#include <llvm/DataLayout.h> -+#else - #include <llvm/Target/TargetData.h> -+#endif - - #endif /* OSL_LLVM_HEADERS_H */ -diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp -index 8709c8b..3e42557 100644 ---- a/src/liboslexec/llvm_instance.cpp -+++ b/src/liboslexec/llvm_instance.cpp -@@ -1273,13 +1273,21 @@ RuntimeOptimizer::llvm_setup_optimization_passes () - // - m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module()); - llvm::FunctionPassManager &fpm (*m_llvm_func_passes); -+#if OSL_LLVM_VERSION >= 32 -+ fpm.add (new llvm::DataLayout(llvm_module())); -+#else - fpm.add (new llvm::TargetData(llvm_module())); -+#endif - - // Specify module-wide (interprocedural optimization) passes - // - m_llvm_passes = new llvm::PassManager; - llvm::PassManager &passes (*m_llvm_passes); -+#if OSL_LLVM_VERSION >= 32 -+ passes.add (new llvm::DataLayout(llvm_module())); -+#else - passes.add (new llvm::TargetData(llvm_module())); -+#endif - - if (shadingsys().llvm_optimize() >= 1 && shadingsys().llvm_optimize() <= 3) { - // For LLVM 3.0 and higher, llvm_optimize 1-3 means to use the -diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp -index 135da2e..4e0eefe 100644 ---- a/src/liboslexec/llvm_util.cpp -+++ b/src/liboslexec/llvm_util.cpp -@@ -42,7 +42,11 @@ namespace pvt { - llvm::Type * - RuntimeOptimizer::llvm_type_union(const std::vector<llvm::Type *> &types) - { -+#if OSL_LLVM_VERSION >= 32 -+ llvm::DataLayout target(llvm_module()); -+#else - llvm::TargetData target(llvm_module()); -+#endif - size_t max_size = 0; - size_t max_align = 1; - for (size_t i = 0; i < types.size(); ++i) { diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 1fc2bfdd9..c96dee0ec 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $ +# $Id: PKGBUILD 103707 2014-01-10 10:51:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.9.1 +pkgver=1.10.0 pkgrel=2 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" @@ -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() { @@ -46,7 +46,7 @@ build() { make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ - TLS=1 LIBDIR=lib + TLS=1 LIBDIR=lib PREFIX=/usr } package() { @@ -54,7 +54,7 @@ package() { make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ - TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install + TLS=1 BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) mkdir -p $pkgdir/etc/ diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 26bda4541..aaa29cdaf 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com> pkgname=openssh-askpass -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') -url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' +url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0' license=('GPL') depends=('openssh' 'qt4') makedepends=('cmake') provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') -source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz" +source=("http://hugo.pereira.free.fr/software/tgz/$pkgname-$pkgver.tar.gz" "$pkgname.sh") build() { @@ -32,5 +32,5 @@ package() { install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" } -md5sums=('99b31e5bc2c12f91cc88869661ad92be' +md5sums=('c196971941ff3773d9f977b52015b214' 'baec3f0499b851aca6705968fa9e0df7') diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD index c3765b3c8..8b8459283 100644 --- a/community/opusfile/PKGBUILD +++ b/community/opusfile/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102291 2013-12-07 11:02:30Z bpiotrowski $ +# $Id: PKGBUILD 105124 2014-02-01 00:48:22Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> pkgname=opusfile -pkgver=0.4 +pkgver=0.5 pkgrel=1 pkgdesc='Library for opening, seeking, and decoding .opus files' arch=('i686' 'x86_64' 'mips64el') url='http://www.opus-codec.org/' -license=('custom') +license=('BSD') depends=('libogg' 'openssl' 'opus') source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz) -md5sums=('80f3d4106106905255ff84def1b5d9ae') +md5sums=('6c96ae240ada27fafff423f96a8814cb') build() { cd $pkgname-$pkgver diff --git a/community/pacparser/PKGBUILD b/community/pacparser/PKGBUILD new file mode 100644 index 000000000..f7c000918 --- /dev/null +++ b/community/pacparser/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 103445 2014-01-06 02:45:23Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Max Meyer <dev@fedux.org> + +pkgbase=pacparser +pkgname=('pacparser' 'python2-pacparser') +pkgver=1.3.1 +pkgrel=1 +arch=(i686 x86_64) +url="http://pacparser.googlecode.com" +license=('LGPL') +makedepends=('python2') +options=('!makeflags') +source=("http://pacparser.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz") + +build() { + cd $pkgbase-$pkgver + PYTHON=python2 make all pymod -C src +} + +package_pacparser() { + pkgdesc="Library to parse proxy auto-config (PAC) files" + + cd $pkgbase-$pkgver + make -C src DESTDIR="$pkgdir/" install +} + +package_python2-pacparser() { + depends=('python2') + pkgdesc="Python 2.x pacparser module" + + cd $pkgbase-$pkgver + PYTHON=python2 make -C src DESTDIR="$pkgdir/" install-pymod +} + +# vim:set ts=2 sw=2 et: +sha512sums=('20295667d92eb5385429c085c14ca8dc1ba216487ff474304433f99119216934be2dd1647452173418de31f5345679dd7159eafd331e40a2b87564f878d31349') diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD index 4b7f6eda4..148faba04 100644 --- a/community/par2cmdline/PKGBUILD +++ b/community/par2cmdline/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 102557 2013-12-14 14:03:38Z idevolder $ +# $Id: PKGBUILD 103377 2014-01-04 19:33:08Z idevolder $ # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org pkgname=par2cmdline -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc='A PAR 2.0 compatible file verification and repair tool' url='https://github.com/BlackIkeEagle/par2cmdline' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz") -sha256sums=('903bff9d1720523683cb04db76d37169ebab3a5157f0ae1d5f9065f371929288') +sha256sums=('431da50fdd794881bad7e1b0dee234e8102d7065f53abd7ce1e86be758810116') build() { cd "$pkgname-$pkgver" diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD index 59fab2a04..8ce5e34a2 100644 --- a/community/partclone/PKGBUILD +++ b/community/partclone/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 90410 2013-05-12 09:03:51Z jsteel $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> +# $Id: PKGBUILD 104331 2014-01-17 20:10:14Z jsteel $ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contrinutor: Dan Serban # Contributor: Franz Burgmann # Contributor: Todd Partridge (Gen2ly) # Contributor: Ivan Sichmann Freitas pkgname=partclone -pkgver=0.2.58 -pkgrel=2 +pkgver=0.2.69 +pkgrel=1 pkgdesc="Utilities to save and restore used blocks on a partition" arch=('i686' 'x86_64' 'mips64el') url="http://partclone.org" license=('GPL') depends=('progsreiserfs' 'ntfs-3g') source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.orig.tar.gz) -md5sums=('8d8edeab8a0ce430d2e00efcc25f4ce7') +md5sums=('2cc3b4e49819da32adcf63ef9246dca0') build() { cd "$srcdir"/$pkgname-$pkgver @@ -29,5 +29,5 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir"/ install + make PREFIX=/usr DESTDIR="$pkgdir"/ install } diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 4db7991a5..2412f2a16 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100819 2013-11-11 12:06:03Z spupykin $ +# $Id: PKGBUILD 105017 2014-01-30 08:53:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.21 -pkgrel=2 +pkgver=4.0.37 +pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs' 'staticlibs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('200ba8636baa06c9a44d30c7bbb50ac3') +md5sums=('7040af5314fe19a420f38732c6bd4f5b') prepare() { cd $srcdir/passenger-release-$pkgver diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index 6c6f3ad94..1289ae086 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' 'mips64el') @@ -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/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 56894c53a..016fa2ac6 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99948 2013-10-31 02:38:13Z allan $ +# $Id: PKGBUILD 105842 2014-02-16 09:46:31Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.10 +pkgver=1.8.11 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('BSD') depends=('python2' 'systemd') makedepends=('pkg-config') options=('!docs') -source=("https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${pkgver}.tar.bz2") -md5sums=('7268cc5ef8fc01b785c7cea87adb1ade') +source=("https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-${pkgver}.tar.bz2") +md5sums=('73502ca4ba6526727f9f49c63d805408') build() { cd "${srcdir}/pcsc-lite-${pkgver}" diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD index 164608a55..f0843d556 100644 --- a/community/pcsxr/PKGBUILD +++ b/community/pcsxr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99949 2013-10-31 02:38:33Z allan $ +# $Id: PKGBUILD 104373 2014-01-19 16:29:37Z bpiotrowski $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: quantax -- contact via Arch Linux forum or AUR # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=pcsxr pkgver=1.9.93 -pkgrel=2 +pkgrel=3 pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project' arch=('i686' 'x86_64') url='http://pcsxr.codeplex.com/' diff --git a/community/pcurses/PKGBUILD b/community/pcurses/PKGBUILD new file mode 100644 index 000000000..1cc5e1827 --- /dev/null +++ b/community/pcurses/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> + +pkgname=pcurses +pkgver=3 +pkgrel=2 +pkgdesc='A curses package management tool using libalpm' +arch=('x86_64' 'i686') +url="https://github.com/schuay/$pkgname" +license=('GPL') +depends=('ncurses' 'pacman>=4.1.2') +makedepends=('boost' 'cmake' 'git') +source=("git://github.com/schuay/pcurses.git#tag=pcurses-$pkgver") +md5sums=('SKIP') + +build() { + rm -rf "$srcdir/$pkgname-build" + mkdir "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/$pkgname" + make +} + +package() { + cd "$srcdir/$pkgname-build" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD index 535913d6a..fa9279dd0 100644 --- a/community/pdf2svg/PKGBUILD +++ b/community/pdf2svg/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 67717 2012-03-14 08:30:56Z giovanni $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 104053 2014-01-14 22:18:17Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: corvolino <corvolino@archlinux.com.br> # Contributor: Joel Schaerer pkgname=pdf2svg -pkgver=0.2.1 -pkgrel=7.1 +pkgver=0.2.2 +pkgrel=1 pkgdesc="A pdf to svg converter" arch=('i686' 'x86_64' 'mips64el') -url="http://www.cityinthesky.co.uk/pdf2svg.html" +url="http://www.cityinthesky.co.uk/opensource/pdf2svg/" license=('GPL') depends=('poppler-glib' 'gtk2' 'glib2') -source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz") -md5sums=('59b3b9768166f73b77215e95d91f0a9d') +source=(http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/$pkgname-$pkgver.tar.gz) +md5sums=('800488ff6d773b309561dfa9be5dc712') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/community/pdfgrep/PKGBUILD b/community/pdfgrep/PKGBUILD new file mode 100644 index 000000000..063b5a20c --- /dev/null +++ b/community/pdfgrep/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Gabriel B. Casella <gbc921@gmail.com> +# Contributor: josephgbr <rafael.f.f1@gmail.com> + +pkgname=pdfgrep +pkgver=1.3.0 +pkgrel=2 +pkgdesc="A tool to search text in PDF files" +arch=('i686' 'x86_64') +url="http://pdfgrep.sourceforge.net/" +license=('GPL') +depends=('poppler') +conflicts=('pdfgrep-git') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) +md5sums=('07d2819dd11b0f92278df11a95221833') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index 0bcf76cb3..a9170e3bc 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $ +# $Id: PKGBUILD 105815 2014-02-15 20:44:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker -pkgver=2.18 -pkgrel=7 +pkgver=2.20 +pkgrel=1 pkgdesc="Create generic class methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Class-MethodMaker" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") -md5sums=('99435d78e0a1754b102fe39597c6c3df') +source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-${pkgver}.tar.gz") +md5sums=('6ff22acb19ebfccaa9de07c7d4358129') build() { cd $srcdir/Class-MethodMaker-$pkgver diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index 31ddf15e9..b368c94d9 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alex Dioso <adioso->gmail*com> pkgname=perl-clone -pkgver=0.35 +pkgver=0.36 pkgrel=1 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz") -md5sums=('22175ef74a6e5f5604cb74d1e4af456e') +md5sums=('bb7aeeb66b183f600e5a4ccb941cbc1b') build() { cd Clone-${pkgver} diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 9f6a4e829..3820d3735 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $ +# $Id: PKGBUILD 105763 2014-02-15 20:31:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=1.03 -pkgrel=2 +pkgver=1.07 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('ea0fc830410b9ce3baeef3525bc0acdd') +md5sums=('2b1745e4f7c0777c02545033588f6394') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index 5bdb15d52..54c85f245 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $ +# $Id: PKGBUILD 105418 2014-02-07 09:53:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-pg -pkgver=2.19.3 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Pg" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'postgresql-libs') options=('!emptydirs') source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") -md5sums=('026ea19f89aee12051bce23d797e824b') +md5sums=('58c2613bcb241279aca4c111ba16db48') build() { cd DBD-Pg-${pkgver} diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index e5f0134ec..6be053a96 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93776 2013-07-10 07:27:16Z bpiotrowski $ +# $Id: PKGBUILD 105781 2014-02-15 20:33:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> pkgname=perl-gd -pkgver=2.50 -pkgrel=2 +pkgver=2.51 +pkgrel=1 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GD" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('gd') options=('!emptydirs') source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) -md5sums=('b2f1e47dfc1c4e4fdda3277f165d36e5') +md5sums=('49ab25536d4708ab10b7f4879d2fbbc8') build() { cd $srcdir/GD-$pkgver diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 45af750c0..4c3e9349e 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $ +# $Id: PKGBUILD 105797 2014-02-15 20:34:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-string-crc32 -pkgver=1.4 -pkgrel=9 +pkgver=1.5 +pkgrel=1 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/String-CRC32" license=("GPL" "PerlArtistic") options=('!emptydirs') source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz") -md5sums=('9b241bc4a482a3aa59fbb1429bc30546') +md5sums=('3a9516454722823bd7965d1128d53869') build() { cd String-CRC32-${pkgver} diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index e1f6f5035..513c5857f 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100412 2013-11-03 17:59:19Z jsteel $ +# $Id: PKGBUILD 105751 2014-02-15 09:51:59Z jsteel $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=2.0107 +pkgver=2.0110 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ replaces=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=$pkgname.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('4caedd8fb64167e1caf0443f18ec47a2') +md5sums=('5cc869a22613e20d9d0abc58aae11bcd') build() { cd "$srcdir"/XML-LibXML-$pkgver diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index e21cfc56a..8c0b47f60 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100900 2013-11-12 23:39:12Z eric $ +# $Id: PKGBUILD 105747 2014-02-15 01:58:04Z eric $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt -pkgver=1.82 +pkgver=1.87 pkgrel=1 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('perl-xml-libxml' 'libxslt') options=('!emptydirs') source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('91b5432b2c68fcf88b25cfd825b23b14') +md5sums=('6a9303ffada82422781a36c54d3f4a8f') build() { cd XML-LibXSLT-$pkgver diff --git a/community/pgadmin3/ChangeLog b/community/pgadmin3/ChangeLog deleted file mode 100644 index 76de01d7d..000000000 --- a/community/pgadmin3/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -2008-08-21 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.8.5 - -2008-06-24 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.4 - -2008-02-21 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.2 - -2008-01-05 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for x86_64 - 1.8.1 - * Updated for i686 - 1.8.1 - -2007-10-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-10-11 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-06-28 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 9c4ee420d..73a521e71 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99091 2013-10-24 10:41:34Z spupykin $ +# $Id: PKGBUILD 103960 2014-01-14 05:57:45Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,12 +6,12 @@ pkgname=pgadmin3 pkgver=1.18.1 -pkgrel=3 +pkgrel=8 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://www.pgadmin.org" license=('custom') -depends=('wxgtk' 'postgresql-libs' 'libxslt') +depends=('wxgtk2.8' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') install=pgadmin3.install source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) @@ -22,17 +22,18 @@ build() { convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cd "pgadmin3-${pkgver}" - [ -f Makefile ] || ./configure --prefix=/usr + sed -i 's/wx-config/wx-config-2.8/' configure + [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=2.8 make } package() { - cd $srcdir/pgadmin3-${pkgver} + cd "$srcdir"/pgadmin3-${pkgver} - make DESTDIR=$pkgdir/ install - install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pgAdmin3.ico + make DESTDIR="$pkgdir/" install + install -Dm644 i18n/$pkgname.lng "$pkgdir/usr/share/pgadmin3/i18n" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 pgadmin/include/images/pgAdmin3.ico "$pkgdir/usr/share/pgadmin3/pgAdmin3.ico" install -Dm644 "$srcdir/pgadmin3-3.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png" install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" } diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD index 9bbf6f5cc..05628853f 100644 --- a/community/phantomjs/PKGBUILD +++ b/community/phantomjs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $ +# $Id: PKGBUILD 104973 2014-01-29 04:07:48Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: grimsock <lord.grimsock at gmail dot com> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> @@ -6,23 +6,19 @@ # Contributor: Henry Tang <henryykt@gmail.com> pkgname=phantomjs -pkgver=1.9.2 +pkgver=1.9.7 pkgrel=1 pkgdesc="Headless WebKit with JavaScript API" url="http://www.phantomjs.org/" license=('BSD' 'LGPL' 'MIT') arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'fontconfig' 'freetype2') -makedepends=('unzip') -source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip") -noextract=("${pkgname}-${pkgver}-source.zip") +depends=('gstreamer0.10-base' 'fontconfig' 'freetype2' 'gcc-libs') +makedepends=('git') +source=("git+https://github.com/ariya/${pkgname}.git#tag=$pkgver") build() { - # workaround for https://code.google.com/p/libarchive/issues/detail?id=271 - # cd $srcdir/$pkgname-$pkgver - unzip ${pkgname}-${pkgver}-source.zip + cd $pkgname - cd $pkgname-$pkgver # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635 sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri @@ -30,13 +26,13 @@ build() { } package() { - install -Dm755 "$srcdir/$pkgname-$pkgver/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" + install -Dm755 "$srcdir/$pkgname/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" mkdir -p "$pkgdir/usr/share/$pkgname" - cp -r "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/$pkgname"/ + cp -r "$srcdir/$pkgname/examples" "$pkgdir/usr/share/$pkgname"/ - install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" - install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" + install -Dm644 "$srcdir/$pkgname/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" + install -Dm644 "$srcdir/$pkgname/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" } -sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720') +sha512sums=('SKIP') diff --git a/community/pianobar/PKGBUILD b/community/pianobar/PKGBUILD index ca792101e..dcdfc8f05 100644 --- a/community/pianobar/PKGBUILD +++ b/community/pianobar/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98105 2013-10-06 00:35:49Z dwallace $ +# $Id: PKGBUILD 103923 2014-01-13 17:16:56Z andyrtr $ # Maintainer: Daniel Wallace < danielwallace at gtmanfred dot com> # Contributor: Mitch Bigelow <ipha00@gmail.com> # Contributor: Patrick Palka <patrick@parcs.ath.cx> pkgname=pianobar pkgver=2013.09.15 -pkgrel=1 +pkgrel=2 pkgdesc="console-based frontend for Pandora" url="http://6xq.net/0017" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 079791b09..2d8d73663 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102564 2013-12-15 04:07:26Z fyan $ +# $Id: PKGBUILD 105694 2014-02-14 06:29:13Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2c.20131206 -_commit=41f92cb7d8b4cfb26e51eded734e8110f845cff3 +pkgver=0.2c.20140214 +_commit=de349f7a2d6b1728f4f03e374dd3bc000f4b1248 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') @@ -20,21 +20,22 @@ source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" "git://github.com/xiehuc/lwqq.git") prepare() { - cd "$srcdir/$pkgname" + cd $pkgname git submodule init git config submodule."liblwqq".url "$srcdir/lwqq" git submodule update } build() { - cd "${srcdir}/$pkgname" - - cmake -DCMAKE_INSTALL_PREFIX=/usr . + cd $pkgname + + #Disable SSL as per upstream suggests + cmake -DCMAKE_INSTALL_PREFIX=/usr -DSSL=Off . make } package() { - cd "$srcdir/$pkgname" + cd $pkgname make DESTDIR="${pkgdir}" install } diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD index 38cfbd399..bc1cd9ced 100644 --- a/community/pidgin-otr/PKGBUILD +++ b/community/pidgin-otr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79622 2012-11-09 00:24:37Z ebelanger $ +# $Id: PKGBUILD 103924 2014-01-13 17:16:58Z andyrtr $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Allan McRae <allan@archlinux.org> @@ -7,7 +7,7 @@ pkgname=pidgin-otr pkgver=4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='Off-the-Record Messaging plugin for Pidgin.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD new file mode 100644 index 000000000..f094aa050 --- /dev/null +++ b/community/pidgin-talkfilters/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> + +pkgname=pidgin-talkfilters +pkgver=2.7.0 +pkgrel=2 +pkgdesc="Implements GNU talkfilters in pidgin chats" +arch=('i686' 'x86_64') +url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" +license=('GPL') +depends=('libpurple' 'talkfilters') +makedepends=('intltool' 'gettext' 'python2' 'pidgin') +source=(https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-$pkgver.tar.bz2) +sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') + +build() { + cd "$srcdir"/purple-plugin-pack-$pkgver + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr --with-plugins=talkfilters +} + +package() { + cd "$srcdir"/purple-plugin-pack-$pkgver + + make + make DESTDIR="$pkgdir" install +} diff --git a/community/pidgin-toobars/PKGBUILD b/community/pidgin-toobars/PKGBUILD index 4187952c2..1ed3d8c8e 100644 --- a/community/pidgin-toobars/PKGBUILD +++ b/community/pidgin-toobars/PKGBUILD @@ -1,25 +1,26 @@ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 104483 2014-01-21 17:38:13Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: JokerBoy <jokerboy at punctweb dot ro> pkgname=pidgin-toobars pkgver=1.14 -pkgrel=1 -pkgdesc="Pidgin plugin that adds a toolbar and status bar to the buddy list" +pkgrel=2 +pkgdesc='Pidgin plugin that adds a toolbar and status bar to the buddy list' arch=('i686' 'x86_64' 'mips64el') -url="http://vayurik.ru/wordpress/en/toobars/" +url='http://vayurik.ru/wordpress/en/toobars/' license=('GPL') depends=('pidgin') makedepends=('intltool') -source=("http://vayurik.ru/wordpress/wp-content/uploads/toobars/${pkgver}/${pkgname}-${pkgver}.tar.gz") +source=(http://vayurik.ru/wordpress/wp-content/uploads/toobars/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('0b9255902c10ec1b171329474bd69e82') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index a049f5d0d..4046afb3a 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102268 2013-12-07 10:36:53Z bpiotrowski $ +# $Id: PKGBUILD 104769 2014-01-25 18:55:45Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.6 -pkgrel=10 +pkgrel=11 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -23,6 +23,8 @@ build() { # fedora patch to fix error due to new standards # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282 patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch + # manpage must be in man6, not man1 + sed -i "s#/man1/#/man6/#g" Makefile scons prefix=/usr } diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index 6d3b73dce..8fe0e0c7e 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102269 2013-12-07 10:36:55Z bpiotrowski $ +# $Id: PKGBUILD 104802 2014-01-26 12:17:40Z andyrtr $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -7,7 +7,7 @@ pkgname=pinot pkgver=1.06 -pkgrel=2 +pkgrel=3 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/pinot-search/' diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 138f002ad..48e94274c 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z arodseth $ +# $Id: PKGBUILD 104876 2014-01-27 23:51:46Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar @@ -6,7 +6,7 @@ pkgname=plan9port pkgver=20131024 -pkgrel=2 +pkgrel=3 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686' 'mips64el') url='http://swtch.com/plan9port/' @@ -45,10 +45,10 @@ package() { LICENSE # Fix hardcoded paths - #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do - # echo -n "\t$f" - # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true - #done + for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do + echo -n "\t$f" + [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true + done # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ diff --git a/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch new file mode 100644 index 000000000..591b2f20d --- /dev/null +++ b/community/planner/05ba23be296085313abd8d7d5075d962084f5d38.patch @@ -0,0 +1,26 @@ +From 05ba23be296085313abd8d7d5075d962084f5d38 Mon Sep 17 00:00:00 2001 +From: Alexandre Franke <alexandre.franke@gmail.com> +Date: Wed, 14 Mar 2012 10:52:25 +0000 +Subject: Better use of fields in the .desktop file + +https://bugzilla.gnome.org/show_bug.cgi?id=672033 +--- +diff --git a/data/planner.desktop.in.in b/data/planner.desktop.in.in +index af61d34..30eb921 100644 +--- a/data/planner.desktop.in.in ++++ b/data/planner.desktop.in.in +@@ -1,6 +1,10 @@ + [Desktop Entry] +-_Name=Project Management +-_Comment=Planner Project Management ++Version=1.0 ++_Name=Planner ++_GenericName=Project Management ++_X-GNOME-FullName=Planner Project Management ++_Comment=Handle the tasks, resources, and cost of your projects ++_Keywords=Gantt;Chart;Critical path;Relationship;Dependency;WBS; + Exec=planner %F + Icon=gnome-planner.png + Terminal=false +-- +cgit v0.9.2 diff --git a/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch new file mode 100644 index 000000000..de5a64c37 --- /dev/null +++ b/community/planner/0cc65e2f420af45f78d190ac2af64810a148bb31.patch @@ -0,0 +1,41 @@ +From 0cc65e2f420af45f78d190ac2af64810a148bb31 Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 11 Mar 2013 00:00:44 +0000 +Subject: Don't crash on an empty print preview, just provide an empty preview. + +https://bugzilla.gnome.org/show_bug.cgi?id=581282 +--- +diff --git a/src/planner-print-job.c b/src/planner-print-job.c +index 6334037..96267a0 100644 +--- a/src/planner-print-job.c ++++ b/src/planner-print-job.c +@@ -237,17 +237,7 @@ print_job_draw_page (GtkPrintOperation *operation, + + l = priv->views; + +- /* Abort if there is nothing to print. +- * +- * A better solution would be to set the number of pages to print to 0 +- * in print_job_begin_print, but 0 is not a valid value for +- * gtk_print_operation_set_n_pages. +- */ +- if(!l) { +- return; +- } +- +- while (!page_found) { ++ while (! page_found && l != NULL) { + v = PLANNER_VIEW (l->data); + + pages_in_view = planner_view_print_get_n_pages (v); +@@ -258,8 +248,6 @@ print_job_draw_page (GtkPrintOperation *operation, + } else { + page_nr -= pages_in_view; + l = l->next; +- +- g_assert (l != NULL); + } + } + } +-- +cgit v0.9.2 diff --git a/community/planner/PKGBUILD b/community/planner/PKGBUILD new file mode 100644 index 000000000..5aef75dd1 --- /dev/null +++ b/community/planner/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 104580 2014-01-23 07:08:15Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: herb <herb@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=planner +pkgver=0.14.6 +pkgrel=3 +pkgdesc='Project management application for GNOME' +arch=('i686' 'x86_64') +license=('GPL') +url='https://wiki.gnome.org/Apps/Planner' +depends=('libgnomecanvas' 'libxslt' 'gconf' 'desktop-file-utils') +makedepends=('intltool' 'gtk-doc' 'pygtk') +options=('!emptydirs') +install=planner.install +source=(http://ftp.gnome.org/pub/GNOME/sources/planner/${pkgver%.*}/planner-$pkgver.tar.xz + f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + 05ba23be296085313abd8d7d5075d962084f5d38.patch + 0cc65e2f420af45f78d190ac2af64810a148bb31.patch + cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch) +sha256sums=('130d29e6d6b8c1994017deba2acca05a4bf83ba1e169635ec8c5c7878abe0696' + 'bc4455b318bb26f44fe50a8e07292b7654c795ff2a1629a788ea749f6c8bac81' + '88a34bb93bca4ae5865f6c70d7d73f3a0009e5137ba2346a8446c6e206e51b20' + '0cde21948f01baaa31a9a5f8af76444c7151ad39a0bc45d8e04de8b07837f0ad' + '1644550a9be35253fe0a353fc004bd8576de3b85a6b21b92cbb0a87c03f37894' + '4275689c2d4493ddcda3a40309a6bbdcdf6323bed80ca2e011138cdcd88da852') + +prepare() { + cd $pkgname-$pkgver + # Upstream fixes + patch -Np1 -i ../f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch + patch -Np1 -i ../05ba23be296085313abd8d7d5075d962084f5d38.patch + patch -Np1 -i ../0cc65e2f420af45f78d190ac2af64810a148bb31.patch + + # Remove deprecated libgnomeui dependency + patch -Np1 -i ../cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch + patch -Np1 -i ../fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch +} + +build() { + cd $pkgname-$pkgver + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-update-mimedb --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch new file mode 100644 index 000000000..722c59ec3 --- /dev/null +++ b/community/planner/cd2b658e83d47e8f49d1bbaf54be6433a21d3758.patch @@ -0,0 +1,147 @@ +From cd2b658e83d47e8f49d1bbaf54be6433a21d3758 Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 04 Mar 2013 17:10:26 +0000 +Subject: Remove deprecated GnomeEntry. + +It is replaced by GtkEntry. This means we lose the history +functionality, but that could be reimplemented using GtkComboBoxText +with an entry. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/data/glade/sql.glade b/data/glade/sql.glade +index 2b12b85..f673ae0 100644 +--- a/data/glade/sql.glade ++++ b/data/glade/sql.glade +@@ -165,24 +165,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="server_entry"> ++ <widget class="GtkEntry" id="server_entry"> + <property name="visible">True</property> +- <property name="history_id">database_server</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry1"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +@@ -194,24 +186,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="user_entry"> ++ <widget class="GtkEntry" id="user_entry"> + <property name="visible">True</property> +- <property name="history_id">database_user</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry2"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +@@ -248,24 +232,16 @@ + </child> + + <child> +- <widget class="GnomeEntry" id="db_entry"> ++ <widget class="GtkEntry" id="db_entry"> + <property name="visible">True</property> +- <property name="history_id">database_name</property> +- <property name="max_saved">10</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="combo-entry3"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char" translatable="yes">*</property> +- <property name="activates_default">True</property> +- </widget> +- </child> ++ <property name="can_focus">True</property> ++ <property name="editable">True</property> ++ <property name="visibility">True</property> ++ <property name="max_length">0</property> ++ <property name="text" translatable="yes"></property> ++ <property name="has_frame">True</property> ++ <property name="invisible_char" translatable="yes">*</property> ++ <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> +diff --git a/src/planner-sql-plugin.c b/src/planner-sql-plugin.c +index 14a088c..ea2f46a 100644 +--- a/src/planner-sql-plugin.c ++++ b/src/planner-sql-plugin.c +@@ -27,7 +27,6 @@ + #include <stdlib.h> + #include <glib.h> + #include <glib/gi18n.h> +-#include <libgnomeui/gnome-entry.h> + #include <glade/glade.h> + #include <gtk/gtk.h> + #include <libgda/libgda.h> +@@ -950,12 +949,9 @@ sql_plugin_retrieve_db_values (PlannerPlugin *plugin, + + gtk_window_set_title (GTK_WINDOW (dialog), title); + +- server_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "server_entry"))); +- db_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "db_entry"))); +- user_entry = gnome_entry_gtk_entry ( +- GNOME_ENTRY (glade_xml_get_widget (gui, "user_entry"))); ++ server_entry = glade_xml_get_widget (gui, "server_entry"); ++ db_entry = glade_xml_get_widget (gui, "db_entry"); ++ user_entry = glade_xml_get_widget (gui, "user_entry"); + password_entry = glade_xml_get_widget (gui, "password_entry"); + + str = planner_conf_get_string (CONF_SERVER, NULL); +-- +cgit v0.9.2 diff --git a/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch new file mode 100644 index 000000000..1ee60f528 --- /dev/null +++ b/community/planner/f9840c342e4b5767ee35f0d326b7f7eaf56850ed.patch @@ -0,0 +1,114 @@ +From f9840c342e4b5767ee35f0d326b7f7eaf56850ed Mon Sep 17 00:00:00 2001 +From: Alexandre Franke <alexandre.franke@gmail.com> +Date: Mon, 05 Mar 2012 17:22:56 +0000 +Subject: Fix for broken "open file on startup" behaviour + +Switch to gtk_init_with_args from GnomeProgam broke opening of files from command line and when double clicking on file in file browser. + +Based on patches 193670 and 193835 by Maxim Zakharov. + +https://bugzilla.gnome.org/show_bug.cgi?id=656373 +--- +diff --git a/src/planner-main.c b/src/planner-main.c +index cdeb8ea..c0aabd2 100644 +--- a/src/planner-main.c ++++ b/src/planner-main.c +@@ -37,7 +37,7 @@ static gchar **args_remaining = NULL; + + static GOptionEntry options[] = { + { "geometry", 'g', 0, G_OPTION_ARG_STRING, &geometry, N_("Create the initial window with the given geometry."), N_("GEOMETRY")}, +- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES") }, ++ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &args_remaining, NULL, N_("FILES|URIs") }, + { NULL } + }; + +@@ -92,26 +92,27 @@ main (int argc, char **argv) + + gtk_widget_show_all (main_window); + +- if (argc > 1) { +- i = 1; +- while (argv[i]) { +- if (g_str_has_prefix (argv[i], "file:")) { ++ if (args_remaining != NULL) { ++ for (i = 0; args_remaining[i]; i++) { ++ gchar *scheme = g_uri_parse_scheme(args_remaining[i]); ++ if (scheme != NULL) { + planner_window_open_in_existing_or_new ( +- PLANNER_WINDOW (main_window), argv[i], FALSE); ++ PLANNER_WINDOW (main_window), args_remaining[i], FALSE); ++ g_free(scheme); + } else { + gchar *uri; + +- if (!g_path_is_absolute (argv[i])) { ++ if (!g_path_is_absolute (args_remaining[i])) { + /* Relative path. */ + gchar *cwd, *tmp; + + cwd = g_get_current_dir (); +- tmp = g_build_filename (cwd, argv[i], NULL); ++ tmp = g_build_filename (cwd, args_remaining[i], NULL); + uri = g_filename_to_uri (tmp, NULL, NULL); + g_free (tmp); + g_free (cwd); + } else { +- uri = g_filename_to_uri (argv[i], NULL, NULL); ++ uri = g_filename_to_uri (args_remaining[i], NULL, NULL); + } + + if (uri) { +@@ -120,8 +121,6 @@ main (int argc, char **argv) + g_free (uri); + } + } +- +- i++; + } + } + +diff --git a/src/planner-window.c b/src/planner-window.c +index 73f1766..b0536c3 100644 +--- a/src/planner-window.c ++++ b/src/planner-window.c +@@ -1726,36 +1726,24 @@ planner_window_open_in_existing_or_new (PlannerWindow *window, + { + PlannerWindowPriv *priv; + GtkWidget *new_window; +- gchar *filename; + gboolean ret; + + priv = window->priv; +- +- filename = g_filename_from_uri (uri, NULL, NULL); +- if (!filename) { +- return FALSE; +- } +- + if (mrp_project_is_empty (priv->project)) { +- ret = planner_window_open (window, filename, internal); +- g_free (filename); ++ ret = planner_window_open (window, uri, internal); + return ret; + } else { + new_window = planner_application_new_window (priv->application); +- if (planner_window_open (PLANNER_WINDOW (new_window), filename, internal)) { +- g_free (filename); ++ if (planner_window_open (PLANNER_WINDOW (new_window), uri, internal)) { + gtk_widget_show_all (new_window); + return TRUE; + } else { +- g_free (filename); + g_signal_emit (new_window, signals[CLOSED], 0, NULL); + gtk_widget_destroy (new_window); + return FALSE; + } + } + +- g_free (filename); +- + return FALSE; + } + +-- +cgit v0.9.2 diff --git a/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch new file mode 100644 index 000000000..7c1b1d5ef --- /dev/null +++ b/community/planner/fd8da8994f7006b9fcefc90d2fe5c2b484c7871e.patch @@ -0,0 +1,41 @@ +From fd8da8994f7006b9fcefc90d2fe5c2b484c7871e Mon Sep 17 00:00:00 2001 +From: Luis Menina <liberforce@freeside.fr> +Date: Mon, 04 Mar 2013 13:42:22 +0000 +Subject: Remove deprecated libgnomeui. + +https://bugzilla.gnome.org/show_bug.cgi?id=589045 +--- +diff --git a/README b/README +index e6d5c31..b2489ef 100644 +--- a/README ++++ b/README +@@ -59,7 +59,6 @@ Dependencies: + GLIB 2.6.0 + GTK 2.14.0 + LIBGNOMECANVAS 2.10.0 +-LIBGNOMEUI 2.10.0 + LIBGLADE 2.3.0 + GNOME_VFS 2.10.0 + GCONF 2.10.0 +diff --git a/configure.in b/configure.in +index 9f3d112..06568fd 100644 +--- a/configure.in ++++ b/configure.in +@@ -67,7 +67,6 @@ dnl it too, or it will never make it into the spec file! + GLIB_REQUIRED=2.6.0 + GTK_REQUIRED=2.14.0 + LIBGNOMECANVAS_REQUIRED=2.10.0 +-LIBGNOMEUI_REQUIRED=2.10.0 + LIBGLADE_REQUIRED=2.3.0 + GNOME_VFS_REQUIRED=2.10.0 + GCONF_REQUIRED=2.10.0 +@@ -116,7 +115,6 @@ PKG_CHECK_MODULES(PLANNER, + gobject-2.0 gmodule-2.0 + gtk+-2.0 >= $GTK_REQUIRED + libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED +- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED + ]) +-- +cgit v0.9.2 diff --git a/community/planner/planner.install b/community/planner/planner.install new file mode 100644 index 000000000..9d325dbb1 --- /dev/null +++ b/community/planner/planner.install @@ -0,0 +1,26 @@ +pkgname=planner + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/community/plib/PKGBUILD b/community/plib/PKGBUILD index 294df226d..b612a359a 100644 --- a/community/plib/PKGBUILD +++ b/community/plib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70925 2012-05-19 18:43:17Z spupykin $ +# $Id: PKGBUILD 103334 2014-01-03 11:08:04Z bpiotrowski $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -11,6 +11,7 @@ url="http://plib.sourceforge.net/" license=('custom:LGPL') makedepends=('mesa' 'libxi' 'libxmu') source=(http://plib.sourceforge.net/dist/$pkgname-$pkgver.tar.gz) +options=('staticlibs') md5sums=('47a6fbf63668c1eed631024038b2ea90') sha1sums=('c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc') diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index 3c3858870..a9c7f4b2a 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,31 +1,38 @@ -# $Id: PKGBUILD 96184 2013-08-21 12:27:48Z spupykin $ +# $Id: PKGBUILD 105671 2014-02-13 11:03:29Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.5.7 -pkgrel=4 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.poedit.net/" -license=('custom') -depends=('wxgtk2.9' 'gtkspell' 'db' 'hicolor-icon-theme' 'gettext') -makedepends=('pkgconfig' 'boost') +license=('MIT') +depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell') +makedepends=('boost' 'libsm') install=poedit.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('f5b53ec66a606f088b0aa388595ea5f9') +#source=(http://www.poedit.net/dl/poedit-$pkgver.tar.gz) +source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-$pkgver.tar.gz + build-fix.patch) +md5sums=('203e27826c1baa4de403ce6d1cc60444' + '724aed37a6760c8ac9405f9ee4b70c05') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/build-fix.patch +} build() { - cd ${srcdir}/${pkgname}-${pkgver} - export WX_CONFIG_PATH=/usr/bin/wx-config-2.9 - ./configure --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/poedit make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/poedit/build-fix.patch b/community/poedit/build-fix.patch new file mode 100644 index 000000000..fb582bf2b --- /dev/null +++ b/community/poedit/build-fix.patch @@ -0,0 +1,235 @@ +diff -wbBur poedit-1.6.4/src/edapp.cpp poedit-1.6.4.my/src/edapp.cpp +--- poedit-1.6.4/src/edapp.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edapp.cpp 2014-02-13 14:49:30.231324614 +0400 +@@ -67,7 +67,6 @@ + + #include "edapp.h" + #include "edframe.h" +-#include "aboutbox.h" + #include "manager.h" + #include "prefsdlg.h" + #include "parser.h" +@@ -666,7 +665,7 @@ + about.SetCopyright(L"Copyright \u00a9 1999-2014 Václav Slavík"); + about.SetWebSite("http://www.poedit.net"); + +- PoeditAboutBox(about); ++// PoeditAboutBox(about); + } + + +@@ -792,7 +791,7 @@ + void PoeditApp::EmailSupport(const wxString& subject, const wxString& body) + { + wxString body2(body); +- wxString appname(HasLicense() ? "Poedit Pro" : "Poedit"); ++ wxString appname("Poedit"); + + #ifdef __WXOSX__ + NSString *s = [[NSProcessInfo processInfo] operatingSystemVersionString]; +@@ -927,31 +926,8 @@ + + void PoeditApp::OnLicense(wxCommandEvent&) + { +- ShowLicenseInformation(); + } + + void PoeditApp::ImportLicenseKey(const wxString& url) + { +- PoeditLicense lic = PoeditLicense::FromURL(url); +- +- if (lic.IsValid()) +- { +- lic.Store(); // save valid license +- ShowLicenseInformation(nullptr, &lic); // ...and thank the user +- } +- else if (!lic.Key().empty()) +- { +- // if we at least parsed the data, even if invalid, show it and let the +- // user correct them +- ShowLicenseInformation(nullptr, &lic); +- } +- else +- { +- wxMessageDialog dlg(nullptr, _("Invalid license data."), _("Poedit"), wxOK | wxICON_ERROR); +- dlg.SetExtendedMessage(wxString::Format(_("The link doesn't contain valid Poedit license. Try entering it manually or contact support at help@poedit.net.\n\n(%s)"), url)); +- dlg.ShowModal(); +- } +- +- if (wxTopLevelWindows.empty()) +- OpenNewFile(); + } +diff -wbBur poedit-1.6.4/src/edapp.h poedit-1.6.4.my/src/edapp.h +--- poedit-1.6.4/src/edapp.h 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edapp.h 2014-02-13 14:49:08.831324860 +0400 +@@ -27,8 +27,6 @@ + #ifndef _EDAPP_H_ + #define _EDAPP_H_ + +-#include "licensing.h" +- + #include <wx/app.h> + #include <wx/string.h> + #include <wx/intl.h> +diff -wbBur poedit-1.6.4/src/edframe.cpp poedit-1.6.4.my/src/edframe.cpp +--- poedit-1.6.4/src/edframe.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/edframe.cpp 2014-02-13 14:49:20.301324729 +0400 +@@ -85,9 +85,7 @@ + #include "errorbar.h" + #include "utility.h" + #include "languagectrl.h" +-#include "statistics.h" + #include "welcomescreen.h" +-#include "wordpress.h" + #include "errors.h" + + #include <wx/listimpl.cpp> +@@ -1374,8 +1372,6 @@ + + void PoeditFrame::OnNewForWordpress(wxCommandEvent&) + { +- CHECK_LICENSE(Wordpress); +- + DoIfCanDiscardCurrentDoc([=]{ + NewForWordpress(); + }); +@@ -1466,73 +1462,6 @@ + void PoeditFrame::NewForWordpress() + { + // TODO: share code with NewFromPOT() +- +- wxDirDialog dirdlg(this, +- _("Select the folder with the WordPress theme or plugin"), +- "", +- wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST); +- if (dirdlg.ShowModal() != wxID_OK) +- return; +- +- try +- { +- std::unique_ptr<ProgressInfo> progress(new ProgressInfo(this, _("WordPress"))); +- progress->UpdateMessage(_("Analyzing WordPress code...")); +- +- auto wpInfo = WordpressInfo::Analyze(dirdlg.GetPath()); +- auto catalog = wpInfo.CreateCatalog(); +- +- delete m_catalog; +- m_catalog = catalog.release(); +- +- m_fileName = wpInfo.GetPOFilePath("LANG"); +- m_catalog->SetFileName(m_fileName); +- m_fileExistsOnDisk = false; +- m_modified = true; +- +- EnsureContentView(Content::PO); +- m_list->CatalogChanged(m_catalog); +- +- UpdateTitle(); +- UpdateMenu(); +- UpdateStatusBar(); +- InitSpellchecker(); +- +- progress.reset(); +- +- UpdateCatalog(); +- +- // Choose the language: +- wxWindowPtr<LanguageDialog> dlg(new LanguageDialog(this)); +- +- dlg->ShowWindowModalThenDo([=](int retcode){ +- if (retcode == wxID_OK) +- { +- Language lang = dlg->GetLang(); +- m_catalog->Header().Lang = lang; +- m_catalog->Header().SetHeaderNotEmpty("Plural-Forms", lang.DefaultPluralFormsExpr()); +- +- m_fileName = wpInfo.GetPOFilePath(lang.Code()); +- m_catalog->SetFileName(m_fileName); +- m_fileExistsOnDisk = false; +- m_modified = true; +- +- UpdateTitle(); +- UpdateMenu(); +- UpdateStatusBar(); +- RecreatePluralTextCtrls(); +- InitSpellchecker(); +- if (m_list) +- m_list->CatalogChanged(m_catalog); // refresh language column +- } +- }); +- } +- catch (const WordpressException& e) +- { +- WordpressErrorDialog dlg(this, e); +- dlg.ShowModal(); +- return; +- } + } + + +@@ -1728,10 +1657,6 @@ + + void PoeditFrame::OnStatistics(wxCommandEvent&) + { +- CHECK_LICENSE(Statistics); +- +- wxWindowPtr<wxDialog> dlg(new StatisticsWindow(this, *m_catalog)); +- dlg->ShowWindowModalThenDo([dlg](int){}); + } + + +diff -wbBur poedit-1.6.4/src/tm/tm_migrate.cpp poedit-1.6.4.my/src/tm/tm_migrate.cpp +--- poedit-1.6.4/src/tm/tm_migrate.cpp 2014-02-01 22:10:12.000000000 +0400 ++++ poedit-1.6.4.my/src/tm/tm_migrate.cpp 2014-02-13 14:15:57.734681082 +0400 +@@ -92,7 +92,7 @@ + return path.GetFullPath(); + #endif + #else +- return wxStandardPaths::Get().GetInstallPrefix() + "/libexec/poedit-dump-legacy-tm"; ++ return wxStandardPaths::Get().GetInstallPrefix() + "/lib/poedit/poedit-dump-legacy-tm"; + #endif + } + +diff -wbBur poedit-1.6.4/src/welcomescreen.cpp poedit-1.6.4.my/src/welcomescreen.cpp +--- poedit-1.6.4/src/welcomescreen.cpp 2014-02-07 22:03:55.000000000 +0400 ++++ poedit-1.6.4.my/src/welcomescreen.cpp 2014-02-13 14:48:36.421325233 +0400 +@@ -118,11 +118,10 @@ + #endif + + +-class UpgradeSizer : public wxBoxSizer, public LicenseObserver ++class UpgradeSizer : public wxBoxSizer + { + public: + UpgradeSizer(int orient) : wxBoxSizer(orient) {} +- virtual void OnLicenseEntered() { ShowItems(false); } + }; + + } // anonymous namespace +@@ -203,26 +202,6 @@ + + sizer->AddSpacer(20); + +- if (!HasLicense()) +- { +- auto upgradeSizer = new UpgradeSizer(wxHORIZONTAL); +- sizer->Add(upgradeSizer, wxSizerFlags().Align(wxALIGN_RIGHT).Border()); +- auto upgradeBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBanner"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro"); +- upgradeBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerHighlight")); +- upgradeBtn->SetToolTip(_("Upgrade to the Pro version of Poedit with more features.")); +- upgradeSizer->Add(upgradeBtn); +- auto upgradeInfoBtn = new wxBitmapButton(this, wxID_ANY, wxArtProvider::GetBitmap("UpgradeBannerInfo"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxDefaultValidator, "Upgrade to Pro Info"); +- upgradeInfoBtn->SetBitmapCurrent(wxArtProvider::GetBitmap("UpgradeBannerInfoHighlight")); +- upgradeSizer->Add(upgradeInfoBtn); +- +- upgradeBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){ +- PurchaseUpgrade(UpgradeSource::WelcomeScreen_Upgrade, /*certain=*/false, parent); +- }); +- upgradeInfoBtn->Bind(wxEVT_BUTTON, [=](wxCommandEvent&){ +- AskUserToUpgradeIfAppliable(UpgradeSource::WelcomeScreen_Info, parent); +- }); +- } +- + sizer->Add(new ActionButton( + this, wxID_OPEN, + _("Edit a translation"), diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 8c243711e..d6fe96e8e 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102271 2013-12-07 10:36:58Z bpiotrowski $ +# $Id: PKGBUILD 104126 2014-01-16 06:37:17Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> @@ -7,22 +7,22 @@ pkgname=pokerth _realname=PokerTH -pkgver=1.0.1 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Poker game written in C++/Qt4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" license=('GPL' 'custom') depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' - 'qt4' 'sdl_mixer' 'libircclient' 'tinyxml') + 'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2") -md5sums=('c6dcf0ed68ab50af91371348ffad5d00') +md5sums=('a7f76f95782099f966e5f2b6809f502a') build() { cd "$srcdir/$_realname-$pkgver-src" - qmake-qt4 "$pkgname.pro" + qmake-qt5 "$pkgname.pro" make } diff --git a/community/pokerth/gcrypt16.patch b/community/pokerth/gcrypt16.patch new file mode 100644 index 000000000..818feda09 --- /dev/null +++ b/community/pokerth/gcrypt16.patch @@ -0,0 +1,57 @@ +From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001 +From: lotodore <pokerth@lotharmay.de> +Date: Thu, 19 Dec 2013 12:28:35 +0100 +Subject: [PATCH] Fix for libgcrypt 1.6.0 compile error #247 (supported only on + Linux because libgcrypt does not yet support native Windows threads). + +--- + src/net/common/socket_startup.cpp | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/net/common/socket_startup.cpp b/src/net/common/socket_startup.cpp +index 12e8604..59ffc4f 100644 +--- a/src/net/common/socket_startup.cpp ++++ b/src/net/common/socket_startup.cpp +@@ -37,6 +37,10 @@ + + #ifndef HAVE_OPENSSL + ++// With libgcrypt 1.6.0, it is no longer supported to provide thread callbacks. ++// Use the default thread implementation instead, and cross fingers that it works with boost thread... ++#if GCRYPT_VERSION_NUMBER < 0x010600 ++ + extern "C" { + + int gcry_bthread_init() +@@ -64,12 +68,15 @@ + return 0; + } + +- struct gcry_thread_cbs gcry_threads_boost = { ++ static struct gcry_thread_cbs gcry_threads_boost = { + GCRY_THREAD_OPTION_USER, gcry_bthread_init, gcry_bmutex_init, + gcry_bmutex_destroy, gcry_bmutex_lock, gcry_bmutex_unlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL + }; + } ++ ++#endif // GCRYPT_VERSION_NUMBER < 0x010600 ++ + #endif // not HAVE_OPENSSL + + bool +@@ -78,8 +85,10 @@ + #ifdef HAVE_OPENSSL + return SSL_library_init() == 1; + #else +- gcry_check_version(NULL); ++#if GCRYPT_VERSION_NUMBER < 0x010600 + gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost); ++#endif ++ gcry_check_version(NULL); + gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0); + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); + return true; +-- +1.8.5.1 + diff --git a/community/ponymix/PKGBUILD b/community/ponymix/PKGBUILD new file mode 100644 index 000000000..49f988710 --- /dev/null +++ b/community/ponymix/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Dave Reisner <d@falconindy.com> +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +pkgname=ponymix +pkgver=2 +pkgrel=2 +pkgdesc="CLI PulseAudio Volume Control" +arch=('i686' 'x86_64') +url="http://github.com/falconindy/ponymix" +license=('MIT') +depends=('pulseaudio' 'libnotify') +source=("http://code.falconindy.com/archive/ponymix/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('9874c22dbba2805c870ae663331ca4ca' + 'SKIP') + +build() { + make -C "$srcdir/$pkgname-$pkgver" +} + +package() { + make -C "$srcdir/$pkgname-$pkgver" DESTDIR="$pkgdir" install +} + +# vim: ft=sh syn=sh et diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD index 82291a2e5..057403fcf 100644 --- a/community/portaudio/PKGBUILD +++ b/community/portaudio/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 99961 2013-10-31 02:42:36Z allan $ +# $Id: PKGBUILD 105110 2014-01-31 20:24:11Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> # Contributor: Bob Finch <w9ya@qrparci.net> pkgname=portaudio -pkgver=19_20111121 -pkgrel=3 +pkgver=19_20140130 +pkgrel=1 pkgdesc='A free, cross-platform, open source, audio I/O library.' arch=('i686' 'x86_64' 'mips64el') url='http://www.portaudio.com/' @@ -16,13 +16,13 @@ conflicts=('portaudio_cpp') provides=('portaudio_cpp') replaces=('portaudio_cpp') source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz") -md5sums=('25c85c1cc5e9e657486cbc299c6c035a') +md5sums=('7f220406902af9dca009668e198cbd23') build() { cd "$srcdir/$pkgname" ./configure --prefix=/usr --enable-cxx - make -j1 + make } package() { diff --git a/community/pdns-recursor/PKGBUILD b/community/powerdns-recursor/PKGBUILD index 876f44eef..34f6d8b28 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/powerdns-recursor/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 100036 2013-10-31 11:20:57Z arodseth $ +# $Id: PKGBUILD 100035 2013-10-31 11:20:48Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Jan Steffens <heftig@archlinux.org> -pkgname=pdns-recursor +pkgname=powerdns-recursor pkgver=3.5.3 -pkgrel=1 -pkgdesc='PowerDNS recursor' +pkgrel=2 +pkgdesc='Resolving DNS server' url='https://www.powerdns.com/' license=('GPL') arch=('x86_64' 'i686' 'mips64el') depends=('gcc-libs' 'lua51') makedepends=('boost') +replaces=('pdns-recursor') +provides=('pdns-recursor') +conflicts=('pdns-recursor') backup=('etc/powerdns/recursor.conf') -source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" +source=("http://downloads.powerdns.com/releases/pdns-recursor-$pkgver.tar.bz2" 'pdns-recursor.service') sha256sums=('192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa' - '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9') + 'd4f545e85dffa86bf23c89ff0f352c74ec3524dfc53871f129656299222e4fba') build() { - cd "$pkgname-$pkgver" - - make -j1 LUA=1 \ + make -C "pdns-recursor-$pkgver" -j1 LUA=1 \ LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \ LUA_LIBS_CONFIG="$(pkg-config --libs lua5.1)" } package() { - cd "$pkgname-$pkgver" + cd "pdns-recursor-$pkgver" make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install mv "$pkgdir/etc/powerdns/recursor.conf-dist" \ diff --git a/community/pdns-recursor/pdns-recursor.service b/community/powerdns-recursor/pdns-recursor.service index e8d23ccd0..0859889a6 100644 --- a/community/pdns-recursor/pdns-recursor.service +++ b/community/powerdns-recursor/pdns-recursor.service @@ -1,5 +1,5 @@ [Unit] -Description=PowerDNS recursing nameserver +Description=PowerDNS resolving DNS server After=network.target [Service] diff --git a/community/pdns/PKGBUILD b/community/powerdns/PKGBUILD index 6045d1a2b..842decd4c 100644 --- a/community/pdns/PKGBUILD +++ b/community/powerdns/PKGBUILD @@ -1,35 +1,37 @@ -# $Id: PKGBUILD 102266 2013-12-07 10:36:51Z bpiotrowski $ +# $Id: PKGBUILD 101429 2013-11-25 14:11:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> -pkgname=pdns -pkgver=3.3 -pkgrel=3 -pkgdesc='Modern, advanced and high performance authoritative-only nameserver' +pkgname=powerdns +pkgver=3.3.1 +pkgrel=1 +pkgdesc='Authoritative DNS server' arch=('x86_64' 'i686' 'mips64el') url='http://www.powerdns.com/' license=('GPL') -depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51') +depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua') makedepends=('boost') -provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') -replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') -conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +provides=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +replaces=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') +conflicts=('pdns' 'pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql') options=('!makeflags') backup=('etc/powerdns/pdns.conf') -source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz" +source=("http://downloads.powerdns.com/releases/pdns-$pkgver.tar.gz" 'pdns.service' 'pdns.conf') -sha256sums=('93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6' +sha256sums=('feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3' 'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040' 'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e') prepare() { - touch "$pkgname-$pkgver/AUTHORS" "$pkgname-$pkgver/NEWS" + cd "pdns-$pkgver" + + touch AUTHORS NEWS } build() { - cd "$pkgname-$pkgver" + cd "pdns-$pkgver" ./configure \ --prefix=/usr \ @@ -46,7 +48,7 @@ build() { } package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + make -C "pdns-$pkgver" DESTDIR="$pkgdir" install install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/" install -Dm644 "$srcdir/pdns.service" \ "$pkgdir/usr/lib/systemd/system/pdns.service" diff --git a/community/pdns/pdns.conf b/community/powerdns/pdns.conf index e71d7155c..e71d7155c 100644 --- a/community/pdns/pdns.conf +++ b/community/powerdns/pdns.conf diff --git a/community/pdns/pdns.service b/community/powerdns/pdns.service index b544ba73e..b544ba73e 100644 --- a/community/pdns/pdns.service +++ b/community/powerdns/pdns.service diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index c95f667e1..1e8f49b76 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101337 2013-11-22 22:20:43Z ttoepper $ +# $Id: PKGBUILD 104374 2014-01-19 16:29:38Z bpiotrowski $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: J0k3r <moebius282 e4a t gmail D0_T com> # Contributor: Alois Nespor <alois.nespor@gmail.com> @@ -6,7 +6,7 @@ pkgname=pragha pkgver=1.1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') url="http://pragha.wikispaces.com/" diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index c2557b7d1..ecc0580c6 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $ +# $Id: PKGBUILD 104598 2014-01-23 11:45:02Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.1 +pkgver=2.1.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' @@ -10,18 +10,18 @@ url='http://www.processing.org/' license=('GPL' 'LGPL') depends=('libgl' 'libxxf86vm') makedepends=('gendesk') -options=('!strip') # 'staticlibs') +options=('!strip') if [[ $CARCH == "x86_64" ]]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('e1799b9ec86633f4fd2c45905d6ac7897f14b1de4ea4913d7ad5b3b8956917d7' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('9b4db11ea9b7b16a4c2c36987a1fadb4971e36023a7fa3259d7763e068b17284' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi prepare() { diff --git a/community/prosody/ChangeLog b/community/prosody/ChangeLog deleted file mode 100644 index 45f3a05fd..000000000 --- a/community/prosody/ChangeLog +++ /dev/null @@ -1,398 +0,0 @@ -2009-11-23 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.6.0-1 for changeset 6c5b7e66bee4 - [d573d1d7a403] [tip] - - * .hgtags: - Removed tag v0.6.0-1 - [6c5b7e66bee4] [v0.6.0-1] - - * PKGBUILD: - Use correct package name and version - [1e65e6a877d3] - - * .hgtags: - Added tag v0.6.0-1 for changeset ad52fee15148 - [8196689dd4c4] - - * PKGBUILD, prosody.cfg.lua: - Included mod_compression in example configuration file - [ad52fee15148] - - * ChangeLog: - Updated ChangeLog - [34b6046aca14] - - * PKGBUILD: - Updated checksums - [3b4c28f28321] - - * PKGBUILD, prosody.cfg.lua: - New upstream version - [9d201755b63d] - -2009-10-22 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.6.0rc1-1 for changeset c0a99ab935a8 - [a0e2015435b6] - - * ChangeLog, PKGBUILD: - New upstream version - [c0a99ab935a8] [v0.6.0rc1-1] - - * PKGBUILD: - Removed conflicts - [0f0560190a81] - - * PKGBUILD: - Removed makedepends for gcc, the base-devel group is assumed to - exist - [4160ed469fa4] - - * PKGBUILD: - Fix typo in PKGBUILD - [85d988c7e4a5] - -2009-09-28 Dwayne Bent <dbb.0@liqd.org> - - * ChangeLog, PKGBUILD: - New upstream version - [3e4ffcdc887a] - -2009-07-29 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.5.1-1 for changeset 1be51884e580 - [74f32914279c] - - * ChangeLog, PKGBUILD: - New upstream version - [1be51884e580] [v0.5.1-1] - -2009-07-20 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Corrected tag name - [d9662df69ab4] - - * .hgtags: - Added tag v0.5.0 for changeset d228983b5873 - [a350368643eb] - - * PKGBUILD: - New upstream version - [d228983b5873] [v0.5.0-1] - - * ChangeLog: - Updated ChangeLog - [111cf16bfc8b] - -2009-07-14 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.5.0rc2-1 for changeset 701e6c5ed639 - [828bb0fc4e5e] - - * PKGBUILD: - New upstream version - [701e6c5ed639] [v0.5.0rc2-1] - - * ChangeLog: - Updated ChangeLog - [7616eaf8b835] - - * prosody.cfg.lua: - Enabled PEP in default configuration - [c8a7c4d15e38] - -2009-07-11 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Cleaned up and added new modules to default configuration file - [07fdc8fd8ff9] - - * PKGBUILD: - Added luasec back as hard dependency - [9506bff48c77] - - * .hgtags: - Added tag v0.5.0rc1-2 for changeset a252809a03a3 - [803ace20879a] - - * ChangeLog, PKGBUILD: - New release version - [a252809a03a3] [v0.5.0rc1-2] - - * PKGBUILD: - Added make before make install - - This should fix Prosody not correctly reporting version. - [881eca5b8e0e] - - * .hgtags: - Added tag v0.5.0rc1-1 for changeset f1d918d4779e - [1fc8dbc498d5] - - * ChangeLog: - New upstream version - [f1d918d4779e] [v0.5.0rc1-1] - - * PKGBUILD, prosody.rcd: - Redid indent alignment and silenced successful output of prosodyctl - [de9bdd756bd8] - - * PKGBUILD, prosody-datadir.diff: - Converted to prosody-devel package - [92e5e98529dd] - -2009-06-30 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD, prosody.cfg.lua: - Moved luasec from depends to optdepends - - Since luasec is not strictly required for Prosody to operate it is - now an optional dependency. - [7079ec87eef5] - -2009-06-27 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-4 for changeset 0345a59e8495 - [1e488e1c03eb] - - * PKGBUILD: - New release version - [0345a59e8495] [v0.4.2-4] - - * prosody.install: - Added note about ChangeLog to install script - [c683ef309b6a] - - * PKGBUILD, prosody.rcd: - Use prosodyctl to start/stop daemon - [eaf4c26bb29f] - - * PKGBUILD, prosody.rcd: - Refactored start, stop, reload in rc.d script - - Start, stop, reload will not display a friendly error message if - Prosody is not running when you attempt to stop or reload, or if - Prosody is already running when you attempt to start. Reload also - now utilizes the get_pid function. - [9873d5256a42] - - * PKGBUILD, prosody.logrotated: - Use explicit log filenames in logrotate script - - This fixes an issue where if you do not have olddir enabled, rotated - logs will be rotated again. - [38ea11efacb9] - -2009-06-22 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD, prosody.rcd: - Added status command to rc.d usage - [1b31e88d992d] - - * PKGBUILD, prosody.rcd: - Added reload command - [62e3cbdff1d5] - - * prosody.install: - Updated leftover olddir path - [e91b3fc2a9ee] - - * PKGBUILD, prosody.rcd: - Use explicit source command - [b790c098d519] - - * prosody.install: - Removed tab characters - [870316274137] - -2009-06-20 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD: - Updated md5 sums - [74ce2ab8a96b] - - * prosody.logrotated: - Changed default olddir path - [cef8226473c2] - - * prosody.rcd: - Removed sleep delay in restart - [a94167e59091] - -2009-06-10 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Removed per-host certificate entry in example configuration - - Until Issue #30 - [http://code.google.com/p/lxmppd/issues/detail?id=30] is fixed per- - host certificates have no effect. - [d00e35979450] - -2009-06-05 Dwayne Bent <dbb.0@liqd.org> - - * ChangeLog: - Added ChangeLog - [7298c4da135a] - -2009-06-03 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-3 for changeset 028183ffeba8 - [7dbfd040e908] - - * PKGBUILD: - New release version - [028183ffeba8] [v0.4.2-3] - - * PKGBUILD: - Removed superfluous make command - [3d96c98bac26] - - * PKGBUILD: - More consistent use of quote marks - [f6bd5b595b2d] - - * PKGBUILD, prosody.logrotated: - Correct PID file location in logrotate script - [cec60904c739] - -2009-05-30 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-2 for changeset 37268dd0d4fd - [a8a197635bb6] - - * PKGBUILD: - New release version - [37268dd0d4fd] [v0.4.2-2] - - * PKGBUILD: - Use install instead of mkdir in PKGBUILD - [8e48108bbe9a] - - * PKGBUILD, prosody-datadir.diff: - Apply patch to fix world-readable data directory - [2c706dda941c] - -2009-05-23 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-1 for changeset 1d29ea2dc519 - [e2d2962de3f7] - - * PKGBUILD: - New upstream release - [1d29ea2dc519] [v0.4.2-1] - - * prosody.cfg.lua: - Aesthetic changes to the configuration file - [d5d848a58965] - -2009-05-22 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Removed extraneous semicolon in configuration file - [9a002c74edc2] - - * PKGBUILD: - Cleaned up PKGBUILD license - [82cb66a84de8] - -2009-05-21 Dwayne Bent <dbb.0@liqd.org> - - * prosody.install: - Changed formatting of leftover path messages. - [ac6069de93c9] - - * prosody.install: - Moved prosody user removal to post_remove. - [2c60e27d0c13] - - * PKGBUILD, prosody.cfg.lua: - Added comment about pidfile in prosody configuration file. - [8b9fa4da48ca] - - * .hgtags: - Added tag v0.4.1-5 for changeset 69962178bcae - [01812099521b] - - * PKGBUILD: - New release version. - [69962178bcae] [v0.4.1-5] - - * PKGBUILD, prosody.cfg.lua, prosody.install, prosody.rcd: - Refactored rc.d daemon script. - - Prosody now writes its own PID file to /var/run/prosody/prosody.pid. - rc.d script now uses '/bin/kill -0' to check for running process - instead of awkward combination of 'ps' and 'awk'. - [4f0e937c5148] - - * prosody.install: - Added post_install message with link to Arch Wiki documentation. - [88d99267ad19] - -2009-05-19 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD: - Add logrotate script to backup array. - [d4f5445707f7] - -2009-05-11 Dwayne Bent <dbb.0@liqd.org> - - * prosody.install: - Fixed install script attempting to add prosody group when it already - exists. - [7d7807aa5d30] - - * .hgtags: - Added tag v0.4.1-4 for changeset 442f62077f30 - [389c885a35c5] - - * PKGBUILD: - New release version. - [442f62077f30] [v0.4.1-4] - - * PKGBUILD: - Generated correct checksums for source files. - [162859c9e287] - - * .hgtags: - Added tag v0.4.1-3 for changeset b629392e4716 - [f3d11fbd0b45] - - * PKGBUILD: - New release version. - [b629392e4716] [v0.4.1-3] - - * prosody.logrotated: - Fixed wrong PID file path in logrotate script. - [0871a4a12392] - -2009-05-07 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua, prosody.rcd: - Removed trailing whitespace. - [7c86c073650e] - - * prosody.cfg.lua: - Added logging timestamps to default configuration. - [46f9111d47ce] - - * .hgtags: - Added tag v0.4.1-2 for changeset 24b9dee19e65 - [5240b39d76d7] - - * PKGBUILD, prosody.cfg.lua, prosody.install, prosody.logrotated, - prosody.rcd: - Initial commit. - [24b9dee19e65] [v0.4.1-2] - diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 2ab0743cc..359b55a6b 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $ +# $Id: PKGBUILD 105722 2014-02-14 11:30:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb@dbb.io> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> # Contributor: Timothée Ravier <tim@siosm.fr> pkgname=prosody -pkgver=0.9.1 -pkgrel=1 +pkgver=0.9.3 +pkgrel=2 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua" arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" @@ -22,13 +22,7 @@ source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc} 'fix-config.patch' 'prosody.tmpfile.d' 'prosody.service') -sha256sums=('f0e5e5fa27aa3ffec326b6c212adf2d86fb438133739d45e1232082ff0fbe06f' - 'SKIP' - '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' - '1b461d860b584c09ba4c16300a245f2580f1d0b74d774ae7567b7aac0f249587' - '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4' - '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b') -sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5' +sha256sums=('22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0' 'SKIP' '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f' 'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da' @@ -38,8 +32,6 @@ sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5' prepare() { cd ${pkgname}-${pkgver} patch -p1 < ../fix-config.patch - find . -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \; } build() { @@ -47,7 +39,8 @@ build() { ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \ --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \ --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \ - --ldflags="${LDFLAGS} -shared" + --ldflags="${LDFLAGS} -shared" --no-example-certs \ + --runwith=lua5.1 make } @@ -56,7 +49,7 @@ package() { make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install -C tools/migration - install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody +# install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service @@ -65,7 +58,6 @@ package() { done install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING - install -dm 755 "${pkgdir}"/var/log/prosody rm "${pkgdir}"/etc/prosody/certs/* } diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install index a77801d7b..dbd78bb62 100644 --- a/community/prosody/prosody.install +++ b/community/prosody/prosody.install @@ -7,7 +7,7 @@ post_install() { fi chown prosody:prosody var/lib/prosody - chown prosody:prosody var/log/prosody + [ -d var/log/prosody ] && chown prosody:prosody var/log/prosody echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD index 00761c7a0..2ef614ef3 100644 --- a/community/pv/PKGBUILD +++ b/community/pv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98158 2013-10-06 19:15:22Z jlichtblau $ +# $Id: PKGBUILD 105108 2014-01-31 20:17:47Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=pv -pkgver=1.4.12 +pkgver=1.5.1 pkgrel=1 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml' license=('custom:Artistic 2.0') depends=('glibc') source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2") -md5sums=('605adc0f369496bca92b0656cf86b25e') +md5sums=('fb7ecf2f5a8d5562d618efd5d85cdf82') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD index 352ea5f1c..65a78d1a7 100644 --- a/community/pymol/PKGBUILD +++ b/community/pymol/PKGBUILD @@ -1,21 +1,38 @@ -# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com> +# $Id: PKGBUILD 105733 2014-02-14 15:40:11Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> # Contributor: graysky # Contributor: Tomasz Żok <tomasz dot zok at gmail dot com> pkgname=pymol -pkgver=1.6.0.0 +pkgver=1.7.0.0 pkgrel=2 -pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation" +pkgdesc="Molecular visualization system on an Open Source foundation" arch=('i686' 'x86_64') url="http://pymol.org/" license=('custom') -depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk') -source=("http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2") -md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d') +depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh') +makedepends=('desktop-file-utils' 'gendesk') +source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2" + "${pkgname}-38899.patch") +install="${pkgname}.install" +md5sums=('36fc735f6104e59802f109d0d25b6676' + '1f8152c4604ba2939b24e25a022937ca') prepare() { + # create desktop file + gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry" + # suppress non-zero exit code that breaks makepkg - sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}/setup.py" + sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py" + # change python to python2 + sed -i "s|python|python2|g" "${srcdir}/pymol/test/cyg" + sed -i "s|python|python2|g" "${srcdir}/pymol/test/run" + sed -i "s|python|python2|g" "${srcdir}/pymol/test/show" + sed -i "s|python|python2|g" "${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py" + + # fix FS#38899 + patch -p0 -i "${pkgname}-38899.patch" + mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb" } build() { @@ -25,18 +42,12 @@ build() { package() { cd "${srcdir}/${pkgname}" - python2 setup.py install --prefix="usr/" --root="${pkgdir}" - - sed -i "s|${pkgdir}||g" pymol - install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol" - - # change python to python2 - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show" - - install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + python2 setup.py install --prefix=/usr --root="${pkgdir}" + sed -i "s|"${pkgdir}"||g" pymol + install -Dm755 "pymol" "${pkgdir}/usr/bin/pymol" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/pymol.desktop" "${pkgdir}/usr/share/applications/pymol.desktop" + install -Dm644 "${srcdir}/pymol.png" "${pkgdir}/usr/share/pixmaps/pymol.png" } # vim:set ts=2 sw=2 et: diff --git a/community/pymol/pymol-38899.patch b/community/pymol/pymol-38899.patch new file mode 100644 index 000000000..8e4baf416 --- /dev/null +++ b/community/pymol/pymol-38899.patch @@ -0,0 +1,251 @@ +diff -ruN pymol.orig/modules/pymol/importing.py pymol/modules/pymol/importing.py +--- pymol.orig/modules/pymol/importing.py 2014-01-15 00:02:55.000000000 +0400 ++++ pymol/modules/pymol/importing.py 2014-02-14 10:19:11.275591741 +0400 +@@ -473,7 +473,7 @@ + def _processPWG(fname,_self=cmd): + r = DEFAULT_ERROR + try: +- from web.pymolhttpd import PymolHttpd ++ from pymolweb.pymolhttpd import PymolHttpd + browser_flag = 0 + launch_flag = 0 + report_url = None +diff -ruN pymol.orig/modules/web/examples/content/SOP.html pymol/modules/web/examples/content/SOP.html +--- pymol.orig/modules/web/examples/content/SOP.html 2014-01-15 00:02:58.000000000 +0400 ++++ pymol/modules/web/examples/content/SOP.html 2014-02-14 10:19:11.275591741 +0400 +@@ -49,7 +49,7 @@ + The first seven + <a href="../index.html#sample01" target="_blank"> sample applications</a> + are implemented like this, residing in folders at +-<code>$PYMOL_PATH/modules/web/examples/sample[0-7]</code> There ++<code>$PYMOL_PATH/modules/pymolweb/examples/sample[0-7]</code> There + may be future PyMOL web applications delivered with new versions of + PyMOL. Of course, you are free to write your own PyMOL web + applications and store them on each user's machine, or perhaps on a +diff -ruN pymol.orig/modules/web/examples/content/pwg.html pymol/modules/web/examples/content/pwg.html +--- pymol.orig/modules/web/examples/content/pwg.html 2014-01-15 00:02:58.000000000 +0400 ++++ pymol/modules/web/examples/content/pwg.html 2014-02-14 10:19:11.275591741 +0400 +@@ -58,13 +58,13 @@ + + <p>In contrast, the PWG file which launches the Sample 01 application is:</p> + <pre> +-root $PYMOL_PATH/modules/web/examples/sample01/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs + browser + </pre> + + <p>which tells PyMOL to (1) launch its internal web server on a + dynamically assigned port with a root content directory of +-$PYMOL_PATH/modules/web/examples/sample01/htdocs and (2) open ++$PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs and (2) open + up a local browser window pointing at that server instance. The + assumption in this scenario is that this newly-opened web page will be + responsible for sending requests to the PyMOL server (and thus, will +diff -ruN pymol.orig/modules/web/examples/content/running.html pymol/modules/web/examples/content/running.html +--- pymol.orig/modules/web/examples/content/running.html 2014-01-15 00:02:58.000000000 +0400 ++++ pymol/modules/web/examples/content/running.html 2014-02-14 10:19:11.278925074 +0400 +@@ -36,7 +36,7 @@ + + <p>The main index file with sample application links is located at</p> + +-<pre>./modules/web/examples/index.html</pre> ++<pre>./modules/pymolweb/examples/index.html</pre> + + <p>If you are reading this file from within a browser, then you may + <a href="../index.html">return to it now</a> in order to try the sample +@@ -55,7 +55,7 @@ + + <pre># from within the PyMOL folder + +-cd ./modules/web/examples ++cd ./modules/pymolweb/examples + + # then + +diff -ruN pymol.orig/modules/web/examples/content/server.html pymol/modules/web/examples/content/server.html +--- pymol.orig/modules/web/examples/content/server.html 2014-01-15 00:02:58.000000000 +0400 ++++ pymol/modules/web/examples/content/server.html 2014-02-14 10:19:11.278925074 +0400 +@@ -18,7 +18,7 @@ + browser window).</p> + + <p>The source code is located at +-<code>$PYMOL_PATH/modules/web/pymolhttpd.py</code>, ++<code>$PYMOL_PATH/modules/pymolweb/pymolhttpd.py</code>, + and this file serves as a python module that can be imported by any + python script running inside of PyMOL. </p> + +@@ -33,7 +33,7 @@ + <p>Alternatively, pymolhttpd.py can be used as the start-up script + when you launch PyMOL.</p> + +-<pre>pymol $PYMOL_PATH/modules/web/pymolhttpd.py</pre> ++<pre>pymol $PYMOL_PATH/modules/pymolweb/pymolhttpd.py</pre> + + <p>This will cause PyMOL to start serving requests on the default port + (8080, assuming of course that the port is not already claimed by +@@ -44,7 +44,7 @@ + <p> + The PyMOL web server module can be imported into and launched using code like this. + <pre> +-from web import pymolhttpd ++from pymolweb import pymolhttpd + httpd = pymolhttpd.PymolHttpd("htdocs", 8080) + httpd.start() + </pre> +diff -ruN pymol.orig/modules/web/examples/index.html pymol/modules/web/examples/index.html +--- pymol.orig/modules/web/examples/index.html 2014-01-15 00:02:58.000000000 +0400 ++++ pymol/modules/web/examples/index.html 2014-02-14 10:19:11.288925075 +0400 +@@ -156,7 +156,7 @@ + services interface!</p> + + <p>The code for the applications above is located inside a series of folders located at: +-<pre>$PYMOL_PATH/modules/web/examples/sample*</pre></p> ++<pre>$PYMOL_PATH/modules/pymolweb/examples/sample*</pre></p> + + </body> + </html> +diff -ruN pymol.orig/modules/web/examples/sample01/htdocs/api.html pymol/modules/web/examples/sample01/htdocs/api.html +--- pymol.orig/modules/web/examples/sample01/htdocs/api.html 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample01/htdocs/api.html 2014-02-14 10:19:11.288925075 +0400 +@@ -9,9 +9,9 @@ + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>load</b></font> +-<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<i>filename, object, state, format, finish, discrete, quiet, multiplex, zoom, partial</i><pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre> + + </p></li> + <li><p><font face="Courier" size="2"><b>enable</b></font> +@@ -38,7 +38,7 @@ + </p></li> + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>color</b></font> + <i>color, selection, quiet, flags</i><pre><a target="result" href="/apply/pymol.cmd.color?color=yellow&selection=elem c">/apply/pymol.cmd.color?color=yellow&selection=elem c</a></pre> +@@ -118,9 +118,9 @@ + </p></li> + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/map.ccp4</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/map.ccp4</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>isomesh</b></font> + <i>name, map, level, selection, buffer, state, carve, source_state, quiet</i><pre><a target="result" href="/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0">/apply/pymol.cmd.isomesh?name=mesh&map=map&level=1.0</a></pre> +@@ -142,7 +142,7 @@ + </p></li> + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>show</b></font> + <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show?representation=sticks">/apply/pymol.cmd.show?representation=sticks</a></pre> +@@ -174,7 +174,7 @@ + </p></li> + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>show_as</b></font> + <i>representation, selection</i><pre><a target="result" href="/apply/pymol.cmd.show_as?representation=spheres">/apply/pymol.cmd.show_as?representation=spheres</a></pre> +@@ -224,7 +224,7 @@ + </p></li> + </ul><hr><p>Please click the link(s) below before testing methods in this section (in order).</p><pre><a target="result" href="/apply/pymol.cmd.reinitialize">/apply/pymol.cmd.reinitialize</a></pre> + +-<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/web/examples/data/ref.pdb</a></pre> ++<pre><a target="result" href="/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb">/apply/pymol.cmd.load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/ref.pdb</a></pre> + + <ul><li><p><font face="Courier" size="2"><b>super</b></font> + <i>mobile, target, cutoff, cycles, gap, extend, max_gap, object, matrix, mobile_state, target_state, quiet, max_skip, transform, reset, seq, radius, scale, base, coord, expect, window, ante</i><pre><a target="result" href="/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/">/apply/pymol.cmd.create?name=helix1&selection=polymer and 5-17/</a></pre> +diff -ruN pymol.orig/modules/web/examples/sample01/start.pwg pymol/modules/web/examples/sample01/start.pwg +--- pymol.orig/modules/web/examples/sample01/start.pwg 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample01/start.pwg 2014-02-14 10:19:11.288925075 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample01/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample02/start.pwg pymol/modules/web/examples/sample02/start.pwg +--- pymol.orig/modules/web/examples/sample02/start.pwg 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample02/start.pwg 2014-02-14 10:19:11.292258408 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample02/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample02/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample03/start.pwg pymol/modules/web/examples/sample03/start.pwg +--- pymol.orig/modules/web/examples/sample03/start.pwg 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample03/start.pwg 2014-02-14 10:19:11.292258408 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample03/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample03/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js pymol/modules/web/examples/sample04/htdocs/pdbshow.js +--- pymol.orig/modules/web/examples/sample04/htdocs/pdbshow.js 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample04/htdocs/pdbshow.js 2014-02-14 10:19:11.292258408 +0400 +@@ -12,7 +12,7 @@ + function get_protein(a) { + // load protein, unless already loaded + if (load_state[a] == undefined) { +- load = "load?filename=$PYMOL_PATH/modules/web/examples/data/" + a + ".pdb.gz" + zoom; ++ load = "load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/" + a + ".pdb.gz" + zoom; + cmd(load); + zoom = "&zoom=0"; // subsequent loads shold not zoom + cmd("orient?selection=bymol organic and elem n&animate=2"); +diff -ruN pymol.orig/modules/web/examples/sample04/start.pwg pymol/modules/web/examples/sample04/start.pwg +--- pymol.orig/modules/web/examples/sample04/start.pwg 2014-01-15 00:02:56.000000000 +0400 ++++ pymol/modules/web/examples/sample04/start.pwg 2014-02-14 10:19:11.292258408 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample04/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample04/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample05/htdocs/index.html pymol/modules/web/examples/sample05/htdocs/index.html +--- pymol.orig/modules/web/examples/sample05/htdocs/index.html 2014-01-15 00:02:57.000000000 +0400 ++++ pymol/modules/web/examples/sample05/htdocs/index.html 2014-02-14 10:19:11.292258408 +0400 +@@ -108,7 +108,7 @@ + + function loadPDB(code) + { +- return cmd('load?filename=$PYMOL_PATH/modules/web/examples/data/'+code+'.pdb'); ++ return cmd('load?filename=$PYMOL_PATH/modules/pymolweb/examples/data/'+code+'.pdb'); + } + + </script> +diff -ruN pymol.orig/modules/web/examples/sample05/start.pwg pymol/modules/web/examples/sample05/start.pwg +--- pymol.orig/modules/web/examples/sample05/start.pwg 2014-01-15 00:02:57.000000000 +0400 ++++ pymol/modules/web/examples/sample05/start.pwg 2014-02-14 10:19:11.292258408 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample05/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample05/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample06/start.pwg pymol/modules/web/examples/sample06/start.pwg +--- pymol.orig/modules/web/examples/sample06/start.pwg 2014-01-15 00:02:57.000000000 +0400 ++++ pymol/modules/web/examples/sample06/start.pwg 2014-02-14 10:19:11.292258408 +0400 +@@ -1,3 +1,3 @@ +-root $PYMOL_PATH/modules/web/examples/sample06/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample06/htdocs + browser + logging 0 +diff -ruN pymol.orig/modules/web/examples/sample07/start.pwg pymol/modules/web/examples/sample07/start.pwg +--- pymol.orig/modules/web/examples/sample07/start.pwg 2014-01-15 00:02:57.000000000 +0400 ++++ pymol/modules/web/examples/sample07/start.pwg 2014-02-14 10:19:11.295591741 +0400 +@@ -1,2 +1,2 @@ +-root $PYMOL_PATH/modules/web/examples/sample07/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample07/htdocs + browser +diff -ruN pymol.orig/modules/web/examples/sample08/start.pwg pymol/modules/web/examples/sample08/start.pwg +--- pymol.orig/modules/web/examples/sample08/start.pwg 2014-01-15 00:02:57.000000000 +0400 ++++ pymol/modules/web/examples/sample08/start.pwg 2014-02-14 10:19:11.295591741 +0400 +@@ -1,3 +1,3 @@ +-root $PYMOL_PATH/modules/web/examples/sample08/htdocs ++root $PYMOL_PATH/modules/pymolweb/examples/sample08/htdocs + browser + logging 0
\ No newline at end of file diff --git a/community/pymol/pymol.install b/community/pymol/pymol.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/pymol/pymol.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/python-biopython/PKGBUILD b/community/python-biopython/PKGBUILD new file mode 100644 index 000000000..75d169a4e --- /dev/null +++ b/community/python-biopython/PKGBUILD @@ -0,0 +1,27 @@ +# $id$ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Stunts <f.pinamartins at gmail dot com> +# Contributor: damir <damir at archlinux dot org> + +pkgname=python-biopython +_upstream_pkgname=biopython +pkgver=1.63 +pkgrel=2 +pkgdesc="Freely available Python tools for computational molecular biology" +arch=('i686' 'x86_64') +url="http://www.biopython.org" +license=('custom') +depends=('python-numpy') +source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz) +md5sums=('09c58433150849b131d2d9bbfdf342d3') + +build() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python setup.py build +} + +package() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python setup.py install --root="${pkgdir}" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD index 74986cdc6..a7ec30bf1 100644 --- a/community/python-cx_freeze/PKGBUILD +++ b/community/python-cx_freeze/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $ +# $Id: PKGBUILD 103463 2014-01-06 11:40:32Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> @@ -7,7 +7,7 @@ pkgbase=python-cx_freeze pkgname=('python-cx_freeze' 'python2-cx_freeze') -pkgver=4.3.1 +pkgver=4.3.2 pkgrel=1 pkgdesc='Set of utilities for freezing Python scripts into executables' arch=('x86_64' 'i686' 'mips64el') @@ -15,13 +15,13 @@ url='http://cx-freeze.sourceforge.net/' license=('PSF') makedepends=('python' 'python2') source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz") -sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b') +sha256sums=('d634aae1e1d20b660d24245450b8a5ea3ad9c443cd735d8fbe17c1d93b8b23df') package_python-cx_freeze() { depends=('python') conflicts=('cx_freeze' 'python2-cx_freeze') - cd "$srcdir/cx_Freeze-$pkgver" + cd "cx_Freeze-$pkgver" python setup.py install --root "$pkgdir" --optimize 1 } @@ -30,8 +30,9 @@ package_python2-cx_freeze() { conflicts=('cx_freeze' 'python-cx_freeze') replaces=('cx_freeze') - cd "$srcdir/cx_Freeze-$pkgver" + cd "cx_Freeze-$pkgver" python2 setup.py install --root "$pkgdir" --optimize 1 + # Python 2 shebang fix find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \; } diff --git a/community/python-greenlet/PKGBUILD b/community/python-greenlet/PKGBUILD new file mode 100644 index 000000000..5d123cf72 --- /dev/null +++ b/community/python-greenlet/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 104937 2014-01-28 14:10:19Z fyan $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Ralf Schmitt <ralf@systemexit.de> + +pkgbase=python-greenlet +pkgname=(python-greenlet python2-greenlet) +pkgver=0.4.2 +pkgrel=2 +pkgdesc="Lightweight in-process concurrent programming" +license=("MIT") +url="http://pypi.python.org/pypi/greenlet" +makedepends=('python' 'python2') +source=("http://pypi.python.org/packages/source/g/greenlet/greenlet-${pkgver}.zip") +arch=('i686' 'x86_64') + +prepare() { + cp -r greenlet-$pkgver greenlet-$pkgver-py2 +} + +build() { + cd greenlet-$pkgver + python setup.py build + + cd ../greenlet-$pkgver-py2 + python2 setup.py build +} + +package_python-greenlet() { + depends=('python') + + cd greenlet-$pkgver + python setup.py install -O1 --root="$pkgdir" + install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" +} + +package_python2-greenlet() { + depends=('python2') + + cd greenlet-$pkgver-py2 + python2 setup.py install -O1 --root="$pkgdir" + install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" +} + +sha512sums=('9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992') diff --git a/community/python-levenshtein/PKGBUILD b/community/python-levenshtein/PKGBUILD new file mode 100644 index 000000000..f38df5c3f --- /dev/null +++ b/community/python-levenshtein/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 104954 2014-01-28 15:04:34Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas S Hatch <thatch45@gmail.com> +# Contributor: shamrok <szamrok@gmail.com> +# Contributor: scj <scj archlinux us> + +pkgbase=python-levenshtein +pkgname=(python-levenshtein python2-levenshtein) +pkgver=0.11.1 +pkgrel=2 +pkgdesc="Python extension for computing string edit distances and similarities" +url="http://pypi.python.org/pypi/python-Levenshtein/" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('python-setuptools' 'python2-setuptools') +source=("http://pypi.python.org/packages/source/p/python-Levenshtein/python-Levenshtein-$pkgver.tar.gz") + +prepare() { + cp -r python-Levenshtein-$pkgver python2-Levenshtein-$pkgver + + cd python-Levenshtein-$pkgver + sed -i "s|[)].read|, encoding='utf8').read|" setup.py +} + +package_python-levenshtein() { + depends=('python') + + cd python-Levenshtein-$pkgver + python setup.py build install -O1 --prefix=/usr --root="$pkgdir" +} + +package_python2-levenshtein() { + depends=('python2') + + cd python2-Levenshtein-$pkgver + python2 setup.py build install -O1 --prefix=/usr --root="$pkgdir" +} + +sha512sums=('335f29253ec7bba8d54881dfe093ac194626cdaad0cc6ed08327917d6187cdfe1fbb3d003744f991587f8dc800aa1d361e3aa0b276b31ecfe7a43d83ea0d660b') diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index 594f8c62b..9a3ebeb83 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98442 2013-10-10 15:29:19Z fyan $ +# $Id: PKGBUILD 104353 2014-01-19 04:17:18Z bgyorgy $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -7,7 +7,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64' 'mips64el') url='http://matplotlib.org' @@ -20,18 +20,23 @@ optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') -source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") +source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz" + "ffmpeg-2.0.patch") +sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40' + 'f76cde48aee9819f080bc34717c9cb6270f6dfac0490e7b19673ee665392be1837621aa858435f48595fa7d095e8efaee6737c87f9d42419499f5b8b8b001129') prepare() { cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 cd matplotlib-${pkgver} + patch -Np1 -i ../ffmpeg-2.0.patch for file in $(find . -name '*.py' -print); do sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} done cd ../matplotlib-${pkgver}-py3 + patch -Np1 -i ../ffmpeg-2.0.patch for file in $(find . -name '*.py' -print); do sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file} @@ -65,4 +70,3 @@ package_python-matplotlib() { install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib } -sha512sums=('04877aa15b6d52a6f813e8377098d13c432f66ae2522c544575440180944c9b73a2164ae63edd3a0eff807883bf7b39cd55f28454ccee8c76146567ff4a6fd40') diff --git a/community/python-matplotlib/ffmpeg-2.0.patch b/community/python-matplotlib/ffmpeg-2.0.patch new file mode 100644 index 000000000..e9c12e911 --- /dev/null +++ b/community/python-matplotlib/ffmpeg-2.0.patch @@ -0,0 +1,98 @@ +From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001 +From: Vlad Seghete <vlad.seghete@gmail.com> +Date: Mon, 25 Nov 2013 13:35:57 -0600 +Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility + between bbox options and animation backends + +--- + lib/matplotlib/animation.py | 8 ++++---- + matplotlibrc.template | 4 ++++ + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py +index 295d60d..9078c5d 100644 +--- a/lib/matplotlib/animation.py ++++ b/lib/matplotlib/animation.py +@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase): + def _args(self): + # Returns the command line parameters for subprocess to use + # ffmpeg to create a movie using a collection of temp images +- return [self.bin_path(), '-vframes', str(self._frame_counter), +- '-r', str(self.fps), '-i', +- self._base_temp_name()] + self.output_args ++ return [self.bin_path(), '-i', self._base_temp_name()-vframes, ++ '-vframes', str(self._frame_counter), ++ '-r', str(self.fps), ] + self.output_args + + + # Base class of avconv information. AVConv has identical arguments to +diff --git a/matplotlibrc.template b/matplotlibrc.template +index 473d624..e4d3593 100644 +--- a/matplotlibrc.template ++++ b/matplotlibrc.template +@@ -380,6 +380,10 @@ backend : %(backend)s + #savefig.edgecolor : white # figure edgecolor when saving + #savefig.format : png # png, ps, pdf, svg + #savefig.bbox : standard # 'tight' or 'standard'. ++ # 'tight' is incompatible with pipe-based animation ++ # backends but will workd with temporary file based ones: ++ # e.g. setting animation.writer to ffmpeg will not work, ++ # use ffmpeg_file instead + #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to 'tight' + #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality parameter. + #savefig.directory : ~ # default directory in savefig dialog box, +-- +1.8.5.1 + + +From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001 +From: Vlad Seghete <vlad.seghete@gmail.com> +Date: Mon, 25 Nov 2013 13:52:53 -0600 +Subject: [PATCH 2/3] fixed a typo + +--- + lib/matplotlib/animation.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py +index 9078c5d..07c6d27 100644 +--- a/lib/matplotlib/animation.py ++++ b/lib/matplotlib/animation.py +@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase): + def _args(self): + # Returns the command line parameters for subprocess to use + # ffmpeg to create a movie using a collection of temp images +- return [self.bin_path(), '-i', self._base_temp_name()-vframes, ++ return [self.bin_path(), '-i', self._base_temp_name(), + '-vframes', str(self._frame_counter), + '-r', str(self.fps), ] + self.output_args + +-- +1.8.5.1 + + +From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001 +From: Vlad Seghete <vlad.seghete@gmail.com> +Date: Mon, 25 Nov 2013 14:17:54 -0600 +Subject: [PATCH 3/3] fixed another typo + +--- + lib/matplotlib/animation.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py +index 07c6d27..9854ca2 100644 +--- a/lib/matplotlib/animation.py ++++ b/lib/matplotlib/animation.py +@@ -401,7 +401,7 @@ def _args(self): + # ffmpeg to create a movie using a collection of temp images + return [self.bin_path(), '-i', self._base_temp_name(), + '-vframes', str(self._frame_counter), +- '-r', str(self.fps), ] + self.output_args ++ '-r', str(self.fps)] + self.output_args + + + # Base class of avconv information. AVConv has identical arguments to +-- +1.8.5.1 + diff --git a/community/python-msgpack/PKGBUILD b/community/python-msgpack/PKGBUILD new file mode 100644 index 000000000..486ea8c28 --- /dev/null +++ b/community/python-msgpack/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 105444 2014-02-08 02:18:28Z seblu $ +# Maintainer: Sébastien "Seblu" Luttringer + +pkgbase=python-msgpack +pkgname=('python-msgpack' 'python2-msgpack') +pkgver=0.4.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='https://github.com/msgpack/msgpack-python' +license=('Apache') +makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute') +checkdepends=('python-pytest' 'python2-pytest' 'python-six' 'python2-six') +source=("http://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-$pkgver.tar.gz") +md5sums=('8b9ce43619fd1428bf7baddf57e38d1a') + +build() { + cd msgpack-python-$pkgver + python setup.py build --build-lib=build/python + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +check() { + cd msgpack-python-$pkgver + msg2 'python' + PYTHONPATH=$PWD/build/python py.test test + msg2 'python2' + PYTHONPATH=$PWD/build/python2 py.test2 test +} + +package_python-msgpack() { + pkgdesc='MessagePack serializer implementation for Python' + depends=('python') + + cd msgpack-python-$pkgver + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 +} + +package_python2-msgpack() { + pkgdesc='MessagePack serializer implementation for Python2' + depends=('python2') + + cd msgpack-python-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD index d381c2e8a..8c4c74de0 100644 --- a/community/python-numexpr/PKGBUILD +++ b/community/python-numexpr/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96812 2013-09-05 18:53:58Z aginiewicz $ +# $Id: PKGBUILD 104927 2014-01-28 11:43:36Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@lblbox> pkgbase=python-numexpr pkgname=('python2-numexpr' 'python-numexpr') -pkgver=2.2 +pkgver=2.3 pkgrel=1 -pkgdesc="A JIT compiler for Python expressions" -url="http://code.google.com/p/numexpr/" +pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas" +url="https://github.com/pydata/numexpr" arch=('i686' 'x86_64' 'mips64el') license=('MIT') makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy') -source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) -md5sums=('1d83b13e69fff897a5bc588b7119506c') +source=(https://github.com/pydata/numexpr/archive/$pkgver.tar.gz) +md5sums=('fc9b5765c8ceda4a4c2e974e565b98cf') build() { cd "$srcdir" diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD index 436125772..756956683 100644 --- a/community/python-pillow/PKGBUILD +++ b/community/python-pillow/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102812 2013-12-21 01:57:46Z kkeen $ +# $Id: PKGBUILD 105239 2014-02-03 10:02:23Z heftig $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: minder pkgbase=python-pillow pkgname=(python-pillow python2-pillow) -pkgver=2.2.2 -pkgrel=1 +pkgver=2.3.0 +pkgrel=3 _appname=Pillow _py2basever=2.7 _py3basever=3.3m @@ -15,7 +15,7 @@ url="http://python-imaging.github.io/" license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip") -md5sums=('6a76a16f6db45744ff2e9327bf0608b4') +md5sums=('56b6614499aacb7d6b5983c4914daea7') build() { cd "$srcdir" diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index bd9db9a8b..f215da072 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $ +# $Id: PKGBUILD 103604 2014-01-08 10:35:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) -md5sums=('1b433f83d50d1bc61e09026e906d84c7') +md5sums=('53d81793fbab8fee6e732a0425d50047') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/community/python-pybluez/PKGBUILD b/community/python-pybluez/PKGBUILD new file mode 100644 index 000000000..1dc7b5535 --- /dev/null +++ b/community/python-pybluez/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: cs-cam - me.at.camdaniel.com + +pkgbase=python-pybluez +pkgname=(python-pybluez python2-pybluez) +pkgver=0.20 +pkgrel=1 +pkgdesc="Python wrapper for the BlueZ Bluetooth stack" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybluez/" +license=('GPL') +makedepends=('python' 'python2' 'bluez-libs') +source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.zip) +md5sums=('1e7fad332d50f089bbce69070c877ef6') + +package_python-pybluez() { + depends=('python' 'bluez-libs') + + cd $srcdir/PyBluez-$pkgver + python setup.py install --root=$pkgdir +# ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python3.3/site-packages/_bluetooth.so +} + +package_python2-pybluez() { + depends=('python2' 'bluez-libs') + + cd $srcdir/PyBluez-$pkgver + python2 setup.py install --root=$pkgdir +# ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so +} diff --git a/community/python-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD index 874445d6f..193f1b1e1 100644 --- a/community/python-pybox2d/PKGBUILD +++ b/community/python-pybox2d/PKGBUILD @@ -1,25 +1,35 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgname=python-pybox2d +# $Id: PKGBUILD 104878 2014-01-28 00:06:26Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgbase=python-pybox2d +pkgname=('python2-pybox2d') pkgver=370 pkgrel=1 -pkgdesc="Python wrapper for Box2D" arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/pybox2d" +url='http://code.google.com/p/pybox2d' license=('GPL') -depends=('python' 'swig') -makedepends=('subversion') -source=("svn+http://pybox2d.googlecode.com/svn/trunk/") +makedepends=('subversion' 'python2' 'swig') +source=("$pkgbase::svn+http://pybox2d.googlecode.com/svn/trunk/") md5sums=('SKIP') build() { - cd ${srcdir}/trunk + cd "$pkgbase" - python setup.py build + python2 setup.py build } -package() { - cd ${srcdir}/trunk +package_python2-pybox2d() { + depends=('python2') + pkgdesc='Python wrapper for Box2D' + + cd "$pkgbase" - python setup.py install --root=${pkgdir} + python2 setup.py install --root="$pkgdir" --optimize=1 + + # Fixes the warning about a missing dependency on python + sed -i 's:python:python2:g' \ + "$pkgdir/usr/lib/python2.7/site-packages/Box2D/__init__.py" } + # vim: sw=2 ts=2 et: diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD index 748012d7b..35f81c8cc 100644 --- a/community/python-pygit2/PKGBUILD +++ b/community/python-pygit2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98636 2013-10-15 23:04:31Z thestinger $ +# $Id: PKGBUILD 104863 2014-01-27 17:34:04Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> pkgbase=python-pygit2 pkgname=(python-pygit2 python2-pygit2) -pkgver=0.19.1 +pkgver=0.20.0 pkgrel=1 pkgdesc='Python bindings for libgit2' url="https://github.com/libgit2/pygit2" @@ -12,7 +12,7 @@ makedepends=(python python2) arch=(i686 x86_64 mips64el) license=('GPL2') source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz) -md5sums=('98a98d8052a4066ab48b74ebd05c90e1') +md5sums=('3b8cba0ad69bcb2e1aa73d325dcdf53b') package_python-pygit2() { cd "$srcdir/pygit2-$pkgver" diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD index 07f720db3..fbe922ea5 100644 --- a/community/python-pyopencl/PKGBUILD +++ b/community/python-pyopencl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102275 2013-12-07 10:37:03Z bpiotrowski $ +# $Id: PKGBUILD 105755 2014-02-15 13:12:50Z jelle $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyopencl pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') pkgver=2013.2 -pkgrel=2 +pkgrel=3 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" @@ -39,7 +39,7 @@ check(){ } package_python-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers') + depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers' 'python-setuptools') cd "${srcdir}/pyopencl-${pkgver}" python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build @@ -50,7 +50,7 @@ package_python-pyopencl() { } package_python2-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers') + depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers' 'python2-setuptools') cd "${srcdir}/pyopencl-${pkgver}-python2" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD index 9831e3438..fc5876a12 100644 --- a/community/python-pytables/PKGBUILD +++ b/community/python-pytables/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 98817 2013-10-19 13:44:44Z bpiotrowski $ +# $Id: PKGBUILD 105425 2014-02-07 11:53:10Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@cern.ch> pkgbase=python-pytables pkgname=('python2-pytables' 'python-pytables') -pkgver=3.0.0 -pkgrel=4 +pkgver=3.1.0 +pkgrel=1 arch=("i686" "x86_64" "mips64el") pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" license=("BSD") makedepends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2' 'python-numexpr' 'cython') source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz") -md5sums=('9c8a18d51be5e94a2ae50ea31d26f8c2') +md5sums=('22e048ef20883269c4a2a3f2026c38ee') build() { cd "$srcdir" diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 9dc109822..260ef4096 100644 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.13.2 +pkgver=0.13.3 pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') @@ -15,6 +15,7 @@ license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools') checkdepends=('python-nose' 'python2-nose') source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz") +md5sums=('0547c1f8e8afad4009cc9b5ef17a2d4d') build() { # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) @@ -80,4 +81,3 @@ package_python2-scipy() { } # vim:set ts=2 sw=2 et: -md5sums=('fcd110802b0bf3505ba567cf831566e1') diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD index 5ac12532a..ce91e686d 100644 --- a/community/python-simplejson/PKGBUILD +++ b/community/python-simplejson/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95625 2013-08-15 08:14:50Z arodseth $ +# $Id: PKGBUILD 105342 2014-02-05 15:26:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,20 +6,20 @@ pkgbase=python-simplejson pkgname=("$pkgbase" 'python2-simplejson') -pkgver=3.3.0 +pkgver=3.3.2 pkgrel=1 pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python' license=('MIT') arch=('i686' 'x86_64' 'mips64el') url='http://undefined.org/python/#simplejson' -makedepends=('python' 'python2-distribute') +makedepends=('python-setuptools' 'python2-setuptools') source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}") -sha256sums=('ed7e700a9b689f81e54738d796ce456eca12481412f198d44d42f69d8d6f9a82') +sha256sums=('ecff7508cb34547de611c5b367ad1ff74290f638f29853be5801823e1565592c') package_python-simplejson() { depends=('python') - cd "$srcdir/simplejson-simplejson-"* + cd "simplejson-simplejson-"* python setup.py install --root="$pkgdir" install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -28,7 +28,7 @@ package_python-simplejson() { package_python2-simplejson() { depends=('python2') - cd "$srcdir/simplejson-simplejson-"* + cd "simplejson-simplejson-"* python2 setup.py install --root="$pkgdir" install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/community/python-simplejson/python-simplejson.changelog b/community/python-simplejson/python-simplejson.changelog deleted file mode 100644 index c1e227d24..000000000 --- a/community/python-simplejson/python-simplejson.changelog +++ /dev/null @@ -1,20 +0,0 @@ -2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.6.1-1 - -2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.5.2-1 - -2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.3.3-1 - -2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.2.1-1 - -2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.1.3-1 - -2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.1.1 - -2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.1.0 diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index 1bb3b9f72..32e2c6fa7 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 105348 2014-02-05 18:51:35Z angvp $ # 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.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') # 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=('c36a958e46a8514583be82523785269d') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver @@ -31,6 +31,7 @@ check() { package_python-sqlalchemy() { pkgdesc='Python SQL toolkit and Object Relational Mapper' depends=('python') + optdepends=('python-psycopg2: connect to PostgreSQL database') cd SQLAlchemy-${pkgver} python setup.py install --root="${pkgdir}" @@ -41,6 +42,7 @@ package_python-sqlalchemy() { package_python2-sqlalchemy() { pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' depends=('python2') + optdepends=('python2-psycopg2: connect to PostgreSQL database') cd SQLAlchemy2-$pkgver python2 setup.py install --root="$pkgdir" diff --git a/community/python-tornado/PKGBUILD b/community/python-tornado/PKGBUILD new file mode 100644 index 000000000..42c463e58 --- /dev/null +++ b/community/python-tornado/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 104290 2014-01-17 07:31:27Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > + +pkgname=('python-tornado' 'python2-tornado') +pkgver=3.2.0 +pkgrel=1 +pkgdesc='open source version of the scalable, non-blocking web server and tools' +arch=('i686' 'x86_64') +url='http://www.tornadoweb.org/' +license=('Apache') +makedepends=('python-setuptools' 'python2-setuptools' 'python2-backports.ssl_match_hostname') +source=("https://github.com/facebook/tornado/archive/v${pkgver}.tar.gz") + +build() { + cd "$srcdir" + cp -r tornado-${pkgver} python2-tornado-${pkgver} + + cd tornado-${pkgver} + + python setup.py build + + cd ../python2-tornado-${pkgver} + + # python -> python2 rename + find -name '*py' -exec sed -e 's_#!/usr/bin/env python_&2_' -i {} \; + + python2 setup.py build +} + +package_python-tornado() { + depends=('python') + + cd "$srcdir/tornado-${pkgver}" + + python setup.py install --root="${pkgdir}" --optimize=1 +} + +package_python2-tornado() { + depends=('python2' 'python2-backports.ssl_match_hostname') + + cd "$srcdir/python2-tornado-${pkgver}" + + python2 setup.py install --root="${pkgdir}" --optimize=1 +} + +sha512sums=('1703178be34060a6c36e9e0aa742b87ad905dfb0f565e43a1158edfe5c7800fe35aff9168b60aabd3b831b339af6ef95aaa144a9fb167c5d93f548eb59fc2557') diff --git a/community/python2-biopython/PKGBUILD b/community/python2-biopython/PKGBUILD new file mode 100644 index 000000000..c22385574 --- /dev/null +++ b/community/python2-biopython/PKGBUILD @@ -0,0 +1,48 @@ +# $id$ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: Stunts <f.pinamartins at gmail dot com> +# Contributor: damir <damir at archlinux dot org> + +pkgname=python2-biopython +_upstream_pkgname=biopython +pkgver=1.63 +pkgrel=2 +pkgdesc="Freely available Python tools for computational molecular biology" +arch=('i686' 'x86_64') +url="http://www.biopython.org" +license=('custom') +depends=('python2-numpy') +optdepends=('python2-reportlab: for pdf graphics code' + 'mysql-python: for BioSQL module') +source=(http://www.biopython.org/DIST/${_upstream_pkgname}-${pkgver}.tar.gz) +md5sums=('09c58433150849b131d2d9bbfdf342d3') + +prepare() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + # change python to python2 + sed -i "s|python|python2|g" "Bio/bgzf.py" + sed -i "s|python|python2|g" "Bio/DocSQL.py" + sed -i "s|python|python2|g" "Bio/kNN.py" + sed -i "s|python|python2|g" "Bio/LogisticRegression.py" + sed -i "s|python|python2|g" "Bio/PDB/parse_pdb_header.py" + sed -i "s|python|python2|g" "Bio/PDB/PDBList.py" + sed -i "s|python|python2|g" "Bio/Restriction/__init__.py" + sed -i "s|python|python2|g" "Bio/Restriction/PrintFormat.py" + sed -i "s|python|python2|g" "Bio/Restriction/Restriction.py" + sed -i "s|python|python2|g" "Bio/SeqUtils/__init__.py" + sed -i "s|python|python2|g" "Bio/UniProt/GOA.py" + sed -i "s|python|python2|g" "Bio/Wise/__init__.py" + sed -i "s|python|python2|g" "Bio/Wise/dnal.py" + sed -i "s|python|python2|g" "Bio/Wise/psw.py" +} + +build() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python2 setup.py build +} + +package() { + cd "${srcdir}/${_upstream_pkgname}-${pkgver}/" + python2 setup.py install --root="${pkgdir}" + install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-caja/PKGBUILD b/community/python2-caja/PKGBUILD new file mode 100644 index 000000000..85ad37a62 --- /dev/null +++ b/community/python2-caja/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 104310 2014-01-17 11:54:21Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Xpander <xpander0@gmail.com> + +pkgname=python2-caja +_pkgname=python-caja +pkgver=1.6.1 +pkgrel=1 +pkgdesc="Python binding for Caja, to allow Caja property page and menu item extensions to be written in Python." +url="http://mate-desktop.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('mate-file-manager' 'python2' 'python2-gobject') +makedepends=('mate-common') +options=('!emptydirs') +replaces=('python-caja') +provides=('python-caja') +source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz") +sha1sums=('44c39d62c977b06e9a8f37cfdbd81c2f6eb10ff5') + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + sed -i 's/python-config/python2-config/' configure +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/python2-exiv2/PKGBUILD b/community/python2-exiv2/PKGBUILD new file mode 100644 index 000000000..77e5caeb2 --- /dev/null +++ b/community/python2-exiv2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 104803 2014-01-26 12:17:41Z andyrtr $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Archie <xMickael@ifrance.com> +# Contributor: Byron Clark <byron@theclarkfamily.name> + +_pkgname=pyexiv2 +pkgname=python2-exiv2 +pkgver=0.3.2 +pkgrel=3 +pkgdesc="pyexiv2 is a Python binding to exiv2, the C++ library for manipulation of EXIF, IPTC and XMP image metadata." +url="http://tilloy.net/dev/pyexiv2" +arch=('i686' 'x86_64') +depends=('python2' 'boost-libs' 'exiv2') +makedepends=('scons' 'boost') +replaces=('pyexiv2') +conflicts=('pyexiv2') +provides=('pyexiv2') +license=('GPL') +source=("http://launchpad.net/${_pkgname}/0.3.x/${pkgver}/+download/${_pkgname}-${pkgver}.tar.bz2") +md5sums=('9c0377ca4cf7d5ceeee994af0b5536ae') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + scons +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + scons DESTDIR="${pkgdir}" install +} diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD index adce49d24..fdc763e87 100644 --- a/community/python2-gnutls/PKGBUILD +++ b/community/python2-gnutls/PKGBUILD @@ -5,7 +5,7 @@ pkgname=python2-gnutls pkgver=1.2.5 -pkgrel=3 +pkgrel=4 pkgdesc="Python wrapper for the GNUTLS library" arch=('i686' 'x86_64' 'mips64el') url="http://cheeseshop.python.org/pypi/python-gnutls" @@ -15,7 +15,7 @@ source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${p libraryinit.patch libraryfunctions.patch) md5sums=('a398a75b1f366857cf2628cf4d62dd34' - '28227b8626e8a7df81cf3b7dae88bd80' + '2ac537f816225bc324a9e0529774df48' '9907d3a446fdc3b33a70e57925d67298') build() { diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch index 5f987b513..5a82bbcf8 100644 --- a/community/python2-gnutls/libraryinit.patch +++ b/community/python2-gnutls/libraryinit.patch @@ -5,7 +5,7 @@ gcry_control = libgcrypt.gcry_control else: - gcry_control = libgnutls.gcry_control -+ libgcrypt = load_library(name='gcrypt', version=11) ++ libgcrypt = load_library(name='gcrypt', version=20) + gcry_control = libgcrypt.gcry_control gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD deleted file mode 100644 index ea9605f52..000000000 --- a/community/python2-greenlet/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: Ralf Schmitt <ralf@systemexit.de> - -pkgname=python2-greenlet -pkgver=0.4.1 -pkgrel=1 -pkgdesc="python coroutine library" -license=("MIT") -url="http://pypi.python.org/pypi/greenlet" -depends=('python2') -source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip) -arch=('i686' 'x86_64') - -build() { - cd "$srcdir/greenlet-$pkgver" - python2 setup.py build -} - -package() { - cd "$srcdir/greenlet-$pkgver" - python2 setup.py install --root="$pkgdir" - install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" -} - -sha512sums=('bb33db07b8b86ba8ccec920748cfc207d27eed0b76218cf06c3b1706a1e9350be62a99a92e05c8e683a7c3ab1e232dbb46259380c7e5f2c6b140a3a96a36f8bf') diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD deleted file mode 100644 index 965f3f130..000000000 --- a/community/python2-imaging/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 83335 2013-01-29 19:26:55Z kkeen $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: simo <simo@archlinux.org> - -pkgname=python2-imaging -pkgver=1.1.7 -pkgrel=8 -pkgdesc="PIL. Provides image processing capabilities for python" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.pythonware.com/products/pil/index.htm" -license=('custom:"pil"') -depends=('python2' 'libjpeg' 'freetype2' 'lcms') -makedepends=('tk' 'sane') -optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module') -provides=("pil=${pkgver}" "python-imaging=${pkgver}") -conflicts=('pil' 'python-imaging') -replaces=('pil' 'python-imaging') -source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) -md5sums=('fc14a54e1ce02a0225be8854bfba478e') - -build() { - cd "${srcdir}/Imaging-${pkgver}" - - # FS#33452 - export CFLAGS="$CFLAGS -fno-strict-aliasing" - - python2 setup.py build_ext - cd Sane - python2 setup.py build_ext -} - -package() { - cd "${srcdir}/Imaging-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - - pushd Sane - python2 setup.py install --root="${pkgdir}" --optimize=1 - popd - - install -dm755 "${pkgdir}/usr/include/python2.7/" - install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h - - # do not have files ending in .py in /usr/bin - for f in pildriver pilprint pilconvert pilfile pilfont; do - mv "${pkgdir}"/usr/bin/${f}{.py,} - done - - # Install license - install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \ - "${pkgdir}/usr/share/licenses/${pkgname}/README" -} diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD index 5d64c807b..e2801f4a7 100644 --- a/community/python2-ldap/PKGBUILD +++ b/community/python2-ldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93180 2013-06-27 12:10:25Z spupykin $ +# $Id: PKGBUILD 105333 2014-02-05 12:43:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org> pkgname=python2-ldap -pkgver=2.4.13 +pkgver=2.4.14 pkgrel=1 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('python2' 'libldap>=2.4.26') makedepends=('chrpath') replaces=('python-ldap') source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz) -md5sums=('74b7b50267761540451eade44b2049ee') +md5sums=('15eb167403b3706fe2e40db751117c28') build() { cd $srcdir/python-ldap-$pkgver diff --git a/community/python2-m2crypto/LICENSE b/community/python2-m2crypto/LICENSE new file mode 100644 index 000000000..d2f636fdd --- /dev/null +++ b/community/python2-m2crypto/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved. + +Portions copyright (c) 2004-2006 Open Source Applications Foundation. +All rights reserved. + +Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. +All rights reserved. + +Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD index 3a744e587..183e4ebfb 100644 --- a/community/python2-m2crypto/PKGBUILD +++ b/community/python2-m2crypto/PKGBUILD @@ -4,16 +4,18 @@ # Contributor: William Rea <sillywilly@gmail.com> pkgname=python2-m2crypto -pkgver=0.21.1 -pkgrel=2 +pkgver=0.22.3 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') +makedepends=('swig' 'python2-setuptools') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" + "LICENSE") +md5sums=('573f21aaac7d5c9549798e72ffcefedd' + 'b0e1f0b7d0ce8a62c18b1287b991800e') build() { cd "${srcdir}/M2Crypto-${pkgver}" @@ -23,5 +25,5 @@ build() { package() { cd "${srcdir}/M2Crypto-${pkgver}" python2 setup.py install --root="${pkgdir}/" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/python-pmw/LICENSE.txt b/community/python2-pmw/LICENSE.txt index de9a58260..de9a58260 100644 --- a/community/python-pmw/LICENSE.txt +++ b/community/python2-pmw/LICENSE.txt diff --git a/community/python-pmw/PKGBUILD b/community/python2-pmw/PKGBUILD index dd43ef0b5..739d1cfd3 100644 --- a/community/python-pmw/PKGBUILD +++ b/community/python2-pmw/PKGBUILD @@ -1,11 +1,12 @@ -# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com> -# Contributor: kfgz <kfgz at interia pl> +# $Id: PKGBUILD 105149 2014-02-01 19:59:28Z arcanis $ +# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> +# Contributor: kfgz <kfgz at interia dot pl> # Contributor: Michael Krauss <hippodriver at gmx dot net> # Contributor: dsa -pkgname=python-pmw +pkgname=python2-pmw pkgver=1.3.3b -pkgrel=2 +pkgrel=1 pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module" arch=('i686' 'x86_64') url="http://pmw.sourceforge.net/doc/index.html" @@ -16,16 +17,21 @@ source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/P md5sums=('d8b998b921584db32a5eeeddc6bc606c' '28b047a148c1780eddcf4bed6b150123') -package() { +prepare() { + # change python to python2 + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/ManualTests.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/demos/All.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/tests/All.py" + sed -i "s|python|python2|g" "${srcdir}/Pmw/Pmw/Pmw_1_3_3/bin/bundlepmw.py" +} + +build() { cd "Pmw" python2 setup.py build +} + +package() { + cd "Pmw" python2 setup.py install --prefix=/usr --root="${pkgdir}" - - # change python to python2 - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/ManualTests.py" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/demos/All.py" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/All.py" - sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/bin/bundlepmw.py" - install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD deleted file mode 100644 index f211ede1f..000000000 --- a/community/python2-pybluez/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: cs-cam - me.at.camdaniel.com - -pkgname=python2-pybluez -pkgver=0.18 -pkgrel=6 -pkgdesc="Python wrapper for the BlueZ Bluetooth stack" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/pybluez/" -license=('GPL') -provides=('pybluez') -conflicts=('pybluez') -replaces=('pybluez') -depends=('python2' 'bluez-libs') -source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) -md5sums=('be8c8ce615c3189fda1aaf3d568314b2') - -package() { - cd $srcdir/PyBluez-$pkgver - python2 setup.py install --root=$pkgdir - ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so -} diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD index 418557d2e..821cbb5cb 100644 --- a/community/python2-pycdio/PKGBUILD +++ b/community/python2-pycdio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101971 2013-12-03 03:22:58Z fyan $ +# $Id: PKGBUILD 104375 2014-01-19 16:29:39Z bpiotrowski $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Alessandro Pezzoni <donbex at nerdshack dot com> pkgname=python2-pycdio pkgver=0.20 -pkgrel=1 +pkgrel=2 pkgdesc="Python OO interface to libcdio (CD Input and Control library)" arch=("i686" "x86_64" "mips64el") url="http://pypi.python.org/pypi/pycdio/" diff --git a/community/python2-systemd/PKGBUILD b/community/python2-systemd/PKGBUILD new file mode 100644 index 000000000..e956cec53 --- /dev/null +++ b/community/python2-systemd/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 105641 2014-02-12 17:41:55Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com +pkgname=python2-systemd +_pkgname=systemd +pkgver=208 +pkgrel=1 +pkgdesc="Python2 bindings for systemd" +arch=('x86_64' 'i686') +url="http://www.freedesktop.org/wiki/Software/systemd/" +license=('GPL') +depends=('python2' "systemd=$pkgver") +makedepends=('intltool' 'gperf') +source=("http://www.freedesktop.org/software/$_pkgname/$_pkgname-$pkgver.tar.xz") +md5sums=('df64550d92afbffb4f67a434193ee165') + + +build() { + cd "$_pkgname-$pkgver" + ./configure \ + --libexecdir=/usr/lib \ + --disable-manpages \ + --with-sysvinit-path=/etc/rc.d/init.d \ + --with-rc-local-script-path-start=/etc/rc.d/rc.local \ + PYTHON=python2 + make +} + +package(){ + cd "$_pkgname-$pkgver" + make DESTDIR=$srcdir/root install + install -dm755 $pkgdir/usr/lib/python2.7 + cp -dpr --no-preserve=ownership $srcdir/root/usr/lib/python2.7 $pkgdir/usr/lib/python2.7 +} diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD index 5ca8ea7fc..9cf16a528 100644 --- a/community/python2-traits/PKGBUILD +++ b/community/python2-traits/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96105 2013-08-20 06:32:41Z lcarlier $ +# $Id: PKGBUILD 105025 2014-01-30 10:34:22Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> pkgname=python2-traits -pkgver=4.3.0 -pkgrel=2 +pkgver=4.4.0 +pkgrel=1 pkgdesc="Explicitly typed attributes for Python" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/enthought/traits" @@ -13,7 +13,7 @@ makedepends=('python2-setuptools') options=(!emptydirs) source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/traits/archive/${pkgver}.tar.gz") -md5sums=('f78c15c44e0f965cc2ab799806a80388') +md5sums=('f284e67ae3437e9427e23f7f8a4975d6') build() { cd "$srcdir"/traits-$pkgver diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 8dbe5a252..9c924cdcb 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102798 2013-12-20 11:28:08Z spupykin $ +# $Id: PKGBUILD 105852 2014-02-16 14:13:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.4.5.0 +pkgver=3.4.6.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('glu') options=('libtool') source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d' +md5sums=('b446738ba71ee0a0ba1431b95d07a2fd' '84f189dd152e7614a1265659dac6222d') prepare() { @@ -59,7 +59,7 @@ package() { install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop install -dm0755 $pkgdir/usr/bin - echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad + echo -e '#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 5e6546abf..66f70dc5b 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 103152 2013-12-27 20:10:05Z jlichtblau $ +#$Id: PKGBUILD 105826 2014-02-15 21:58:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.7.4 +pkgver=0.7.5 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2') +sha256sums=('6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index ca8e921c9..0cbc2673d 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2014-02-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.5-1 + 2013-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.7.4-1 diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD index d85ed86d5..f64a14d42 100644 --- a/community/qtcurve/PKGBUILD +++ b/community/qtcurve/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $ +# $Id: PKGBUILD 105059 2014-01-30 19:46:54Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,16 +6,16 @@ pkgbase=qtcurve pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4') -pkgver=1.8.17 +pkgver=1.8.18 pkgrel=1 pkgdesc='A configurable set of widget styles for KDE and Gtk' arch=('i686' 'x86_64') url='https://github.com/QtCurve/qtcurve' -license=('GPL') +license=('LGPL') groups=('qtcurve') makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace') source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -md5sums=('c4f2e9bc296398b42bfc132b88a3b989') +md5sums=('422d1876d944bb278855f320eda19368') build() { cd $pkgbase-$pkgver @@ -37,7 +37,7 @@ build() { package_qtcurve-utils() { depends=('libx11') - cd $pkgbase-$pkgver/build/qtcurve-utils + cd $pkgbase-$pkgver/build/lib/utils make DESTDIR="$pkgdir" install } @@ -45,6 +45,8 @@ package_qtcurve-gtk2() { depends=('qtcurve-utils' 'gtk2') cd $pkgbase-$pkgver/build/gtk2 make DESTDIR="$pkgdir" install + cd ../lib/cairo + make DESTDIR="$pkgdir" install } package_qtcurve-qt4() { diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index c64c433ee..4e78d67ec 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 98346 2013-10-08 20:19:08Z schiv $ +# $Id: PKGBUILD 105622 2014-02-12 07:14:10Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.11 -pkgrel=1 +pkgver=0.5.12 +pkgrel=2 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo' +depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo>=0.28' 'rubberband' 'shared-mime-info') makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') install=qtractor.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('97a07f55ea61747859b1fd6c284a0806') +md5sums=('f26691f70c4cd4b89bc4369a579f291f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD index 1dc5e82a1..9b1d4bb4b 100644 --- a/community/qtspim/PKGBUILD +++ b/community/qtspim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85407 2013-03-01 10:39:40Z andrea $ +# $Id: PKGBUILD 105104 2014-01-31 20:09:26Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=qtspim -pkgver=9.1.7 -pkgrel=2 +pkgver=9.1.13 +pkgrel=1 pkgdesc="New user interface for spim, a MIPS simulator." arch=('i686' 'x86_64') url="http://spimsimulator.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('subversion') __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator" __svnmod=('QtSpim' 'CPU' 'Documentation' 'Setup') -__svnrev=598 +__svnrev=637 build() { cd "$srcdir" @@ -38,7 +38,8 @@ build() { done cd "$srcdir/build/QtSpim" - qmake + qmake-qt4 + sed -i 's/qcollectiongenerator/qcollectiongenerator-qt4/' Makefile make } diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD index 1ff7d7cb1..d43c09d04 100644 --- a/community/qucs/PKGBUILD +++ b/community/qucs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94064 2013-07-13 14:17:21Z spupykin $ +# $Id: PKGBUILD 105286 2014-02-04 16:31:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Víctor Martínez Romanos <vmromanos@gmail.com> pkgname=qucs pkgver=0.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="An integrated circuit simulator with a graphical user interface" arch=('i686' 'x86_64' 'mips64el') url="http://qucs.sourceforge.net" @@ -17,6 +17,11 @@ optdepends=('freehdl: to permit digital circuit simulation' source=("http://downloads.sourceforge.net/project/qucs/qucs/$pkgver/qucs-$pkgver.tar.gz") md5sums=('4b93ffcc2ef3dbbd6fa53a5743721532') +prepare() { + cd $srcdir/$pkgname-${pkgver/s/.} + sed -i 's|Icon=.*|Icon=/usr/share/qucs/bitmaps/big.qucs.xpm|' debian/qucs.desktop +} + build() { cd $srcdir/$pkgname-${pkgver/s/.} ./configure --prefix=/usr @@ -26,4 +31,6 @@ build() { package() { cd $srcdir/$pkgname-${pkgver/s/.} make DESTDIR=$pkgdir install + + install -Dm0644 debian/qucs.desktop $pkgdir/usr/share/applications/qucs.desktop } diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD index 44d7f817c..bd149df59 100644 --- a/community/quesoglc/PKGBUILD +++ b/community/quesoglc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99975 2013-10-31 02:47:18Z allan $ +# $Id: PKGBUILD 103332 2014-01-03 11:06:25Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Markus Pargmann pkgname=quesoglc pkgver=0.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="A free implementation of the OpenGL Character Renderer (GLC)" arch=('i686' 'x86_64' 'mips64el') url="http://quesoglc.sourceforge.net/" diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index e0fe27250..7a9e95b0e 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101735 2013-11-30 16:21:06Z seblu $ +# $Id: PKGBUILD 103783 2014-01-11 19:10:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.9.7 +pkgver=1.9.8 pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' @@ -12,9 +12,10 @@ license=('custom') depends=('glibc' 'libdaemon') arch=('i686' 'x86_64' 'mips64el') backup=('etc/radvd.conf') -source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" +source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc} "$pkgname.service") -sha1sums=('92f7eadfee951f787e861f41c344689416f3f504' +sha1sums=('69db8ee2e74e2312db482882bb68726f7bbd3477' + 'SKIP' '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index 767d945d5..055f617a0 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100277 2013-11-02 08:47:54Z spupykin $ +# $Id: PKGBUILD 103801 2014-01-11 20:08:34Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: AqD <aquila.deus@gmail.com> @@ -6,12 +6,12 @@ pkgname=rapidsvn pkgver=0.12.1 -pkgrel=2 +pkgrel=6 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('subversion' 'wxgtk') +depends=('subversion' 'wxgtk2.8') makedepends=('python2' 'automake' 'libtool') source=(http://www.rapidsvn.org/download/release/$pkgver/rapidsvn-$pkgver.tar.gz $pkgname.desktop) @@ -24,7 +24,10 @@ build() { ./autogen.sh sed -i 's#src/tests/svncpp/Makefile##' configure - [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr --with-apu-config="`which apu-1-config`" --with-apr-config="`which apr-1-config`" + [ "$NOEXTRACT" == 1 ] || ./configure --prefix=/usr \ + --with-apu-config="`which apu-1-config`" \ + --with-apr-config="`which apr-1-config`" \ + --with-wx-config="`which wx-config-2.8`" sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/*.py sed -i 's|python|python2|' src/locale/Makefile diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD index dbfaaeac6..ad4de8c21 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' 'mips64el') 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/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index ea5f6ba0f..b256019d4 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100450 2013-11-04 12:12:48Z spupykin $ +# $Id: PKGBUILD 104804 2014-01-26 12:17:42Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=10 +pkgrel=11 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 54e0a876c..2c39d7c01 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92590 2013-06-09 15:08:48Z stativ $ +# $Id: PKGBUILD 103786 2014-01-11 19:56:49Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.11 +pkgver=4.0.12 pkgrel=1 epoch=1 pkgdesc="RAW photo editor" @@ -13,10 +13,13 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.rawtherapee.com/" license=('GPL3') depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('cmake') +makedepends=('cmake' 'mercurial') +#makedepends=('cmake') install=rawtherapee.install -source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") -md5sums=('d30a54e6446326d8299c06ec76c281d8') +source=("rawtherapee-$pkgver::hg+https://code.google.com/p/rawtherapee/#tag=$pkgver") +md5sums=('SKIP') +#source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") +#md5sums=('d30a54e6446326d8299c06ec76c281d8') build() { mkdir "$srcdir/$pkgname-build" diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD index 7ed26bf3e..c6bf0ea4a 100755 --- a/community/rbutil/PKGBUILD +++ b/community/rbutil/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 96229 2013-08-22 00:02:57Z alucryd $ +# $Id: PKGBUILD 103630 2014-01-08 13:34:03Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: said <atvordhosbn@gmail.com> # Contributor: clinx <clinx.hacker@googlemail.com> pkgname=rbutil -pkgver=1.3.1 -pkgrel=4 +pkgver=1.4.0 +pkgrel=1 pkgdesc="Rockbox Utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility" license=("GPL") -depends=('qt4' 'libusbx') -makedepends=('gendesk') +depends=('qt5-base' 'libusbx') +makedepends=('gendesk' 'qt5-tools') optdepends=('speex: voice files support') source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2") -sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca') +sha256sums=('bc28a58ac1f62055a39b072e7b41a162f407a8b83172c84790568235d4637e4c') prepare() { gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer" @@ -23,8 +23,8 @@ prepare() { build() { cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt - lrelease-qt4 rbutilqt.pro - qmake-qt4 + lrelease-qt5 rbutilqt.pro + qmake-qt5 make } diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop deleted file mode 100755 index 920b6a452..000000000 --- a/community/rbutil/rbutil.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Rockbox Utility -GenericName=Rockbox Utility -Comment=Configure Rockbox -Encoding=UTF-8 -Exec=rbutil -Icon=rbutil.png -Categories=Application;Qt;AudioVideo;Audio; -StartupNotify=false -Terminal=false -Type=Application diff --git a/community/rdesktop/PKGBUILD b/community/rdesktop/PKGBUILD index 9ed9c79c0..f666847d5 100644 --- a/community/rdesktop/PKGBUILD +++ b/community/rdesktop/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 101267 2013-11-21 12:16:40Z bpiotrowski $ +# $Id: PKGBUILD 104044 2014-01-14 19:45:06Z jelle $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop pkgver=1.8.1 -pkgrel=1 +pkgrel=3 pkgdesc="An open source client for Windows Remote Desktop Services" arch=('i686' 'x86_64') url="http://www.rdesktop.org/" license=('GPL3') -depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') +depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite' 'libgssglue') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" rdesktop-send_physical_buttons.diff) sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8' diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 20cfff99b..67c403c8a 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102497 2013-12-12 12:51:43Z spupykin $ +# $Id: PKGBUILD 105686 2014-02-13 16:52:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.8.3 +pkgver=2.8.6 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('6327e6786130b556b048beef0edbdfa7' +md5sums=('f0dbfcdea98ed237e7990d1eaff82241' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index dcd7122a6..962c1c5b8 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101077 2013-11-16 03:53:07Z andrea $ +# $Id: PKGBUILD 104681 2014-01-24 15:11:26Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=2.4.0 +pkgver=2.4.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support' 'qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('660f40fe612b6706623977d8cdb94b49aaacdb53aac2689d95f02d782ce2715b') +sha256sums=('e9805b32f592ca5809bd1632c624c57fc0109ce98b73a8b8e3ebd04e9c875126') prepare() { mkdir build diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD index 54ee3ba5d..67eac4915 100644 --- a/community/remind/PKGBUILD +++ b/community/remind/PKGBUILD @@ -5,12 +5,14 @@ pkgname=remind pkgver=3.01.13 -pkgrel=1 +pkgrel=2 pkgdesc='A sophisticated calendar and alarm program.' arch=('i686' 'x86_64' 'mips64el') url='http://www.roaringpenguin.com/penguin/open_source_remind.php' license=('GPL') -depends=('tk' 'tcllib') +optdepends=('tk: for tkremind' + 'tcllib: for tkremind' + 'tcl: for cm2rem.tcl') source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz"{,.sig}) options=('!emptydirs') md5sums=('9b746d257eccd5961d61c649cf48305c' diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index adc4084a8..17b881c1a 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72637 2012-06-18 09:24:39Z spupykin $ +# $Id: PKGBUILD 103926 2014-01-13 17:17:00Z andyrtr $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=9.1 +pkgrel=11 pkgdesc="remote desktop client written in GTK+" arch=(i686 x86_64 mips64el) url="http://remmina.sourceforge.net/" @@ -14,7 +14,8 @@ makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring' optdepends=('libxkbfile' 'freerdp' 'telepathy-glib' - 'gnome-keyring') + 'gnome-keyring' + 'nxproxy') replaces=('remmina-plugins') provides=('remmina-plugins') install=remmina.install @@ -30,16 +31,16 @@ source=("https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz" 'https://github.com/FreeRDP/Remmina/commit/b2277827.patch' 'https://github.com/FreeRDP/Remmina/commit/cb0b209b.patch') md5sums=('701c540acaab961bc3adf130a2ddb8b1' - '23927a584c23d0da7a893c1f39d53857' - '40f5ce2f30c8ce8ae8a4ebcee52874ab' - 'c842ba295c2327ab4d0819fc4a5bc03f' - '9312b5bf953a63e6203f0d0be6cb8134' - '65bfcc39ae51343b90928ea329cc4900' - '42b971116f887657fc210da70c3afba5' - '04b5bc1190b53211747e097897d1d19c' - 'ce0b538ff850556b2ad8fc4e4736039e' - '3bc1a4e50cdd864c0e2d7c91a1e02e32' - 'b9023ea4f36c31c3d4e98cfc472c1a09') + '658218f0e63f512425893ec204e18f29' + 'dd1aad8524f470c634c4534122c1d101' + '2cfe2dbb399cbc1b0d89606824b4280d' + '26d06a319589bdc906422eb902ebfd17' + 'b813f7b1281d808d45da99699e17c4b7' + '3bb434fd6c6b8ee90d98fcd7be2e307d' + '083a34a0339f763e52f33b6dbfb0a550' + '0fdb897dbccf2f986fc49a15f6d22bd7' + 'e891041fb3b14eb6465cc3d783e9b600' + '59ec2f4ed9382c743db212e86ebfbdfe') build() { cd ${srcdir}/FreeRDP-Remmina-*/ diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD index cd0fb0261..896d1f8ac 100644 --- a/community/ripperx/PKGBUILD +++ b/community/ripperx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83323 2013-01-29 14:04:00Z spupykin $ +# $Id: PKGBUILD 105241 2014-02-03 10:20:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=ripperx pkgver=2.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="GTK program to rip and encode mp3 files" arch=(i686 x86_64 'mips64el') url="http://ripperx.sourceforge.net/" @@ -13,11 +13,20 @@ license=('GPL') source=(http://downloads.sourceforge.net/ripperx/ripperX-$pkgver.tar.gz) md5sums=('f07c55edf08a1cd57537f1b9379b4e4d') -build() { +prepare() { cd $srcdir/ripperX-$pkgver - LDFLAGS=-lm ./configure --prefix=/usr sed -i 's|Icon=.*|Icon=ripperX.xpm|g' ripperX.desktop echo "Categories=GTK;GNOME;AudioVideo;DiscBurning;" >>ripperX.desktop + patch ripperX.pc.in <<EOF +diff -r ripperX-2.7.3/ripperX.pc.in ripperX-2.7.3.y/ripperX.pc.in +3a4 +> includedir=@includedir@ +EOF +} + +build() { + cd $srcdir/ripperX-$pkgver + LDFLAGS=-lm ./configure --prefix=/usr make } diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index aded6c0b6..11614da4a 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 92214 2013-06-02 21:00:23Z ttoepper $ +# $Id: PKGBUILD 104490 2014-01-21 20:41:40Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.7.2 +pkgver=2.8.1 pkgrel=1 pkgdesc='Tabbed, VTE-based terminal emulator' arch=('i686' 'x86_64' 'mips64el') url='http://roxterm.sourceforge.net/' license=('GPL3') -depends=('dbus-glib' 'vte3' 'hicolor-icon-theme') +depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'libsm') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install -source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -md5sums=('8ef80f9a5e0aea659b1f9cd6de9869b4') -sha1sums=('fa32ceeb19a097d5fb8a54c24cb7a6f1b957e74d') +source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2" + "http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2.sign") +md5sums=('cf5aa488cc382ec0df8b3a856707d245' + 'SKIP') +sha1sums=('45535957cec6936d259dc8ae693f2ab4b148bde6' + 'SKIP') build() { diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 4ae5984c1..d5a9fb56c 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99981 2013-10-31 02:49:18Z allan $ +# $Id: PKGBUILD 104502 2014-01-22 01:50:15Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=16 +pkgrel=17 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" @@ -20,7 +20,7 @@ md5sums=('a772bd143cd8d141edf4d9eff9860ab3' '4211215c9a4918b0dff30a7000647dd9') build() { - cd ${srcdir}/${pkgname}_${pkgver} + cd ${pkgname}_${pkgver} [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) @@ -34,16 +34,16 @@ build() { } package() { - cd ${srcdir}/${pkgname}_${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}_${pkgver} + make DESTDIR="${pkgdir}" install # FS#18300 - install -d ${pkgdir}/usr/lib/xscreensaver/ - list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) + install -d "${pkgdir}/usr/lib/xscreensaver/" + list=$(ls "${pkgdir}/usr/bin" --ignore rss-glx_install.pl) for i in $list; do ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" done - install -d ${pkgdir}/usr/share/applications/screensavers - install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers + install -d "${pkgdir}/usr/share/applications/screensavers" + install -m644 "${srcdir}"/${pkgname}-desktops/*.desktop "${pkgdir}/usr/share/applications/screensavers" } diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 50df0b3f8..cea367ff1 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102435 2013-12-11 10:18:07Z spupykin $ +# $Id: PKGBUILD 105661 2014-02-13 09:27:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.4.7 +pkgver=7.6.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd') +depends=('zlib' 'libestr' 'libee' 'json-c' 'systemd' 'liblogging') makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' @@ -16,13 +16,12 @@ optdepends=('postgresql-libs: PostgreSQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog' - 'etc/conf.d/rsyslog') + 'etc/logrotate.d/rsyslog') options=('strip' 'zipman') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('c96850bd9d07780ea7398ac86df385ae' +md5sums=('26a12cb6d6693839aea07d29f8654bc9' '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD index 76f5a20ec..3bad0ade0 100644 --- a/community/rtl-sdr/PKGBUILD +++ b/community/rtl-sdr/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 100562 2013-11-05 21:31:17Z kkeen $ +# $Id: PKGBUILD 105412 2014-02-07 01:40:43Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Michael Düll <mail@akurei.me> pkgname=rtl-sdr # they are just starting to play with tags # consider using tags for the pkgver in the future -pkgver=20131105 -_commit=c5b8a2130007 +pkgver=20140207 +_commit=df9596b2d1 pkgrel=1 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)." arch=('i686' 'x86_64') @@ -31,9 +31,10 @@ pkgver() { build() { cd "$srcdir/$_gitname" - mkdir build + mkdir -p build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DDETACH_KERNEL_DRIVER=ON \ -DINSTALL_UDEV_RULES=ON -Wno-dev ../ make } diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index 1d4d24942..bf7ead370 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103201 2013-12-29 21:58:18Z heftig $ +# $Id: PKGBUILD 105511 2014-02-09 13:50:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=2.2.3 +pkgver=2.2.5 pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(llvm rubinius-ruby) options=(!emptydirs) source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 gemrc dirs.patch) -sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf' +sha256sums=('42cfae89d481dfa5e0ccb53a67720f109fc6c2e1b6ca68a8ae9676be6d0457de' '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66') @@ -61,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" @@ -75,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/dirs.patch b/community/rubinius/dirs.patch new file mode 100644 index 000000000..8fe9c3b4e --- /dev/null +++ b/community/rubinius/dirs.patch @@ -0,0 +1,16 @@ +diff --git i/library/rbconfig.rb w/library/rbconfig.rb +index 611ad6a..533ef00 100644 +--- i/library/rbconfig.rb ++++ w/library/rbconfig.rb +@@ -19,9 +19,9 @@ module RbConfig + CONFIG["libexecdir"] = "$(exec_prefix)/libexec" + CONFIG["datarootdir"] = "$(prefix)/share" + CONFIG["datadir"] = "$(datarootdir)" +- CONFIG["sysconfdir"] = "$(prefix)/etc" ++ CONFIG["sysconfdir"] = "/etc" + CONFIG["sharedstatedir"] = "$(prefix)/com" +- CONFIG["localstatedir"] = "$(prefix)/var" ++ CONFIG["localstatedir"] = "/var" + CONFIG["includedir"] = "$(prefix)/include" + CONFIG["oldincludedir"] = "/usr/include" + CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)" diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index 0b0ef4e3e..56ae7e010 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102505 2013-12-12 14:34:05Z arodseth $ +# $Id: PKGBUILD 104887 2014-01-28 03:34:18Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeremy <reebydobalina@yahoo.ca> pkgname=ruby-cairo -pkgver=1.12.6 +pkgver=1.12.8 pkgrel=1 pkgdesc='Ruby bindings for cairo' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('ruby' 'cairo') makedepends=('ruby-pkgconfig') source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") -sha256sums=('e7ff8d49a730662b3f999187fde45ac0b8651996fe7f9a952496be8b6e45800e') +sha256sums=('8a6a73c9c67eb0a5b6502483c8c39ffb6acbcadd2574123a6597271c2c25736d') build() { cd "$srcdir/rcairo-$pkgver" @@ -27,7 +27,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 ext/cairo/cairo.so \ - "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux/cairo.so" + "$pkgdir/usr/lib/ruby/vendor_ruby/2.1.0/$CARCH-linux/cairo.so" } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 0ab0c44d3..854f049ac 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92390 2013-06-04 13:59:53Z arodseth $ +# $Id: PKGBUILD 104888 2014-01-28 03:34:19Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,17 +8,17 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=2.0.2 -pkgrel=1 +pkgver=2.1.0 +pkgrel=2 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('3a009bde5f4c684214d7860cce5763db4d862cfdeafaa84578117dc723b7e1e5') +sha256sums=('939251c1f82b41c3cf657552396cf4e1198365316904957cfb7167d1298db204') prepare() { - cd "$srcdir/ruby-gtk2-$pkgver" + cd "ruby-gtk2-$pkgver" LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor @@ -34,8 +34,7 @@ prepare() { } build() { - cd "$srcdir/ruby-gtk2-$pkgver" - make + make -C "ruby-gtk2-$pkgver" } package_ruby-atk() { @@ -43,7 +42,7 @@ package_ruby-atk() { depends=("ruby-glib2=$pkgver" 'atk') cd "$srcdir/ruby-gtk2-$pkgver/atk" - make includedir="/usr/include" DESTDIR="$pkgdir" install + make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 } package_ruby-gdkpixbuf2() { @@ -51,7 +50,7 @@ package_ruby-gdkpixbuf2() { depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - make includedir="/usr/include" DESTDIR="$pkgdir" install + make includedir="/usr/include" DESTDIR="$pkgdir" install -j1 } package_ruby-gio2() { @@ -59,7 +58,7 @@ package_ruby-gio2() { depends=("ruby-glib2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gio2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-glib2() { @@ -67,7 +66,7 @@ package_ruby-glib2() { depends=('glib2' 'ruby') cd "$srcdir/ruby-gtk2-$pkgver/glib2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-gtk2() { @@ -76,7 +75,7 @@ package_ruby-gtk2() { "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } package_ruby-pango() { @@ -84,7 +83,7 @@ package_ruby-pango() { depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" - make includedir="/usr/include" DESTDIR="$pkgdir/" install + make includedir="/usr/include" DESTDIR="$pkgdir/" install -j1 } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index 22205ea02..a09544879 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $ +# $Id: PKGBUILD 104889 2014-01-28 03:34:19Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -6,8 +6,8 @@ # Contributor: kritoke <kritoke@nospam.gmail.com> pkgbase=ruby-gtk3 -pkgver=2.0.2 -pkgrel=1 +pkgver=2.1.0 +pkgrel=2 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver") arch=('x86_64' 'i686' 'mips64el') @@ -15,7 +15,7 @@ url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047') +sha256sums=('436844cc9ab3bf5e5a3027e3276fc69ff9cae5cff88bc60179c416050d5e753d') prepare() { cd "$srcdir/ruby-gtk3-$pkgver" diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD index 8a6e207f9..87d751791 100755 --- a/community/ruby-iconv/PKGBUILD +++ b/community/ruby-iconv/PKGBUILD @@ -1,41 +1,27 @@ -# $Id: PKGBUILD 100391 2013-11-03 11:24:29Z alucryd $ +# $Id: PKGBUILD 104890 2014-01-28 03:34:20Z td123 $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ruby-iconv -pkgver=1.0.3 -pkgrel=6 -pkgdesc="Wrapper library for iconv" +pkgver=1.0.4 +pkgrel=2 +pkgdesc='Wrapper library for iconv' arch=('i686' 'x86_64' 'mips64el') -url="https://github.com/nurse/iconv" +url='https://github.com/nurse/iconv' license=('BSD') depends=('ruby') +options=('!emptydirs') source=("http://rubygems.org/downloads/${pkgname#*-}-${pkgver}.gem") noextract=("${pkgname#*-}-${pkgver}.gem") -sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da') - -prepare() { - gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem - sed "s|iconv/iconv.so|$CARCH-linux/iconv.so|" -i gems/${pkgname#*-}-${pkgver}/lib/iconv.rb -} +sha256sums=('5bd4e387a2e8070baf3ebf8d91f545200db25c08686f82cde66f118d9f914f9b') package() { - cd gems/${pkgname#*-}-${pkgver} - - local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')" - - install -dm 755 "${pkgdir}"/usr/lib/ruby/{gems/${_rubyver},vendor_ruby} - mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver} - -# Native extension - install -dm 755 "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/$CARCH-linux - mv "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}/{iconv,$CARCH-linux}/iconv.so + local _gemdir="$(ruby -e'puts Gem.default_dir')" -# Gem compatibility - mv ../../specifications "${pkgdir}"/usr/lib/ruby/gems/${_rubyver}/ + gem install --ignore-dependencies --no-user-install -N -i "${pkgdir}"/${_gemdir} ${pkgname#*-}-${pkgver}.gem + find "${pkgdir}" -type f -name *.gem -delete -# License install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}BSDL + ln -s ${_gemdir}/gems/${pkgname#*-}-${pkgver}/BSDL "${pkgdir}"/usr/share/licenses/${pkgname}/ } # vim: ts=2 sw=2 et: diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index ba37a6dc5..25ee81890 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92582 2013-06-09 08:55:46Z arodseth $ +# $Id: PKGBUILD 104893 2014-01-28 03:34:24Z td123 $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeff Mickey <j@codemac.net> @@ -6,7 +6,7 @@ pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc='Module for interactive text console applications (ncurses)' arch=('x86_64' 'i686' 'mips64el') url='http://ncurses-ruby.berlios.de/' diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index b6831ab5d..fb1832001 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $ +# $Id: PKGBUILD 103695 2014-01-10 03:08:10Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> pkgname=rust -pkgver=0.8 -pkgrel=1 +pkgver=0.9 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='A safe, concurrent, practical language' url='http://www.rust-lang.org/' @@ -11,9 +11,10 @@ depends=(gcc shared-mime-info) makedepends=(libffi perl python2 curl chrpath) source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz" "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc") -sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182' +sha256sums=('c0911c3545b797a1ca16f3d76bf5ed234754b828efd1e22c182c7300ac7dd5d1' 'SKIP') install=rust.install +options=(staticlibs) build() { cd rust-$pkgver @@ -57,8 +58,8 @@ package() { cd "$pkgdir/usr" # https://github.com/mozilla/rust/issues/5219 - chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + chrpath -d bin/* lib/*.so lib/rustlib/*/lib/*.so cd lib - ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* . + ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/* . } diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 1a6718f5c..1ec59806e 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102937 2013-12-24 15:23:39Z arcanis $ +# $Id: PKGBUILD 105532 2014-02-09 18:40:24Z arcanis $ # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com> # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas <nqn1976 at gmail dot com> @@ -8,39 +8,36 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=6.0 -pkgrel=2 -pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab" +pkgver=6.1.1 +pkgrel=1 +pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=('i686' 'x86_64') url="http://www.sagemath.org" license=('GPL') #depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz') depends=('freetype2>=2.3.5') -makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils') +makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' 'openssh: to use the notebook in secure mode' 'ffmpeg: to show animations' 'cairo: R plots') source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - "fix-pil.patch" "sage.service") install="${pkgname}.install" -md5sums=('da1bacf90fc291e736aaa71431e8874e' - 'de54cb818d74c070a524fc3fd5208b2c' +md5sums=('800c59f7cfa32c012f358ae240cdb2e6' '985da1c1d1dcdc3ea9aa73035cb7996b') prepare() { # create *.desktop file - gendesk -n \ + gendesk -f -n \ --pkgname="sage-notebook" \ - --pkgdesc="sage notebook" \ - --name="sage" \ + --pkgdesc="Sage notebook" \ + --name="Sage" \ --exec="/opt/sage/sage -notebook" \ --terminal=true \ --categories="Science;Math" \ - --custom="StartupNotify=true -X-DCOP-ServiceType= + --custom="X-DCOP-ServiceType= X-KDE-SubstituteUID=false X-KDE-Username=" @@ -51,22 +48,6 @@ X-KDE-Username=" mkdir "${srcdir}/build" # according to FS#34769 - # NOTE: there is an error in pil build (freetype/fterrors.h not found) - cd "${srcdir}/sage-${pkgver}/upstream/" - tar xjfv pil-1.1.6.tar.bz2 - rm -r pil-1.1.6.tar.bz2 - patch -p0 -i "${srcdir}/fix-pil.patch" - tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6 - rm -rf pil-1.1.6 - # fix checksums - SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}') - sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini" - # disable freetype build - rm -rf freetype-* sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install" } @@ -100,7 +81,6 @@ build() { # only build sage, no documents #make build make - ./sage --bdist "${pkgver}" } << COMMENT @@ -115,27 +95,23 @@ check() { COMMENT package() { - cd "sage-${pkgver}" + cd "${srcdir}/sage-${pkgver}/" + # remove build logs + rm -f *.log + rm -rf "${srcdir}/sage-${pkgver}/"{logs,upstream} + # do NOT remove build directory! # cp because make install is experimental and will corrupt the install - install -d "${pkgdir}/opt/sage" - cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/" + install -dm755 "${pkgdir}/opt/sage" + cp -r * "${pkgdir}/opt/sage/" # move SageTeX files to more appropriate directory - install -d "${pkgdir}/usr/share" + install -dm755 "${pkgdir}/usr/share" mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share" - # remove build logs - rm -f "${pkgdir}/opt/sage/*.log" - rm -rf "${pkgdir}/opt/sage/spkg/logs" - - # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - rm -f "${pkgdir}/opt/sage/spkg/base/*spkg" - rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg" - # according to FS#37090 # install scripts - install -d "${pkgdir}/usr/bin" + install -dm755 "${pkgdir}/usr/bin" ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)" # rename scripts to avoid conflicts for ITEM in $(ls "${pkgdir}/usr/bin"); do @@ -147,9 +123,9 @@ package() { install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service" # install *.desktop and icon files install -Dm644 "${srcdir}/sage-notebook.desktop" \ - "${pkgdir}/usr/share/applications/SAGE-notebook.desktop" - install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \ - "${pkgdir}/usr/share/pixmaps/SAGE-notebook.png" + "${pkgdir}/usr/share/applications/sage-notebook.desktop" + install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.8.2-py2.7.egg/sagenb/data/sage/images/icon48x48.png" \ + "${pkgdir}/usr/share/pixmaps/sage-notebook.png" } # vim :set ts=2 sw=2 et: diff --git a/community/sage-mathematics/fix-pil.patch b/community/sage-mathematics/fix-pil.patch deleted file mode 100644 index a17f26833..000000000 --- a/community/sage-mathematics/fix-pil.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c ---- pil-1.1.6.orig/_imagingft.c 2013-12-23 17:45:39.991183855 +0400 -+++ pil-1.1.6/_imagingft.c 2013-12-23 17:49:06.297861197 +0400 -@@ -65,7 +65,7 @@ - const char* message; - } ft_errors[] = - --#include <freetype/fterrors.h> -+#include <freetype2/fterrors.h> - - /* -------------------------------------------------------------------- */ - /* font objects */ diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index 7e5fa2714..c38d4ba84 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102425 2013-12-10 20:26:05Z ronald $ +# $Id: PKGBUILD 105082 2014-01-31 10:43:46Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=sakura -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64' 'mips64el') @@ -11,35 +11,30 @@ url="https://launchpad.net/sakura" license=('GPL') depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') -source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" - "deprecated_symbols.patch") +source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") install=sakura.install -sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1' - '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1') +sha1sums=('44556f30eb63c95eb46d253a0e69c81ec7e0112b') prepare() { - cd $srcdir/${pkgname}-${pkgver} + cd "$srcdir/${pkgname}-${pkgver}" # Set default font size a bit smaller sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c - - # deprecated gtk symbols are used but disabled... enabling - patch -Np1 -i ${srcdir}/deprecated_symbols.patch } build() { - cd $srcdir/${pkgname}-${pkgver} + cd "$srcdir/${pkgname}-${pkgver}" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . make } package() { - cd $srcdir/${pkgname}-${pkgver} + cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install # extract the keybindings from the installed documentation, rest is only relevant during build time awk '/^Keybindings/{f="'${pkgdir}'/usr/share/doc/'${pkgname}'/KEYBINDINGS"} f{print > f} /^END/' \ - ${pkgdir}/usr/share/doc/${pkgname}/INSTALL - rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL + "${pkgdir}"/usr/share/doc/${pkgname}/INSTALL + rm "${pkgdir}/usr/share/doc/${pkgname}/INSTALL" } diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 94f4e2238..f5f7bd4f9 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=('i686' 'x86_64' 'mips64el') @@ -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/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 0770354ba..d46fd2201 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -5,12 +5,12 @@ pkgname=scorched3d pkgver=43.3.d _pkgver=43.3d -pkgrel=5 +pkgrel=6 pkgdesc="3D artillery combat game" arch=('i686' 'x86_64' 'mips64el') url="http://www.scorched3d.co.uk/" license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') +depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') makedepends=('gendesk' 'mesa') install=scorched3d.install source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" @@ -20,12 +20,16 @@ source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.t 'scorched3d-libpng1.5.patch' 'libpng14.patch') md5sums=('9c3043282a9e7451468ff325bef3b04c' - '0f7e570f586c227873e909ebbc17c84d' + 'cc3217f5b3baa6950a4619aac72d8a75' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' 'ec6958191751b5a2c44aa15abfc75269' 'c8c03855fd3693122fd39427fa3638c1') +prepare() { + gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Scorched3d" +} + build() { cd "$srcdir/scorched" @@ -35,13 +39,14 @@ build() { # patch -Np0 -i ${srcdir}/libpng14.patch WANT_WXGTK=gtk2 - sh autogen.sh \ + ./configure \ --prefix=/usr \ --datadir=/usr/share/scorched3d \ --disable-openaltest \ - --with-wx-config=wx-config + --with-wx-config=wx-config-2.8 sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp + sed -i 's|freetype/||g' src/launcher/wxdialogs/TrueTypeFont.h src/client/GLEXT/GLFont2dFreeType.h #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 @@ -49,10 +54,8 @@ build() { } package() { - cd "$srcdir" - gendesk - cd scorched + make DESTDIR=${pkgdir} install cd .. diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD index 508442874..4ea7e23ad 100644 --- a/community/scratch/PKGBUILD +++ b/community/scratch/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $ -# Maintainer: Jonathan Steel <mail at jsteel dot org> +# $Id: PKGBUILD 105503 2014-02-09 11:46:59Z jsteel $ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Muhammed Uluyol <muhammedu@gmail.com> pkgname=scratch pkgver=1.4.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="Create and share your own interactive stories, games, music and art" arch=('i686' 'x86_64') url="http://scratch.mit.edu" license=('GPL2') install=$pkgname.install -depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango' - 'gtk-update-icon-cache') +depends=('squeak-vm' 'shared-mime-info' 'desktop-file-utils' 'pango' + 'gtk-update-icon-cache') source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz) md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a') -build() { +prepare() { cd "$srcdir"/$pkgname-$pkgver.src sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/$pkgname +} + +build() { + cd "$srcdir"/$pkgname-$pkgver.src make build } @@ -35,6 +39,10 @@ package() { install -dm755 "$pkgdir"/usr/share/{$pkgname,icons/hicolor} cp -rp Help locale Media Projects README "$pkgdir"/usr/share/$pkgname/ - cp -rp src/icons/* "$pkgdir"/usr/share/icons/hicolor/ cp -rp Plugins "$pkgdir"/usr/lib/$pkgname/ + + for res in 32 48 128; do + install -D -m644 src/icons/${res}x${res}/$pkgname.png \ + "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png + done } diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install index 7fe49829c..8db29369c 100644 --- a/community/scratch/scratch.install +++ b/community/scratch/scratch.install @@ -4,6 +4,10 @@ post_install() { gtk-update-icon-cache -qf /usr/share/icons/hicolor } +post_upgrade() { + post_install +} + post_remove() { post_install } diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index 736b5a9a5..845d12c7b 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 90088 2013-05-06 19:39:30Z foutrelis $ +# $Id: PKGBUILD 103803 2014-01-11 20:08:37Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools -pkgver=1.4.0 -pkgrel=3 +pkgver=1.6.0 +pkgrel=1 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" license=('GPL') -depends=('libpng' 'wxgtk' 'flac' 'libvorbis') +depends=('libpng' 'wxgtk2.8' 'flac' 'libvorbis') arch=('i686' 'x86_64' 'mips64el') -source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('43cbf9f5c4939876cf4149dd59e68044') +source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.bz2) +md5sums=('9a5c74a49707c513e8853004e3a699e4') build() { cd ${pkgname}-${pkgver} + sed -i 's/wxgtk2-2.8-config/wx-config-2.8/' configure ./configure --prefix=/usr make } diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD index b3974172f..203051775 100644 --- a/community/scummvm/PKGBUILD +++ b/community/scummvm/PKGBUILD @@ -4,12 +4,14 @@ pkgname=scummvm pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.scummvm.org/" -depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad') +depends=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2' + 'libgl' 'glu') +makedepends=('mesa') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('473c151ff44e3db7b603ecacd800a0d2') diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD index e19df670f..c75baf697 100644 --- a/community/sfk/PKGBUILD +++ b/community/sfk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102870 2013-12-23 01:46:34Z seblu $ +# $Id: PKGBUILD 105651 2014-02-13 00:44:20Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Baumi <baumi@gmx.com> pkgname=sfk -pkgver=1.6.9 +pkgver=1.7.0 pkgrel=1 pkgdesc='Swiss File Knife - A Command Line Tools Collection' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk' license=('custom: BSD') depends=('gcc-libs') source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") -md5sums=('3a006bd1f73587ef347838231a5adbb3') +md5sums=('325842e02ca7db504deace76b6375861') build() { cd ${pkgname}${pkgver//./} diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index 20a79b127..7a714c5fa 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -1,34 +1,32 @@ -# $Id: PKGBUILD 103038 2013-12-25 17:41:52Z jlichtblau $ +# $Id: PKGBUILD 105403 2014-02-06 19:27:08Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Bob Finch <w9ya@arrl.net> pkgname=shapelib pkgver=1.3.0 -pkgrel=4 +pkgrel=5 pkgdesc='simple C API for reading and writing ESRI Shapefiles' arch=('i686' 'x86_64' 'mips64el') url='http://shapelib.maptools.org/' license=('LGPL' 'MIT') +options=('staticlibs') source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f' '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile make lib } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - # The Makefile won't install it correctly, this is easier. - install -D -m644 libshp.a "$pkgdir/usr/lib/libshp.a" - install -D -m644 shapefil.h "$pkgdir/usr/include/libshp/shapefil.h" - install -dm755 "$pkgdir"/usr/{lib,include} + install -dm755 "${pkgdir}"/usr/{lib,include} # Fix the broken makefile sed -i -e s:/usr/local:${pkgdir}/usr: Makefile @@ -36,7 +34,7 @@ package() { make lib_install # Fix world readable bit not set - chmod 644 $pkgdir/usr/include/shapefil.h + chmod 644 "${pkgdir}"/usr/include/shapefil.h - install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index fe560a485..2fa364c1d 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z spupykin $ +# $Id: PKGBUILD 104606 2014-01-23 13:18:27Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" 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/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index 1a04353e4..4b058df5b 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103041 2013-12-25 17:46:25Z jlichtblau $ +# $Id: PKGBUILD 105400 2014-02-06 18:08:16Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=4.1.2 -pkgrel=2 +pkgver=4.1.3 +pkgrel=1 pkgdesc='File system and media management forensic analysis tools' arch=('i686' 'x86_64' 'mips64el') url='http://www.sleuthkit.org/sleuthkit' @@ -12,7 +12,7 @@ license=('GPL2' 'CPL' 'custom:"IBM Public Licence"') depends=('perl') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3') +sha256sums=('67f9d2a31a8884d58698d6122fc1a1bfa9bf238582bde2b49228ec9b899f0327') build() { cd ${pkgname}-${pkgver} diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog index 86fb29e8b..9a3c7c791 100644 --- a/community/sleuthkit/sleuthkit.changelog +++ b/community/sleuthkit/sleuthkit.changelog @@ -1,3 +1,6 @@ +2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sleuthkit 4.1.3-1 + 2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * sleuthkit 4.1.2-2 static library removed diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 8acee1114..4fa7a5201 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $ +# $Id: PKGBUILD 103894 2014-01-13 12:10:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=smbnetfs -pkgver=0.5.3a -pkgrel=6 +pkgver=0.5.3b +pkgrel=1 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory." arch=('i686' 'x86_64' 'mips64el') url="http://smbnetfs.sourceforge.net/" @@ -19,7 +19,7 @@ options=(docs) source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 conf-smbnetfs smbnetfs.service) -md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' +md5sums=('fa9f7be673eb48d032bbd044f6da4016' 'e150c4cd894cc6ade11b94c95cf17ec4' '0fdd0dbaa5f16b1ecd00ec1ddcdfc223') diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index dae8aa4d5..f5a4bc09b 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,37 +1,37 @@ -# $Id: PKGBUILD 102305 2013-12-07 21:26:57Z bpiotrowski $ +# $Id: PKGBUILD 105055 2014-01-30 18:44:14Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$pkgname.install -depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev') +depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' + 'udev' 'bash') makedepends=('intltool' 'gettext') optdepends=('lsof: device processes' - 'eject: eject media' 'wget: plugin download' 'gksu: perform as root functionality' 'udevil: mount as non-root user and mount networks' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz) -md5sums=('f7d04110b4dd9c3c434bffe8b04bbb69') +md5sums=('6bbf41bc97a46a797500dbf0ae359971') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-pixmaps \ - --with-gtk3 - make + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-pixmaps \ + --with-gtk3 + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD index 019c6cc2e..466e014a1 100644 --- a/community/spice-gtk3/PKGBUILD +++ b/community/spice-gtk3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102790 2013-12-20 03:19:02Z bgyorgy $ +# $Id: PKGBUILD 105626 2014-02-12 09:17:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Facchini <stefano.facchini@gmail.com> # Contributor: Jonathan Lestrelin <zanko@daemontux.org> # Contributor: Lucio Zara <pennega@gmail.com> pkgname=spice-gtk3 -pkgver=0.22 +pkgver=0.23 pkgrel=1 pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)" arch=('i686' 'x86_64') @@ -15,6 +15,7 @@ depends=('celt0.5.1' 'dbus-glib' 'gtk3' 'libcacard' 'libpulse' 'usbredir') makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'spice-protocol' 'usbutils' 'vala') source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") sha256sums=('05e9e5d915a99005a812846f733bba177ef3b1a9de9356690047250fb1b1fa3a') +sha256sums=('bfdfa6cb12c40327b63167fe7191ce94e7f2a272473c87df31790c25d60cc81d') prepare() { cd "$srcdir/spice-gtk-$pkgver" diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 5cb460ab8..e776d4e27 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102279 2013-12-07 10:37:11Z bpiotrowski $ +# $Id: PKGBUILD 103730 2014-01-11 01:37:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.95.0 -_pkgver=95.0 -pkgrel=2 +pkgver=0.96.0 +_pkgver=96.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('2030100b4c51a1906408aad417a39b1b') +md5sums=('2aeaaed4cf316ea22761efc0ef849a73') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/spring/boost-1.50.patch b/community/spring/boost-1.50.patch deleted file mode 100644 index f8a8b5695..000000000 --- a/community/spring/boost-1.50.patch +++ /dev/null @@ -1,2539 +0,0 @@ -diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp ---- spring_89.0/rts/Game/Camera/CameraController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -59,7 +59,7 @@ - bool CCameraController::GetUseDistToGroundForIcons() { - - const float3& dir = GetDir().UnsafeNormalize(); -- const float dot = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector)))); -+ const float dot = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector)))); - - if (dot < switchVal) { - // flat angle (typical for first person camera) -diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp ---- spring_89.0/rts/Game/Camera/FPSController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -80,9 +80,9 @@ - oldHeight = pos.y - gndHeight; - } - -- dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y)); -- dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y)); -+ dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp ---- spring_89.0/rts/Game/Camera/FreeController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,9 +51,9 @@ - dir = float3(0.0f, -2.0f, -1.0f); - dir.ANormalize(); - if (camera) { -- const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z)); -- camera->rot.y = atan2(dir.x, dir.z); -- camera->rot.x = atan2(dir.y, hDist); -+ const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z)); -+ camera->rot.y = math::atan2(dir.x, dir.z); -+ camera->rot.x = math::atan2(dir.y, hDist); - } - pos -= (dir * 1000.0f); - -@@ -84,14 +84,14 @@ - - // lock the view direction to the target - const float3 diff(trackPos - pos); -- const float rads = atan2(diff.x, diff.z); -+ const float rads = math::atan2(diff.x, diff.z); - camera->rot.y = rads; - - const float len2D = diff.Length2D(); -- if (fabs(len2D) <= 0.001f) { -+ if (math::fabs(len2D) <= 0.001f) { - camera->rot.x = 0.0f; - } else { -- camera->rot.x = atan2((trackPos.y - pos.y), len2D); -+ camera->rot.x = math::atan2((trackPos.y - pos.y), len2D); - } - - camera->UpdateForward(); -@@ -130,11 +130,11 @@ - if (pos.y < (gndHeight + gndOffset + 1.0f)) { - float3 hDir; - hDir.y = 0.0f; -- hDir.x = (float)sin(camera->rot.y); -- hDir.z = (float)cos(camera->rot.y); -+ hDir.x = (float)math::sin(camera->rot.y); -+ hDir.z = (float)math::cos(camera->rot.y); - const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false); - const float dot = gndNormal.dot(hDir); -- const float gndRotX = (float)acos(dot) - (PI * 0.5f); -+ const float gndRotX = (float)math::acos(dot) - (PI * 0.5f); - const float rotXdiff = (gndRotX - camera->rot.x); - autoTiltVel = (autoTilt * rotXdiff); - } -@@ -214,8 +214,8 @@ - // convert the angular velocity into its positional change - const float3 diff2 = (pos - trackPos); - const float deltaRad = (avel.y * ft); -- const float cos_val = cos(deltaRad); -- const float sin_val = sin(deltaRad); -+ const float cos_val = math::cos(deltaRad); -+ const float sin_val = math::sin(deltaRad); - pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z)); - pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x)); - } -@@ -246,7 +246,7 @@ - if (pos.y < minHeight) { - pos.y = minHeight; - if (gndLock) { -- vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); -+ vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); - } else { - vel.y = 0.0f; - } -@@ -263,7 +263,7 @@ - camera->rot.x = -xRotLimit; - avel.x = 0.0f; - } -- camera->rot.y = fmod(camera->rot.y, PI * 2.0f); -+ camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f); - - // setup for the next loop - prevVel = vel; -@@ -277,9 +277,9 @@ - float3 CFreeController::GetDir() const - { - float3 dir; -- dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - return dir; - } -@@ -373,7 +373,7 @@ - if ((yDiff * dir.y) >= 0.0f) { - pos = float3(newPos.x, h, newPos.z); - } else { -- pos = target - (dir * fabs(yDiff / dir.y)); -+ pos = target - (dir * math::fabs(yDiff / dir.y)); - } // FIXME - /* - const float oldPosY = pos.y; -diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp ---- spring_89.0/rts/Game/Camera/OrbitController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,8 +51,8 @@ - const float3 w = (v / v.Length()); // do not normalize v in-place - - const float d = v.Length(); -- const float e = RAD2DEG(acos(v.Length2D() / d)); -- const float r = RAD2DEG(acos(w.x)); -+ const float e = RAD2DEG(math::acos(v.Length2D() / d)); -+ const float r = RAD2DEG(math::acos(w.x)); - - distance = cDistance = d; - elevation = cElevation = e; -@@ -251,12 +251,12 @@ - float tx = cx; - - tx = cx; -- cx = cx * cos(beta) + cy * sin(beta); -- cy = tx * sin(beta) + cy * cos(beta); -+ cx = cx * math::cos(beta) + cy * math::sin(beta); -+ cy = tx * math::sin(beta) + cy * math::cos(beta); - - tx = cx; -- cx = cx * cos(gamma) - cz * sin(gamma); -- cz = tx * sin(gamma) + cz * cos(gamma); -+ cx = cx * math::cos(gamma) - cz * math::sin(gamma); -+ cz = tx * math::sin(gamma) + cz * math::cos(gamma); - - return float3(cx, cy, cz); - } -diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp ---- spring_89.0/rts/Game/Camera/OverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -52,7 +52,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - - pos.x += move.x * pixelSize * 2.0f * scrollSpeed; - pos.z -= move.y * pixelSize * 2.0f * scrollSpeed; -diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp ---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,7 +29,7 @@ - - void CRotOverheadController::KeyMove(float3 move) - { -- move *= sqrt(move.z) * 400; -+ move *= math::sqrt(move.z) * 400; - - float3 flatForward = camera->forward; - if(camera->forward.y < -0.9f) -@@ -68,9 +68,9 @@ - - void CRotOverheadController::UpdateVectors() - { -- dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.y=(float)(sin(camera->rot.x)); -- dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x)); -+ dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y=(float)(math::sin(camera->rot.x)); -+ dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); - dir.ANormalize(); - - pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f); -diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp ---- spring_89.0/rts/Game/Camera/SmoothController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -55,7 +55,7 @@ - move.y = -move.y; - } - -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -@@ -103,7 +103,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp ---- spring_89.0/rts/Game/Camera/TWController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -35,7 +35,7 @@ - flatForward.y=0; - flatForward.ANormalize(); - -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - pos += (camera->right * move.x + flatForward * move.y) * scrollSpeed; - UpdateVectors(); - } -@@ -79,9 +79,9 @@ - - camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f); - -- dir.x = sin(camera->rot.y) * cos(camera->rot.x); -- dir.y = sin(camera->rot.x); -- dir.z = cos(camera->rot.y) * cos(camera->rot.x); -+ dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x); -+ dir.y = math::sin(camera->rot.x); -+ dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp ---- spring_89.0/rts/Game/Camera.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -89,7 +89,7 @@ - up.UnsafeANormalize(); - - const float aspect = globalRendering->aspectRatio; -- const float viewx = tan(aspect * halfFov); -+ const float viewx = math::tan(aspect * halfFov); - const float viewy = tanHalfFov; - - if (globalRendering->viewSizeY <= 0) { -@@ -218,9 +218,9 @@ - - void CCamera::UpdateForward() - { -- forward.z = cos(rot.y) * cos(rot.x); -- forward.x = sin(rot.y) * cos(rot.x); -- forward.y = sin(rot.x); -+ forward.z = math::cos(rot.y) * math::cos(rot.x); -+ forward.x = math::sin(rot.y) * math::cos(rot.x); -+ forward.y = math::sin(rot.x); - forward.Normalize(); - } - -@@ -229,7 +229,7 @@ - { - fov = myfov; - halfFov = (fov * 0.5f) * (PI / 180.f); -- tanHalfFov = tan(halfFov); -+ tanHalfFov = math::tan(halfFov); - } - - -@@ -330,7 +330,7 @@ - float3 pInt; - - // prevent DIV0 when calculating line.dir -- if (fabs(xdir.z) < 0.001f) -+ if (math::fabs(xdir.z) < 0.001f) - xdir.z = 0.001f; - - if (ydir.y != 0.0f) { -diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp ---- spring_89.0/rts/Game/CameraHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -139,7 +139,7 @@ - cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime)); - const float nextTime = cameraTimeLeft; - const float exp = cameraTimeExponent; -- const float ratio = 1.0f - (float)pow((nextTime / currTime), exp); -+ const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp); - - const float deltaFOV = wantedCamFOV - camera->GetFov(); - const float3 deltaPos = wantedCamPos - camera->pos; -diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp ---- spring_89.0/rts/Game/GameServer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp 2012-07-13 06:34:42.936060485 +0200 -@@ -253,7 +253,7 @@ - // Something in CGameServer::CGameServer borks the FPU control word - // maybe the threading, or something in CNet::InitServer() ?? - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - } - -diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp ---- spring_89.0/rts/Game/SelectedUnitsAI.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -179,7 +179,7 @@ - const float3 sideDir = frontdir.cross(UpVector); - - // calculate so that the units form in an aproximate square -- float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f); -+ float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f); - - // push back some extra params so it confer with a front move - c.params.push_back(pos.x + (sideDir.x * length)); -diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp ---- spring_89.0/rts/Game/TraceRay.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -75,7 +75,7 @@ - if (closeFlatLength > length) - closeFlatLength = length; - -- if (fabs(linear - quadratic * closeFlatLength) < 0.15f) { -+ if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) { - // relatively flat region -> use approximation - dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength; - -diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp ---- spring_89.0/rts/Game/UI/EndGameBox.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,11 +29,11 @@ - - if (num == 0) { - sprintf(c, "0"); -- } else if (fabs(num) < 10 * mul) { -+ } else if (math::fabs(num) < 10 * mul) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < 10000 * mul) { -+ } else if (math::fabs(num) < 10000 * mul) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < 10000000 * mul) { -+ } else if (math::fabs(num) < 10000000 * mul) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -165,7 +165,7 @@ - if (dispMode > 0 ) { - if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) && - (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) { -- int sel = (int) floor(-(my - box.y1 - 0.57f) * 50); -+ int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50); - - if (button == 1) { - stat1 = sel; -@@ -341,7 +341,7 @@ - - if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) && - (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) { -- const int sel = (int) floor(50 * -(my - box.y1 - 0.57f)); -+ const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f)); - - glColor4f(0.7f, 0.2f, 0.2f, guiAlpha); - glDisable(GL_TEXTURE_2D); -diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h ---- spring_89.0/rts/Game/UI/EndGameBox.h 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h 2012-07-13 06:34:43.066060493 +0200 -@@ -60,8 +60,8 @@ - if (team >= 0 && static_cast<size_t>(team) >= values.size()) { - values.resize(team + 1); - } -- if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) { -- maxdif = fabs(value-values[team].back()); -+ if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) { -+ maxdif = math::fabs(value-values[team].back()); - } - - values[team].push_back(value); -diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp ---- spring_89.0/rts/Game/UI/MouseCursor.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -355,7 +355,7 @@ - return; - } - -- animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod); -+ animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod); - - if (animTime < frames[currentFrame].startTime) { - currentFrame = 0; -diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp ---- spring_89.0/rts/Game/UI/ResourceBar.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -48,11 +48,11 @@ - - if (num == 0) - sprintf(c, "0"); -- if ( fabs(num) < (10 * mul)) { -+ if ( math::fabs(num) < (10 * mul)) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < (10000 * mul)) { -+ } else if (math::fabs(num) < (10000 * mul)) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < (10000000 * mul)) { -+ } else if (math::fabs(num) < (10000000 * mul)) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -180,11 +180,11 @@ - - smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses - smallFont->glFormat(metalx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(), -- FloatToSmallString(fabs(myTeam->metalSent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->metalSent)).c_str()); - smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(), -- FloatToSmallString(fabs(myTeam->energySent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->energySent)).c_str()); - - smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income - smallFont->glFormat(metalx + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s", -diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp ---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -367,9 +367,9 @@ - camera->rot.x=-1; - - float3 wantedCamDir; -- wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x)); -- wantedCamDir.y=(float)(sin(camera->rot.x)); -- wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x)); -+ wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x)); -+ wantedCamDir.y=(float)(math::sin(camera->rot.x)); -+ wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x)); - wantedCamDir.ANormalize(); - - camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800); -diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp ---- spring_89.0/rts/Game/UI/UnitTracker.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -297,8 +297,8 @@ - modPlanePos.y = minHeight; - } - -- trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime)); -- trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime)); -+ trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime)); -+ trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime)); - trackDir.ANormalize(); - - camera->pos = trackPos; -diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h ---- spring_89.0/rts/lib/gml/gmlsrv.h 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h 2012-07-13 06:34:43.209393834 +0200 -@@ -361,7 +361,7 @@ - if (gmlShareLists) { - ogc[thr]->WorkerThreadPost(); - } -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientSub(); - } -@@ -452,7 +452,7 @@ - Threading::SetThreadName("sim"); - Watchdog::RegisterThread(WDT_SIM, true); - set_threadnum(GML_SIM_THREAD_NUM); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientAuxSub(); - } -diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp ---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-13 06:35:00.626061514 +0200 -@@ -12,10 +12,16 @@ - extern "C" { - #endif - -+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_ -+ #define SPRING_UTCTIME boost::TIME_UTC_ -+#else -+ #define SPRING_UTCTIME boost::TIME_UTC -+#endif -+ - int stub_sdl_getSystemMilliSeconds() { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000); - return milliSeconds; - } -@@ -23,7 +29,7 @@ - void stub_sdl_sleepMilliSeconds(int milliSeconds) { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - t.nsec += 1000000 * milliSeconds; - boost::thread::sleep(t); - } -diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp ---- spring_89.0/rts/lib/streflop/streflopC.cpp 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -9,16 +9,16 @@ - #endif - - void streflop_init_Simple() { -- streflop_init<Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void streflop_init_Double() { -- streflop_init<Double>(); -+ streflop::streflop_init<streflop::Double>(); - } - - #if defined(Extended) - void streflop_init_Extended() { -- streflop_init<Extended>(); -+ streflop::streflop_init<streflop::Extended>(); - } - #endif // defined(Extended) - -diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h ---- spring_89.0/rts/lib/streflop/streflop_cond.h 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h 2012-07-13 06:34:42.906060483 +0200 -@@ -11,8 +11,6 @@ - - #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT) - #include "streflop.h" --using namespace streflop; -- - namespace math { - using namespace streflop; - } -@@ -20,6 +18,7 @@ - #include <cmath> - namespace math { - using std::fabs; -+ // We are using fastmath::sqrt_sse instead! - // using std::sqrt; - using std::sin; - using std::cos; -diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp ---- spring_89.0/rts/Map/BasicMapDamage.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -33,7 +33,7 @@ - - for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) { - const float r = a / float(CRATER_TABLE_SIZE); -- const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI)); -+ const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI)); - craterTable[a] = d; - } - -@@ -83,7 +83,7 @@ - const float* curHeightMap = readmap->GetCornerHeightMapSynced(); - const float* orgHeightMap = readmap->GetOriginalHeightMapSynced(); - const unsigned char* typeMap = readmap->GetTypeMapSynced(); -- const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness; -+ const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness; - const float invRadius = 1.0f / radius; - - for (int y = e->y1; y <= e->y2; ++y) { -@@ -111,7 +111,7 @@ - orgHeightMap[y * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - e->squares.push_back(dif); -@@ -148,7 +148,7 @@ - orgHeightMap[z * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - totalDif += dif; -diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp ---- spring_89.0/rts/Map/Ground.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -433,8 +433,8 @@ - - float3 CGround::GetSmoothNormal(float x, float y, bool synced) const - { -- int sx = (int) floor(x / SQUARE_SIZE); -- int sy = (int) floor(y / SQUARE_SIZE); -+ int sx = (int) math::floor(x / SQUARE_SIZE); -+ int sy = (int) math::floor(y / SQUARE_SIZE); - - if (sy < 1) - sy = 1; -diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp ---- spring_89.0/rts/Map/SM3/Plane.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -15,7 +15,7 @@ - a = ry1*rz2 - ry2*rz1; - b = rz1*rx2 - rz2*rx1; - c = rx1*ry2 - rx2*ry1; -- float len = (float)sqrt(a*a + b*b + c*c); -+ float len = (float)math::sqrt(a*a + b*b + c*c); - a /= len; - b /= len; - c /= len; -@@ -37,10 +37,10 @@ - bool Plane::EpsilonCompare(const Plane& pln, float epsilon) - { - Plane t; -- t.a = fabs(a - pln.a); -- t.b = fabs(b - pln.b); -- t.c = fabs(c - pln.c); -- t.d = fabs(d - pln.d); -+ t.a = math::fabs(a - pln.a); -+ t.b = math::fabs(b - pln.b); -+ t.c = math::fabs(c - pln.c); -+ t.d = math::fabs(d - pln.d); - if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) { - return false; - } -diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp ---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -197,7 +197,7 @@ - continue; - } - -- float len = sqrt(dx*dx + dy*dy); -+ float len = math::sqrt(dx*dx + dy*dy); - const float step = 5.0f; - float invLength2d = step / len; - dx *= invLength2d; -diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp ---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -248,7 +248,7 @@ - } - - // flatness=dotproduct of surface normal with up vector -- float slope = 1.0f - fabs(norm_y); -+ float slope = 1.0f - math::fabs(norm_y); - - if (slope < gi->minSlope - gi->minSlopeFuzzy) { - bm->at(x,y) = 0.0f; -@@ -307,7 +307,7 @@ - Vector3 n; - - if (sx*sx + sy*sy < 32*32) { -- const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); -+ const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); - n = Vector3(sx, sy, sz); - n.ANormalize(); - } -diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp ---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -99,7 +99,7 @@ - const int minz = bty * smfReadMap->bigTexSize; - const int maxz = minz + smfReadMap->bigTexSize; - const float miny = readmap->currMinHeight; -- const float maxy = fabs(cam->pos.y); -+ const float maxy = math::fabs(cam->pos.y); - - const float3 mins( 0, miny, minz); - const float3 maxs(smfReadMap->mapSizeX, maxy, maxz); -diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp ---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -405,7 +405,7 @@ - - // Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height. - // Use values passed on the stack instead of re-accessing the Height Field. -- float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2)); -+ float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2)); - - if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0) - myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy -diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp ---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -385,7 +385,7 @@ - smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1); - smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1); -- smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0); -+ smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0); - smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1); - smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1); -diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp ---- spring_89.0/rts/Rendering/Env/AdvSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -65,8 +65,8 @@ - memset(thicknessTransform, 0, 1024); - memset(covers, 0, 4 * 32 * sizeof(float)); - -- domeheight = cos(PI / 16) * 1.01f; -- domeWidth = sin(2 * PI / 32) * 400 * 1.7f; -+ domeheight = math::cos(PI / 16) * 1.01f; -+ domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -383,7 +383,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -417,11 +417,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -533,7 +533,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(int) (alpha*255); -@@ -560,11 +560,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -622,8 +622,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx = sin(x*2*PI/256.0f); -- float dy = cos(x*2*PI/256.0f); -+ float dx = math::sin(x*2*PI/256.0f); -+ float dy = math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.125f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -646,7 +646,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -749,7 +749,7 @@ - - for(int a=0;a<5;++a){ - float fade = gs->frameNum / float(30<<a); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - int size = std::min(32,256>>a); - - if(fade>1){ -@@ -770,7 +770,7 @@ - - } - float tSize = std::max(1,8>>a); -- float c = pow(2.0f,a)*6/255.0f; -+ float c = math::pow(2.0f,a)*6/255.0f; - CVertexArray* va = GetVertexArray(); - va->Initialize(); - va->CheckInitSize(4*VA_SIZE_T); -@@ -867,10 +867,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -903,7 +903,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist)); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -918,7 +918,7 @@ - void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -229,7 +229,7 @@ - std::list<FallingTree>::iterator prev = fti++; - fallingTrees.erase(prev); - } else { -- fti->speed += (sin(fti->fallPos) * 0.04f); -+ fti->speed += (math::sin(fti->fallPos) * 0.04f); - ++fti; - } - } -@@ -616,7 +616,7 @@ - if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(yvec.cross(zvec)); - -@@ -957,7 +957,7 @@ - if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(zvec.cross(yvec)); - -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -159,9 +159,9 @@ - int numIter=(int)max(3.0f,size*10); - for(int a=0;a<=numIter;a++){ - float angle=a/(float)numIter*2*PI; -- float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -- barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); -+ float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -+ barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); - } - barkva->EndStrip(); - } -@@ -176,18 +176,18 @@ - - for (int a = 0; a < numBranch; ++a) { - const float angle = baseAngle + (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1 * sin(angle) + orto2 * cos(angle); -+ float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle); - dir.y = 0.3f + fRand(0.4f); - dir.ANormalize(); - const float3 start(0, (a + 5) * height / (numBranch + 5), 0); -- const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch); -+ const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch); - - TrunkIterator(start, dir, length, length * 0.05f, 1); - } - - for (int a = 0; a < 3; ++a) { - const float angle = (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1*sin(angle)+orto2*cos(angle); -+ float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle); - dir.y = 0.8f; - dir.ANormalize(); - const float3 start(0, height - 0.3f, 0); -@@ -225,7 +225,7 @@ - const float newLength = length * (float(numTrunks - a) / (numTrunks + 1)); - - float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1)); -- float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif; -+ float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif; - newDir.ANormalize(); - - TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1); -@@ -245,8 +245,8 @@ - - float3 pos = start + dir * length * (0.7f + fRand(0.3f)); - pos += -- (orto1 * sin(angle) + orto2 * cos(angle)) * -- (sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * -+ (orto1 * math::sin(angle) + orto2 * math::cos(angle)) * -+ (math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * - 0.1f * MAX_TREE_HEIGHT; - - if (pos.y < 0.2f * MAX_TREE_HEIGHT) -@@ -538,12 +538,12 @@ - float baseAngle=fRand(2*PI); - for(int a=0;a<numBranch;++a){ - float sh = 0.2f + fRand(0.2f); -- float h = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); -+ float h = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); - float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI; -- float3 dir(orto1 * sin(angle) + orto2 * cos(angle)); -+ float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle)); - dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f)); - dir.ANormalize(); -- float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; -+ float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; - DrawPineBranch(float3(0,h,0),dir,size); - } - //create the top -@@ -569,16 +569,16 @@ - for(int a=0;a<numIter;a++){ - float angle=a/(float)numIter*2*PI; - float angle2=(a+1)/(float)numIter*2*PI; -- float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f; -+ float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f; - -- va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); -+ va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); - } - } - -diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp ---- spring_89.0/rts/Rendering/Env/AdvWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -48,7 +48,7 @@ - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { - scrap[(y*64 + x)*4 + 0] = 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128); -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128); - scrap[(y*64 + x)*4 + 2] = 0; - scrap[(y*64 + x)*4 + 3] = 255; - } -@@ -62,8 +62,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = 26.5f*PI/180.0f; - const float pos = y*2+x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]); -@@ -75,8 +75,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = -19*PI/180.0f; - const float pos = 3*y - x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]); -@@ -192,14 +192,14 @@ - dir = xbase + dv; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col); - - dir = xbase; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col); - -diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp ---- spring_89.0/rts/Rendering/Env/BasicSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -67,8 +67,8 @@ - rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE); - blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32); - -- domeheight=cos(PI/16)*1.01f; -- domeWidth=sin(PI/16)*400*1.7f; -+ domeheight=math::cos(PI/16)*1.01f; -+ domeWidth=math::sin(PI/16)*400*1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -369,7 +369,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -403,11 +403,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -506,7 +506,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(unsigned char)(alpha*255); -@@ -533,11 +533,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -589,8 +589,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx=sin(x*2*PI/256.0f); -- float dy=cos(x*2*PI/256.0f); -+ float dx=math::sin(x*2*PI/256.0f); -+ float dy=math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.25f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -613,7 +613,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -764,10 +764,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -800,7 +800,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -814,7 +814,7 @@ - void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp ---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -269,7 +269,7 @@ - for (int x = 0; x < size; ++x) { - const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize(); - const float dot = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir())); -- const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f); -+ const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f); - - buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255); - buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255); -diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp ---- spring_89.0/rts/Rendering/Env/DynWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -88,9 +88,9 @@ - - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { -- temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; -+ temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; - temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0]; -- temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; -+ temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; - temp[(y*64 + x)*4 + 3] = 0; - } - } -@@ -197,7 +197,7 @@ - const float dy = y - 31.5f; - for (int x = 0; x < 64; ++x) { - const float dx = x-31.5f; -- const float dist = sqrt(dx*dx + dy*dy); -+ const float dist = math::sqrt(dx*dx + dy*dy); - temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); -@@ -425,8 +425,8 @@ - - oldCamPosBig = camPosBig; - -- camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - glDisable(GL_DEPTH_TEST); - glDepthMask(0); -@@ -835,8 +835,8 @@ - va = GetVertexArray(); - va->Initialize(); - -- camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - // FIXME: - // 1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty -@@ -1132,8 +1132,8 @@ - // hovercraft - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1144,7 +1144,7 @@ - if ((pos.y > -4.0f) && (pos.y < 4.0f)) { - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.75f; -- const float depth = sqrt(sqrt(unit->mass)) * 0.4f; -+ const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f; - const float3 n(depth, 0.05f * depth, depth); - - va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1156,8 +1156,8 @@ - // surface ship - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1171,7 +1171,7 @@ - - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.18f; -- const float depth = sqrt(sqrt(unit->mass)); -+ const float depth = math::sqrt(math::sqrt(unit->mass)); - const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth); - - va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1249,8 +1249,8 @@ - for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) { - Explosion& explo = *ei; - float3 pos = explo.pos; -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -- || (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -+ || (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp ---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -75,11 +75,11 @@ - } - - // TODO: get rid of the magic constants -- maxGrassDist = 800 + sqrt((float) detail) * 240; -+ maxGrassDist = 800 + math::sqrt((float) detail) * 240; - maxDetailedDist = 146 + detail * 24; - detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1; - numTurfs = 3 + int(detail * 0.5f); -- strawPerTurf = 50 + int(sqrt((float) detail) * 10); -+ strawPerTurf = 50 + int(math::sqrt((float) detail) * 10); - - blocksX = gs->mapx / grassSquareSize /grassBlockSize; - blocksY = gs->mapy / grassSquareSize / grassBlockSize; -@@ -641,7 +641,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -673,7 +673,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -820,7 +820,7 @@ - float3 forwardVect = sideVect.cross(UpVector); - sideVect *= mapInfo->grass.bladeWidth; - -- const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length; -+ const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length; - float3 basePos(30.0f, 0.0f, 30.0f); - - while (basePos.SqLength2D() > (turfSize * turfSize / 4)) { -@@ -837,10 +837,10 @@ - - const float3 edgePosL = - -sideVect * (1 - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - const float3 edgePosR = - sideVect * (1.0f - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - - if (b == 0) { - va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h); -diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp ---- spring_89.0/rts/Rendering/Env/SkyLight.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -72,7 +72,7 @@ - bool DynamicSkyLight::SetLightDir(const float4& newLightDir) { - if (newLightDir != lightDir) { - static float4 lastUpdate = ZeroVector; -- static const float minCosAngle = cos(1.5f * (PI/180.f)); -+ static const float minCosAngle = math::cos(1.5f * (PI/180.f)); - - if (lastUpdate.dot(newLightDir) < minCosAngle) { - lastUpdate = newLightDir; -@@ -92,7 +92,7 @@ - const float angularVelocity = 2.0f * PI / sunOrbitTime; - - const float sunAng = startAngle - initialSunAngle - angularVelocity * gameSeconds; -- const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng))); -+ const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng))); - - return sunPos; - } -@@ -108,18 +108,18 @@ - if (newLightDir.w == FLT_MAX) { - // old: newLightDir is position where sun reaches highest altitude - const float sunLen = newLightDir.Length2D(); -- const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen); -- const float sunHeight = tan(sunAzimuth - 0.001f); -+ const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen); -+ const float sunHeight = math::tan(sunAzimuth - 0.001f); - -- float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle)); -+ float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle)); - v1.ANormalize(); - - if (v1.y <= orbitMinSunHeight) { - newLightDir = UpVector; - sunOrbitHeight = v1.y; -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } else { -- float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI)); -+ float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI)); - v2.ANormalize(); - float3 v3 = v2 - v1; - sunOrbitRad = v3.Length() / 2.0f; -@@ -137,7 +137,7 @@ - } else { - // new: newLightDir is center position of orbit, and newLightDir.w is orbit height - sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f)); -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } - - sunRotation.LoadIdentity(); -diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp ---- spring_89.0/rts/Rendering/GL/glExtra.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -83,7 +83,7 @@ - float adjustment = rad/2; - float ydiff = 0; - int j; -- for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){ -+ for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){ - if(adjRadius > rad) { - rad += adjustment; - } else { -@@ -93,7 +93,7 @@ - pos.x = center.x + (sinR * rad); - pos.z = center.z + (cosR * rad); - float newY = ground->GetHeightAboveWater(pos.x, pos.z, false); -- ydiff = fabs(pos.y - newY); -+ ydiff = math::fabs(pos.y - newY); - pos.y = newY; - heightDiff = (pos.y - center.y); - adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad; -diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp ---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -963,7 +963,7 @@ - radius = damage * 0.25f; - - if (damage > 400) -- damage = 400 + sqrt(damage - 399); -+ damage = 400 + math::sqrt(damage - 399); - - pos.ClampInBounds(); - -diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp ---- spring_89.0/rts/Rendering/InMapDrawView.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -38,7 +38,7 @@ - for (int y = 0; y < 64; y++) { - // circular thingy - for (int x = 0; x < 64; x++) { -- float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); -+ float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); - if (dist > 31.0f) { - // do nothing - leave transparent - } else if (dist > 30.0f) { -diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp ---- spring_89.0/rts/Rendering/LineDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -29,7 +29,7 @@ - void CLineDrawer::UpdateLineStipple() - { - stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed()); -- stippleTimer = fmod(stippleTimer, (16.0f / 20.0f)); -+ stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f)); - } - - -diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp ---- spring_89.0/rts/Rendering/Models/S3OParser.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -319,7 +319,7 @@ - float3& t = tTangents[vrtIdx]; - int h = 1; - -- if (isnan(n.x) || isnan(n.y) || isnan(n.z)) { -+ if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) { - n = float3(0.0f, 0.0f, 1.0f); - } - if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); } -diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp ---- spring_89.0/rts/Sim/Misc/LosMap.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -182,7 +182,7 @@ - - y = (int)i; - x = 1; -- y = (int) (sqrt((float)r2 - 1) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - 1) + 0.5f); - while (x < y) { - if(!PaintTable[x+y*Radius]) { - DrawLine(PaintTable, x, y, Radius); -@@ -198,7 +198,7 @@ - } - - x += 1; -- y = (int) (sqrt((float)r2 - x*x) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - x*x) + 0.5f); - } - if (x == y) { - if(!PaintTable[x+y*Radius]) { -diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp ---- spring_89.0/rts/Sim/Misc/QuadField.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -329,12 +329,12 @@ - float zp = start.z; - const float invQuadSize = 1.0f / QUAD_SIZE; - -- if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) && -- (floor(start.z * invQuadSize) == floor(to.z * invQuadSize))) -+ if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) && -+ (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize))) - { - *endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX); - ++endQuad; -- } else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) { -+ } else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -347,7 +347,7 @@ - *endQuad = a; ++endQuad; - } - } -- } else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) { -+ } else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -369,14 +369,14 @@ - ++endQuad; - - if (dx > 0) { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; - } else { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; - } - if (dz > 0) { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; - } else { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; - } - - if (xn < zn) { -@@ -388,8 +388,8 @@ - } - - keepgoing = -- (fabs(xp - start.x) < fabs(to.x - start.x)) && -- (fabs(zp - start.z) < fabs(to.z - start.z)); -+ (math::fabs(xp - start.x) < math::fabs(to.x - start.x)) && -+ (math::fabs(zp - start.z) < math::fabs(to.z - start.z)); - } - } - -diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-13 06:34:43.256060504 +0200 -@@ -386,7 +386,7 @@ - - const float dif = wSpeed - currentSpeed; - -- if (fabs(dif) < 0.05f) { -+ if (math::fabs(dif) < 0.05f) { - deltaSpeed = dif * 0.125f; - nextDeltaSpeedUpdate = gs->frameNum + 8; - } else if (dif > 0.0f) { -@@ -529,7 +529,7 @@ - skidRotSpeed = 0.0f; - owner->physicalState = oldPhysState; - owner->moveType->useHeading = true; -- float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f); -+ float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f); - skidRotSpeed2 = (rp - skidRotPos2) * 0.5f; - ChangeHeading(owner->heading); - } else { -@@ -545,10 +545,10 @@ - } - - float remTime=speedf/speedReduction-1; -- float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); -+ float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); - skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1); - -- if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){ -+ if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){ - skidRotPos2=0; - skidRotSpeed2=0; - } -@@ -571,7 +571,7 @@ - speed*=0.95f; - } - else { -- speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f; -+ speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f; - speed*=.8; - } - } -@@ -625,7 +625,7 @@ - float totRad = owner->radius + u->radius; - - if (sqDist < totRad * totRad && sqDist != 0) { -- float dist = sqrt(sqDist); -+ float dist = math::sqrt(sqDist); - float3 dif = midPos - u->midPos; - dif /= std::max(dist, 1.f); - -@@ -682,7 +682,7 @@ - float sqDist=(midPos-u->midPos).SqLength(); - float totRad=owner->radius+u->radius; - if(sqDist<totRad*totRad && sqDist!=0){ -- float dist=sqrt(sqDist); -+ float dist=math::sqrt(sqDist); - float3 dif=midPos-u->midPos; - dif/=std::max(dist, 1.f); - float impactSpeed = -owner->speed.dot(dif); -@@ -721,8 +721,8 @@ - - skidRotPos2 += skidRotSpeed2; - -- float cosp = cos(skidRotPos2 * PI * 2.0f); -- float sinp = sin(skidRotPos2 * PI * 2.0f); -+ float cosp = math::cos(skidRotPos2 * PI * 2.0f); -+ float sinp = math::sin(skidRotPos2 * PI * 2.0f); - - float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir); - float3 f2 = owner->frontdir - f1; -@@ -812,7 +812,7 @@ - float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid); - - if (objectToUnit.dot(avoidanceDir) < radiusSum && -- fabs(objectDistToAvoidDirCenter) < radiusSum && -+ math::fabs(objectDistToAvoidDirCenter) < radiusSum && - (o->moveDef || Distance2D(owner, o) >= 0)) { - - if (objectDistToAvoidDirCenter > 0.0f) { -@@ -824,7 +824,7 @@ - rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f)); - } else { - avoidLeft += -- (radiusSum - fabs(objectDistToAvoidDirCenter)) * -+ (radiusSum - math::fabs(objectDistToAvoidDirCenter)) * - AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq); - avoidanceDir -= (rightOfAvoid * avoidLeft); - avoidanceDir.Normalize(); -@@ -952,7 +952,7 @@ - if (!decRate) { - return 0.0f; - } -- return fabs(speed*speed / decRate); -+ return math::fabs(speed*speed / decRate); - } - - float3 CClassicGroundMoveType::Here() -@@ -1043,7 +1043,7 @@ - const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE; - const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE; - -- if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) { - if (newmp.y < owner->mapPos.y) { - haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1, zmove - 3.99f, owner->mapPos.y); - newmp = owner->GetMapPos(); -@@ -1261,20 +1261,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a < floor(to.z); ++a) -+ for (int a = 1; a < math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a > floor(to.z); --a) -+ for (int a = -1; a > math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a < floor(to.x); ++a) -+ for (int a = 1; a < math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a > floor(to.x); --a) -+ for (int a = -1; a > math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1283,14 +1283,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1302,10 +1302,10 @@ - } - - keepgoing = -- fabs(xp - start.x) < fabs(to.x - start.x) && -- fabs(zp - start.z) < fabs(to.z - start.z); -+ math::fabs(xp - start.x) < math::fabs(to.x - start.x) && -+ math::fabs(zp - start.z) < math::fabs(to.z - start.z); - -- lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) ); -+ lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) ); - } - - lineTable[yt][xt].pop_back(); -@@ -1335,7 +1335,7 @@ - const MoveDef& md = *(owner->unitDef->moveDef); - const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2); - -- if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) { - if (newMoveSquareX > moveSquareX) { - const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2); - if (cmod > 0.01f && nmod <= 0.01f) { -diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -1808,20 +1808,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a <= floor(to.z); ++a) -+ for (int a = 1; a <= math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a >= floor(to.z); --a) -+ for (int a = -1; a >= math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a <= floor(to.x); ++a) -+ for (int a = 1; a <= math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a >= floor(to.x); --a) -+ for (int a = -1; a >= math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1830,14 +1830,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1851,7 +1851,7 @@ - keepgoing = - math::fabs(xp - start.x) <= math::fabs(to.x - start.x) && - math::fabs(zp - start.z) <= math::fabs(to.z - start.z); -- int2 pt(int(floor(xp)), int(floor(zp))); -+ int2 pt(int(math::floor(xp)), int(math::floor(zp))); - - static const int MIN_IDX = -int(LINETABLE_SIZE / 2); - static const int MAX_IDX = -MIN_IDX; -diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -325,7 +325,7 @@ - { - #define NOZERO(x) std::max(x, 0.0001f) - -- const float driftSpeed = fabs(owner->unitDef->dlHoverFactor); -+ const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor); - float3 deltaVec = goalPos - owner->pos; - float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z); - float l = NOZERO(deltaDir.Length2D()); -@@ -342,7 +342,7 @@ - deltaDir -= owner->speed; - l = deltaDir.SqLength2D(); - if (l > (maxSpeed * maxSpeed)) { -- deltaDir *= maxSpeed / NOZERO(sqrt(l)); -+ deltaDir *= maxSpeed / NOZERO(math::sqrt(l)); - } - wantedSpeed = owner->speed + deltaDir; - -diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -412,7 +412,7 @@ - } - } - -- if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { -+ if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { - elevator = 1; - } - UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir); -@@ -528,13 +528,13 @@ - if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f) - maneuver = 1; - -- if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { -+ if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { - maneuver = 2; - maneuverSubState = 0; - } - - // roll -- if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) { -+ if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) { - const float goalBankDif = goalDotRight + rightdir.y * 0.2f; - if (goalBankDif > maxAileron * speedf * 4.0f) { - aileron = 1; -@@ -706,7 +706,7 @@ - } else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) { - aileron = -1; - } else { -- if (fabs(rightdir.y) < maxBank) { -+ if (math::fabs(rightdir.y) < maxBank) { - aileron = goalBankDif / (maxAileron * speedf * 4); - } else { - if (rightdir.y < 0.0f && goalBankDif < 0.0f) { -@@ -762,7 +762,7 @@ - } else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) { - elevator = 1; - } else { -- if (fabs(frontdir.y) < maxPitch) -+ if (math::fabs(frontdir.y) < maxPitch) - elevator = hdif / (maxElevator * speedf * speedf * 20); - } - } -diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp ---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -201,7 +201,7 @@ - - void CPathEstimator::CalcOffsetsAndPathCosts(int thread) { - //! reset FPU state for synced computations -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A], - // A must be completely finished before B_i can be safely called. This means we cannot -diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp ---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-13 06:34:43.016060490 +0200 -@@ -251,7 +251,7 @@ - - - void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - char loadMsg[512] = {'\0'}; - const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)"; -@@ -310,7 +310,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::InitNodeLayersThread( -@@ -360,7 +360,7 @@ - - - void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - #ifdef QTPFS_OPENMP_ENABLED - { -@@ -375,7 +375,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::UpdateNodeLayersThread( -@@ -569,7 +569,7 @@ - SCOPED_TIMER("PathManager::Update"); - - #ifdef QTPFS_ENABLE_THREADED_UPDATE -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // allow ThreadUpdate to run one iteration - condThreadUpdate->notify_one(); -@@ -579,7 +579,7 @@ - // wait for the ThreadUpdate iteration to finish - condThreadUpdated->wait(lock); - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #else - ThreadUpdate(); - #endif -diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp ---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -262,7 +262,7 @@ - damage *= gfxMod; - damage = std::max(damage, 0.0f); - -- const float sqrtDmg = sqrt(damage); -+ const float sqrtDmg = math::sqrt(damage); - const float camLength = camVect.Length(); - float moveLength = radius * 0.03f; - -@@ -283,7 +283,7 @@ - if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; } - - if (smokeDamage > 0.01f) { -- smokeDamageSQRT = sqrt(smokeDamage); -+ smokeDamageSQRT = math::sqrt(smokeDamage); - smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f); - } - -@@ -507,17 +507,17 @@ - } - case OP_SAWTOOTH: { - // this translates to modulo except it works with floats -- val -= (*(float*) code) * floor(val / (*(float*) code)); -+ val -= (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_DISCRETE: { -- val = (*(float*) code) * floor(val / (*(float*) code)); -+ val = (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_SINE: { -- val = (*(float*) code) * sin(val); -+ val = (*(float*) code) * math::sin(val); - code += 4; - break; - } -@@ -538,12 +538,12 @@ - break; - } - case OP_POW: { -- val = pow(val, (*(float*) code)); -+ val = math::pow(val, (*(float*) code)); - code += 4; - break; - } - case OP_POWBUFF: { -- val = pow(val, buffer[(*(int*) code)]); -+ val = math::pow(val, buffer[(*(int*) code)]); - code += 4; - break; - } -diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -111,7 +111,7 @@ - oldSmokeDir.Normalize(); - const float3 camDir = (pos - camera->pos).Normalize(); - -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { - drawTrail = false; - } - -@@ -334,7 +334,7 @@ - - if (!drawTrail) { - float3 camDir = (pos - camera->pos).Normalize(); -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) { - drawTrail = true; - } - } -@@ -373,7 +373,7 @@ - const float3 dif2 = (oldSmokePos - camera->pos).Normalize(); - const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize(); - -- float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir))); -+ float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir))); - float alpha = std::min(255.0f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -381,7 +381,7 @@ - col[3] = (unsigned char) (alpha); - - unsigned char col2[4]; -- float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - - if (age < 8) - a2 = 0; -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -188,7 +188,7 @@ - particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread; - particles[i].pos = pos; - -- particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - } - - drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread); -@@ -232,7 +232,7 @@ - const float az = gu->usRandFloat() * 2 * PI; - const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0); - -- float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - - CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner); - -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -124,7 +124,7 @@ - if (lastSegment) { - a1 = 0; - } -- a1 *= 0.7f + fabs(dif1.dot(dir1)); -+ a1 *= 0.7f + math::fabs(dif1.dot(dir1)); - float alpha = std::min(255.f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -136,7 +136,7 @@ - if (firstSegment) { - a2 = 0; - } -- a2 *= 0.7f + fabs(dif2.dot(dir2)); -+ a2 *= 0.7f + math::fabs(dif2.dot(dir2)); - alpha = std::min(255.f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha); - col2[1] = (unsigned char) (color * alpha); -@@ -153,7 +153,7 @@ - - unsigned char col3[4]; - float a2 = (1 - (float)(age + 4) / lifeTime) * 255; -- a2 *= 0.7f + fabs(dif3.dot(middir)); -+ a2 *= 0.7f + math::fabs(dif3.dot(middir)); - alpha = std::min(255.0f, std::max(0.0f, a2)); - col3[0] = (unsigned char) (color * alpha); - col3[1] = (unsigned char) (color * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -49,7 +49,7 @@ - const float yp = (y + ypart) / 16.0f*PI - PI/2; - for (int x = 0; x < 5; ++x) { - float xp = (x + xpart) / 32.0f*2*PI; -- vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp)); -+ vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp)); - } - } - pos = centerPos+vectors[12] * sphereSize; -@@ -86,7 +86,7 @@ - float alpha = - baseAlpha * - (1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) * -- (1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f); -+ (1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -@@ -94,7 +94,7 @@ - col[3] = ((unsigned char) (40 * alpha)) + 1; - va->AddVertexQTC(centerPos + vectors[y*5 + x] * interSize, texx, texy, col); - va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col); -- alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); -+ alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -79,7 +79,7 @@ - float interSize = size + sizeExpansion * globalRendering->timeOffset; - float interRot = rotation + rotSpeed * globalRendering->timeOffset; - -- const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize; -+ const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize; - const float3 dir2 = dir1.cross(UpVector); - - #define wt projectileDrawer->waketex -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -96,7 +96,7 @@ - drawRadius = radius + maxSpeed * 8; - - float3 camDir = (pos - camera->pos).ANormalize(); -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) { - drawTrail = false; - } - -@@ -229,8 +229,8 @@ - // is too close or height difference too large) - const float horDiff = (targPos - pos).Length2D() + 0.01f; - const float verDiff = (targPos.y - pos.y) + 0.01f; -- const float dirDiff = fabs(targetDir.y - dir.y); -- const float ratio = fabs(verDiff / horDiff); -+ const float dirDiff = math::fabs(targetDir.y - dir.y); -+ const float ratio = math::fabs(verDiff / horDiff); - - dir.y -= (dirDiff * ratio); - } else { -@@ -295,7 +295,7 @@ - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); - -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) { - drawTrail = true; - } - } -@@ -343,7 +343,7 @@ - dir2.ANormalize(); - - float a1 = (1.0f / (SMOKE_TIME)) * 255; -- a1 *= 0.7f + fabs(dif.dot(dir)); -+ a1 *= 0.7f + math::fabs(dif.dot(dir)); - const float alpha1 = std::min(255.0f, std::max(0.0f, a1)); - col[0] = (unsigned char) (color * alpha1); - col[1] = (unsigned char) (color * alpha1); -@@ -357,7 +357,7 @@ - a2 = 0; - } - -- a2 *= 0.7f + fabs(dif2.dot(oldDir)); -+ a2 *= 0.7f + math::fabs(dif2.dot(oldDir)); - const float alpha2 = std::min(255.0f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha2); - col2[1] = (unsigned char) (color * alpha2); -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -90,13 +90,13 @@ - } - } - -- maxGoodDif = cos(tracking * 0.6f); -+ maxGoodDif = math::cos(tracking * 0.6f); - curSpeed = speed.Length(); - dir = speed / curSpeed; - oldSmokeDir = dir; - - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist >= 200.0f); - drawRadius = maxSpeed * 8.0f; -@@ -304,7 +304,7 @@ - - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist > 300.0f); - } -@@ -335,11 +335,11 @@ - - const float a1 = - ((1.0f - (0.0f / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif1.dot(dir))); -+ (0.7f + math::fabs(dif1.dot(dir))); - const float a2 = - (age < 8)? 0.0f: - ((1.0f - (age2 / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - const int alpha1 = std::min(255, (int) std::max(0.0f, a1)); - const int alpha2 = std::min(255, (int) std::max(0.0f, a2)); - -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -252,8 +252,8 @@ - const float dot = speed.dot(normal); - - pos -= speed; -- speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip); -- speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound); -+ speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip); -+ speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound); - pos += speed; - - if (weaponDef->bounceExplosionGenerator) { -diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -770,7 +770,7 @@ - b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE); - b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos)); - b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget); -- edgeFactor = fabs(w->targetBorder); -+ edgeFactor = math::fabs(w->targetBorder); - } - - const float diffLength2D = diff.Length2D(); -diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -349,7 +349,7 @@ - if (rx <= spread) - continue; - -- rx = sqrt(rx); -+ rx = math::sqrt(rx); - - const float minx = std::max( spread, center.x - rx); - const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx); -@@ -676,7 +676,7 @@ - am->ForceHeading(unloadHeading); - am->maxDrift = 1; - if ((owner->pos.SqDistance(pos) < 64) && -- (owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { -+ (owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { - if (!SpotIsClearIgnoreSelf(pos, unit)) { - // chosen spot is no longer clear to land, choose a new one - // if a new spot cannot be found, don't unload at all -diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp ---- spring_89.0/rts/Sim/Units/UnitDef.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -399,9 +399,9 @@ - selfDCountdown = udTable.GetInt("selfDestructCountdown", 5); - - speed = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED; -- speed = fabs(speed); -+ speed = math::fabs(speed); - rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED; -- rSpeed = fabs(rSpeed); -+ rSpeed = math::fabs(rSpeed); - - fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL); - fireState = std::min(fireState, int(FIRESTATE_FIREATWILL)); -@@ -462,8 +462,8 @@ - useSmoothMesh = udTable.GetBool("useSmoothMesh", true); - - -- maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -- maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values -+ maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -+ maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values - - turnRate = udTable.GetFloat("turnRate", 0.0f); - turnInPlace = udTable.GetBool("turnInPlace", true); -@@ -709,7 +709,7 @@ - seismicSignature = udTable.GetFloat("seismicSignature", -1.0f); - if (seismicSignature == -1.0f) { - if (!canFloat && !canHover && !canfly) { -- seismicSignature = sqrt(mass / 100.0f); -+ seismicSignature = math::sqrt(mass / 100.0f); - } else { - seismicSignature = 0.0f; - } -diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp ---- spring_89.0/rts/Sim/Units/UnitHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp 2012-07-13 06:34:43.076060493 +0200 -@@ -419,8 +419,8 @@ - // look for a nearby geothermal feature if we need one - for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) { - if ((*fi)->def->geoThermal -- && fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -- && fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { -+ && math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -+ && math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { - canBuild = BUILDSQUARE_OPEN; - break; - } -@@ -589,7 +589,7 @@ - BuildInfo bi(cmd); - tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos; - -- if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) { -+ if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) { - return cmd; - } - } -diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp ---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -62,7 +62,7 @@ - const float s = -owner->speed.y; - const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)); - if (sq > 0) { -- predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq); -+ predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq); - } else { - predict = 0; - } -diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp ---- spring_89.0/rts/Sim/Weapons/Cannon.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -169,7 +169,7 @@ - - int ttl = 0; - float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed; -- int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) -+ int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) - : math::sqrt(diff.SqLength2D() / sqSpeed2D)); - if(weaponDef->flighttime > 0) { - ttl = weaponDef->flighttime; -@@ -216,9 +216,9 @@ - // try to cache results, sacrifice some (not much too much even for a pewee) accuracy - // it saves a dozen or two expensive calculations per second when 5 guardians - // are shooting at several slow- and fast-moving targets -- if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { -+ if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { - return lastDir; - } - -@@ -237,7 +237,7 @@ - // FIXME: temporary safeguards against FP overflow - // (introduced by extreme off-map unit positions; the term - // DFsq * Dsq * ... * dy should never even approach 1e38) -- if (Dsq < 1e12f && fabs(dy) < 1e6f) { -+ if (Dsq < 1e12f && math::fabs(dy) < 1e6f) { - const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq; - - if (root1 >= 0.0f) { -diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp ---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -126,9 +126,9 @@ - - // should really be tan but TA seem to cap it somehow - // should also be 7fff or ffff theoretically but neither seems good -- wd.accuracy = sin((accuracy) * PI / 0xafff); -- wd.sprayAngle = sin((sprayAngle) * PI / 0xafff); -- wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff); -+ wd.accuracy = math::sin((accuracy) * PI / 0xafff); -+ wd.sprayAngle = math::sin((sprayAngle) * PI / 0xafff); -+ wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff); - - wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f); - wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f); -@@ -375,7 +375,7 @@ - - - const float gd = max(30.0f, wd.damages[0] / 20.0f); -- const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f; -+ const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f; - wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed); - - // Dynamic Damage -@@ -461,7 +461,7 @@ - wd.hitSound.setVolume(0, 5.0f); - wd.hitSound.setVolume(1, 5.0f); - } else { -- float fireSoundVolume = sqrt(wd.damages[0] * 0.5f); -+ float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f); - - if (wd.type == "LaserCannon") { - fireSoundVolume *= 0.5f; -@@ -472,7 +472,7 @@ - if ((fireSoundVolume > 100.0f) && - ((wd.type == "MissileLauncher") || - (wd.type == "StarburstLauncher"))) { -- fireSoundVolume = 10.0f * sqrt(hitSoundVolume); -+ fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume); - } - - if (wd.damageAreaOfEffect > 8.0f) { -@@ -564,7 +564,7 @@ - - if (inverted == true) { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -@@ -577,7 +577,7 @@ - } - else { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp ---- spring_89.0/rts/System/Matrix44f.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -72,8 +72,8 @@ - - *this=Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[4]; - m[4] = cr*a - sr*m[8]; -@@ -107,8 +107,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a + sr*m[8]; -@@ -142,8 +142,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a - sr*m[4]; -@@ -165,8 +165,8 @@ - - void CMatrix44f::Rotate(float rad, const float3& axis) - { -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - for(int a=0;a<3;++a){ - float3 v(m[a*4],m[a*4+1],m[a*4+2]); -diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp ---- spring_89.0/rts/System/myMath.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/myMath.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -44,7 +44,7 @@ - } - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -58,7 +58,7 @@ - #pragma omp parallel - { - //good_fpu_control_registers("OMP-Init"); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -77,8 +77,8 @@ - for (int a = 0; a < NUM_HEADINGS; ++a) { - float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS; - float2 v; -- v.x = sin(ang); -- v.y = cos(ang); -+ v.x = math::sin(ang); -+ v.y = math::cos(ang); - headingToVectorTable[a] = v; - } - -@@ -107,9 +107,9 @@ - float3 ret; - float h = heading * TAANG2RAD; - float p = pitch * TAANG2RAD; -- ret.x = sin(h) * cos(p); -- ret.y = sin(p); -- ret.z = cos(h) * cos(p); -+ ret.x = math::sin(h) * math::cos(p); -+ ret.y = math::sin(p); -+ ret.z = math::cos(h) * math::cos(p); - return ret; - } - -@@ -138,7 +138,7 @@ - float3 dir(l2-l1); - float3 pdir(p-l1); - float length = dir.Length(); -- if (fabs(length) < 1e-4f) -+ if (math::fabs(length) < 1e-4f) - return l1; - float c = dir.dot(pdir) / length; - if (c < 0) c = 0; -diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp ---- spring_89.0/rts/System/Net/Socket.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -73,7 +73,7 @@ - //! (date of note: 08/05/10) - //! something in from_string() is invalidating the FPU flags - //! tested on win2k and linux (not happening there) -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return addr; -@@ -94,7 +94,7 @@ - #ifdef STREFLOP_H - //! (date of note: 08/22/10) - //! something in resolve() is invalidating the FPU flags -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return resolveIt; -diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp ---- spring_89.0/rts/System/OffscreenGLContext.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -259,7 +259,7 @@ - #ifdef STREFLOP_H - // init streflop to make it available for synced computations, too - // redundant? threads copy the FPU state of their parent. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - try { -diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h ---- spring_89.0/rts/System/Sound/SoundSource.h 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h 2012-07-13 06:34:42.836060480 +0200 -@@ -7,7 +7,6 @@ - - #include <al.h> - #include <boost/noncopyable.hpp> --#include <boost/thread/recursive_mutex.hpp> - - class IAudioChannel; - class float3; -diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp ---- spring_89.0/rts/System/SpringApp.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp 2012-07-13 06:34:42.982727155 +0200 -@@ -385,7 +385,7 @@ - #ifdef STREFLOP_H - //! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word. - //! Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - //! setup GL smoothing -@@ -1009,7 +1009,7 @@ - SDL_Event event; - - while (SDL_PollEvent(&event)) { -- streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags -+ streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags - input.PushEvent(event); - } - } -diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp ---- spring_89.0/rts/System/Sync/FPUCheck.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -85,7 +85,7 @@ - LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text); - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif diff --git a/community/spring/gcc48.patch b/community/spring/gcc48.patch deleted file mode 100644 index ea69a42c4..000000000 --- a/community/spring/gcc48.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/rts/System/Sound/EFX.cpp b/rts/System/Sound/EFX.cpp -index 08fe9f4..3b197f0 100644 ---- a/rts/System/Sound/EFX.cpp -+++ b/rts/System/Sound/EFX.cpp -@@ -83,7 +83,7 @@ CEFX::CEFX(ALCdevice* device) - ALuint alFx; - alGenEffects(1, &alFx); - if (alGetError() == AL_NO_ERROR) { -- for(size_t i = 0; i < sizeof(effects); i++) { -+ for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) { - const ALuint fx = effects[i]; - alEffecti(alFx, AL_EFFECT_TYPE, fx); - effectsSupported[fx] = (alGetError() == AL_NO_ERROR); -@@ -103,7 +103,7 @@ CEFX::CEFX(ALCdevice* device) - ALuint alFilter; - alGenFilters(1, &alFilter); - if (alGetError() == AL_NO_ERROR) { -- for(size_t i = 0; i < sizeof(filters); i++) { -+ for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) { - const ALuint filter = filters[i]; - alFilteri(alFilter, AL_FILTER_TYPE, filter); - filtersSupported[filter] = (alGetError() == AL_NO_ERROR); diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index e10ab5811..63b6091ed 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 102280 2013-12-07 10:37:12Z bpiotrowski $ +# $Id: PKGBUILD 104963 2014-01-28 18:12:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby pkgver=0.180 -pkgrel=1 +pkgrel=3 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') url="http://springlobby.info/" license=('GPL2') -depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' 'alure') +depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs' + 'alure' 'libsm') optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD index 95e66e8b8..e6ee41f75 100644 --- a/community/sqlite2/PKGBUILD +++ b/community/sqlite2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99991 2013-10-31 02:52:44Z allan $ +# $Id: PKGBUILD 103328 2014-01-03 10:53:51Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=sqlite2 pkgver=2.8.17 -pkgrel=5 +pkgrel=6 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.sqlite.org/" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index e06b654cc..2e76912a3 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 105249 2014-02-03 11:29:24Z 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.3 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') 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=('4c4c53d2260afd6e7e2dd7c445c92920' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') diff --git a/community/srm/PKGBUILD b/community/srm/PKGBUILD index a610fc767..1c08c8c9b 100644 --- a/community/srm/PKGBUILD +++ b/community/srm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102189 2013-12-06 12:44:16Z giovanni $ +# $Id: PKGBUILD 104066 2014-01-15 08:27:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=srm -pkgver=1.2.11 -pkgrel=2 +pkgver=1.2.12 +pkgrel=1 pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking" arch=('i686' 'x86_64' 'mips64el') url="http://srm.sourceforge.net/" license=('custom') depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ee8269be18de6bbd3f74252d6e3039fe') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('395c42753e9d98d6f815ac28a42ba87a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/sshfs/PKGBUILD b/community/sshfs/PKGBUILD index 05b1a8546..7ef1a502b 100644 --- a/community/sshfs/PKGBUILD +++ b/community/sshfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102191 2013-12-06 12:45:33Z giovanni $ +# $Id: PKGBUILD 104110 2014-01-15 23:34:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=sshfs -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +pkgrel=1 pkgdesc="FUSE client based on the SSH File Transfer Protocol" arch=('i686' 'x86_64' 'mips64el') url="http://fuse.sourceforge.net/sshfs.html" @@ -11,7 +11,7 @@ license=('GPL') depends=('fuse' 'glib2' 'openssh') makedepends=('pkg-config') source=("http://downloads.sourceforge.net/sourceforge/fuse/${pkgname}-fuse-${pkgver}.tar.gz") -md5sums=('3c7c3647c52ce84d09486f1da3a3ce24') +md5sums=('17494910db8383a366b1301e5f5148a9') build() { cd "${srcdir}/${pkgname}-fuse-${pkgver}" diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index d93e934d5..d2a1be7d4 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94597 2013-07-27 17:54:41Z seblu $ +# $Id: PKGBUILD 105863 2014-02-16 17:09:52Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.15 +pkgver=1.16 pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') @@ -13,21 +13,21 @@ license=('GPL2') depends=('libconfig') backup=('etc/sslh.conf') install=$pkgname.install -source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" +source=("http://www.rutschle.net/tech/$pkgname-v$pkgver.tar.gz" 'sslh-select.service' 'sslh-fork.service') -md5sums=('cdb3e4499ff00438495f46ef7204ec58' +md5sums=('1e85b84eb82a96b81de9b1e637a3e795' '67e8c9511508673254afa3e1ca61ff89' 'a4402244a4d819beb3c6dc7ff031084e') build() { - cd $pkgname-$pkgver + cd $pkgname-v$pkgver make VERSION=\"v$pkgver\" } package() { # manually install to have both ssl-fork and ssl-select - cd $pkgname-$pkgver + cd $pkgname-v$pkgver install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" ln -s sslh-fork "$pkgdir/usr/bin/sslh" diff --git a/community/stella/PKGBUILD b/community/stella/PKGBUILD index ea68ee2ce..2e0be090d 100644 --- a/community/stella/PKGBUILD +++ b/community/stella/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=stella -pkgver=3.9.2 +pkgver=3.9.3 pkgrel=1 pkgdesc="A multi-platform Atari 2600 VCS emulator" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('sdl' 'hicolor-icon-theme' 'gtk-update-icon-cache') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz) -md5sums=('49d2accab82601ad0ad04536e8400266') +md5sums=('007d45faa46341763da31f87d55df2d8') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 3b994e1a6..55c65cd38 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99994 2013-10-31 02:53:44Z allan $ +# $Id: PKGBUILD 103727 2014-01-10 21:25:08Z bgyorgy $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ pkgname=stunnel pkgver=4.56 -pkgrel=3 +pkgrel=4 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -42,17 +42,10 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - for i in ca.pl importCA.sh; do - install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" - done - - install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" + install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel-openssl.cnf-sample" + install -Dm644 tools/stunnel.service "$pkgdir/usr/lib/systemd/system/stunnel.service" install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" - # move systemd service into place - install -dm755 "$pkgdir/usr/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" - sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ -e "s:no\(body\|group\):stunnel:g" \ diff --git a/community/subsurface/PKGBUILD b/community/subsurface/PKGBUILD new file mode 100644 index 000000000..f0d7087db --- /dev/null +++ b/community/subsurface/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 105595 2014-02-11 07:54:24Z bisson $ +# Contributor: Francois Boulogne <fboulogne at april dot org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=subsurface +_pkgname=Subsurface +pkgver=4.0.2 +pkgrel=1 +pkgdesc='Divelog program' +url='http://subsurface.hohndel.org/' +license=('GPL2') +arch=('i686' 'x86_64') +depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libdivecomputer' 'libusbx') +source=("http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz") +sha1sums=('14370c2e91f82a6df32d44e2a0a4b20908c74465') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + qmake-qt4 -config release + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD deleted file mode 100644 index cc9e5f317..000000000 --- a/community/subtle/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 86887 2013-03-23 23:10:50Z td123 $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: unexist <unexist@dorfelite.net> -# Contributor: Abakus <java5@arcor.de> -# Contributor: TDY <tdy@gmx.com> -# Contributor: Xilon <xilonmu@gmail.com> - -pkgname=subtle -pkgver=0.11.3224 -pkgrel=2 -pkgdesc='Grid-based manual tiling window manager' -arch=('x86_64' 'i686' 'mips64el') -url='http://subtle.subforge.org/' -license=('GPL') -depends=('ruby' 'libxft' 'libxpm' 'libxrandr' 'libxft' 'libxpm' 'libxinerama' - 'libxtst') -makedepends=('pkg-config' 'libxinerama' 'libxrandr' 'libxft' 'libxpm') -backup=('etc/xdg/subtle/subtle.rb') -install=subtle.install -source=("http://subforge.org/attachments/download/81/$pkgname-$pkgver-xi.tbz2") -sha256sums=('a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2') - -build() { - cd "$srcdir/$pkgname-$pkgver-xi" - - # Disable the check for Ruby 1.9 - sed -i 's/ 1 != / 7 == /' Rakefile - sed -i 's/ 9 != / 7 == /' Rakefile - # Use vendor_ruby instead of site_ruby - sed -e \ - 's/RbConfig::CONFIG\["sitelibdir"\]/RbConfig::CONFIG\["vendorlibdir"\]/' \ - -i Rakefile -} - -package() { - cd "$srcdir/$pkgname-$pkgver-xi" - - rake destdir=$pkgdir install --trace -} - -# vim:set ts=2 sw=2 et: diff --git a/community/subtle/subtle.install b/community/subtle/subtle.install deleted file mode 100644 index cdb0d9469..000000000 --- a/community/subtle/subtle.install +++ /dev/null @@ -1,7 +0,0 @@ -post_upgrade() { - echo "In order to use sur you can install ruby-curb and ruby-minitar." - echo "If you have subtle on your system remember to upgrade with:" - echo " sur upgrade" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/synce-core/PKGBUILD b/community/synce-core/PKGBUILD index 4ed45b1af..55dd9c6eb 100644 --- a/community/synce-core/PKGBUILD +++ b/community/synce-core/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 100285 2013-11-02 08:49:32Z spupykin $ +# $Id: PKGBUILD 103618 2014-01-08 11:37:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan Was <janek.jan@gmail.com> pkgname=synce-core pkgver=0.17 -pkgrel=2 +pkgrel=3 pkgdesc="provide a means of communication with a Windows CE device - libraries" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" license=('GPL') depends=('dbus-glib' 'udev' 'python2') -makedepends=('dhclient') +makedepends=('dhclient' 'pyrex') provides=('synce-libsynce' 'synce-librapi') replaces=('synce-libsynce' 'synce-librapi') conflicts=('synce-libsynce' 'synce-librapi') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index fdf5e0de9..0ccabda99 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102282 2013-12-07 10:37:16Z bpiotrowski $ +# $Id: PKGBUILD 104503 2014-01-22 01:50:16Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.1 -pkgrel=2 +pkgrel=3 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -25,15 +25,15 @@ md5sums=('548a5d51a48b2be0c3fcaebe917a5d88' 'c6684c876c093f5e53d2c46592994e9b') prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/build-fix.patch - patch -Np1 -i $srcdir/ffmpeg-0.8.patch -# patch -Np1 -i $srcdir/ffmpeg-loop.patch + cd $pkgname-$pkgver + patch -p1 -i "$srcdir/build-fix.patch" + patch -Np1 -i "$srcdir/ffmpeg-0.8.patch" +# patch -Np1 -i "$srcdir/ffmpeg-loop.patch" sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp } build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" @@ -44,6 +44,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index e45ac8dda..f7e4d9d8b 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100454 2013-11-04 12:13:37Z spupykin $ +# $Id: PKGBUILD 104646 2014-01-24 07:28:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.2.0 +pkgver=10.2.1 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat' source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat.service lib64-fix.patch) -md5sums=('7a6e3df08590385113a27a76ce64a6ff' +md5sums=('039dcd235dfcfb3d4acc0a05730f9512' '12ba479c606620193e8b7c6e982d5088' '7ffa6bf990609d85367070f71b40a34b') diff --git a/community/system-tools-backends/PKGBUILD b/community/system-tools-backends/PKGBUILD new file mode 100644 index 000000000..49dffb894 --- /dev/null +++ b/community/system-tools-backends/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 104267 2014-01-16 18:40:20Z flexiondotorg $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> +# Contributor: Martin Wimpress <code@flexion.org> + +pkgname=system-tools-backends +pkgver=2.10.2 +pkgrel=4 +pkgdesc='Backends for Gnome/MATE System Tools.' +arch=('i686' 'x86_64') +url='http://system-tools-backends.freedesktop.org/' +license=('GPL') +depends=('dbus-glib' 'perl' 'perl-net-dbus' 'polkit') +makedepends=('intltool' 'perl-xml-parser') +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670') + +build() { + cd "${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --with-dbus-sys=/etc/dbus-1/system.d \ + --localstatedir=/var \ + --mandir=/usr/share \ + --sbindir=/usr/bin \ + --disable-static + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + #clean up man + rm -rf "${pkgdir}/usr/share/system-tools-backends-2.0/modules/share/" +} diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD index 59dc75b5b..9c22c0851 100644 --- a/community/tabbed/PKGBUILD +++ b/community/tabbed/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92069 2013-05-31 08:05:10Z lfleischer $ +# $Id: PKGBUILD 105102 2014-01-31 19:44:06Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: totoloco <totoloco at gmx> pkgname=tabbed -pkgver=0.5 +pkgver=0.6 pkgrel=1 pkgdesc='Simple generic tabbed fronted to xembed aware applications.' arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('libx11') install='tabbed.install' source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('cd9cfd696db745637486ec3b9bbe4b75' - 'cea7b04d4f67d917c68673cd0e63ae32') +md5sums=('7898992feb9358e0196119750b77b42c' + '910b1cbcf62051064c58029987e05db8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tabbed/config.h b/community/tabbed/config.h index ca4b8d6b4..ceda9f704 100644 --- a/community/tabbed/config.h +++ b/community/tabbed/config.h @@ -2,10 +2,10 @@ /* appearance */ static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*"; -static const char normbgcolor[] = "#222222"; -static const char normfgcolor[] = "#cccccc"; -static const char selbgcolor[] = "#555555"; -static const char selfgcolor[] = "#ffffff"; +static const char* normbgcolor = "#222222"; +static const char* normfgcolor = "#cccccc"; +static const char* selbgcolor = "#555555"; +static const char* selfgcolor = "#ffffff"; static const char before[] = "<"; static const char after[] = ">"; static const int tabwidth = 200; @@ -19,11 +19,20 @@ static const Bool foreground = True; static int newposition = 0; static Bool npisrelative = False; +#define SETPROP(p) { \ + .v = (char *[]){ "/bin/sh", "-c", \ + "prop=\"`xwininfo -children -id $1 | grep '^ 0x' | sed -e's@^ *\\(0x[0-9a-f]*\\) \"\\([^\"]*\\)\".*@\\1 \\2@' | xargs -0 printf %b | dmenu -l 10`\" &&" \ + "xprop -id $1 -f $0 8s -set $0 \"$prop\"", \ + p, winid, NULL \ + } \ +} + #define MODKEY ControlMask static Key keys[] = { \ /* modifier key function argument */ { MODKEY|ShiftMask, XK_Return, focusonce, { 0 } }, { MODKEY|ShiftMask, XK_Return, spawn, { 0 } }, + { MODKEY, XK_t, spawn, SETPROP("_TABBED_SELECT_TAB") }, { MODKEY|ShiftMask, XK_l, rotate, { .i = +1 } }, { MODKEY|ShiftMask, XK_h, rotate, { .i = -1 } }, diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index ab6b31024..6ae449aee 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,17 +5,17 @@ # Contributor: coolkehon <coolkehon@gmail.com> pkgname=task -pkgver=2.2.0 -pkgrel=1 +pkgver=2.3.0 +pkgrel=2 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64' 'mips64el') url="http://taskwarrior.org/projects/show/taskwarrior/" license=('MIT') -depends=('util-linux') +depends=('util-linux' 'gnutls') makedepends=('cmake') optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'perl-json: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha256sums=('39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14') +sha256sums=('2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tcplay/PKGBUILD b/community/tcplay/PKGBUILD index 2e11106e0..81b53d2dc 100644 --- a/community/tcplay/PKGBUILD +++ b/community/tcplay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102520 2013-12-12 22:28:07Z tredaelli $ +# $Id: PKGBUILD 103928 2014-01-13 17:17:02Z andyrtr $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Thomas Weißschuh <thomas t-8ch de> # Contributor: James Reed <supplantr at archlinux dot info> pkgname=tcplay pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Free and simple TrueCrypt implementation based on dm-crypt." arch=('i686' 'x86_64') url="https://github.com/bwalex/tc-play" diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 80bead240..632d88604 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102931 2013-12-24 09:48:38Z spupykin $ +# $Id: PKGBUILD 105222 2014-02-03 09:08:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=37.0.1 +pkgver=37.1.0 pkgrel=1 pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell') install=tea.install source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('587a3c245e414ecb718369a170f1c991' +md5sums=('aa63bea9c741ba0201fbeb0da0eb9599' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index b965c6975..81a7d376c 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' 'mips64el') -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/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD index befe6843c..21bec9994 100644 --- a/community/the_silver_searcher/PKGBUILD +++ b/community/the_silver_searcher/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $ +# $Id: PKGBUILD 105344 2014-02-05 15:34:54Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jeff Horelick <jdhore1@gmail.com> # Contributor: skydrome <skydrome@i2pmail.org> pkgname=the_silver_searcher -pkgver=0.18.1 +pkgver=0.19.2 pkgrel=1 pkgdesc='Code searching tool similar to Ack, but faster' url='https://github.com/ggreer/the_silver_searcher' @@ -12,7 +12,7 @@ license=('Apache') depends=('pcre' 'zlib' 'xz') arch=('x86_64' 'i686' 'mips64el') source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz") -sha256sums=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5') +sha256sums=('e2de31b8b4745b4614d3a6fa4cd61130474b0e861e80b3784daee7ce0eeca300') prepare() { cd "$pkgname-$pkgver" @@ -27,9 +27,7 @@ build() { } package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 843288f8c..5f84ee833 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100001 2013-10-31 02:56:06Z allan $ +# $Id: PKGBUILD 104076 2014-01-15 09:51:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.3.0 -pkgrel=3 -_xorgver=1.14.2 +pkgrel=4 +_xorgver=1.15.0 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" @@ -23,13 +23,15 @@ source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tiger vncserver.service vncviewer.desktop gethomedir.patch - getmaster.patch) + getmaster.patch + xorg115.patch) md5sums=('a5158228e64d14496821a39bf3851f1b' - '5d36a6483e8e301875131e8302c67727' + 'c2ace3697b32414094cf8c597c39d7d9' '0903d5a0dfa38e0b04964505b644585c' '71cac0fb9701b0a041430f0fddfe00c8' '22f1523a0eca56ad79cfabd0db6e2cf6' - 'e056a2502dfe0cb3b02e08cab689482f') + 'e056a2502dfe0cb3b02e08cab689482f' + 'd7765cb11be43b557ee77dfa486fdb68') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -37,6 +39,7 @@ prepare() { patch -Np1 -i ${srcdir}/gethomedir.patch patch -Np1 -i ${srcdir}/getmaster.patch + patch -Np1 -i ${srcdir}/xorg115.patch } build() { @@ -49,6 +52,7 @@ build() { patch -Np1 -i ../xserver114.patch autoreconf -fiv ./configure --prefix=/usr \ + --disable-wayland --disable-present --disable-dri3 \ --disable-static --disable-xinerama --without-dtrace \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ diff --git a/community/tigervnc/xorg115.patch b/community/tigervnc/xorg115.patch new file mode 100644 index 000000000..d070a705c --- /dev/null +++ b/community/tigervnc/xorg115.patch @@ -0,0 +1,15 @@ +diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx 2013-07-01 08:41:24.000000000 -0400 ++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h 2013-11-07 11:39:49.749992669 -0500 +@@ -44,8 +44,10 @@ + #define XORG 113 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000)) + #define XORG 114 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000)) ++#define XORG 115 + #else +-#error "X.Org newer than 1.14 is not supported" ++#error "X.Org newer than 1.15 is not supported" + #endif + + #endif diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD new file mode 100644 index 000000000..f321ae4fc --- /dev/null +++ b/community/tomoyo-tools/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 96550 2013-08-31 16:05:13Z foutrelis $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> + +pkgname=tomoyo-tools +_basever=2.5.0 +_timestamp=20130406 +_file=53357 +pkgver=${_basever}.${_timestamp} +pkgrel=2 +pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' +arch=('i686' 'x86_64') +url='http://tomoyo.sourceforge.jp' +#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' +license=('GPL') +depends=('ncurses' 'linux>=3.2') +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('8888f83fcb87823d714ff551e8680d0d') + +prepare() { + cd "${srcdir}/${pkgname}" + sed -i \ + -e 's|usr/sbin|usr/bin|g' \ + -e 's|sbin|usr/bin|g' \ + usr_lib_tomoyo/init_policy.c +} + +build() { + cd "${srcdir}/${pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin +} + +package() { + cd "${srcdir}/${pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install +} diff --git a/community/tomoyo-tools/tomoyo-tools.install b/community/tomoyo-tools/tomoyo-tools.install new file mode 100644 index 000000000..c23df1212 --- /dev/null +++ b/community/tomoyo-tools/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/community/udpxy/PKGBUILD b/community/udpxy/PKGBUILD new file mode 100644 index 000000000..bec1cca99 --- /dev/null +++ b/community/udpxy/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 104084 2014-01-15 11:36:44Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Konstantin Shabanov <kes.eclipse@gmail.com> +# Contributor: Evka +# Maintainer: Jose Riha <jose 1711 gmail com> + +pkgname=udpxy +pkgver=1.0.23.0 +_pkgver=1.0.23-0 +pkgrel=2 +pkgdesc="small-footprint UNIX/Linux daemon to relay multicast UDP traffic to client's TCP (HTTP) connection." +arch=(i686 x86_64) +url="http://udpxy.sf.net" +license=('GPL3') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/Chipmunk-1.0/$pkgname.${_pkgver}-prod.tar.gz + $pkgname.service + pidfile.patch) +md5sums=('3dd99ba264078e873cbe1d98369ed423' + '19d76e6fbd876b5a7cdaa3e69cecdb0e' + '7a268f58ee964895377c95d16c9c633a') + +prepare() { + cd "$srcdir/$pkgname-${_pkgver}" + patch -Np1 -i "${srcdir}/pidfile.patch" + sed -i '/ln -s $(INSTALLROOT)\/bin\/$(EXEC) $(INSTALLROOT)\/bin\/$(UDPXREC/s%$(INSTALLROOT)%/usr%' Makefile +} + +build() { + cd "$srcdir/$pkgname-${_pkgver}" + make +} + +package() { + cd "$srcdir/$pkgname-${_pkgver}" + make INSTALLROOT="$pkgdir/usr" install + install -D -m644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service +} diff --git a/community/udpxy/pidfile.patch b/community/udpxy/pidfile.patch new file mode 100644 index 000000000..0adb24951 --- /dev/null +++ b/community/udpxy/pidfile.patch @@ -0,0 +1,48 @@ +diff --git a/udpxy.c b/udpxy.c +index 43f213a..8f0e30d 100644 +--- a/udpxy.c ++++ b/udpxy.c +@@ -1423,7 +1423,7 @@ udpxy_main( int argc, char* const argv[] ) + } + } + +- rc = set_pidfile( g_udpxy_app, port, pidfile, sizeof(pidfile) ); ++ rc = set_pidfile( g_udpxy_app, pidfile, sizeof(pidfile) ); + if( 0 != rc ) { + mperror( g_flog, errno, "set_pidfile" ); + rc = ERR_INTERNAL; break; +diff --git a/util.c b/util.c +index 0ad34bb..6b7daf8 100644 +--- a/util.c ++++ b/util.c +@@ -302,7 +302,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log ) + * (fail if destination directory is not writable) + */ + int +-set_pidfile( const char* appname, int port, char* buf, size_t len ) ++set_pidfile( const char* appname, char* buf, size_t len ) + { + int n = -1; + +@@ -311,7 +311,7 @@ set_pidfile( const char* appname, int port, char* buf, size_t len ) + if( -1 == access(PIDFILE_DIR, W_OK ) ) + return -1; + +- n = snprintf( buf, len, "%s/%s%d.pid", PIDFILE_DIR, appname, port ); ++ n = snprintf( buf, len, "%s/%s.pid", PIDFILE_DIR, appname ); + if( n < 0 ) return EXIT_FAILURE; + + buf[ len - 1 ] = '\0'; +diff --git a/util.h b/util.h +index f274c7b..64a10d1 100644 +--- a/util.h ++++ b/util.h +@@ -66,7 +66,7 @@ make_pidfile( const char* fpath, pid_t pid, FILE* log ); + * (fail of destination directory is not writable) + */ + int +-set_pidfile( const char* appname, int port, char* buf, size_t len ); ++set_pidfile( const char* appname, char* buf, size_t len ); + + /* write buffer to designated socket/file + * return number of bytes read/written or one of the error diff --git a/community/udpxy/udpxy.service b/community/udpxy/udpxy.service new file mode 100644 index 000000000..9ab244043 --- /dev/null +++ b/community/udpxy/udpxy.service @@ -0,0 +1,11 @@ +[Unit] +Description=UDP multicast to TCP (HTTP) relay proxy +After=network.target + +[Service] +Type=forking +PIDFile=/run/udpxy.pid +ExecStart=/usr/bin/udpxy -T -S -p 4022 -B 256kb + +[Install] +WantedBy=multi-user.target diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 85af0b30f..32fb678a3 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 95829 2013-08-17 12:17:24Z bgyorgy $ +# $Id: PKGBUILD 103501 2014-01-06 21:19:08Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.10.3 -pkgrel=2 +pkgver=1.10.4 +pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64' 'mips64el') -url="http://urlget.sourceforge.net/" +url="http://ugetdm.com/" license=('LGPL') depends=('libnotify' 'gtk3' 'gstreamer' 'curl' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('d71c927cfcfc3ef9f62cc9cb3ca7bab7') +md5sums=('58139de0bd043cfeae0f22c239f4bbc5') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-appindicator make @@ -25,6 +24,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install } diff --git a/community/umurmur/PKGBUILD b/community/umurmur/PKGBUILD index 6af6b8cb3..c191297ef 100644 --- a/community/umurmur/PKGBUILD +++ b/community/umurmur/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101363 2013-11-23 15:13:00Z bpiotrowski $ +# $Id: PKGBUILD 103638 2014-01-08 15:18:58Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Robert Knauer <robert@privatdemail.net> # Contributor: xav <xav at ethertricks dot net> pkgname=umurmur -pkgver=0.2.13 +pkgver=0.2.14 pkgrel=1 pkgdesc='Minimalistic Mumble server' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ install=$pkgname.install backup=('etc/umurmur/umurmur.conf') source=(http://umurmur.googlecode.com/files/umurmur-$pkgver.tar.gz umurmur.service) -md5sums=('04d0ea7a90b7858c16df26317b318bf4' +md5sums=('e22121b4b91f4c9de43f858f6defa0b0' 'd9d556e4ffa77e193fb40ce508804720') build() { diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 1390a5344..10b2cbf8c 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101548 2013-11-27 16:02:52Z spupykin $ +# $Id: PKGBUILD 104840 2014-01-27 10:46:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -16,10 +16,12 @@ backup=('etc/unrealircd/unrealircd.conf') install=unrealircd.install source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.service + unrealircd.tmpfiles.d arch-fixes.patch) md5sums=('21c460dc04d221b401a1701ca96e9e58' - '93276a1cd426e4a811c072c35fc31e94' - '77807313c4578f2c30286b9f9e3fb21c') + '677d8de0bae770488a2c1730f9475a51' + '3ec519ea7dbe99696eb6c51dfc0d382a' + '5f4bf9f99f6c78bc9e6ee4ec66b021fa') prepare() { cd $srcdir/Unreal$pkgver @@ -68,5 +70,7 @@ package() { find $pkgdir/usr -type f -exec chmod ugo+r {} \; find $pkgdir/usr -type d -exec chmod ugo+rx {} \; - install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + rm -f $pkgdir/etc/unrealircd/unreal + install -Dm0644 $srcdir/unrealircd.service $pkgdir/usr/lib/systemd/system/unrealircd.service + install -Dm0644 $srcdir/unrealircd.tmpfiles.d $pkgdir/usr/lib/tmpfiles.d/unrealircd.conf } diff --git a/community/unrealircd/arch-fixes.patch b/community/unrealircd/arch-fixes.patch index a1741968d..2f89647bc 100644 --- a/community/unrealircd/arch-fixes.patch +++ b/community/unrealircd/arch-fixes.patch @@ -1,6 +1,6 @@ -diff -wbBur Unreal3.2.org/doc/example.conf Unreal3.2/doc/example.conf ---- Unreal3.2.org/doc/example.conf 2009-04-13 15:03:55.000000000 +0400 -+++ Unreal3.2/doc/example.conf 2011-08-29 13:39:25.000000000 +0400 +diff -wbBur Unreal3.2.10.2.org/doc/example.conf Unreal3.2.10.2/doc/example.conf +--- Unreal3.2.10.2.org/doc/example.conf 2013-11-24 23:24:26.000000000 +0400 ++++ Unreal3.2.10.2/doc/example.conf 2014-01-27 14:38:16.669081776 +0400 @@ -33,8 +33,8 @@ */ @@ -12,10 +12,22 @@ diff -wbBur Unreal3.2.org/doc/example.conf Unreal3.2/doc/example.conf /* FOR Windows, uncomment the following 2 lines: */ //loadmodule "modules/commands.dll"; -diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c ---- Unreal3.2.org/src/ircd.c 2009-03-01 21:37:58.000000000 +0300 -+++ Unreal3.2/src/ircd.c 2011-08-29 13:39:25.000000000 +0400 -@@ -844,7 +844,7 @@ +diff -wbBur Unreal3.2.10.2.org/include/config.h Unreal3.2.10.2/include/config.h +--- Unreal3.2.10.2.org/include/config.h 2013-11-24 23:24:26.000000000 +0400 ++++ Unreal3.2.10.2/include/config.h 2014-01-27 14:38:53.349081379 +0400 +@@ -248,7 +248,7 @@ + #define RPATH "ircd.rules" /* server rules file */ + #define OPATH "oper.motd" /* Operators MOTD file */ + #define LPATH "debug.log" /* Where the debug file lives, if DEBUGMODE */ +-#define PPATH "ircd.pid" /* file for server pid */ ++#define PPATH "/run/unrealircd/ircd.pid" /* file for server pid */ + #define VPATH "ircd.svsmotd" /* Services MOTD append. */ + #define BPATH "bot.motd" /* Bot MOTD */ + #define IRCDTUNE "ircd.tune" /* tuning .. */ +diff -wbBur Unreal3.2.10.2.org/src/ircd.c Unreal3.2.10.2/src/ircd.c +--- Unreal3.2.10.2.org/src/ircd.c 2013-11-24 23:24:26.000000000 +0400 ++++ Unreal3.2.10.2/src/ircd.c 2014-01-27 14:38:16.669081776 +0400 +@@ -840,7 +840,7 @@ const char *compiledfor, *runtime; int error = 0; @@ -24,7 +36,7 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c compiledfor = OPENSSL_VERSION_TEXT; runtime = SSLeay_version(SSLEAY_VERSION); if (strcasecmp(compiledfor, runtime)) -@@ -854,7 +854,7 @@ +@@ -850,7 +850,7 @@ error=1; } #endif @@ -33,7 +45,7 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c runtime = zlibVersion(); compiledfor = ZLIB_VERSION; if (*compiledfor != *runtime) -@@ -864,7 +864,7 @@ +@@ -860,7 +860,7 @@ error = 1; } #endif @@ -42,48 +54,3 @@ diff -wbBur Unreal3.2.org/src/ircd.c Unreal3.2/src/ircd.c /* Perhaps someone should tell them to do this a bit more easy ;) * problem is runtime output is like: 'libcurl/7.11.1 zlib/1.2.1 c-ares/1.2.0' * while header output is like: '7.11.1'. -diff -wbBur Unreal3.2.org/unreal.in Unreal3.2/unreal.in ---- Unreal3.2.org/unreal.in 2009-03-01 21:37:55.000000000 +0300 -+++ Unreal3.2/unreal.in 2011-08-29 13:39:37.000000000 +0400 -@@ -7,7 +7,7 @@ - if [ -r $PID_FILE ] ; then - mv -f $PID_FILE $PID_BACKUP - fi -- @BINDIR@ -+ @BINDIR@/ircd - sleep 1 - if [ ! -r $PID_FILE ] ; then - echo "Possible error encountered (IRCd seemingly not started)" -@@ -31,11 +31,11 @@ - echo "Restarting UnrealIRCd" - kill -2 `cat $PID_FILE` - elif [ "$1" = "mkpasswd" ] ; then -- @BINDIR@ -P $2 $3 -+ @BINDIR@/ircd -P $2 $3 - elif [ "$1" = "version" ] ; then -- @BINDIR@ -v -+ @BINDIR@/ircd -v - elif [ "$1" = "gencloak" ] ; then -- @BINDIR@ -k -+ @BINDIR@/ircd -k - elif [ "$1" = "backtrace" ] ; then - cd @IRCDDIR@ - -@@ -90,7 +90,7 @@ - fi - - # Some ugly prepare work -- ignore errors -- (echo quit|gdb @BINDIR@ $corefile 2>&1)|\ -+ (echo quit|gdb @BINDIR@/ircd $corefile 2>&1)|\ - grep -i 'no such file'|\ - awk -F ':' '{ print $1 }'|sort|uniq|\ - awk -F '.' "{ system(\"ln -s ../$modpath/\" \$2 \".so \" \$0) }" -@@ -110,7 +110,7 @@ - quit - __EOF__ - -- gdb -batch -x gdb.commands @BINDIR@ $corefile -+ gdb -batch -x gdb.commands @BINDIR@/ircd $corefile - rm -f gdb.commands - echo "GCC: `gcc -v 2>&1|tail -n 1`" - echo "UNAME: `uname -a`" diff --git a/community/unrealircd/unrealircd.install b/community/unrealircd/unrealircd.install index 274d8b13f..0eca0c2a8 100644 --- a/community/unrealircd/unrealircd.install +++ b/community/unrealircd/unrealircd.install @@ -1,7 +1,9 @@ post_install() { - echo "Create ircd user and chown /etc/unrealircd and /var/log/unrealircd recursively" + getent passwd ircd >/dev/null || useradd -r ircd + chown -R ircd etc/unrealircd var/log/unrealircd + systemd-tmpfiles --create unrealircd.conf echo "SSL is enabled by default, so you need to create pem files" - echo "Also unrealircd.conf needs adjustments" + echo "unrealircd.conf needs adjustments" echo "See also: https://wiki.archlinux.org/index.php/UnrealIRCd" } @@ -10,5 +12,5 @@ post_upgrade() { } post_remove() { - echo "Don't forget to remove ircd user" + userdel ircd } diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service index a81419f2a..7550ebe15 100644 --- a/community/unrealircd/unrealircd.service +++ b/community/unrealircd/unrealircd.service @@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking User=ircd -PIDFile=/var/run/unrealircd.pid +PIDFile=/run/unrealircd/ircd.pid ExecStart=/usr/bin/unrealircd [Install] diff --git a/community/unrealircd/unrealircd.tmpfiles.d b/community/unrealircd/unrealircd.tmpfiles.d new file mode 100644 index 000000000..137431233 --- /dev/null +++ b/community/unrealircd/unrealircd.tmpfiles.d @@ -0,0 +1 @@ +d /run/unrealircd 0755 ircd root - diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 0a3607bcb..846bcfa8a 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98181 2013-10-07 10:07:44Z spupykin $ +# $Id: PKGBUILD 105224 2014-02-03 09:08:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=2.0.1 +pkgver=2.1.0 pkgrel=1 -_pkgdata=20130807 +_pkgdata=20140129 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('e48d4419d0574d342bb183f7465556d0' - '91feff51deba6e48e78506b8f4db2274' - 'dd14f254f6c3642ce16fd7c2f43ee112') +md5sums=('9eaf1749996f5f797323d474d1d390c5' + 'e1e7a4c679f8029a8da146477d102c60' + '1ec5054e071d6af9ab5b862197222455') prepare() { cd $srcdir/usb-modeswitch-$pkgver/ diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index cce6fe1a9..39cf1d837 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102953 2013-12-24 23:07:41Z dwallace $ +# $Id: PKGBUILD 105643 2014-02-12 17:51:46Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -14,7 +14,6 @@ pkgname=(uwsgi uwsgi-plugin-python uwsgi-plugin-nagios uwsgi-plugin-router - uwsgi-plugin-admin uwsgi-plugin-php uwsgi-plugin-lua51 uwsgi-plugin-carbon @@ -23,7 +22,8 @@ pkgname=(uwsgi uwsgi-plugin-zergpool ) #uwsgi-plugin-erlang -pkgver=1.9.21.1 + #uwsgi-plugin-admin +pkgver=2.0.1 pkgrel=1 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" @@ -41,8 +41,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch) -md5sums=('82df3eeacc0d4e661459bc50d50e757b' - '2f21e871e81698c88c7ec2dbb4e3833e' +md5sums=('e7234f16ddfb4fe5d0b5d5fa76dc17e1' + 'a0749da07b545efcbb0276f52be22652' 'b05ba1d796e1ea608a40635bc4f3ec67' '740a7718bd341b03d916a13ddbbbe694' 'db70315bbc8cb886a278ba59d5fd8d57' @@ -155,13 +155,13 @@ package_uwsgi-plugin-router(){ install -Dm755 router_basicauth_plugin.so $pkgdir/usr/lib/uwsgi/basicauth_plugin.so } -package_uwsgi-plugin-admin(){ - depends=( uwsgi-plugin-common) - pkgdesc="Plugin for Admin support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} +#package_uwsgi-plugin-admin(){ +# depends=( uwsgi-plugin-common) +# pkgdesc="Plugin for Admin support" +# install -dm755 $pkgdir/usr/bin +# install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so +# ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} +#} package_uwsgi-plugin-lua51(){ depends=(lua51 uwsgi-plugin-common) diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini index f2550757f..4e689849f 100644 --- a/community/uwsgi/archlinux.ini +++ b/community/uwsgi/archlinux.ini @@ -14,4 +14,4 @@ yaml_implementation = auto malloc_implementation = libc embedded_plugins = echo, ping, http, corerouter plugin_dir = /usr/lib/uwsgi -plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter +plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter diff --git a/community/vbam/PKGBUILD b/community/vbam/PKGBUILD index 3ea2ab4e0..6a182124d 100755 --- a/community/vbam/PKGBUILD +++ b/community/vbam/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 98482 2013-10-11 16:52:10Z alucryd $ +# $Id: PKGBUILD 103805 2014-01-11 20:08:39Z eric $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=vbam pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx') pkgver=1.8.0.1202 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://vba-m.com" license=('GPL2') -makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk' 'zip') +makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk2.8' 'zip') [[ $CARCH == i686 ]] && makedepends+=('nasm') source=("http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2" 'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz' @@ -25,6 +25,7 @@ sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877' prepare() { patch -Np0 -i soil.patch patch -Np0 -i sfml.patch + sed 's/wxrc/wxrc-2.8/g' -i {po/update_pot.sh,src/wx/CMakeLists.txt} } build() { @@ -47,6 +48,7 @@ build() { mkdir build && cd build local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' -DENABLE_WX='ON' \ + -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' -DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \ -DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \ -DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \ @@ -91,7 +93,7 @@ install='vbam-gtk.install' package_vbam-wx() { pkgdesc="Nintendo GameBoy Advance emulator - wx version" -depends=('wxgtk') +depends=('wxgtk2.8') conflicts=('vbam-gtk') options=('!emptydirs') install='vbam-wx.install' diff --git a/community/viewnior/PKGBUILD b/community/viewnior/PKGBUILD index b0695e908..98e30b3db 100644 --- a/community/viewnior/PKGBUILD +++ b/community/viewnior/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 66682 2012-02-27 10:02:48Z spupykin $ +# $Id: PKGBUILD 105587 2014-02-10 17:25:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> # Maintainer: M Rawash <mrawash@gmail.com> pkgname=viewnior -pkgver=1.3 -pkgrel=1 +pkgver=1.4 +pkgrel=2 pkgdesc="A simple, fast and elegant image viewer program" arch=('i686' 'x86_64' 'mips64el') url="http://xsisqox.github.com/Viewnior/" license=('GPL3') -depends=('gtk2>=2.12') +depends=('gtk2>=2.12' 'exiv2') makedepends=('make' 'intltool>=0.35' 'pkgconfig>=0.9' 'perl>=5.8.1') install=viewnior.install -source=(http://cloud.github.com/downloads/xsisqox/Viewnior/$pkgname-$pkgver.tar.gz) -md5sums=('273c379933ae3e74ad414fde00198695') +source=(https://www.dropbox.com/s/zytq0suabesv933/viewnior-$pkgver.tar.gz) +md5sums=('13d7cb3381522161b32de9b70dd989b8') build() { cd $pkgname-$pkgver LDFLAGS=-lm ./configure --prefix=/usr make +} + +package() { + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/viewnior/viewnior.install b/community/viewnior/viewnior.install index 5f0358791..c52bea067 100644 --- a/community/viewnior/viewnior.install +++ b/community/viewnior/viewnior.install @@ -1,7 +1,7 @@ post_install() { [ -x `which update-mime-database` ] && update-mime-database usr/share/mime [ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - /bin/true + true } post_upgrade() { diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 64196d9eb..1877deec9 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97743 2013-09-28 08:12:47Z jlichtblau $ +# $Id: PKGBUILD 105307 2014-02-04 19:39:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.4.2 +pkgver=1.5 pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') @@ -12,22 +12,22 @@ url="http://viking.sourceforge.net/" license=('GPL2') depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel') makedepends=('intltool' 'gnome-doc-utils') -optdepends=(geo: for geocaches) +optdepends=('geo: for geocaches') options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('58e85c9792d0df62c3c9b583869bc40d6218ca01c117c05599d45e6d6b254bf1') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('2f00549e236dedec811c6b018f5ae76a1f4a1b68b1e33ef1eb2de14533579dc4') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --enable-expedia --enable-geocaches make } package(){ - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index 78255a931..e0c5ff12a 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.5-1 + 2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.4.2-1 diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index d4f458448..f8d432691 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 102983 2013-12-25 11:05:37Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 105457 2014-02-08 12:33:27Z bpiotrowski $ +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.3.6 -pkgrel=2 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index ec8bd87b6..e5a316067 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103140 2013-12-27 12:02:56Z foutrelis $ +# $Id: PKGBUILD 104437 2014-01-20 20:07:03Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.3.6 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD index 0f6721646..7ec063ca8 100644 --- a/community/virtualgl/PKGBUILD +++ b/community/virtualgl/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Andres Jimenez pkgname=virtualgl -pkgver=2.3.2 -pkgrel=4 +pkgver=2.3.3 +pkgrel=1 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" arch=('i686' 'x86_64' 'mips64el') url="http://virtualgl.org" @@ -12,7 +12,7 @@ license=('LGPL') depends=('libxv' 'glu' 'libjpeg-turbo') makedepends=('cmake' 'mesa') source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz") -sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9') +sha1sums=('7128fc546f0bc65a74296e19d474e52d41acbf47') build() { cd "$srcdir/VirtualGL-$pkgver" diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 7035a24a1..9251089ef 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 95330 2013-08-09 16:10:52Z spupykin $ +# $Id: PKGBUILD 105236 2014-02-03 09:59:08Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.5.7 -pkgrel=1 +pkgver=0.6.0 +pkgrel=2 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." -depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt' 'spice-gtk3') +depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt' 'spice-gtk3' 'desktop-file-utils') makedepends=('intltool') url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64' 'mips64el') license=('GPL') +install=virtviewer.install source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('c0d6d2de66e61df6c2ad339625c58a2a') +md5sums=('a3d7dd877105117e36185378ee1849ee') build() { cd $srcdir/virt-viewer-$pkgver - ./configure --prefix=/usr --with-gtk=3.0 + ./configure --prefix=/usr --with-gtk=3.0 --disable-update-mimedb make } diff --git a/community/virtviewer/virtviewer.install b/community/virtviewer/virtviewer.install new file mode 100644 index 000000000..4d07c984a --- /dev/null +++ b/community/virtviewer/virtviewer.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 5db9de80b..3a1a84a16 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98818 2013-10-19 13:44:45Z bpiotrowski $ +# $Id: PKGBUILD 105095 2014-01-31 14:18:52Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,13 +12,13 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=10 +pkgrel=11 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk' 'wget') optdepends=('python2: python bindings' 'java-runtime: java bindings' 'tk: tcl bindings' @@ -26,14 +26,16 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" - ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff + tcl-8.6.diff python-destdir.diff freetype.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694' '4ff5668957336709dcd096fbac102558' 'a804a9f034e24ef1a8b28542c15ce1a1' - 'f7aba715bcc10de93a6ecf1cd6b0c560') + 'f7aba715bcc10de93a6ecf1cd6b0c560' + '1e45b3664b395c70017ff46d3370c84d') build() { cd "${srcdir}"/VTK$pkgver @@ -44,6 +46,7 @@ build() { patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff" patch -Np1 -i "${srcdir}/tcl-8.6.diff" patch -Np1 -i "${srcdir}/python-destdir.diff" + patch -Np1 -i "${srcdir}/freetype.diff" cd "${srcdir}" diff --git a/community/vtk/freetype.diff b/community/vtk/freetype.diff new file mode 100644 index 000000000..03753ee3f --- /dev/null +++ b/community/vtk/freetype.diff @@ -0,0 +1,16 @@ +--- VTK5.10.1/CMake/FindFREETYPE.cmake.orig 2014-01-30 12:40:11.252760741 +0100 ++++ VTK5.10.1/CMake/FindFREETYPE.cmake 2014-01-30 12:40:43.235853875 +0100 +@@ -10,9 +10,11 @@ + # also defined, but not for general use are + # FREETYPE_LIBRARY, where to find the FREETYPE library. + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h) ++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h ++ /usr/include/freetype2 ++) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h + /usr/include/freetype2 + /usr/local/include/freetype2 + PATH_SUFFIXES freetype2 diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD index 9106ca202..7e9d8b387 100644 --- a/community/vym/PKGBUILD +++ b/community/vym/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85424 2013-03-01 10:42:25Z andrea $ +# $Id: PKGBUILD 105317 2014-02-04 21:41:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: S�ren Holm <sgh@sgh.dk> +# Contributor: Søren Holm <sgh@sgh.dk> pkgname=vym pkgver=2.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A mindmapping tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.insilmaril.de/vym/" @@ -22,7 +22,7 @@ sha256sums=('fa6d088327feae80c4c6760454fba64fe253a7de6e7e46f45a4c7f7db9b998f4' build() { cd "${srcdir}"/$pkgname-$pkgver - qmake PREFIX=/usr + qmake-qt4 PREFIX=/usr make } @@ -33,9 +33,10 @@ package() { make INSTALL_ROOT="${pkgdir}" install # correct doc location - install -d "${pkgdir}"/usr/share/doc/$pkgname + install -d "${pkgdir}"/usr/share/{doc/$pkgname,man/man1} install -m644 doc/* "${pkgdir}"/usr/share/doc/$pkgname rm -rf "${pkgdir}"/usr/share/doc/packages + mv "${pkgdir}"/usr/share/doc/vym/vym.1.gz "${pkgdir}"/usr/share/man/man1/ # .desktop and icon file install -D -m644 "${srcdir}"/$pkgname.desktop \ diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog index 6344bbecd..ebbcbda5d 100644 --- a/community/vym/vym.changelog +++ b/community/vym/vym.changelog @@ -1,3 +1,6 @@ +2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vym 2.2.4-3 FS#38753 fixed, qt4 rebuild finalized + 2012-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vym 2.2.4-1 diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index eae9d26ce..53e252866 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103053 2013-12-25 21:25:19Z andyrtr $ +# $Id: PKGBUILD 104875 2014-01-27 23:38:12Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.3.1 +pkgver=1.4.0 pkgrel=2 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,14 @@ url='http://wayland.freedesktop.org' license=('MIT') depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('56acdfde4d1a3871d6e54f0cdbcf2736e73e979a') +sha1sums=('49b0b6d5e2366a7bad5158b29998213e5ca7f254') build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/weston \ - --enable-demo-clients + --enable-demo-clients-install make } diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD index efbf80827..df3f45a64 100644 --- a/community/winff/PKGBUILD +++ b/community/winff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96460 2013-08-29 16:47:40Z arodseth $ +# $Id: PKGBUILD 105386 2014-02-06 11:25:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Paolo Stivanin <admin AT polslinux DOT it> pkgname=winff -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc='GUI for ffmpeg' url='http://code.google.com/p/winff/' @@ -13,9 +13,8 @@ arch=('x86_64' 'i686') depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme') makedepends=('lazarus' 'lazarus-gtk2' 'gendesk' 'tar') install='winff.install' -source=("https://$pkgname.googlecode.com/files/WinFF-$pkgver-source.tar.gz") -noextract=("WinFF-$pkgver-source.tar.gz") -sha256sums=('9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c') +source=("$pkgname-$pkgver.tar.gz::https://docs.google.com/uc?authuser=0&id=0B8HoAIi30ZDkMHlvVkVtNHJnLVE&export=download") +sha256sums=('ce82ef4359ef45d4c4a18977e49e403474cae4e3a948e90a66cc41068b3d5106') prepare() { gendesk -n \ @@ -23,12 +22,6 @@ prepare() { --pkgdesc "$pkgdesc" \ --genericname 'Video converter' \ --categories 'AudioVideo;AudioVideoEditing;GTK' - - # The file provided by upstream is an "exploding tarball" where the files - # are not extracted in a directory. Also everything is set as executable. m) - mkdir -p "$pkgname" - cd "$pkgname" - tar zxf "../WinFF-$pkgver-source.tar.gz" } build() { diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD index 2cda54a4b..70b2c2544 100644 --- a/community/wireshark/PKGBUILD +++ b/community/wireshark/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102796 2013-12-20 11:11:34Z tredaelli $ +# $Id: PKGBUILD 103931 2014-01-13 17:17:08Z andyrtr $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.10.5 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio' diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD index 974971d91..ea750b50c 100644 --- a/community/wxcam/PKGBUILD +++ b/community/wxcam/PKGBUILD @@ -1,7 +1,8 @@ +# $Id: PKGBUILD 103835 2014-01-12 02:47:26Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=wxcam pkgver=1.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=(GPL) pkgdesc="Webcam application for linux" @@ -9,24 +10,24 @@ pkgdesc="Webcam application for linux" # http://cimg.sourceforge.net/ _CImg_ver=1.4.9 url="http://wxcam.sourceforge.net" -makedepends=('intltool>=0.35.0') +makedepends=('intltool>=0.35.0' 'libsm') depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib') source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip) md5sums=('c9ea8991b6375c1709a7ce4e61fcc263' 'a07cba03f6d66a9970e0b3fcc230bddc') -build() { - cp $srcdir/CImg-${_CImg_ver}/CImg.h $srcdir/$pkgname-$pkgver +prepare() { + cp "$srcdir"/CImg-${_CImg_ver}/CImg.h "$srcdir"/$pkgname-$pkgver +} - cd $srcdir/$pkgname-$pkgver +build() { + cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - mv $pkgdir/usr/doc $pkgdir/usr/share/ + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" wxcamdocdir=/usr/share/doc/wxcam install } diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD deleted file mode 100644 index 9497c57bf..000000000 --- a/community/wxgtk2.9/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 96072 2013-08-19 20:07:32Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=wxgtk2.9 -pkgver=2.9.5 -pkgrel=1 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64' 'mips64el') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2') -optdepends=('webkitgtk2: for webview support') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 - wxGTK-2.9.5-collision.patch) -sha1sums=('0bab57ecd6d065a3672ec5fbb09d287456727ea4' - '22f21e91d847779f17cace8cfde553ab1ffac279') - -prepare() { - cd wxWidgets-${pkgver} - patch -p1 -i ../wxGTK-2.9.5-collision.patch -} - -build() { - cd wxWidgets-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo -} - -package() { - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch b/community/wxgtk2.9/wxGTK-2.9.5-collision.patch deleted file mode 100644 index 4d7090581..000000000 --- a/community/wxgtk2.9/wxGTK-2.9.5-collision.patch +++ /dev/null @@ -1,88 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -14964,15 +14964,16 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -- -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ -+ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale - for l in $(LOCALE_LINGUAS) ; do \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ -+ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -138,7 +138,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -124,7 +124,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) ---- a/Makefile.in 2013-07-17 18:32:11.705720544 -0400 -+++ b/Makefile.in 2013-07-17 18:39:24.134286555 -0400 -@@ -16124,7 +16124,7 @@ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/msw/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD index 2d71c8a37..b71dd164d 100644 --- a/community/xbindkeys/PKGBUILD +++ b/community/xbindkeys/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92556 2013-06-08 11:18:52Z bpiotrowski $ +# $Id: PKGBUILD 103379 2014-01-04 20:12:41Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Thayer Williams <thayer@archlinux.org> pkgname=xbindkeys -pkgver=1.8.5 -pkgrel=4 +pkgver=1.8.6 +pkgrel=1 pkgdesc="Launch shell commands with your keyboard or your mouse under X" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/xbindkeys/xbindkeys.html" @@ -13,7 +13,7 @@ license=('GPL') depends=('libx11' 'guile') optdepends=('tk: xbindkeys_show') source=(http://www.nongnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4b66a05594dbc6888c0a6439351aa66d') +md5sums=('c6ea9db56e075dae0697497e2ed390cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 943912d3b..a2c71d3ea 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 97844 2013-09-30 10:04:25Z spupykin $ +# $Id: PKGBUILD 104711 2014-01-24 18:40:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.7.2 -pkgrel=3 +pkgver=4.7.3 +pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/xboard/" license=('GPL3') -depends=('gnuchess' 'texinfo' 'xdg-utils' - 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' - 'gtk2' 'cairo' 'librsvg') -optdepends=('perl') +depends=('texinfo' 'xdg-utils' 'gtk2' 'cairo' 'librsvg') +optdepends=('gnuchess: chess engine' + 'perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('83ec086cbf5c4bc362a188654a9332fc') +md5sums=('5ad06ca818c29f499ba227ea3d19df14') build() { cd "${pkgname}-${pkgver}" diff --git a/community/xchm/PKGBUILD b/community/xchm/PKGBUILD index f2fd50ac3..2e443ca4e 100644 --- a/community/xchm/PKGBUILD +++ b/community/xchm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 102193 2013-12-06 12:52:51Z giovanni $ +# $Id: PKGBUILD 103807 2014-01-11 20:08:41Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=xchm pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64' 'mips64el') url="http://xchm.sourceforge.net/" license=('GPL') -depends=('chmlib' 'wxgtk' 'desktop-file-utils') +depends=('chmlib' 'wxgtk2.8' 'desktop-file-utils') install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' @@ -21,7 +21,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - ./configure --prefix=/usr \ + #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8 + ./configure --prefix=/usr --with-wx-config=wx-config-2.8 \ --build=$CHOST \ --host=$CHOST make diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD index bd8d6cd9f..d629379ea 100644 --- a/community/xdelta3/PKGBUILD +++ b/community/xdelta3/PKGBUILD @@ -1,31 +1,44 @@ -# $Id: PKGBUILD 90967 2013-05-16 19:50:32Z bpiotrowski $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 105087 2014-01-31 12:10:31Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 -pkgver=3.0.7 +pkgver=3.0.8 pkgrel=1 -pkgdesc="Diff utility which works with binary files" +pkgdesc='Diff utility which works with binary files' arch=('i686' 'x86_64' 'mips64el') -url="http://xdelta.org/" +url='http://xdelta.org/' license=('GPL') depends=('xz') -source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('ef6631e4f9219a80bcb9e3020962b6ec') +source=("http://${pkgname/3}.googlecode.com/files/$pkgname-$pkgver.tar.xz" + 'regtest_size_t.patch') +# SHA1 sum from https://code.google.com/p/xdelta/downloads/detail?name=xdelta3-3.0.8.tar.xz&can=2&q= +sha1sums=('62c7a029e96c0904bb47a5e2f3de08473a185539' + 'c2816b5d4bfb405d3adb771fa09b367a88971240') -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 -i ../regtest_size_t.patch } check() { - cd $pkgname-$pkgver - ./xdelta3 test + cd "$pkgname-$pkgver" + + ./$pkgname test +} + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/xdelta3/regtest_size_t.patch b/community/xdelta3/regtest_size_t.patch new file mode 100644 index 000000000..e048135bd --- /dev/null +++ b/community/xdelta3/regtest_size_t.patch @@ -0,0 +1,11 @@ +--- a/testing/regtest.cc ++++ b/testing/regtest.cc +@@ -12,7 +12,7 @@ public: + Options() : encode_srcwin_maxsz(1<<20), + block_size(Constants::BLOCK_SIZE), + size_known(false) { } +- size_t encode_srcwin_maxsz; ++ uint64_t encode_srcwin_maxsz; + size_t block_size; + bool size_known; + }; diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD index 1269ee7ea..3665fc78e 100644 --- a/community/xjadeo/PKGBUILD +++ b/community/xjadeo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 101054 2013-11-15 17:47:59Z speps $ +# $Id: PKGBUILD 105623 2014-02-12 07:14:19Z schiv $ # Maintainer : speps <speps at aur dot archlinux dot org> pkgname=xjadeo pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="A simple video player that is synchronized to jack transport." arch=('i686' 'x86_64') url="http://xjadeo.sourceforge.net" license=('GPL') -depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi') +depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo>=0.28' 'libxpm' 'libxv' 'portmidi') makedepends=('qt4') optdepends=('qt4: for the GUI (qjadeo)') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 258f5d9de..2c6b9618b 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $ +# $Id: PKGBUILD 104644 2014-01-24 07:01:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd -pkgver=1.3.1 -pkgrel=3 +pkgver=1.3.6 +pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -19,7 +19,7 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.service xl2tpd.tmpfiles ipparam.patch) -md5sums=('38c2461d3562f98b08454ca403706886' +md5sums=('2f526cc0c36cf6d8a74f1fb2e08c18ec' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' @@ -30,7 +30,7 @@ md5sums=('38c2461d3562f98b08454ca403706886' build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/ipparam.patch +# patch -p1 <$srcdir/ipparam.patch make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin } diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD index be506239e..26b9502c2 100644 --- a/community/xmind/PKGBUILD +++ b/community/xmind/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 105001 2014-01-29 18:13:52Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Christoph Drexler <chrdr at gmx dot at> # Contributor: Jelle van der Waa <jellevdwaa@gmail.com> pkgname=xmind -pkgver=3.4.0 -_pkgdate=201311050558 +pkgver=3.4.1 +_pkgdate=201401221918 pkgrel=1 pkgdesc="Brainstorming and Mind Mapping Software" arch=('i686' 'x86_64') @@ -17,11 +17,10 @@ depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-m optdepends=('lame: needed for the feature audio notes') install=xmind.install source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb) -[ "${CARCH}" = "i686" ] && md5sums=('7e5d4a8218397cdefa5a6c4ecaed7cbd') -[ "${CARCH}" = "x86_64" ] && md5sums=('6dcaeb46ab9b88c1904f594b9b1eebc8') +[ "${CARCH}" = "i686" ] && sha512sums=('780fb661d51d68326d4478810d806eab4312b6f21538d4f2dde786f63bd2b9527ec73c25414b83e5aecf496ef78da932697cab2ef099005966a9b13d0f0c5413') +[ "${CARCH}" = "x86_64" ] && sha512sums=('bfa6f4f3b07091c667fb05fcb4a9f22594f474c6dc34d1439f60bb3769c3c62d583366c2ebd61779c152461553537a2422627f8ad7006be5400f59d4553583f6') build() { - cd "${srcdir}" ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb" bsdtar -xf data.tar.gz } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 1fcca5cd7..1a5740fcb 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97846 2013-09-30 10:05:03Z spupykin $ +# $Id: PKGBUILD 104903 2014-01-28 03:34:35Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=20 +pkgrel=23 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index a6abea19e..20e14ca5a 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $ +# $Id: PKGBUILD 105371 2014-02-06 05:24:17Z bisson $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar pkgver=0.19 -pkgrel=1 +pkgrel=2 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index 44f82123d..fb5c09419 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100021 2013-10-31 03:03:11Z allan $ +# $Id: PKGBUILD 105302 2014-02-04 19:29:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.16 +pkgver=3.17 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') @@ -15,19 +15,21 @@ optdepends=('xosd: feedback support') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz gnee.desktop) -sha256sums=('07393d84d7abfab607b5ba078a0c32411815b7c883317356f6b92f7bbf3176fe' +sha256sums=('c76d1c8b9deff2e52721e474cb69cf092c0d72212c916c6dacc94e33618c8638' 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --enable-gui --enable-lib --disable-static --disable-static-programs make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/gnee.desktop ${pkgdir}/usr/share/applications/gnee.desktop + make DESTDIR="${pkgdir}" install + +#.desktop file + install -Dm644 "${srcdir}"/gnee.desktop "${pkgdir}"/usr/share/applications/gnee.desktop } diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index d72b4493b..aa157b6be 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.17-1 + 2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.16-1 diff --git a/community/xtrabackup/PKGBUILD b/community/xtrabackup/PKGBUILD new file mode 100644 index 000000000..d90eeb4a8 --- /dev/null +++ b/community/xtrabackup/PKGBUILD @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=xtrabackup +pkgver=2.1.7 +pkgrel=3 +pkgdesc='Non-blocking backup tool for MySQL' +arch=('i686' 'x86_64') +url='http://www.percona.com/software/percona-xtrabackup/' +license=('GPL') +depends=('libaio' 'libgcrypt' 'openssl') +makedepends=('cmake' 'python-sphinx' 'zlib') +source=(http://percona.com/redir/downloads/XtraBackup/XtraBackup-$pkgver/source/percona-xtrabackup-$pkgver.tar.gz + build.patch) + +build() { + cd percona-xtrabackup-$pkgver + + utils/build.sh xtradb55 + cp src/xtrabackup_55 src/xbstream src/xbcrypt . + utils/build.sh xtradb56 + cp src/xtrabackup_56 . + + cd doc + make man +} + +package() { + cd percona-xtrabackup-$pkgver + + for file in innobackupex xtrabackup_55 xtrabackup_56 xbcrypt xbstream; do + install -Dm0755 $file "$pkgdir"/usr/bin/$file + done + + cd doc/build/man + for file in *.1; do + install -Dm0644 $file "$pkgdir"/usr/share/man/man1/$file + done +} + +sha256sums=('b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587' + 'e6f329c061c921be6e44e16fd64d79bcca8c61ea1ce4a1d2f923408d30318b25') diff --git a/community/xtrabackup/build.patch b/community/xtrabackup/build.patch new file mode 100644 index 000000000..fc2ef2866 --- /dev/null +++ b/community/xtrabackup/build.patch @@ -0,0 +1,11 @@ +--- utils/build.sh.orig 2014-01-24 10:37:41.206535420 +0100 ++++ utils/build.sh 2014-01-24 10:44:00.841407894 +0100 +@@ -167,6 +167,9 @@ + tar xzf $top_dir/$1 + cd $dirname + patch -p1 < $top_dir/patches/$2 ++ sed 's|srv_buf_size|srv_sort_buf_size|g' -i \ ++ sql/sql_planner.cc \ ++ storage/innobase/row/row0log.cc + cd - + } diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD index fe3c629d2..8fe4e064a 100644 --- a/community/xulrunner/PKGBUILD +++ b/community/xulrunner/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 103127 2013-12-26 20:12:06Z bpiotrowski $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 105483 2014-02-09 04:20:46Z cbehan $ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=23.0.1 +pkgver=27.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 mozconfig mozilla-pkgconfig.patch shared-libs.patch) -options=('!emptydirs') +options=('!emptydirs' '!makeflags' 'staticlibs') replaces=('xulrunner-oss') -sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' - '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' +sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981' + '8455f7bc00e8ad6e69bba43171083c778420a8b1c566347ed5381ae9cf98191a' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') @@ -44,16 +45,17 @@ build() { cd "$srcdir/mozilla-release" export PATH="$srcdir/python2-path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" export PYTHON="/usr/bin/python2" - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + make -j1 -f client.mk build } package() { cd "$srcdir/mozilla-release" make -j1 -f client.mk DESTDIR="$pkgdir" install + # Use system-provided dictionaries rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" @@ -63,6 +65,8 @@ package() { echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell" + ln -s /usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell "${pkgdir}/usr/lib/xulrunner-$pkgver/xpcshell" sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py } diff --git a/community/xulrunner/freetype-headers.patch b/community/xulrunner/freetype-headers.patch new file mode 100644 index 000000000..20a5b19ca --- /dev/null +++ b/community/xulrunner/freetype-headers.patch @@ -0,0 +1,66 @@ +diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers +--- mozilla-release.orig/config/system-headers ++++ mozilla-release/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h +diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers +--- mozilla-release.orig/js/src/config/system-headers ++++ mozilla-release/js/src/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig index 6679dac21..d2078e936 100644 --- a/community/xulrunner/mozconfig +++ b/community/xulrunner/mozconfig @@ -15,15 +15,17 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -#ac_add_options --enable-system-cairo +ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -#ac_add_options --enable-gstreamer - +ac_add_options --enable-gstreamer ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-installer + +# https://bugzilla.mozilla.org/show_bug.cgi?id=955876 +ac_add_options --enable-release diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index 7de1ebc5c..5bae4061f 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92791 2013-06-15 08:44:39Z lfleischer $ +# $Id: PKGBUILD 105538 2014-02-09 21:37:01Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('01afde1f1222fca38eab736e0b3df116') +md5sums=('7c2f30c3a9a71c4dba107e3eb9b40430') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 3af26cb5e..34cf9ec12 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100025 2013-10-31 03:04:33Z allan $ +# $Id: PKGBUILD 105395 2014-02-06 17:52:44Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=5.0.1 +pkgver=5.0.12 pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ license=('BSD') depends=('openssl' 'libxslt' 'icu') changelog=$pkgname.changelog source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('4792096db2175b8e3553dec5f3762efab9b1b9d0f84acceec0690ddcf7954a11') +sha256sums=('bf84f42cd442564bb911e869033c876c7ff561e203ae35504b8ca64f8575a8eb') build() { cd ${srcdir}/$pkgname-$pkgver @@ -34,3 +34,4 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +sha256sums=('4501bbeee665e34ad480508e83fbe8b65d2b5fd0a8194077f1b4235b616a846e') diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog index 7198259b5..2ee2a0a8a 100644 --- a/community/yaz/yaz.changelog +++ b/community/yaz/yaz.changelog @@ -1,3 +1,9 @@ +2014-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * yaz 5.0.12-1 + +2013-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * yaz 5.0.9-1 + 2013-10-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * yaz 5.0.1-1 diff --git a/community/zbar/PKGBUILD b/community/zbar/PKGBUILD index a18821a4b..a90744275 100644 --- a/community/zbar/PKGBUILD +++ b/community/zbar/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 104504 2014-01-22 01:50:17Z eric $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Marti Raudsepp <marti@juffo.org> # Contributor: Radu Andries <admiral0@tuxfamily.org> @@ -6,7 +6,7 @@ pkgname=zbar pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Application and library for reading bar codes from various sources" arch=('i686' 'x86_64') url="http://zbar.sourceforge.net/" @@ -29,6 +29,7 @@ build() { msg 'Running make...' make } + package() { cd zbar-$pkgver make DESTDIR="$pkgdir" install diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index 1e3602001..f36efad23 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72810 2012-06-22 13:58:49Z spupykin $ +# $Id: PKGBUILD 103709 2014-01-10 12:47:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,7 +6,7 @@ pkgname=zynaddsubfx pkgver=2.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64' 'mips64el') url="http://zynaddsubfx.sourceforge.net" @@ -15,31 +15,26 @@ depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk') options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" - "$pkgname.svg" - "zynaddsubfx-2.4.3-no_sse_generic.patch") + "$pkgname.svg") md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a' - 'eb95d339ff5deac8c6b54965f04a8c60' - '49464a33ab9c4250520eda0df7705663' - '6f7e9c3ce3947088a10c99c46a65431f' - 'd997b35b47eff56a2d056df61b737ddc') + '6f7e9c3ce3947088a10c99c46a65431f') build() { cd "$srcdir" - gendesk + gendesk $startdir/PKGBUILD setconf "$pkgname.desktop" Icon "$pkgname.svg" cd "ZynAddSubFX-$pkgver" - # patches -# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" -# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" - patch -Np1 -i ${srcdir}/zynaddsubfx-2.4.3-no_sse_generic.patch sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp [ -d build ] || mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk .. + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDefaultOutput=jack \ + -DDefaultInput=jack \ + -DGuiModule=fltk \ + .. make # build external programs |
