From 1d0d7aa1e250616385bce94b4d23f53b3d7b29e2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Aug 2013 01:41:32 -0700 Subject: Mon Aug 26 01:39:20 PDT 2013 --- community/dmd/PKGBUILD | 84 +++++++---- community/dmd/soname.diff | 15 ++ community/gdc/PKGBUILD | 93 ++++++++++++ community/gdc/folders.diff | 32 +++++ community/jad/PKGBUILD | 12 +- community/ldc/PKGBUILD | 90 +++++++----- community/ldc/ldc2.conf | 18 +++ community/ldc/ldc2.rebuild.conf | 2 + community/liteide/PKGBUILD | 9 +- community/nimrod/PKGBUILD | 48 +++++++ community/shell-fm/PKGBUILD | 31 ---- core/kmod/PKGBUILD | 6 +- core/libarchive/PKGBUILD | 14 +- core/libarchive/libarchive-3.1.2-acl.patch | 219 +++++++++++++++++++++++++++++ extra/pkgfile/PKGBUILD | 10 +- libre/iceape-libre/PKGBUILD | 6 + libre/iceweasel-l10n/PKGBUILD | 4 +- libre/iceweasel-libre/PKGBUILD | 6 +- 18 files changed, 579 insertions(+), 120 deletions(-) create mode 100644 community/dmd/soname.diff create mode 100644 community/gdc/PKGBUILD create mode 100644 community/gdc/folders.diff create mode 100644 community/ldc/ldc2.conf create mode 100644 community/ldc/ldc2.rebuild.conf create mode 100644 community/nimrod/PKGBUILD delete mode 100644 community/shell-fm/PKGBUILD create mode 100644 core/libarchive/libarchive-3.1.2-acl.patch diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index ab5be235b..f8c5d7b76 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 92844 2013-06-17 00:23:34Z svenstaro $ -# Maintainer: Sven-Hendrik Haase +# $Id: PKGBUILD 96324 2013-08-25 17:11:08Z dicebot $ +# Maintainer: Mihails Strasunse +# Contributor: Sven-Hendrik Haase # Contributor: Chris Brannon # Contributor: Andrea Scarpino # Contributor: Anders Bergh # Contributor: Alexander Fehr -pkgname=('dmd' 'libphobos' 'dtools') +pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools') +groups=('dlang' 'dlang-dmd') pkgbase=dmd pkgver=2.063.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.dlang.org" -makedepends=('git') +makedepends=('git' 'gcc' 'make') source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver" "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver" - "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver") + "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver" + "soname.diff") sha1sums=('SKIP' 'SKIP' 'SKIP' - 'SKIP') + 'SKIP' + '5a2198e8a024e1e6494034da569f0df18fabcf9d') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" @@ -32,11 +36,17 @@ build() { make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/phobos + # will be in upstream in next release but making naming change as early as possible + git apply $srcdir/soname.diff make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1 cd $srcdir/tools - for tool in rdmd.d ddemangle.d catdoc.d detab.d tolf.d dget.d; do - $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ $tool + + # rdmd is used to buil others + $srcdir/dmd/src/dmd -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-rdmd rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$srcdir/dmd/src/dmd --build-only -I../druntime/import -I../phobos -L-L../phobos/generated/linux/release/$_archbits/ -od. -ofdtools-`basename $tool` $tool.d done } @@ -44,13 +54,15 @@ package_dmd() { pkgdesc="The D programming language reference compiler" backup=('etc/dmd.conf') depends=('gcc') + optdepends=('dtools: collection of useful utilities for development in D' 'libphobos-devel: standard library, development package') provides=("d-compiler=$pkgver") license=('custom') + backup=('etc/dmd.conf') install -Dm755 $srcdir/dmd/src/dmd $pkgdir/usr/bin/dmd mkdir -p $pkgdir/etc - echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf + echo -e "[Environment]\nDFLAGS=-I/usr/include/dlang/dmd -I/usr/include/dlang/dmd/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1 install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5 @@ -58,36 +70,27 @@ package_dmd() { install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend install -Dm644 $srcdir/dmd/src/gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.1 install -Dm644 $srcdir/dmd/src/artistic.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend.2 + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos mkdir -p $pkgdir/usr/share/d/samples/ cp -r $srcdir/dmd/samples/* $pkgdir/usr/share/d/samples/ find $pkgdir/usr -type f | xargs chmod 0644 chmod 755 $pkgdir/usr/bin/* - - # No longer available, because not source code is provided and those are not mandatory. - # Please get those from http://dlang.org if absolutely needed. - - # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/dumpobj $pkgdir/usr/bin/dumpobj - # install -Dm755 $srcdir/dmd/linux/bin${_archbits}/obj2asm $pkgdir/usr/bin/obj2asm } -# Will be packaged separately once GDC/LDC will be able to compile phobos and pass test suite. -# For now only dependency is relaxed -package_libphobos() { - depends=("d-compiler>=$pkgver" "curl") - pkgdesc="The Phobos standard library for D programming language" - license=("boost") - install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a - install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so +package_libphobos-devel() { + pkgdesc="The Phobos standard library for D programming language. Modules and static library." + depends=("dmd") + license=("custom") - mkdir -p $pkgdir/usr/include/d - cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/d + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a - mkdir -p $pkgdir/usr/include/d/druntime - cp -r $srcdir/druntime/import $pkgdir/usr/include/d/druntime + mkdir -p $pkgdir/usr/include/dlang/dmd + cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/dlang/dmd - mkdir -p $pkgdir/usr/share/doc/d/ + mkdir -p $pkgdir/usr/include/dlang/dmd/druntime + cp -r $srcdir/druntime/import $pkgdir/usr/include/dlang/dmd/druntime find $pkgdir/usr -type f | xargs chmod 0644 @@ -95,12 +98,31 @@ package_libphobos() { install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos } +package_libphobos() { + pkgdesc="The Phobos standard library for D programming language." + depends=("curl") + license=("custom") + + install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.so $pkgdir/usr/lib/libphobos2.so + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + package_dtools() { pkgdesc="Ancilliary tools for the D programming language compiler" - license=("boost") depends=("curl") + license=("custom") cd $srcdir/tools + mkdir -p $pkgdir/usr/bin - install -m755 -t $pkgdir/usr/bin rdmd ddemangle catdoc detab tolf dget + for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do + install -m755 -t $pkgdir/usr/bin $pkgname-$tool + done + + cd $pkgdir + ln -s dtools-rdmd usr/bin/rdmd + ln -s dtools-dustmite usr/bin/dustmite + + # same Boost license as Phobos + install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE-phobos } diff --git a/community/dmd/soname.diff b/community/dmd/soname.diff new file mode 100644 index 000000000..7d155a52a --- /dev/null +++ b/community/dmd/soname.diff @@ -0,0 +1,15 @@ +diff --git a/posix.mak b/posix.mak +index 8fd953e..3776bb4 100644 +--- a/posix.mak ++++ b/posix.mak +@@ -153,8 +153,8 @@ DDOC=$(DMD) + VERSION=../dmd/VERSION + + # Set SONAME, the name of the shared library. +-# The awk script will produce the last 2 digits of the version string, i.e. 2.063 produces 63 +-SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$NF + 0 }' $(VERSION)) ++# The awk script will return the second group without leading zeros of the version string, i.e. 2.063.2 produces 63 ++SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$2 + 0 }' $(VERSION)) + + # Set LIB, the ultimate target + ifeq (,$(findstring win,$(OS))) diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD new file mode 100644 index 000000000..72fb3a5c6 --- /dev/null +++ b/community/gdc/PKGBUILD @@ -0,0 +1,93 @@ +# Maintainer: Mihails Strasuns +# Contributor: Moritz Maxeiner +# Contributor: Jerome Berger +# Contributor: Jesus Alvarez + +pkgname=('gdc' 'libgphobos-devel') +pkgver=4.8.1 +pkgrel=1 +arch=('i686' 'x86_64') +url="https://github.com/D-Programming-GDC/GDC" +license=('GPL') +makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') +options=('!libtool' '!emptydirs' '!buildflags') +_snapshot=4.8-20130725 +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 + folders.diff) +sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' + 'SKIP' + 'cd9df3c4129092f9a3ce6f608baa83e12935d7185d0ad3e273799264a21b031e') + +groups=('dlang' 'dlang-gdc') +conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') + +prepare() +{ + cd $srcdir/gcc-$_snapshot + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + echo $pkgver > gcc/BASE-VER + + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + cd $srcdir/gdc + git apply $srcdir/folders.diff # fix gdc_include_path + ./setup-gcc.sh ../gcc-$_snapshot + + mkdir $srcdir/gcc-build +} + + +build() +{ + cd ${srcdir}/gcc-build + + ${srcdir}/gcc-$_snapshot/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=d \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch \ + --enable-gnu-unique-object --enable-linker-build-id \ + --enable-cloog-backend=isl --disable-cloog-version-check \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu --disable-install-libiberty \ + --disable-multilib --disable-libssp --disable-werror \ + --disable-nls --disable-bootstrap \ + --disable-libgomp --disable-libmudflap --disable-libquadmath + + make +} + +package_gdc() +{ + depends=('libmpc' 'zlib') + optdepends=('libgphobos-devel: D standard library, GDC 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/4.8.1/cc1d +} + +package_libgphobos-devel() +{ + # 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 + + # phobos + cp $srcdir/gdc/libphobos/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d + cp -r $srcdir/gdc/libphobos/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std + cp -r $srcdir/gdc/libphobos/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc + + install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a + install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a +} diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff new file mode 100644 index 000000000..738a7e6cd --- /dev/null +++ b/community/gdc/folders.diff @@ -0,0 +1,32 @@ +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index 5bdab1b..aa1122e 100644 +--- a/gcc/d/Make-lang.in ++++ b/gcc/d/Make-lang.in +@@ -25,9 +25,9 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor + + # This should be configured + ifeq ($(host), $(target)) +- gcc_d_include_dir = $(prefix)/include/d/$(version) ++ gcc_d_include_dir = $(prefix)/include/dlang/gdc/$(version) + else +- gcc_d_include_dir = $(libsubdir)/include/d ++ gcc_d_include_dir = $(libsubdir)/include/dlang/gdc + endif + + +diff --git a/libphobos/configure.in b/libphobos/configure.in +index f6b3660..7e88b23 100644 +--- a/libphobos/configure.in ++++ b/libphobos/configure.in +@@ -232,9 +232,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/gdc + 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/jad/PKGBUILD b/community/jad/PKGBUILD index 30c8ea509..5383ef577 100644 --- a/community/jad/PKGBUILD +++ b/community/jad/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 86961 2013-03-25 11:13:01Z arodseth $ +# $Id: PKGBUILD 96321 2013-08-25 14:38:50Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: astaroth pkgname=jad pkgver=1.5.8e -pkgrel=4 +pkgrel=5 pkgdesc='Java decompiler' license=('custom') arch=('x86_64' 'i686') url='http://www.varaneckas.com/jad' +optdepends=('vim-jad: open class files directly in vim and see the decompiled source code') +makedepends=('links') source=("http://www.varaneckas.com/$pkgname/${pkgname}${pkgver//./}.linux.static.zip" 'jad.html::http://www.varaneckas.com/jad') sha256sums=('2878e19fc1fdd725b516f538a57b02aaec1b2d1e4b106d550230381ffa9c0c81' - '4acee94ff29fe01ea2a9c4c0b47f22fb5a93fc667ee2dd8b6740f7f36bcbcdf2') + '5a0a0a26ca84c733c3a213960c070285bb2046b149adec49d6f47f00b2736dd0') -build() { +prepare() { cd "$srcdir" - grep '' jad.html -A18 | sed 's:::' | sed 's:::' > LICENSE + links -dump jad.html | grep -A19 Copyright > LICENSE } package() { diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index e03404d17..035275fed 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,47 +1,73 @@ -# $Id: PKGBUILD 92773 2013-06-15 01:02:41Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -pkgname=ldc +# $Id: PKGBUILD 96332 2013-08-25 18:27:42Z dicebot $ +# Maintainer: Mihails Strasuns +# Contributor: Sven-Hendrik Haase +pkgname=('ldc' 'liblphobos-devel') +groups=('dlang' 'dlang-ldc') pkgver=0.11.0 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') -url="http://www.dsource.org/projects/ldc" +url="https://github.com/ldc-developers/ldc" license=('BSD') -depends=('llvm' 'libconfig') -makedepends=('git' 'cmake') +depends=('libconfig') +makedepends=('git' 'cmake' 'llvm') backup=('etc/ldc2.conf') -source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}") -sha1sums=('SKIP') - -[[ $CARCH == "x86_64" ]] && _multilib="ON" -[[ $CARCH == "i686" ]] && _multilib="OFF" +source=("git://github.com/ldc-developers/ldc.git#tag=v${pkgver}" + "ldc2.conf" + "ldc2.rebuild.conf" + ) +sha1sums=('SKIP' + 'e4e2c9656a24a2433cfb00f792abdc247a845b46' + '0e6e5e072ccc006a200a8fc918cb1ebeb2e12b7b' + ) build() { - cd "$srcdir"/ldc - git submodule update --init --recursive - - mkdir build && cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \ - -DMULTILIB=$_multilib \ - .. - make + cd $srcdir/ldc + + git submodule update --init --recursive + + mkdir build && cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc \ + .. + make } -package() { - cd "$srcdir"/ldc +package_ldc() { + optdepends=("liblphobos-devel: stadard library, static one + imports, LDC version") + backup=("etc/ldc2.conf" + "etc/ldc2.rebuild.conf" + ) + + # binaries + install -D -m755 $srcdir/ldc/build/bin/ldmd2 $pkgdir/usr/bin/ldmd2 + install -D -m755 $srcdir/ldc/build/bin/ldc2 $pkgdir/usr/bin/ldc2 + + # supplementaries + install -D -m644 $srcdir/ldc/bash_completion.d/ldc $pkgdir/usr/share/bash-completion/completions/ldc + + # licenses + install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # default configuration files + install -D -m644 $srcdir/ldc2.conf $pkgdir/etc/ldc2.conf + install -D -m644 $srcdir/ldc2.rebuild.conf $pkgdir/etc/ldc2.rebuild.conf +} - cd build - make DESTDIR=$pkgdir install - cd .. +package_liblphobos-devel() { + depends=("ldc") - mkdir -p $pkgdir/usr/share/bash-completion/ - mv $pkgdir/etc/bash_completion.d $pkgdir/usr/share/bash-completion/completions + # libraries + install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc.a $pkgdir/usr/lib/liblphobos.a + install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc-debug.a $pkgdir/usr/lib/liblphobos-debug.a - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + # imports + mkdir -p $pkgdir/usr/include/dlang/ldc + cp -r $srcdir/ldc/build/import/* $pkgdir/usr/include/dlang/ldc/ + cp -r $srcdir/ldc/runtime/phobos/std $pkgdir/usr/include/dlang/ldc/ - # We don't actually want the multilib libs in this package - rm -rf $pkgdir/usr/lib32 + # licenses + install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/ldc/ldc2.conf b/community/ldc/ldc2.conf new file mode 100644 index 000000000..8fe82063c --- /dev/null +++ b/community/ldc/ldc2.conf @@ -0,0 +1,18 @@ +// This configuration file uses libconfig. +// See http://www.hyperrealm.com/libconfig/ for syntax details. + +// The default group is required +default: +{ + // 'switches' holds array of string that are appends to the command line + // arguments before they are parsed. + switches = [ + "-I/usr/include/dlang/ldc/ldc", + "-I/usr/include/dlang/ldc", + "-L-L/usr/lib", + "-L-L/usr/lib32", + "-L--no-warn-search-mismatch", + "-defaultlib=lphobos", + "-debuglib=lphobos-debug" + ]; +}; diff --git a/community/ldc/ldc2.rebuild.conf b/community/ldc/ldc2.rebuild.conf new file mode 100644 index 000000000..e9683d1ee --- /dev/null +++ b/community/ldc/ldc2.rebuild.conf @@ -0,0 +1,2 @@ +[Environment] +DFLAGS=-I-I/usr/include/dlang/ldc/ldc -I/usr/include/dlang/ldc -L-L/usr/lib -defaultlib=lphobos -debuglib=lphobos-debug diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 80c6e6e00..6d5a7c483 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 95868 2013-08-17 16:21:10Z arodseth $ +# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: spambanane # Contributor: Matteo pkgname=liteide pkgver=19 -pkgrel=2 +pkgrel=3 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' -depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') +depends=('go' 'libpng12' 'qt5-webkit') replaces=('golangide') conflicts=('golangide') makedepends=('gendesk') -options=('!strip') +options=('!strip' '!emptydirs') source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'liteide.png' 'liteide.sh') @@ -56,6 +56,7 @@ package() { done install -Dm755 bin/liteide "$pkgdir/usr/bin/liteide.elf" install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/golangide" cd "$srcdir/liteide-x$pkgver/liteidex" diff --git a/community/nimrod/PKGBUILD b/community/nimrod/PKGBUILD new file mode 100644 index 000000000..25b5c4913 --- /dev/null +++ b/community/nimrod/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 96341 2013-08-25 20:41:23Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Dominik Picheta +# Contributor: Sven-Hendrik Haase + +pkgname=nimrod +pkgver=0.9.2 +pkgrel=3 +pkgdesc='Imparative, multi-paradigm, compiled programming language' +arch=('x86_64' 'i686') +url='http://nimrod-code.org/' +license=('MIT') +makedepends=('setconf') +source=("http://nimrod-code.org/download/${pkgname}_$pkgver.zip") +options=('!emptydirs') +sha256sums=('4903ff46b90caa61194551f66fdff291b1ecba8bb4eec1611373cd34ecaf7090') + +prepare() { + cd "$pkgname" + + setconf install.sh bindir "$pkgdir/usr/bin" + setconf install.sh configdir "$pkgdir/etc" + setconf install.sh libdir "$pkgdir/usr/lib/$pkgname" + setconf install.sh docdir "$pkgdir/usr/share/doc/$pkgname" + setconf install.sh datadir "$pkgdir/usr/share/$pkgname" +} + +build() { + cd "$pkgname" + + sh build.sh + ./bin/nimrod c -d:release koch + PATH="$PATH":./bin/nimrod ./koch boot -d:release -d:useGnuReadline +} + +package() { + cd "$pkgname" + + install -d "$pkgdir/usr/bin" + install -d "$pkgdir/etc" + install -d "$pkgdir/usr/lib/$pkgname" + install -d "$pkgdir/usr/share/doc/$pkgname" + install -d "$pkgdir/usr/share/$pkgname" + sh install.sh /usr/bin + install -Dm644 copying.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/shell-fm/PKGBUILD b/community/shell-fm/PKGBUILD deleted file mode 100644 index 88cfe9926..000000000 --- a/community/shell-fm/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 68046 2012-03-17 12:04:37Z giovanni $ -# Maintainer: Daenyth -# Contributor: Geoffroy Carrier -# Contributor: Jeff Mickey - -pkgname=shell-fm -pkgver=0.8 -pkgrel=1 -pkgdesc="A console based player for the streams provided by Last.FM" -arch=('i686' 'x86_64') -url="http://github.com/jkramer/$pkgname" -license=('GPL') -depends=('libmad' 'libao' 'taglib') -source=($pkgname-$pkgver.tar.gz::http://github.com/jkramer/$pkgname/tarball/v$pkgver) -md5sums=('ce5c45ead71a299edbff280d4007ad99') - -build() { - cd "$srcdir"/jkramer-$pkgname-* - - make -} - -package() { - cd "$srcdir"/jkramer-$pkgname-* - - make DESTDIR="$pkgdir" install - - cd "$pkgdir/usr" - install -dm755 "$pkgdir/usr/share" - mv man share -} diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 88fdabef2..478ba1699 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189849 2013-07-09 13:17:26Z dreisner $ +# $Id: PKGBUILD 193604 2013-08-25 14:43:28Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod -pkgver=14 +pkgver=15 pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('38009d0d6f10678a3ec22ccd29210d13' +md5sums=('d03372179ed2cfa0c52b6672cf438901' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 05902ecef..7d7260489 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 179100 2013-03-03 17:28:26Z dreisner $ +# $Id: PKGBUILD 193605 2013-08-25 14:43:38Z dreisner $ # Maintainer: Dan McGee pkgname=libarchive pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" license=('BSD') depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib') +provides=('libarchive.so') source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz" - '0001-mtree-fix-line-filename-length-calculation.patch') + '0001-mtree-fix-line-filename-length-calculation.patch' + 'libarchive-3.1.2-acl.patch') md5sums=('efad5a503f66329bb9d2f4308b5de98a' - 'fda89c145bbcd793a96b06b463ef6a72') + 'fda89c145bbcd793a96b06b463ef6a72' + 'a5c995661c62429ceff2c23ea322393b') build() { cd "$pkgname-$pkgver" @@ -21,6 +24,9 @@ build() { # upstream commit e65bf287f0133426b26611fe3e80b51267987106 patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch" + # https://code.google.com/p/libarchive/issues/detail?id=329 + patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch" + ./configure --prefix=/usr --without-xml2 make } diff --git a/core/libarchive/libarchive-3.1.2-acl.patch b/core/libarchive/libarchive-3.1.2-acl.patch new file mode 100644 index 000000000..ce563b0c1 --- /dev/null +++ b/core/libarchive/libarchive-3.1.2-acl.patch @@ -0,0 +1,219 @@ +diff -ruN libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c +--- libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c 2013-02-08 01:52:07.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c 2013-08-08 10:47:41.000000000 +0200 +@@ -399,7 +399,7 @@ + #endif + + +-#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4) ++#ifdef HAVE_POSIX_ACL + static int translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int archive_entry_acl_type); + +@@ -419,6 +419,7 @@ + + archive_entry_acl_clear(entry); + ++#ifdef ACL_TYPE_NFS4 + /* Try NFS4 ACL first. */ + if (*fd >= 0) + acl = acl_get_fd(*fd); +@@ -447,6 +448,7 @@ + acl_free(acl); + return (ARCHIVE_OK); + } ++#endif + + /* Retrieve access ACL from file. */ + if (*fd >= 0) +@@ -492,6 +494,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -508,8 +511,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -519,21 +524,25 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; +- ++#endif + static int + translate_acl(struct archive_read_disk *a, + struct archive_entry *entry, acl_t acl, int default_entry_acl_type) + { + acl_tag_t acl_tag; ++#ifdef ACL_TYPE_NFS4 + acl_entry_type_t acl_type; + acl_flagset_t acl_flagset; ++ int brand, r; ++#endif + acl_entry_t acl_entry; + acl_permset_t acl_permset; +- int brand, i, r, entry_acl_type; ++ int i, entry_acl_type; + int s, ae_id, ae_tag, ae_perm; + const char *ae_name; + + ++#ifdef ACL_TYPE_NFS4 + // FreeBSD "brands" ACLs as POSIX.1e or NFSv4 + // Make sure the "brand" on this ACL is consistent + // with the default_entry_acl_type bits provided. +@@ -560,6 +569,7 @@ + return ARCHIVE_FAILED; + break; + } ++#endif + + + s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry); +@@ -592,9 +602,11 @@ + case ACL_OTHER: + ae_tag = ARCHIVE_ENTRY_ACL_OTHER; + break; ++#ifdef ACL_TYPE_NFS4 + case ACL_EVERYONE: + ae_tag = ARCHIVE_ENTRY_ACL_EVERYONE; + break; ++#endif + default: + /* Skip types that libarchive can't support. */ + s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry); +@@ -605,6 +617,7 @@ + // XXX acl_get_entry_type_np on FreeBSD returns EINVAL for + // non-NFSv4 ACLs + entry_acl_type = default_entry_acl_type; ++#ifdef ACL_TYPE_NFS4 + r = acl_get_entry_type_np(acl_entry, &acl_type); + if (r == 0) { + switch (acl_type) { +@@ -634,9 +647,10 @@ + ae_perm |= acl_inherit_map[i].archive_inherit; + + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); +- for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { ++ for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) { + /* + * acl_get_perm() is spelled differently on different + * platforms; see above. +diff -ruN libarchive-3.1.2/libarchive/archive_write_disk_acl.c libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c +--- libarchive-3.1.2/libarchive/archive_write_disk_acl.c 2013-01-14 02:43:45.000000000 +0100 ++++ libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c 2013-08-08 10:31:35.000000000 +0200 +@@ -43,7 +43,7 @@ + #include "archive_acl_private.h" + #include "archive_write_disk_private.h" + +-#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4) ++#ifndef HAVE_POSIX_ACL + /* Default empty function body to satisfy mainline code. */ + int + archive_write_disk_set_acls(struct archive *a, int fd, const char *name, +@@ -79,10 +79,12 @@ + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_DEFAULT, + ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default"); + return (ret); ++#ifdef ACL_TYPE_NFS4 + } else if (archive_acl_count(abstract_acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0) { + ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_NFS4, + ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4"); + return (ret); ++#endif + } else + return ARCHIVE_OK; + } +@@ -94,6 +96,7 @@ + {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE}, + {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE}, + {ARCHIVE_ENTRY_ACL_READ, ACL_READ}, ++#ifdef ACL_TYPE_NFS4 + {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA}, + {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY}, + {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA}, +@@ -110,8 +113,10 @@ + {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL}, + {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER}, + {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE} ++#endif + }; + ++#ifdef ACL_TYPE_NFS4 + static struct { + int archive_inherit; + int platform_inherit; +@@ -121,6 +126,7 @@ + {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY} + }; ++#endif + + static int + set_acl(struct archive *a, int fd, const char *name, +@@ -130,7 +136,9 @@ + acl_t acl; + acl_entry_t acl_entry; + acl_permset_t acl_permset; ++#ifdef ACL_TYPE_NFS4 + acl_flagset_t acl_flagset; ++#endif + int ret; + int ae_type, ae_permset, ae_tag, ae_id; + uid_t ae_uid; +@@ -171,14 +179,17 @@ + case ARCHIVE_ENTRY_ACL_OTHER: + acl_set_tag_type(acl_entry, ACL_OTHER); + break; ++#ifdef ACL_TYPE_NFS4 + case ARCHIVE_ENTRY_ACL_EVERYONE: + acl_set_tag_type(acl_entry, ACL_EVERYONE); + break; ++#endif + default: + /* XXX */ + break; + } + ++#ifdef ACL_TYPE_NFS4 + switch (ae_type) { + case ARCHIVE_ENTRY_ACL_TYPE_ALLOW: + acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW); +@@ -200,6 +211,7 @@ + // XXX error handling here. + break; + } ++#endif + + acl_get_permset(acl_entry, &acl_permset); + acl_clear_perms(acl_permset); +@@ -210,6 +222,7 @@ + acl_perm_map[i].platform_perm); + } + ++#ifdef ACL_TYPE_NFS4 + acl_get_flagset_np(acl_entry, &acl_flagset); + acl_clear_flags_np(acl_flagset); + for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) { +@@ -217,6 +230,7 @@ + acl_add_flag_np(acl_flagset, + acl_inherit_map[i].platform_inherit); + } ++#endif + } + + /* Try restoring the ACL through 'fd' if we can. */ diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index a1b96923c..f58ddc506 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179110 2013-03-03 17:28:37Z dreisner $ +# $Id: PKGBUILD 193608 2013-08-25 20:10:57Z dreisner $ # Maintainer: Dave Reisner pkgname=pkgfile -pkgver=8 -pkgrel=2 +pkgver=9 +pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') url="http://github.com/falconindy/pkgfile" @@ -12,8 +12,8 @@ depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('772d02872ddf112c5e24d6ad40e5623d' - '712c546c0291975e646a1d2170034e10') +md5sums=('7e27e9c15da6d59ae04f32d5dc977485' + 'SKIP') options=(!strip) diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index efacd73ce..1ea0c56b0 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -100,6 +100,9 @@ prepare() { build() { export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" cd "${srcdir}/${DEBIAN_BUILD}" @@ -117,6 +120,9 @@ build() { package() { export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" cd "${srcdir}/${DEBIAN_BUILD}" diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index d0878ef89..19400ce5f 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -24,11 +24,11 @@ pkgname=($(for lang in ${_langpacks[@]} done)) epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') -url="http://packages.debian.org/experimental/iceweasel" +url="http://packages.debian.org/sid/iceweasel" license=('MPL' 'GPL') depends=("iceweasel-libre>=$epoch:$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 32e502bcb..1918e27a6 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,7 +12,7 @@ _pgo=true -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=iceweasel _debver=23.0.1 _debrel=deb1 @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -38,7 +38,7 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks' 'libpulse: PulseAudio audio driver') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install replaces=('firefox') conflicts=('firefox') -- cgit v1.2.3-54-g00ecf