Commit 5bf5e47d authored by Luca Giambonini's avatar Luca Giambonini

import of local ccr repository

parents
Pipeline #1689 failed with stages
*~
.directory
src/
pkg/
*.gz
*.xz
*.bz2
*.zip
*.run
*.deb
*.rpm
*.sig
*.asc
*.tar
*.tgz
*.bin
*.arm
_*/
[Desktop Entry]
Name=4K YouTube to MP3
GenericName=4K YouTube to MP3
Comment=Download online audio
Exec=4kyoutubetomp3
Terminal=false
Type=Application
Icon=4kyoutubetomp3.png
Categories=Network;Qt;
pkgname=4kyoutubetomp3
pkgver=3.3.3.1777
pkgrel=1
pkgdesc="Extract audio from YouTube, Vimeo, Facebook and other online video hosting services."
arch=('x86_64')
url="http://www.4kdownload.com/products/product-youtubetomp3"
license=('custom:eula')
depends=('qt5-script' 'portaudio' 'ffmpeg-compat' 'ffmpeg-compat-55')
source=("${pkgname}.desktop"
"${pkgname}.png"
"${pkgname}_${pkgver}_amd64.tar.bz2"::"https://dl.4kdownload.com/app/${pkgname}_${pkgver%.*}_amd64.tar.bz2")
sha256sums=('386dfa4085efcd9403c4387c7be4dd0f9762c726555b5ebd0126dcd225bcf828'
'b25f830bb1fe559ea9f0b35cc9eb8ab75e2e40d09b8755f937451f5ddeeec2fd'
'b2a6566090b998e5e0810193aa8fb1f86f4d626f767b60d935a9bfa6494717f1')
package() {
# Install desktop file
install -m 755 -d "${pkgdir}/usr/share/applications"
install -m 755 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop"
# Install icon file
install -m 755 -d "${pkgdir}/usr/share/pixmaps"
install -m 644 -t "${pkgdir}/usr/share/pixmaps" "${pkgname}.png"
# Install files
cd "${pkgname}"
install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" "${pkgname}-bin"
install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/audio"
install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/audio" audio/*
install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/translation"
install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/translation" translation/*
# Install launcher file
install -m 755 -d "${pkgdir}/usr/bin"
ln -s "/usr/lib/${pkgname}/${pkgname}-bin" "${pkgdir}/usr/bin/${pkgname}"
# Install license file
install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "doc/eula"
}
# Maintainer: Mihails Strasunse <public@dicebot.lv>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Anders Bergh <anders1@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=('dmd' 'libphobos-devel' 'libphobos')
pkgdesc="D programming language compiler and standard library"
groups=('dlang' 'dlang-dmd')
pkgbase=dmd
pkgver=2.071.1
pkgrel=2
arch=('x86_64')
url="http://www.dlang.org"
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")
sha1sums=('SKIP'
'SKIP'
'SKIP')
[[ $CARCH == "x86_64" ]] && _archbits="64"
build() {
cd $srcdir/dmd/src
echo $pkgver > ../VERSION
# use AUTO_BOOTSTRAP=1 to build the very first time
make -f posix.mak MODEL=$_archbits RELEASE=1
cd $srcdir/druntime
make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
cd $srcdir/phobos
make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
}
package_dmd() {
pkgdesc="The D programming language reference compiler"
backup=('etc/dmd.conf')
depends=('gcc' 'libphobos-devel')
optdepends=(
'dtools: collection of useful utilities for development in D'
'libphobos: standard D library, Phobos; shared library'
'gcc-multilib: to cross-compile 32-bit applications'
)
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/dlang/dmd -L-L/usr/lib -L-L/usr/lib32 -L--export-dynamic" > $pkgdir/etc/dmd.conf
mkdir -p $pkgdir/usr/share/man/man1
mkdir -p $pkgdir/usr/share/man/man5
cp -r $srcdir/dmd/docs/man/man1/* $pkgdir/usr/share/man/man1/
cp -r $srcdir/dmd/docs/man/man5/* $pkgdir/usr/share/man/man5/
install -Dm644 $srcdir/dmd/src/backendlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-backend
install -Dm644 $srcdir/dmd/src/boostlicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-frontend
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/*
}
package_libphobos-devel() {
pkgdesc="The Phobos standard library for D programming language. Modules and static library."
options=("staticlibs")
provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
license=("custom")
install -Dm644 $srcdir/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a
install -Dm644 $srcdir/phobos/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
mkdir -p $pkgdir/usr/include/dlang/dmd
cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/dlang/dmd
cp -r $srcdir/druntime/import/* $pkgdir/usr/include/dlang/dmd/
find $pkgdir/usr -type f | xargs chmod 0644
install -Dm644 $srcdir/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime
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
}
# Maintainer: Mihails Strasuns <public@dicebot.lv>
# Contributor: Moritz Maxeiner <moritz@ucworks.org>
pkgname=dub
pkgver=1.0.0
pkgrel=1
pkgdesc="Developer package manager for D programming language"
arch=('x86_64')
url="https://github.com/D-Programming-Language/dub"
license=('MIT')
makedepends=('dmd' 'libphobos-devel' 'git')
depends=('curl')
source=(
"git+https://github.com/D-Programming-Language/dub.git#tag=v$pkgver"
)
sha256sums=(
'SKIP'
)
build()
{
# DC=`$srcdir/Arch-PKGBUILDs/d-compiler.sh`
DC=dmd
cd "${srcdir}/${pkgname}"
echo Generating version file...
GITVER=$(git describe) || GITVER=unknown
echo "module dub.version_;" > source/dub/version_.d
echo "enum dubVersion = \"$GITVER\";" >> source/dub/version_.d
echo "enum initialCompilerBinary = \"$DC\";" >> source/dub/version_.d
$DC -ofbin/dub -w -g -version=DubUseCurl -Isource -L-lcurl @build-files.txt
}
package()
{
cd "${srcdir}/${pkgname}"
install -D -m755 bin/dub "${pkgdir}/usr/bin/dub"
install -D -m644 scripts/bash-completion/dub.bash $pkgdir/usr/share/bash-completion/completions/dub
install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
}
# Maintainer: Mihails Strasuns <public@dicebot.lv>
# Contributor: Moritz Maxeiner <moritz@ucworks.org>
# Contributor: Jerome Berger <jeberger@free.fr>
# Contributor: Jesus Alvarez <jeezusjr@gmail.com>
pkgname=('gdc' 'libgphobos-devel')
pkgver=5.3.0
pkgrel=1
arch=('x86_64')
url="https://github.com/D-Programming-GDC/GDC"
license=('GPL')
makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'automake')
options=('!emptydirs' '!buildflags')
source=(
"ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
"gdc::git://github.com/D-Programming-GDC/GDC.git#commit=e95a735b978da70467bbb553fab40efa3ea17569"
"git+https://github.com/D-Programming-GDC/GDMD.git"
"folders.diff"
"system_zlib.diff"
)
sha256sums=(
'b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db'
'SKIP'
'SKIP'
'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20'
'4c679ac426a841182215654f5555c0294449e4fde107da0e0f6c2dbb6476f0b2'
)
groups=('dlang' 'dlang-gdc')
#conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
prepare()
{
cd $srcdir/gcc-$pkgver
# Arch Linux installs x86_64 libraries /lib
[[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
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
git apply $srcdir/system_zlib.diff # use correct system zlib
./setup-gcc.sh ../gcc-$pkgver
mkdir $srcdir/gcc-build
}
build()
{
cd ${srcdir}/gcc-build
${srcdir}/gcc-$pkgver/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 --disable-libssp \
--enable-gnu-unique-object --enable-linker-build-id \
--enable-cloog-backend=isl --disable-cloog-version-check \
--enable-gold --enable-plugin --enable-ld=default \
--enable-install-libiberty --with-plugin-ld=ld.gold \
--with-linker-hash-style=gnu \
--disable-multilib --disable-werror \
--disable-nls --disable-bootstrap \
--disable-libgomp --disable-libmudflap --disable-libquadmath \
--enable-checking=release
make -j 4
}
package_gdc()
{
depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
provides=("d-compiler")
pkgdesc="Compiler for D programming language which uses gcc backend"
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
# tools
install -D -m755 $srcdir/GDMD/dmd-script $pkgdir/usr/bin/gdmd
install -D -m644 $srcdir/GDMD/dmd-script.1 $pkgdir/usr/share/man/man1/gdmd.1
}
package_libgphobos-devel()
{
pkgdesc="Standard library for D programming language, GDC port"
provides=("d-runtime" "d-stdlib")
options=("staticlibs")
# druntime
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/gcc/
rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
# phobos
# 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/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
index e04ddc6..168a033 100644
--- a/gcc/d/d-incpath.cc
+++ b/gcc/d/d-incpath.cc
@@ -202,7 +202,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
import_path = xstrdup(p->fname);
// Add D-specific suffix.
- import_path = concat(import_path, "/d", NULL);
+ import_path = concat(import_path, "/dlang/gdc", NULL);
// Ignore duplicate entries.
bool found = false;
diff --git a/libphobos/configure b/libphobos/configure
index 2ff7114..f7f0660 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -3883,7 +3883,7 @@ fi
# Default case for install directory for D sources files.
-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
+gdc_include_dir=${prefix}/include/dlang/gdc
# Sanity check for the cross-compilation case:
diff --git a/libphobos/configure.ac b/libphobos/configure.ac
index 84492dd..947f6a8 100644
--- a/libphobos/configure.ac
+++ b/libphobos/configure.ac
@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
AC_SUBST(phobos_toolexeclibdir)
# Default case for install directory for D sources files.
-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
+gdc_include_dir=${prefix}/include/dlang/gdc
AC_SUBST(gdc_include_dir)
dnl Checks for header files.
diff --git a/gcc/d/d-spec.c b/gcc/d/d-spec.c
index a43cb34..e4bb527 100644
--- a/gcc/d/d-spec.c
+++ b/gcc/d/d-spec.c
@@ -96,7 +96,7 @@ lang_specific_driver (cl_decoded_option **in_decoded_options,
/* The number of arguments being added to what's in argv, other than
libraries. We use this to track the number of times we've inserted
-xd/-xnone. */
- int added = 0;
+ int added = 1; /* -lz */
/* The new argument list will be contained in this. */
cl_decoded_option *new_decoded_options;
@@ -462,6 +462,14 @@ lang_specific_driver (cl_decoded_option **in_decoded_options,
j++;
}
+ /* Use the up-to-date system zlib with libphobos */
+ {
+ generate_option (OPT_l, "z", 1, CL_DRIVER,
+ &new_decoded_options[j]);
+ added_libraries++;
+ j++;
+ }
+
/* Add `-lgphobos' if we haven't already done so. */
if (library > 0 && phobos)
{
diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am
index de99b58..d174646 100644
--- a/libphobos/src/Makefile.am
+++ b/libphobos/src/Makefile.am
@@ -92,8 +92,6 @@ Z_OBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
zlib/trees.o zlib/uncompr.o zlib/zutil.o
-ZLIB_OBJS=@ZLIB_OBJS@
-
# modules which require some kind of operating system
OS_OBJS=std/file.o std/mmfile.o std/path.o std/process.o \
@@ -113,7 +111,7 @@ WINDOWS_OBJS=std/c/windows/com.o std/c/windows/stat.o std/c/wcharh.o \
D_EXTRA_OBJS=@D_EXTRA_OBJS@
-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
+ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
libgphobos2.a : $(ALL_PHOBOS_OBJS) ../libdruntime/libgdruntime.a
diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in
index 6d3a91f..803e4aa 100644
--- a/libphobos/src/Makefile.in
+++ b/libphobos/src/Makefile.in
@@ -150,7 +150,6 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WERROR = @WERROR@
-ZLIB_OBJS = @ZLIB_OBJS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -272,7 +271,7 @@ WINDOWS_OBJS = std/c/windows/com.o std/c/windows/stat.o std/c/wcharh.o \
std/windows/charset.o std/windows/iunknown.o std/windows/registry.o \
std/windows/syserror.o std/internal/windows/advapi32.o
-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
+ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
diff --git a/libphobos/src/etc/c/zlib.d b/libphobos/src/etc/c/zlib.d
index 65b1d92..b41b63a 100644
--- a/libphobos/src/etc/c/zlib.d
+++ b/libphobos/src/etc/c/zlib.d
@@ -37,8 +37,8 @@ import core.stdc.config;
extern (C):
-const char[] ZLIB_VERSION = "1.2.3";
-const ZLIB_VERNUM = 0x1230;
+const char[] ZLIB_VERSION = "1.2.8";
+const ZLIB_VERNUM = 0x1280;
/*
The 'zlib' compression library provides in-memory compression and
#Maintainer: AlmAck <gluca86 [at] gmail.com>
pkgname=dustforce-hib
pkgver=1.0.20120917
_hibver=1347954459
pkgrel=1
pkgdesc='[Humble Bundle 6] A fast-paced 2D platformer game (Humble Bundle version)'
url='http://dustforce.com/'
arch=('i686' 'x86_64')
license=('custom:commercial')
depends=('mesa' 'sdl' 'libxau' 'libxdamage' 'libxdmcp' 'libxinerama' 'freealut'
'fontconfig' 'libidn' 'libvorbis' 'zlib')
screenshot="http://www.gamingsource.it/wp-content/uploads/2012/01/dustforce.jpg"
source=('dustforce-hib.desktop')
md5sums=('1fa65831c1e2bc56fc9fa8be86279b7f')
PKGEXT='.pkg.tar'
_archive="dustforce-linux-${_hibver}.sh"
_archive_md5='afaca0c6241904becb66a29821f4dce4'
_bundle=('humblebundle6')
_humble() {
if [[ -f "${_gamedir}/${_archive}" ]]; then
ln -sf "${_gamedir}/${_archive}"
fi
if [ ! -f "${_archive}" ]; then
for bundle in ${_bundle[@]}; do
case ${bundle} in
"humblebundle"*) _key="_humblebundle${bundle:12}key";;
*) continue;;
esac
if [ -n "${!_key}" ]; then
msg2 "Getting your unique ${pkgname} download location."
_uri="$(curl -s "http://www.humblebundle.com/downloads?key=${!_key}" | grep "${_archive}" | cut -d "'" -f 10)"
wget $_uri -O ${_archive}
break
fi
done
if [ -z "${!_key}" -a ! -f "${startdir}/${_archive}" ]; then
error "Unable to find \"${_archive}\"."
plain "You should run one of these commands before installing this pkg."
for bundle in ${_bundle[@]}; do
plain "$ export _${bundle}key=<your-${bundle}-key>"
done
plain "$ export _gamedir=<dir/to/${_archive}>"
exit 1
fi
fi
if ! echo "${_archive_md5} ${_archive}" | md5sum -c --quiet; then
echo "Invalid checksum for ${_archive}"
return 1
fi
unset _key _uri _archive_md5 _bundle
}
build() {
cd "${srcdir}"
_humble
chmod +x $_archive
}
package() {
cd "${srcdir}"
install -d "${pkgdir}/opt/"
./${_archive} -u --packager pacman --datadir "${pkgdir}/opt" --bindir "${pkgdir}/opt/Dustforce"
# Remove bundled libraries & helper binaries (use system packages instead)
rm -rf "${pkgdir}/opt/Dustforce/lib64/lib"{SDL-1.2.so.0}
rm -rf "${pkgdir}/opt/Dustforce/"{xdg-open,xdg-utils}
# Install desktop entry
install -Dm644 "${pkgname}.desktop" \
"${pkgdir}/usr/share/applications/${pkgname}.desktop"
# Install icon
install -Dm644 "${pkgdir}/opt/Dustforce/Dustforce.png" \
"${pkgdir}/usr/share/pixmaps/dustforce.png"
# Install launcher symlink
case $CARCH in
i686) _arch=x86 ;;
x86_64) _arch=x86_64;;
esac
chmod 755 "${pkgdir}/opt/Dustforce/Dustforce.bin.$_arch"
install -d "${pkgdir}/usr/bin"
ln -s "/opt/Dustforce/Dustforce.bin.${_arch}" "${pkgdir}/usr/bin/dustforce"
}