Commit a0abbaf3 authored by Luca Giambonini's avatar Luca Giambonini

rebuild/update against new gcc

parent 1151c9d3
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux')
pkgver=2.6.20
pkgver=2.7.0
pkgrel=1
pkgdesc='Simple video editor for cutting, filtering and encoding tasks.'
arch=('x86_64')
......@@ -13,7 +13,7 @@ makedepends=('cmake' 'libxslt' 'qt5-base' 'qt5-tools' 'qt5-script' 'qt5-multimed
categories=('multimedia')
options=("!makeflags")
source=("http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz")
sha256sums=('03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f')
sha256sums=('fe1d6b794c0d94922428ff84a931264a90c39a5ffe965e03ab7ae0ce71a2c4ad')
prepare() {
cd ${pkgbase}_${pkgver}
......@@ -24,14 +24,8 @@ prepare() {
}
build() {
cd "${srcdir}/${pkgbase}_${pkgver}"
# Qt5 requires C++11
CXXFLAGS="$CXXFLAGS -std=c++11"
bash ./bootStrap.bash --with-core \
--with-cli \
--with-plugins
cd ${pkgbase}_${pkgver}
bash bootStrap.bash --with-core --with-cli --with-plugins
}
package_avidemux-cli() {
......@@ -41,11 +35,11 @@ package_avidemux-cli() {
'sdl' 'sqlite3' 'x264' 'x265' 'aften' 'dcaenc' 'twolame')
optdepends=('avidemux: graphical interface')
cd "${srcdir}/${pkgbase}_${pkgver}"
(cd buildCli; make DESTDIR="${pkgdir}" install)
(cd buildCore; make DESTDIR="${pkgdir}" install)
(cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
(cd buildPluginsCommon; make DESTDIR="${pkgdir}" install)
cd ${pkgbase}_${pkgver}
make -C buildCli DESTDIR="${pkgdir}" install
make -C buildCore DESTDIR="${pkgdir}" install
make -C buildPluginsCLI DESTDIR="${pkgdir}" install
make -C buildPluginsCommon DESTDIR="${pkgdir}" install
install -D -m644 "${srcdir}/${pkgbase}_${pkgver}/avidemux_icon.png" "${pkgdir}/usr/share/pixmaps/avidemux.png"
install -D -m644 "${srcdir}/${pkgbase}_${pkgver}/man/avidemux.1" "${pkgdir}/usr/share/man/man1/avidemux.1"
......@@ -55,10 +49,9 @@ package_avidemux() {
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
depends=("avidemux-cli=$pkgver" 'qt5-base' 'mesa')
cd "${srcdir}/${pkgbase}_${pkgver}"
(cd buildQt5; make DESTDIR="${pkgdir}" install)
(cd buildPluginsQt5; make DESTDIR="${pkgdir}" install)
cd ${pkgbase}_${pkgver}
make -C buildQt5 DESTDIR="${pkgdir}" install
make -C buildPluginsQt5 DESTDIR="${pkgdir}" install
install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop"
sed -i 's|2_gtk|3_qt5|' "${pkgdir}/usr/share/applications/avidemux.desktop"
......
# Contributions from ArchLinux: https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/ceph
pkgname=ceph
pkgver=12.0.3
pkgrel=2
pkgver=12.2.1
pkgrel=1
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64')
url='http://ceph.com/'
license=('GPL')
makedepends=('boost' 'xfsprogs' 'python2-sphinx' 'cmake')
depends=('boost-libs' 'curl' 'expat' 'fcgi' 'fuse' 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libatomic_ops'
'libedit' 'systemd' 'util-linux' 'ncurses' 'nss' 'python2' 'snappy' 'python2-cython' 'python2-prettytable' 'yasm')
optdepends=('xfsprogs: support xfs backend')
makedepends=('boost' 'xfsprogs' 'python2-sphinx' 'cmake' 'gcc-libs' 'gperf' 'gperftools')
depends=('boost-libs' 'curl' 'expat' 'fcgi' 'fuse2' 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libatomic_ops'
'libedit' 'systemd' 'util-linux' 'ncurses' 'nss' 'python2' 'snappy' 'python2-cython' 'python2-prettytable'
'python2-pyopenssl' 'python2-setuptools' 'yasm' )
checkdepends=('python2-pip')
optdepends=('xfsprogs: support xfs backend' 'python2-sphinx' )
options=('emptydirs')
source=("https://download.ceph.com/tarballs/$pkgname-$pkgver.tar.gz")
sha256sums=('b0f2655c826bcba12c25828a8434f4e3d4cfdf41b5f59999da54132b96521de7')
source=("https://download.ceph.com/tarballs/$pkgname-$pkgver.tar.gz"
'ceph.sysusers'
'fix-ceph_disk-python-interpreter.patch'
'fix-or-disable-broken-tests.patch'
'fix-python2-paths.patch'
'remove-distro-version-detection.patch')
sha256sums=('512666ee88610640d66b261f9307c96ccd70eb25cd3349acd083fb1220c8a32e'
'3540344c11dab89a5f0d1e29286d1e708c8aaa3bb26362d5e3c1bcca0781162a'
'e811012d3a0acd05742288074cb6709377c9240041cd4f7f6988ca280e1529df'
'afb2bb37e0e2e918b14b51021b42ec2b11b46ffbc579e3d5ad4718cc141c0839'
'5f4702ef4b46b269129cb849f93439bc0dc2a26ef046bf6eef9c9369c42addf1'
'a105b5f6b66115d4b105231eb43408bf51a86e78b809d2de3d00820078206531')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
# apply patch from the source array (should be a pacman feature)
local filename
for filename in "${source[@]}"; do
if [[ "$filename" =~ \.patch$ ]]; then
msg2 "Applying patch ${filename##*/}"
patch -p1 -N -i "$srcdir/${filename##*/}"
fi
done
# remove tests that require root privileges
rm src/test/cli/ceph-authtool/cap*.t
# remove broken tests
rm src/test/cli/crushtool/build.t
rm -rf qa/btrfs
rm src/btrfs_ioc_test.c
# this test will try to perform btrfs operations when a btrfs mount
# is active on the build host, which will fail
if mount | grep 'type btrfs' &>/dev/null; then
sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
fi
# fix python interpreter -> python2
for file in \
src/ceph-create-keys \
src/ceph-rest-api \
src/mount.fuse.ceph \
src/brag/client/ceph-brag \
src/ceph-detect-init/ceph_detect_init/main.py
do
sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${file}"
done
[[ -d build ]] && rm -rfv build
mkdir build
# we install python2 version sphinx-build as sphinx-build2, which is not recognized by the script
sed 's,sphinx-build,sphinx-build2,g' -i $pkgname-$pkgver/CMakeLists.txt
}
build() {
cd build
cmake -DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_FULL_SBINDIR=/usr/bin \
-DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DWITH_SYSTEMD=ON \
-DWITH_LTTNG=OFF \
-DHAVE_BABELTRACE=OFF \
../$pkgname-$pkgver
# FIXME: LTTng and Babeltrace are modules we didn't import yet
make
}
cd "${srcdir}/${pkgbase}-${pkgver}"
check() {
cd build
make test
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_SBINDIR=/usr/bin \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
-DWITH_BABELTRACE=OFF \
-DWITH_CEPHFS=ON \
-DWITH_FUSE=ON \
-DWITH_LTTNG=OFF \
-DWITH_LZ4=ON \
-DWITH_MGR=ON \
-DWITH_NSS=ON \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DWITH_RADOSGW=ON \
-DWITH_RADOSGW_BEAST_FRONTEND=OFF \
-DWITH_RDMA=OFF \
-DWITH_SSL=ON \
-DWITH_SYSTEM_BOOST=ON \
-DWITH_SYSTEMD=ON \
-DWITH_TESTS=ON \
-DWITH_XFS=ON \
-DENABLE_SHARED=ON \
..
make all
}
# ToDo to many fails
#check() {
# cd "${srcdir}/${pkgbase}-${pkgver}/build"
#
# export CTEST_PARALLEL_LEVEL="$(nproc)"
# make check
#
# # sometimes processes are not properly terminated...
# for process in ceph-mon ceph-mgr ceph-osd; do
# pkill -9 "$process" || true
# done
#}
package() {
make -C build DESTDIR="$pkgdir" install
cd "${srcdir}/${pkgbase}-${pkgver}/build"
# main install
make DESTDIR="$pkgdir" install
# install tmpfiles.d and sysusers.d stuff
install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
"${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
install -Dm644 "${srcdir}/ceph.sysusers" \
"${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
# remove debian init script
rm -rf "${pkgdir}/etc/init.d"
# fix sbin dir (cmake opt seems to have no effect)
mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
rm -rf "${pkgdir}/usr/sbin"
cd "$pkgdir"
# remove drop.ceph.com ssh stuff
rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
# install bash-completions to /usr/share
install -d -m 755 usr/share/bash-completion
mv etc/bash_completion.d usr/share/bash-completion/completions
# fix bash completions path
install -d -m 755 "${pkgdir}/usr/share/bash-completion"
mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
# remove upstart scripts
rm -rf etc/init.d
# fix EnvironmentFile location in systemd service files
sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
# fix python2 shebang, did not do it in prepare() anymore because it
# confuse automake
find . -type f -exec \
sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
# prepare some paths and set correct permissions
install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
}
[Unit]
Description=Ceph MDS %i
After=network.target
[Service]
ExecStart=/usr/bin/ceph-mds -f -i %i
[Install]
WantedBy=multi-user.target
[Unit]
Description=Ceph MON %i
After=network.target
[Service]
ExecStart=/usr/bin/ceph-mon -f -i %i
[Install]
WantedBy=multi-user.target
[Unit]
Description=Ceph OSD %i
After=network.target
[Service]
ExecStart=/usr/bin/ceph-osd -f -i %i
[Install]
WantedBy=multi-user.target
u ceph 340 - /run/ceph
--- a/src/ceph-disk/ceph_disk/main.py 2017-08-28 18:30:20.000000000 +0200
+++ b/src/ceph-disk/ceph_disk/main.py 2017-09-21 13:50:39.373573382 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
#
# Copyright (C) 2015, 2016, 2017 Red Hat <contact@redhat.com>
# Copyright (C) 2014 Inktank <info@inktank.com>
This diff is collapsed.
--- a/CMakeLists.txt 2017-09-26 18:27:07.000000000 +0200
+++ b/CMakeLists.txt 2017-10-06 14:10:11.032378659 +0200
@@ -63,7 +63,7 @@
option(WITH_MANPAGE "Build man pages." ON)
if(WITH_MANPAGE)
find_program(SPHINX_BUILD
- sphinx-build)
+ sphinx-build2)
if(NOT SPHINX_BUILD)
message(FATAL_ERROR "Can't find sphinx-build.")
endif(NOT SPHINX_BUILD)
--- a/src/tools/setup-virtualenv.sh 2017-09-26 18:27:07.000000000 +0200
+++ b/src/tools/setup-virtualenv.sh 2017-10-06 15:02:01.736664556 +0200
@@ -18,10 +18,10 @@
DIR=$1
rm -fr $DIR
mkdir -p $DIR
-virtualenv --python python2.7 $DIR
+virtualenv2 --python python2.7 $DIR
. $DIR/bin/activate
-if pip --help | grep -q disable-pip-version-check; then
+if pip2 --help | grep -q disable-pip-version-check; then
DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
else
DISABLE_PIP_VERSION_CHECK=
@@ -29,12 +29,12 @@
# older versions of pip will not install wrap_console scripts
# when using wheel packages
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
# workaround of https://github.com/pypa/setuptools/issues/1042
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
-if pip --help | grep -q disable-pip-version-check; then
+if pip2 --help | grep -q disable-pip-version-check; then
DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
else
DISABLE_PIP_VERSION_CHECK=
@@ -44,7 +44,7 @@
export NO_INDEX=--no-index
fi
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
if test -f requirements.txt ; then
- pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
+ pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
fi
--- a/CMakeLists.txt 2017-09-26 18:27:07.000000000 +0200
+++ b/CMakeLists.txt 2017-10-06 14:10:11.032378659 +0200
@@ -63,7 +63,7 @@
option(WITH_MANPAGE "Build man pages." ON)
if(WITH_MANPAGE)
find_program(SPHINX_BUILD
- sphinx-build)
+ sphinx-build2)
if(NOT SPHINX_BUILD)
message(FATAL_ERROR "Can't find sphinx-build.")
endif(NOT SPHINX_BUILD)
--- a/src/common/util.cc 2017-09-26 18:27:07.000000000 +0200
+++ b/src/common/util.cc 2017-10-05 15:58:14.852647976 +0200
@@ -158,8 +158,7 @@
{
static const map<string, string> kvm = {
{ "distro", "ID=" },
- { "distro_description", "PRETTY_NAME=" },
- { "distro_version", "VERSION_ID=" }
+ { "distro_description", "PRETTY_NAME=" }
};
FILE *fp = fopen("/etc/os-release", "r");
@@ -182,7 +181,7 @@
lderr(cct) << "distro_detect - /etc/os-release is required" << dendl;
}
- for (const char* rk: {"distro", "distro_version"}) {
+ for (const char* rk: {"distro"}) {
if (m->find(rk) == m->end())
lderr(cct) << "distro_detect - can't detect " << rk << dendl;
}
......@@ -5,17 +5,16 @@
# Contributor: Ian Yang <doit.ian@gmail.com>
pkgname=google-glog
pkgver=0.3.4
pkgver=0.3.5
pkgrel=1
pkgdesc="Logging library for C++"
arch=('i686' 'x86_64')
arch=('x86_64')
license=('custom:BSD3')
url="http://code.google.com/p/google-glog/"
depends=('gcc-libs')
makedepends=('make' 'gcc')
options=('!libtool')
source=(https://github.com/google/glog/archive/v$pkgver.tar.gz)
sha1sums=('69f91cd5a1de35ead0bc4103ea87294b0206a456')
sha1sums=('61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc')
build() {
cd "$srcdir/glog-${pkgver}"
......
......@@ -4,7 +4,7 @@ source ../kdeapps.conf
pkgname=libkface
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
arch=('x86_64')
......
......@@ -6,7 +6,7 @@ pkgname=librime
_pkgname=rime
pkgver=1.2.9
epoch=2 # 1.2.20160314 → 1.2.9
pkgrel=3
pkgrel=4
pkgdesc="Rime input method engine"
arch=('x86_64')
url="http://code.google.com/p/rimeime/"
......
pkgname=libspatialite
pkgver=4.3.0a
pkgrel=1
pkgrel=2
pkgdesc="SQLite extension to support spatial data types and operations"
arch=('x86_64')
url="https://www.gaia-gis.it/fossil/libspatialite/index"
......
# Contributions from Arch: https://www.archlinux.org/packages/community/x86_64/postgis/
pkgname=postgis
pkgver=2.3.0
pkgver=2.4.3
pkgrel=1
pkgdesc="Adds support for geographic objects to PostgreSQL"
arch=('x86_64')
url="http://postgis.refractions.net/"
license=('GPL')
options=('!makeflags')
depends=('postgresql' 'proj' 'geos' 'gdal' 'json-c' 'jasper' 'unixodbc')
depends=('postgresql' 'gdal' 'json-c' 'proj' 'protobuf-c')
source=(http://download.osgeo.org/postgis/source/$pkgname-$pkgver.tar.gz)
sha256sums=('0dbff06f4a196d49e5ac06ae6cc21bd5253aaa646af624c9bbf19df582d6cf55')
sha256sums=('ea5374c5db6b645ba5628ddcb08f71d3b3d90a464d366b4e1d20d5a268bde4b9')
build() {
cd ${srcdir}/$pkgname-$pkgver
......
pkgname=qgis
pkgver=2.18.15
pkgver=2.18.16
pkgrel=1
pkgdesc='A Geographic Information System (GIS) that supports vector, raster and database formats'
url='http://qgis.org/'
......@@ -14,7 +14,7 @@ optdepends=('fcgi: qgis mapserver'
'python2-sip: python-support'
'postgis: postgis support and SPIT plugin')
source=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
sha256sums=('eb2c0475b6a844255d4aa7a92586fea258db9fd596e21841e75ce890e6ccf7ca')
sha256sums=('8989e0f9003cfec41ff6cf984bb52866dd0f4d97fe88ec2326f1cf1140050835')
prepare() {
cd $pkgname-$pkgver
......
#
# Apps Packages for Chakra, part of chakra-project.org
#
# Maintainer: Weng Xuetian <wengxt@gmail.com>
pkgname=yaml-cpp
pkgver=0.5.1
pkgver=0.6.1
pkgrel=1
pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
url="http://code.google.com/p/yaml-cpp/"
arch=('i686' 'x86_64')
arch=('x86_64')
license=('MIT')
makedepends=('cmake' 'boost')
source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz)
md5sums=('0fa47a5ed8fedefab766592785c85ee7')
depends=('gcc-libs')
makedepends=('cmake')
source=(https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${pkgver}.tar.gz)
md5sums=('32204de7d9e0ae7ea23bfddecac9f9c6')
build() {
cd $srcdir/$pkgname-$pkgver
prepare() {
mkdir -p yaml-cpp-yaml-cpp-$pkgver/build
}
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
build() {
cd yaml-cpp-yaml-cpp-$pkgver/build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=Release
make
}
check() {
cd yaml-cpp-yaml-cpp-$pkgver/build
make test
test/run-tests
}
package() {
cd $srcdir/$pkgname-$pkgver
cd yaml-cpp-yaml-cpp-$pkgver
make DESTDIR=$pkgdir install
make -C build DESTDIR="$pkgdir" install
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
# avoid conflicting gtest/gmock files
rm -rf "$pkgdir"/usr/include/{gmock,gtest} "$pkgdir"/usr/lib/lib{gmock,gtest}*.so
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment