diff options
42 files changed, 819 insertions, 1032 deletions
diff --git a/artistic/luxrays-art/PKGBUILD b/artistic/luxrays-art/PKGBUILD deleted file mode 100644 index e7cbda0e9..000000000 --- a/artistic/luxrays-art/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=luxrays-art -pkgver=1.0rc4 -_pkgver=752ba5c422e0 -pkgrel=1 -epoch=0 -pkgdesc='Accelerate the ray intersection process by using GPUs' -arch=( - i686 - x86_64 - mips64el -) -url=http://www.${pkgname::3}render.net/ -license=( - GPL -) -depends=( - freeimage - freeglut - glew - libcl-libre -) -makedepends=( - cmake - boost - opencl-headers -) -conflicts=( - ${pkgname%-art} -) -provides=( - ${pkgname%-art}=$pkgver -) -source=( - https://bitbucket.org/${pkgname::3}render/${pkgname%-art}/get/$_pkgver.tar.bz2 -) -md5sums=( - f5f4b53df22a1c7ad301c78d046edd7d -) - -build() { - cd $srcdir/${pkgname::3}render-${pkgname%-art}-$_pkgver - - export CXXFLAGS='$CXXFLAGS -lpthread' - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - . - make -} - -package() { - cd $srcdir/luxrender-${pkgname%-art}-$_pkgver - - install -d -m755 $pkgdir/usr/{bin,include,lib} - install -m755 bin/* $pkgdir/usr/bin - install -m644 lib/* $pkgdir/usr/lib - cp -a include/${pkgname%-art} $pkgdir/usr/include -} - diff --git a/artistic/luxrays-nocl/PKGBUILD b/artistic/luxrays-nocl/PKGBUILD deleted file mode 100644 index cd6d642e7..000000000 --- a/artistic/luxrays-nocl/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=luxrays-nocl -pkgver=1.0rc4 -_pkgver=752ba5c422e0 -pkgrel=1 -epoch=0 -pkgdesc='Accelerate the ray intersection process by using CPUs (without OpenCL)' -arch=( - i686 - x86_64 - mips64el -) -url=http://www.${pkgname::3}render.net/ -license=( - GPL -) -depends=( - freeimage - freeglut - glew -) -makedepends=( - cmake - boost -) -conflicts=( - ${pkgname%-nocl} -) -provides=( - ${pkgname%-nocl}=$pkgver -) -source=( - https://bitbucket.org/${pkgname::3}render/${pkgname%-nocl}/get/$_pkgver.tar.bz2 -) -md5sums=( - f5f4b53df22a1c7ad301c78d046edd7d -) - -build() { - cd $srcdir/${pkgname::3}render-${pkgname%-nocl}-$_pkgver - - export CXXFLAGS='$CXXFLAGS -lpthread' - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - . - make -} - -package() { - cd $srcdir/luxrender-${pkgname%-nocl}-$_pkgver - - install -d -m755 $pkgdir/usr/{bin,include,lib} - install -m755 bin/* $pkgdir/usr/bin - install -m644 lib/* $pkgdir/usr/lib - cp -a include/${pkgname%-nocl} $pkgdir/usr/include -} - diff --git a/artistic/luxrender-art/PKGBUILD b/artistic/luxrender-art/PKGBUILD deleted file mode 100644 index 5c5a4e0d1..000000000 --- a/artistic/luxrender-art/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgname=luxrender-art -pkgver=1.0rc4 -_pkgver=0b4c3e188707 -pkgrel=1 -pkgdesc='Rendering system for physically correct, unbiased image synthesis' -arch=( - i686 - x86_64 - mips64el -) -url=http://www.${pkgname%-art}.net/ -license=( - GPL -) -depends=( - boost-libs - freeimage - openexr - libcl-libre -) -optdepends=( - 'luxblend25: Blender exporter' - 'python: Python interface (pylux)' - 'qt: Qt GUI' -) -makedepends=( - cmake - boost - qt - ${pkgname::3}rays-art=$pkgver - python - opencl-headers -) -conflicts=( - ${pkgname%-art} -) -provides=( - ${pkgname%-art}=$pkgver -) -source=( - https://bitbucket.org/${pkgname%-art}/${pkgname::3}/get/$_pkgver.tar.bz2 - boost_1.50_fix.diff -) -md5sums=( - 54ff625a7833541c3cff5f0a77a93863 - 8c7774bb0c97aadd77d9e665d8fa4aab -) - -build() { - cd $srcdir/${pkgname%-art}-${pkgname::3}-$_pkgver - - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < $srcdir/boost_1.50_fix.diff || true - - export CXXFLAGS='$CXXFLAGS -lpthread' - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu \ - . - make -} - -package() { - cd $srcdir/${pkgname%-art}-${pkgname::3}-$_pkgver - make DESTDIR=$pkgdir install - - # fix library path on x86_64 - [ $CARCH = x86_64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib - - #install pylux - install -D -m644 pylux.so $pkgdir/usr/lib/python3.2/pylux.so -} - diff --git a/artistic/luxrender-art/boost_1.50_fix.diff b/artistic/luxrender-art/boost_1.50_fix.diff deleted file mode 100644 index c1aa0a8e2..000000000 --- a/artistic/luxrender-art/boost_1.50_fix.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp ---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 -@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte - int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); - samplePerPass = xRealWidth * yRealHeight; - -- boost::xtime_get(&creationTime, boost::TIME_UTC); -+ boost::xtime_get(&creationTime, boost::TIME_UTC_); - - //Queryable parameters - AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); -@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { - if (haltTime > 0) { - // Check if we have met the enough rendering time condition - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - if (t.sec - creationTime.sec > haltTime) - enoughSamplesPerPixel = true; - } -diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp ---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen - - boost::xtime photonShootingStartTime; - boost::xtime lastUpdateTime; -- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); -- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); -+ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); - u_int nshot = 0; - while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { - // Dade - print some progress information - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - ss.str(""); - ss << "Photon shooting progress: Direct[" << directPhotons.size(); -@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen - return; - - boost::xtime photonShootingEndTime; -- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; - - if (computeRadianceMap) { -@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen - for (u_int i = 0; i < radiancePhotons.size(); ++i) { - // Dade - print some progress info - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; - -@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen - - - boost::xtime radianceComputeEndTime; -- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); -+ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; - } - -diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp ---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU - // Dade - thread to update the film with data from servers - - boost::xtime reft; -- boost::xtime_get(&reft, boost::TIME_UTC); -+ boost::xtime_get(&reft, boost::TIME_UTC_); - - while (filmUpdaterThread->signal == SIG_NONE) { - // Dade - check signal every 1 sec -@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU - for(;;) { - // Dade - sleep for 1 sec - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - -diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp ---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 -@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, - m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; - - // init timer -- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); -+ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); - lastWriteFLMTime = lastWriteImageTime; - } - -@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter - { - // Check write output interval - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); - bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); - -@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter - // WriteImage can take a very long time to be executed (i.e. by saving - // the film. It is better to refresh timestamps after the - // execution of WriteImage instead than before. -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - - if (timeToWriteImage) - lastWriteImageTime = currentTime; -diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h ---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 -@@ -126,7 +126,7 @@ public: - { - while (state == PAUSE && !boost::this_thread::interruption_requested()) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - } diff --git a/artistic/luxrender-nocl/PKGBUILD b/artistic/luxrender-nocl/PKGBUILD deleted file mode 100644 index 9daa7a548..000000000 --- a/artistic/luxrender-nocl/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgname=luxrender-nocl -pkgver=1.0rc4 -_pkgver=0b4c3e188707 -pkgrel=1 -pkgdesc='Rendering system for physically correct, unbiased image synthesis (without OpenCL)' -arch=( - i686 - x86_64 - mips64el -) -url=http://www.${pkgname%-nocl}.net/ -license=( - GPL -) -depends=( - boost-libs - freeimage - openexr -) -optdepends=( - 'luxblend25: Blender exporter' - 'python: Python interface (pylux)' - 'qt: Qt GUI' -) -makedepends=( - cmake - boost - qt - ${pkgname::3}rays-nocl=$pkgver - python -) -conflicts=( - ${pkgname%-nocl} -) -provides=( - ${pkgname%-nocl}=$pkgver -) -source=( - https://bitbucket.org/${pkgname%-nocl}/${pkgname::3}/get/$_pkgver.tar.bz2 - boost_1.50_fix.diff -) -md5sums=( - 54ff625a7833541c3cff5f0a77a93863 - 8c7774bb0c97aadd77d9e665d8fa4aab -) - -build() { - cd $srcdir/${pkgname%-nocl}-${pkgname::3}-$_pkgver - - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < $srcdir/boost_1.50_fix.diff || true - - export CXXFLAGS='$CXXFLAGS -lpthread' - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=ON \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu \ - . - make -} - -package() { - cd $srcdir/${pkgname%-nocl}-${pkgname::3}-$_pkgver - make DESTDIR=$pkgdir install - - # fix library path on x86_64 - [ $CARCH = x86_64 ] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib - - #install pylux - install -D -m644 pylux.so $pkgdir/usr/lib/python3.2/pylux.so -} - diff --git a/artistic/luxrender-nocl/boost_1.50_fix.diff b/artistic/luxrender-nocl/boost_1.50_fix.diff deleted file mode 100644 index c1aa0a8e2..000000000 --- a/artistic/luxrender-nocl/boost_1.50_fix.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp ---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 -@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte - int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); - samplePerPass = xRealWidth * yRealHeight; - -- boost::xtime_get(&creationTime, boost::TIME_UTC); -+ boost::xtime_get(&creationTime, boost::TIME_UTC_); - - //Queryable parameters - AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); -@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { - if (haltTime > 0) { - // Check if we have met the enough rendering time condition - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - if (t.sec - creationTime.sec > haltTime) - enoughSamplesPerPixel = true; - } -diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp ---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen - - boost::xtime photonShootingStartTime; - boost::xtime lastUpdateTime; -- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); -- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); -+ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); - u_int nshot = 0; - while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { - // Dade - print some progress information - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - ss.str(""); - ss << "Photon shooting progress: Direct[" << directPhotons.size(); -@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen - return; - - boost::xtime photonShootingEndTime; -- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; - - if (computeRadianceMap) { -@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen - for (u_int i = 0; i < radiancePhotons.size(); ++i) { - // Dade - print some progress info - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; - -@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen - - - boost::xtime radianceComputeEndTime; -- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); -+ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; - } - -diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp ---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU - // Dade - thread to update the film with data from servers - - boost::xtime reft; -- boost::xtime_get(&reft, boost::TIME_UTC); -+ boost::xtime_get(&reft, boost::TIME_UTC_); - - while (filmUpdaterThread->signal == SIG_NONE) { - // Dade - check signal every 1 sec -@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU - for(;;) { - // Dade - sleep for 1 sec - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - -diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp ---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 -@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, - m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; - - // init timer -- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); -+ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); - lastWriteFLMTime = lastWriteImageTime; - } - -@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter - { - // Check write output interval - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); - bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); - -@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter - // WriteImage can take a very long time to be executed (i.e. by saving - // the film. It is better to refresh timestamps after the - // execution of WriteImage instead than before. -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - - if (timeToWriteImage) - lastWriteImageTime = currentTime; -diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h ---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 -@@ -126,7 +126,7 @@ public: - { - while (state == PAUSE && !boost::this_thread::interruption_requested()) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - } diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 6b74d24b3..33e806bbc 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 83240 2013-01-28 16:49:24Z stephane $ +# $Id: PKGBUILD 84601 2013-02-20 12:17:25Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.7.2 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" -makedepends=('boost' 'automoc4' 'miniupnpc') +makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('23d44161670c521f2aba64f9351b42260baa6bb2981640617c8e2e7683e5855c') +sha256sums=('e31529147d307b2240e08af3a5a4606fe2c112d1b0e91e3cce4a2bac2583cecc') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" # and make qt gui - qmake + qmake USE_QRCODE=1 make # make bitcoind - make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS" USE_UPNP=1 + make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS" } package_bitcoin-qt() { pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" - depends=(boost-libs qt miniupnpc) + depends=(boost-libs qt miniupnpc qrencode) install=bitcoin-qt.install cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index 7ffbf42ff..f23409572 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81287 2012-12-16 08:30:34Z bpiotrowski $ +# $Id: PKGBUILD 84580 2013-02-20 05:11:56Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.6 +pkgver=1.7 pkgrel=1 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64' 'mips64el') @@ -12,23 +12,27 @@ url='http://www.issihosts.com/haveged' license=('GPL') depends=('glibc') source=($url/$pkgname-$pkgver.tar.gz - rc.d service) -md5sums=('5a386a530e89bfbc6c8d22717b16e2a8' - '264b725be5271288b40f363d7cfc6b68' - 'fc62a480f520377364503aca9efff0b0') + service + haveged-1.7-build.patch) +sha256sums=('9ec85438386a46d5c3fe7b5b121cafd89c34bae68cbbfb4cecb1ff5622111013' + '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a' + '94c77b1d2d80eb5fb30bab4aeb560e6dfe9957654cd3ed915478d2ce67ac37b7') build() { - cd $srcdir/$pkgname-${pkgver/a/} + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/haveged-1.7-build.patch + aclocal && libtoolize --force && automake --add-missing && autoreconf + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-${pkgver/a/} + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - rm -rf $pkgdir/etc/init.d - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/haveged + rm -rf $pkgdir/etc/init.d install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service } md5sums=('c1f34be00c3f438ec83862e90e192e4b' diff --git a/community/haveged/haveged-1.7-build.patch b/community/haveged/haveged-1.7-build.patch new file mode 100644 index 000000000..c32d1927e --- /dev/null +++ b/community/haveged/haveged-1.7-build.patch @@ -0,0 +1,13 @@ +Index: haveged-1.7/src/Makefile.am +=================================================================== +--- haveged-1.7.orig/src/Makefile.am ++++ haveged-1.7/src/Makefile.am +@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h + + haveged_SOURCES = haveged.c haveged.h + +-haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la ++haveged_LDADD = @HA_LDFLAGS@ libhavege.la + ##libtool_end## + + MAINTAINERCLEANFILES = Makefile.in diff --git a/community/haveged/rc.d b/community/haveged/rc.d deleted file mode 100644 index c0e13b40d..000000000 --- a/community/haveged/rc.d +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -## -# chkconfig: 2345 75 25 -# description: havege entropy daemon -# -# source function library -. /etc/rc.conf -. /etc/rc.d/functions - -RETVAL=0 -prog="haveged" - -case "$1" in -start) - stat_busy $"Starting $prog" - /usr/sbin/$prog -w 1024 -v 1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $prog - stat_done - fi - ;; - -stop) - stat_busy $"Stopping $prog" - kill `cat /var/run/$prog.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $prog - stat_done - rm -f /var/lock/$prog - fi - ;; - -restart) - $0 stop - $0 start - ;; - -*) - echo "usage: $prog [start|stop|restart]" -esac diff --git a/community/kio-mtp/PKGBUILD b/community/kio-mtp/PKGBUILD index ebc1beec7..955affe07 100644 --- a/community/kio-mtp/PKGBUILD +++ b/community/kio-mtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84393 2013-02-17 21:44:19Z andrea $ +# $Id: PKGBUILD 84594 2013-02-20 08:07:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > @@ -11,7 +11,7 @@ url='https://projects.kde.org/projects/playground/base/kio-mtp' license=('GPL') depends=('kdebase-runtime' 'libmtp') makedepends=('cmake' 'automoc4') -source=("ftp://ftp.archlinux.org/other/community/${pkgname}-${pkgver}.tar.xz") +source=("ftp://ftp.archlinux.org/other/community/kio-mtp/${pkgname}-${pkgver}.tar.xz") md5sums=('1b4670e938acedcf565ef23cea66890e') build() { diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch deleted file mode 100644 index 395a04501..000000000 --- a/community/luajit/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig 2012-10-16 20:30:00.000000000 +0200 -+++ Makefile 2012-10-17 17:17:05.707727130 +0200 -@@ -34,7 +34,7 @@ - INSTALL_SHARE= $(DPREFIX)/share - INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) - --INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) -+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit - INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit - INSTALL_LMODD= $(INSTALL_SHARE)/lua - INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) -@@ -43,7 +43,7 @@ - INSTALL_MAN= $(INSTALL_SHARE)/man/man1 - INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig - --INSTALL_TNAME= luajit-$(VERSION) -+INSTALL_TNAME= $(INSTALL_TSYMNAME) - INSTALL_TSYMNAME= luajit - INSTALL_ANAME= libluajit-$(ABIVER).a - INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index d2221f378..9b0fbd0f9 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 81293 2012-12-16 11:27:38Z bpiotrowski $ +# $Id: PKGBUILD 84574 2013-02-20 04:52:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luajit -pkgver=2.0.0 -pkgrel=3.1 -pkgdesc='Just-in-time compiler and replacement for Lua 5.1' +pkgver=2.0.1 +pkgrel=1 +pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' arch=('i686' 'x86_64' 'mips64el') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) -md5sums=('97a2b87cc0490784f54b64cfb3b8f5ad') +sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0') build() { cd $srcdir/LuaJIT-$pkgver diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD index 1c6e9ad24..f730fe4cd 100644 --- a/community/menu-cache/PKGBUILD +++ b/community/menu-cache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80045 2012-11-15 18:59:35Z bpiotrowski $ +# $Id: PKGBUILD 84578 2013-02-20 05:00:21Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=menu-cache -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc='Caching mechanism for freedesktop.org compliant menus' arch=('i686' 'x86_64' 'mips64el') @@ -14,16 +14,12 @@ groups=('lxde') depends=('intltool' 'glib2') options=('!libtool') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - menu-cache-gen.h) -md5sums=('c63029a6c65e370ed5d9409f30265950' - '4edc9545b9640ee7698324d3f9683dc7') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +sha256sums=('4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e') build() { cd $srcdir/$pkgname-$pkgver - install -m644 $srcdir/menu-cache-gen.h menu-cache-gen/ - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/menu-cache \ --disable-static diff --git a/community/menu-cache/menu-cache-gen.h b/community/menu-cache/menu-cache-gen.h deleted file mode 100644 index 7d9be4207..000000000 --- a/community/menu-cache/menu-cache-gen.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __MENU_CACHE_GEN_H__ -#define __MENU_CACHE_GEN_H__ 1 -G_BEGIN_DECLS - -guint32 menu_cache_get_de_flag (const char* de_name); - -G_END_DECLS -#endif
\ No newline at end of file diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index d37fd850f..21ed63e0e 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84238 2013-02-14 15:04:13Z ttoepper $ +# $Id: PKGBUILD 84607 2013-02-20 15:15:25Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R42 +pkgver=R43 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -13,7 +13,7 @@ install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') depends=('gcc-libs') -md5sums=('f1ad261f79f6ac45e8d5cc5bea191090' +md5sums=('d57433d86d860b351ee0572800038fe9' '2ab409def9e4726f4835077f68c8c28b') build() { diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 61ddfe37c..45279758e 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 84357 2013-02-16 22:50:35Z ioni $ +# $Id: PKGBUILD 84620 2013-02-20 18:43:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20121128 -pkgrel=3 +pkgver=20130126 +pkgrel=1 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" install=$pkgname.install -depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' - 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' - 'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' - 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') +depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' + 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' + 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' + 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' + 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' + 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') +makedepends=('unzip' 'python' 'python-docutils') if [ "$CARCH" != "mips64el" ]; then -depends+=('libgl' 'libvdpau' 'lirc-utils') + depends+=('libgl' 'libvdpau' 'lirc-utils') + makedepends+=('mesa' 'yasm') fi -makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz - cdio-api-fixes.patch) -md5sums=('696adb2503b2202fe39de6c98b573cd6' - '5ff5fa9d0fd50239ed3a1756b31e6a9d') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('53faf18a1bedb76e980255410b56e59ea4cd5f69984832fc5e942e15dc89622b') build() { cd $srcdir/$pkgname-$pkgver @@ -36,8 +37,6 @@ build() { [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection" - patch -Np1 -i $srcdir/cdio-api-fixes.patch - ./configure --prefix=/usr --confdir=/etc/mplayer \ --enable-translation --language=all \ --enable-joystick \ diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch deleted file mode 100644 index eeb9f0589..000000000 --- a/community/mplayer2/cdio-api-fixes.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c ---- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200 -+++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200 -@@ -17,8 +17,8 @@ - */ - - #include "config.h" --#include <cdio/cdda.h> --#include <cdio/paranoia.h> -+#include <cdio/paranoia/cdda.h> -+#include <cdio/paranoia/paranoia.h> - #include <cdio/cdio.h> - - #include <stdio.h> -@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = { - }; - - static const char *cdtext_name[] = { -- [CDTEXT_ARRANGER] = "Arranger", -- [CDTEXT_COMPOSER] = "Composer", -- [CDTEXT_MESSAGE] = "Message", -- [CDTEXT_ISRC] = "ISRC", -- [CDTEXT_PERFORMER] = "Performer", -- [CDTEXT_SONGWRITER] = "Songwriter", -- [CDTEXT_TITLE] = "Title", -- [CDTEXT_UPC_EAN] = "UPC_EAN", -+ [CDTEXT_FIELD_ARRANGER] = "Arranger", -+ [CDTEXT_FIELD_COMPOSER] = "Composer", -+ [CDTEXT_FIELD_MESSAGE] = "Message", -+ [CDTEXT_FIELD_ISRC] = "ISRC", -+ [CDTEXT_FIELD_PERFORMER] = "Performer", -+ [CDTEXT_FIELD_SONGWRITER] = "Songwriter", -+ [CDTEXT_FIELD_TITLE] = "Title", -+ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN", - }; - - static bool print_cdtext(stream_t *s, int track) - { - cdda_priv* p = (cdda_priv*)s->priv; -- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track); -+ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio); - if (text) { - mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD"); - for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) { - const char *name = cdtext_name[i]; -- const char *value = cdtext_get_const(i, text); -+ const char *value = cdtext_get_const(text, i, track); - if (name && value) - mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value); - } diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index b46429998..216c914df 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 176250 2013-01-28 00:29:28Z allan $ +# $Id: PKGBUILD 178319 2013-02-20 06:23:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo -pkgver=4.13a -pkgrel=8 +pkgver=5.0 +pkgrel=1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/texinfo/" license=('GPL3') groups=('base' 'base-devel') -depends=('ncurses' 'findutils' 'gzip' 'sh') +depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} - texinfo-4.13a-data_types.patch) -md5sums=('71ba711519209b5fb583fed2b3d86fcb' - 'db2ca82c831684cd7cef181234017c46' - 'd8574782ff7def1e2dc5c291dbeaec18') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('ef2fad34c71ddc95b20c7d6a08c0d7a6' + 'a1e46e27d14467b05abe652bfc30684e') build() { - cd ${srcdir}/${pkgname}-4.13 - patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd ${srcdir}/${pkgname}-4.13 + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - # fix this here as it prevents make from trying to rebuild manual pages - sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi } diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 0d8d9de5f..4f78b653d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177768 2013-02-08 09:03:22Z andrea $ +# $Id: PKGBUILD 178338 2013-02-20 11:50:07Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,7 +17,7 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' @@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('df7c2816d2bbe5e2fe87ea0be3fe668c') +md5sums=('8ba98f3ccb3c5097eb059d86b51f6139') build() { mkdir build @@ -132,6 +132,9 @@ package_calligra-plan() { cd "${srcdir}"/build/plan make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/3rdparty/kdgantt + make DESTDIR="${pkgdir}" install } package_calligra-stage() { diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index cde1fd814..9db4debcb 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173222 2012-12-14 01:35:42Z eric $ +# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.3.3 -pkgrel=1.1 +pkgver=2.3.4 +pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeciv.org/" @@ -12,7 +12,7 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') options=('!libtool') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f3cd76d5b4cc637d1a82398cdb9c1ac9518ce057') +sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index bebbc800c..daebfa058 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 177790 2013-02-08 22:44:16Z dan $ +# $Id: PKGBUILD 178348 2013-02-20 15:17:58Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1.3 +pkgver=1.8.1.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -25,8 +25,6 @@ backup=('etc/conf.d/git-daemon.conf') install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf git-daemon@.service git-daemon.socket) @@ -100,18 +98,12 @@ package() { # remove perllocal.pod, .packlist, and empty directories. rm -rf "$pkgdir"/usr/lib/perl5 - # git daemon script - install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon - install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf - - # systemd stuff + # git-daemon via systemd socket activation install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('05fb5ea3792a51cef2becc8d06ea9b87' - 'b8e050c3c96b0b9fa28a7b7e9413af01' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78' +md5sums=('60f32ef4a6b3fa2143b81a28704333ed' + '61d19a9d386c686ee06b493a9df6e61c' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/git/git-daemon b/extra/git/git-daemon deleted file mode 100644 index 21ba73ed5..000000000 --- a/extra/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/extra/git/git-daemon.conf b/extra/git/git-daemon.conf deleted file mode 100644 index 3f9a12060..000000000 --- a/extra/git/git-daemon.conf +++ /dev/null @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 91fe4dd7c..3513965db 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173840 2012-12-25 00:34:21Z foutrelis $ +# $Id: PKGBUILD 178365 2013-02-20 22:51:19Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.28.0 -pkgrel=12.1 +pkgver=2.30.0 +pkgrel=3 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -41,7 +41,7 @@ optdepends=('mono: sharp bindings' esac source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" 'LICENSE') -sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' +sha1sums=('596c1ddf60c5428c5c4700d10f3ea86534195311' 'e78277e502c29abb74b9587a5dc951ec392554ea') options=('!libtool') @@ -59,7 +59,10 @@ build() { export PYTHON=python2 export LUA=lua5.1 - ./configure --prefix=/usr + ./configure \ + --prefix=/usr \ + --with-cgraph=false # apps need porting to that new api first + make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky make } @@ -68,6 +71,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # cf. http://www.graphviz.org/License.php + # http://www.graphviz.org/License.php install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index e1da18b2d..348991cd9 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177976 2013-02-12 18:43:03Z andyrtr $ +# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' pkgbase=java7-openjdk _java_ver=7 _updatever=u13 -_icedtea_ver=2.3.6 +_icedtea_ver=2.3.7 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=97a8b625f6e9 -_JAXP_CHANGESET=d7feafb8427b -_JAXWS_CHANGESET=b900024eb4ba -_JDK_CHANGESET=6bb01322bb5a -_LANGTOOLS_CHANGESET=e0739a8783d1 -_OPENJDK_CHANGESET=dd8d1a8f222f +_CORBA_CHANGESET=82e58144c3fb +_JAXP_CHANGESET=1d46a56eb51c +_JAXWS_CHANGESET=b9590aa972b9 +_JDK_CHANGESET=6a3417030605 +_LANGTOOLS_CHANGESET=b5006c3285c6 +_OPENJDK_CHANGESET=506161df1c48 -_HOTSPOT_CHANGESET=bc0de5a0ece2 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9' - 'a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092' - '511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d' - '81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941' - '276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2' - 'a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2' - '85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb' - '4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068' +sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940' + '704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0' + 'c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe' + 'fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce' + 'c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136' + '2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0' + '44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676' + '203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -135,7 +135,6 @@ package_jre7-openjdk-headless() { 'fontconfig: needed for Java Mauve support - libmawt.so') provides=('java-runtime-headless=7') conflicts=('openjdk6') - # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh etc/java-7-openjdk/calendars.properties @@ -289,7 +288,7 @@ package_jdk7-openjdk() { depends=('jre7-openjdk') provides=('java-environment=7') conflicts=('java-environment') - # replaces=('openjdk6') + replaces=('openjdk6') backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" @@ -337,7 +336,8 @@ package_jdk7-openjdk() { package_openjdk7-src() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" - + replaces=('openjdk6-src') + install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ ${pkgdir}/${_jvmdir}/src.zip } diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index dddbe0ba4..c08be7683 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178136 2013-02-16 22:48:54Z ioni $ +# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.5beta1 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="An ncurses console audio player designed to be powerful and easy to use" arch=('i686' 'x86_64' 'mips64el') @@ -19,9 +19,11 @@ optdepends=('speex: for using the speex plugin' 'faad2: for using the aac plugin' 'libmodplug: for using the modplug plugin') options=('!libtool') -source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig}) +source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \ + moc-ffmpeg.patch) sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa' - '29c232c37e1f3737c3b670372732446e9c0786a8') + '29c232c37e1f3737c3b670372732446e9c0786a8' + 'f3b8b327dd27d50422b1ad8c9ef89a7366529307') # source PKGBUILD && mksource mksource() { @@ -41,6 +43,7 @@ mksource() { build() { cd "${srcdir}/${pkgname}-2.5.0-beta1" + patch -p0 -i "${srcdir}/moc-ffmpeg.patch" ./configure --prefix=/usr --without-rcc \ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..e268e5427 --- /dev/null +++ b/extra/moc/moc-ffmpeg.patch @@ -0,0 +1,557 @@ +Index: menu.c +=================================================================== +--- menu.c (revision 2516) ++++ menu.c (working copy) +@@ -90,9 +90,14 @@ + getyx (menu->win, y, x); + if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT) + xwaddnstr (menu->win, mi->title, title_space); +- else +- xwaddstr (menu->win, mi->title + title_width - title_space); ++ else { ++ char *ptr; + ++ ptr = xstrtail (mi->title, title_space); ++ xwaddstr (menu->win, ptr); ++ free (ptr); ++ } ++ + /* Fill the remainder of the title field with spaces. */ + if (mi == menu->selected) { + getyx (menu->win, y, ix); +Index: utf8.c +=================================================================== +--- utf8.c (revision 2516) ++++ utf8.c (working copy) +@@ -199,47 +199,50 @@ + + int xwaddnstr (WINDOW *win, const char *str, const int n) + { +- int res; ++ int res, width, inv_char; ++ wchar_t *ucs; ++ char *mstr, *lstr; ++ size_t size, num_chars; + + assert (n > 0); + assert (str != NULL); + +- if (using_utf8) { ++ mstr = iconv_str (iconv_desc, str); + +- /* This nasty hack is because we need to count n in chars, but +- * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be +- * longer than 1 byte). There are also problems with [w]addnwstr() +- * (screen garbled). I have no better idea. */ ++ size = xmbstowcs (NULL, mstr, -1, NULL) + 1; ++ ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size); ++ xmbstowcs (ucs, mstr, size, &inv_char); ++ width = wcswidth (ucs, WIDTH_MAX); + +- wchar_t *ucs; +- size_t size; +- size_t utf_num_chars; +- int inv_char; +- +- size = xmbstowcs (NULL, str, -1, NULL) + 1; +- ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size); +- xmbstowcs (ucs, str, size, &inv_char); +- if ((size_t)n < size - 1) +- ucs[n] = L'\0'; +- utf_num_chars = wcstombs (NULL, ucs, 0); +- if (inv_char) { +- char *utf8 = (char *)xmalloc (utf_num_chars + 1); +- +- wcstombs (utf8, ucs, utf_num_chars + 1); +- res = waddstr (win, utf8); +- free (utf8); ++ if (width == -1) { ++ size_t clidx; ++ for (clidx = 0; clidx < size - 1; clidx++) { ++ if (wcwidth (ucs[clidx]) == -1) ++ ucs[clidx] = L'?'; + } +- else +- res = waddnstr (win, str, utf_num_chars); +- free (ucs); ++ width = wcswidth (ucs, WIDTH_MAX); ++ inv_char = 1; + } +- else { +- char *lstr = iconv_str (iconv_desc, str); + +- res = waddnstr (win, lstr, n); +- free (lstr); ++ if (width > n) { ++ while (width > n) ++ width -= wcwidth (ucs[--size]); ++ ucs[size] = L'\0'; + } + ++ num_chars = wcstombs (NULL, ucs, 0); ++ lstr = (char *)xmalloc (num_chars + 1); ++ ++ if (inv_char) ++ wcstombs (lstr, ucs, num_chars + 1); ++ else ++ snprintf (lstr, num_chars + 1, "%s", mstr); ++ ++ res = waddstr (win, lstr); ++ ++ free (ucs); ++ free (lstr); ++ free (mstr); + return res; + } + +Index: decoder_plugins/mp3/mp3.c +=================================================================== +--- decoder_plugins/mp3/mp3.c (revision 2516) ++++ decoder_plugins/mp3/mp3.c (working copy) +@@ -696,17 +696,19 @@ + { + char *ext; + ++ strcpy (buf, "MPx"); ++ + ext = ext_pos (file); +- if (!strcasecmp (ext, "mp3")) +- strcpy (buf, "MP3"); +- else if (!strcasecmp (ext, "mp2")) +- strcpy (buf, "MP2"); +- else if (!strcasecmp (ext, "mp1")) +- strcpy (buf, "MP1"); +- else if (!strcasecmp (ext, "mpga")) +- strcpy (buf, "MPG"); +- else +- strcpy (buf, "MPx"); ++ if (ext) { ++ if (!strcasecmp (ext, "mp3")) ++ strcpy (buf, "MP3"); ++ else if (!strcasecmp (ext, "mp2")) ++ strcpy (buf, "MP2"); ++ else if (!strcasecmp (ext, "mp1")) ++ strcpy (buf, "MP1"); ++ else if (!strcasecmp (ext, "mpga")) ++ strcpy (buf, "MPG"); ++ } + } + + static int mp3_our_format_ext (const char *ext) +Index: decoder_plugins/ffmpeg/ffmpeg.m4 +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.m4 (revision 2516) ++++ decoder_plugins/ffmpeg/ffmpeg.m4 (working copy) +@@ -88,6 +88,25 @@ + [#include <libavcodec/avcodec.h>]) + AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , , + [#include <libavcodec/avcodec.h>]) ++ AC_SEARCH_LIBS(avcodec_free_frame, avcodec, ++ [AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1, ++ [Define to 1 if you have the `avcodec_free_frame' function.])]) ++ AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , , ++ [#include <libavcodec/avcodec.h>]) ++ AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , , ++ [#include <libavcodec/avcodec.h>]) ++ AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , , ++ [#include <libavcodec/avcodec.h>]) ++ AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , , ++ [#include <libavcodec/avcodec.h>]) ++ AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , , ++ [#include <libavcodec/avcodec.h>]) ++ AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil, ++ [AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1, ++ [Define to 1 if you have the `av_get_sample_fmt_name' function.])]) ++ AC_SEARCH_LIBS(av_lockmgr_register, avcodec, ++ [AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1, ++ [Define to 1 if you have the `av_lockmgr_register' function.])]) + CPPFLAGS="$save_CPPFLAGS" + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2516) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -99,6 +99,7 @@ + bool okay; /* was this stream successfully opened? */ + struct decoder_error error; + long fmt; ++ int sample_width; + int bitrate; /* in bits per second */ + int avg_bitrate; /* in bits per second */ + #if SEEK_IN_DECODER +@@ -106,6 +107,7 @@ + int seek_sec; /* second to which to seek */ + #endif + bool seek_broken; /* FFmpeg seeking is broken */ ++ bool timing_broken; /* FFmpeg trashes duration and bit_rate */ + #if SEEK_IN_DECODER && defined(DEBUG) + pthread_t thread_id; + #endif +@@ -277,8 +279,72 @@ + } + } + ++/* Handle FFmpeg's locking requirements. */ ++#ifdef HAVE_LOCKMGR_REGISTER ++static int locking_cb (void **mutex, enum AVLockOp op) ++{ ++ int result; ++ ++ switch (op) { ++ case AV_LOCK_CREATE: ++ *mutex = xmalloc (sizeof (pthread_mutex_t)); ++ result = pthread_mutex_init (*mutex, NULL); ++ break; ++ case AV_LOCK_OBTAIN: ++ result = pthread_mutex_lock (*mutex); ++ break; ++ case AV_LOCK_RELEASE: ++ result = pthread_mutex_unlock (*mutex); ++ break; ++ case AV_LOCK_DESTROY: ++ result = pthread_mutex_destroy (*mutex); ++ free (*mutex); ++ *mutex = NULL; ++ break; ++ } ++ ++ return result; ++} ++#endif ++ ++/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration' ++ * and 'bit_rate' fields in AVFormatContext for large files. Determining ++ * whether or not they are likely to be valid is imprecise and will vary ++ * depending (at least) on: ++ * ++ * - The file's size, ++ * - The file's codec, ++ * - The number and size of tags, ++ * - The version of FFmpeg/LibAV, and ++ * - Whether it's FFmpeg or LibAV. ++ * ++ * This function represents a best guess. ++*/ ++static bool is_timing_broken (AVFormatContext *ic) ++{ ++ int64_t file_size; ++ ++ if (ic->duration < 0 || ic->bit_rate < 0) ++ return true; ++ ++#ifdef HAVE_AVIO_SIZE ++ file_size = avio_size (ic->pb); ++#else ++ file_size = ic->file_size; ++#endif ++ ++ if (file_size < UINT32_MAX) ++ return false; ++ ++ return true; ++} ++ + static void ffmpeg_init () + { ++#ifdef HAVE_LOCKMGR_REGISTER ++ int rc; ++#endif ++ + #ifdef DEBUG + av_log_set_level (AV_LOG_INFO); + #else +@@ -291,10 +357,20 @@ + supported_extns = lists_strs_new (16); + load_audio_extns (supported_extns); + load_video_extns (supported_extns); ++ ++#ifdef HAVE_LOCKMGR_REGISTER ++ rc = av_lockmgr_register (locking_cb); ++ if (rc < 0) ++ fatal ("Lock manager initialisation failed"); ++#endif + } + + static void ffmpeg_destroy () + { ++#ifdef HAVE_LOCKMGR_REGISTER ++ av_lockmgr_register (NULL); ++#endif ++ + av_log_set_level (AV_LOG_QUIET); + ffmpeg_log_repeats (NULL); + +@@ -341,9 +417,9 @@ + } + #endif + +- if (tags_sel & TAGS_TIME) { ++ if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) { + info->time = -1; +- if (ic->duration >= 0) ++ if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0) + info->time = ic->duration / AV_TIME_BASE; + } + +@@ -426,12 +502,6 @@ + + #endif + +- if (tags_sel & TAGS_TIME) { +- info->time = -1; +- if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0) +- info->time = ic->duration / AV_TIME_BASE; +- } +- + end: + #ifdef HAVE_AVFORMAT_CLOSE_INPUT + avformat_close_input (&ic); +@@ -450,12 +520,16 @@ + if (!strcmp (data->ic->iformat->name, "wav")) { + switch (data->enc->codec_id) { + case CODEC_ID_PCM_S8: ++#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR ++ case CODEC_ID_PCM_S8_PLANAR: ++#endif + result = SFMT_S8; + break; + case CODEC_ID_PCM_U8: + result = SFMT_U8; + break; + case CODEC_ID_PCM_S16LE: ++ case CODEC_ID_PCM_S16LE_PLANAR: + case CODEC_ID_PCM_S16BE: + result = SFMT_S16; + break; +@@ -490,15 +564,27 @@ + + switch (data->enc->sample_fmt) { + case AV_SAMPLE_FMT_U8: ++#if HAVE_DECL_AV_SAMPLE_FMT_U8P ++ case AV_SAMPLE_FMT_U8P: ++#endif + result = SFMT_U8; + break; + case AV_SAMPLE_FMT_S16: ++#if HAVE_DECL_AV_SAMPLE_FMT_S16P ++ case AV_SAMPLE_FMT_S16P: ++#endif + result = SFMT_S16; + break; + case AV_SAMPLE_FMT_S32: ++#if HAVE_DECL_AV_SAMPLE_FMT_S32P ++ case AV_SAMPLE_FMT_S32P: ++#endif + result = SFMT_S32; + break; + case AV_SAMPLE_FMT_FLT: ++#if HAVE_DECL_AV_SAMPLE_FMT_FLTP ++ case AV_SAMPLE_FMT_FLTP: ++#endif + result = SFMT_FLOAT; + break; + default: +@@ -597,6 +683,7 @@ + data->stream = NULL; + data->enc = NULL; + data->codec = NULL; ++ data->sample_width = 0; + data->bitrate = 0; + data->avg_bitrate = 0; + +@@ -624,6 +711,7 @@ + data->seek_sec = 0; + #endif + data->seek_broken = false; ++ data->timing_broken = false; + + decoder_error_init (&data->error); + +@@ -702,27 +790,38 @@ + if (data->fmt == 0) + data->fmt = fmt_from_sample_fmt (data); + if (data->fmt == 0) { ++#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME + decoder_error (&data->error, ERROR_FATAL, 0, ++ "Cannot get sample size from unknown sample format: %s", ++ av_get_sample_fmt_name (data->enc->sample_fmt)); ++#else ++ decoder_error (&data->error, ERROR_FATAL, 0, + "Unsupported sample size!"); ++#endif ++ avcodec_close (data->enc); + goto end; + } ++ data->sample_width = sfmt_Bps (data->fmt); + if (data->codec->capabilities & CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); ++ data->timing_broken = is_timing_broken (data->ic); + + data->okay = true; + +- if (data->ic->duration >= AV_TIME_BASE) { ++ if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) { + #ifdef HAVE_AVIO_SIZE + data->avg_bitrate = (int) (avio_size (data->ic->pb) / +- (data->ic->duration / AV_TIME_BASE) * 8); ++ (data->ic->duration / AV_TIME_BASE) * 8); + #else + data->avg_bitrate = (int) (data->ic->file_size / +- (data->ic->duration / AV_TIME_BASE) * 8); ++ (data->ic->duration / AV_TIME_BASE) * 8); + #endif + } +- data->bitrate = data->ic->bit_rate; + ++ if (!data->timing_broken && data->ic->bit_rate > 0) ++ data->bitrate = data->ic->bit_rate; ++ + return data; + + end: +@@ -943,12 +1042,14 @@ + char *buf, int buf_len) + { + int filled = 0; ++ AVFrame *frame; + ++ frame = avcodec_alloc_frame (); ++ + do { + int len, got_frame, is_planar, plane_size, data_size, copied; +- AVFrame frame; + +- len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt); ++ len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt); + + if (len < 0) { + /* skip frame */ +@@ -968,33 +1069,46 @@ + + is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt); + data_size = av_samples_get_buffer_size (&plane_size, +- data->enc->channels, frame.nb_samples, ++ data->enc->channels, ++ frame->nb_samples, + data->enc->sample_fmt, 1); + + if (data_size == 0) + continue; + +- copied = copy_or_buffer (data, (char *)frame.extended_data[0], +- plane_size, buf, buf_len); +- buf += copied; +- filled += copied; +- buf_len -= copied; ++ if (is_planar && data->enc->channels > 1) { ++ int offset, ch; + +- if (is_planar && data->enc->channels > 1) { +- int ch; ++ for (offset = 0; offset < plane_size; offset += data->sample_width) { ++ for (ch = 0; ch < data->enc->channels; ch += 1) { ++ copied = copy_or_buffer (data, ++ (char *)frame->extended_data[ch] ++ + offset, ++ data->sample_width, buf, buf_len); ++ buf += copied; ++ filled += copied; ++ buf_len -= copied; ++ } ++ } ++ } ++ else { ++ copied = copy_or_buffer (data, (char *)frame->extended_data[0], ++ plane_size, buf, buf_len); ++ buf += copied; ++ filled += copied; ++ buf_len -= copied; ++ } + +- for (ch = 1; ch < data->enc->channels; ch += 1) { +- copied = copy_or_buffer (data, (char *)frame.extended_data[ch], +- plane_size, buf, buf_len); +- buf += copied; +- filled += copied; +- buf_len -= copied; +- } +- } +- + debug ("Copying %dB (%dB filled)", data_size, filled); + } while (pkt->size > 0); + ++ avcodec_get_frame_defaults (frame); ++#ifdef HAVE_AVCODEC_FREE_FRAME ++ avcodec_free_frame (&frame); ++#else ++ av_freep (&frame); ++#endif ++ + return filled; + } + #endif +@@ -1122,9 +1236,10 @@ + free_packet (pkt); + } while (!bytes_produced && !data->eos); + +- data->bitrate = compute_bitrate (sound_params, bytes_used, +- bytes_produced + data->remain_buf_len, +- data->bitrate); ++ if (!data->timing_broken) ++ data->bitrate = compute_bitrate (sound_params, bytes_used, ++ bytes_produced + data->remain_buf_len, ++ data->bitrate); + + return bytes_produced; + } +@@ -1185,20 +1300,23 @@ + { + struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data; + +- return data->bitrate / 1000; ++ return data->timing_broken ? -1 : data->bitrate / 1000; + } + + static int ffmpeg_get_avg_bitrate (void *prv_data) + { + struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data; + +- return data->avg_bitrate / 1000; ++ return data->timing_broken ? -1 : data->avg_bitrate / 1000; + } + + static int ffmpeg_get_duration (void *prv_data) + { + struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data; + ++ if (data->timing_broken) ++ return -1; ++ + if (!data->stream) + return -1; + + +Index: configure.in +=================================================================== +--- configure.in (revision 2518) ++++ configure.in (working copy) +@@ -293,7 +293,6 @@ + + dnl optional functions + AC_CHECK_FUNCS([strcasestr strerror_r syslog]) +-AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize]) + AX_CHECK_UNAME_SYSCALL + + dnl MIME magic +@@ -322,6 +321,7 @@ + CC="$PTHREAD_CC" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS" ++AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize]) + + dnl __FUNCTION__ + AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1, + + diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index c160dcdd5..791d57d53 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 177967 2013-02-12 16:59:18Z andyrtr $ +# $Id: PKGBUILD 178353 2013-02-20 17:01:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.12.2 +_icedteaver=1.12.3 _openjdk_version=b27 _openjdk_date=26_oct_2012 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -33,8 +33,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794' - '5f67865307b7ff905304da4dca1fa0511c884480da0ddff269758bada392c8f4' +sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c' + 'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3' '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 8d4a5f91d..fb728058e 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176859 2013-02-01 18:49:56Z eric $ +# $Id: PKGBUILD 178310 2013-02-19 23:15:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.2 +pkgver=5.3.3 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -sha1sums=('bd6b1a31d3a94bc8253709f7ca1c81bcb2e23495' +sha1sums=('96995fe20b332c4644dd51668851193b16976071' 'a20808f6b250225704856f82a544681a962a299d') build() { diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index e0b64408c..375de313c 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 176031 2013-01-26 16:24:37Z foutrelis $ +# $Id: PKGBUILD 178335 2013-02-20 10:00:55Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.76 -pkgrel=2 +pkgver=2.77 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz transmissiond transmissiond.conf transmission.systemd - transmission.tmpfiles - transmission-2.76-fix-regression.patch) -md5sums=('9abbffe29ce9b5ee68a116d293c51111' + transmission.tmpfiles) +md5sums=('60c0e77a1852656215f7102a437b2a3d' '7d6186ee2a852ae3d44980f05063e194' 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' - '23f2320361ad54373c3a4551ef634fe8' - '894b1332cf651c15d593aed0b51dbdd6') + '23f2320361ad54373c3a4551ef634fe8') + build() { cd $pkgbase-$pkgver - # https://trac.transmissionbt.com/ticket/5215 - patch -Np2 -i "$srcdir/transmission-2.76-fix-regression.patch" - ./configure --prefix=/usr make pushd qt diff --git a/extra/transmission/transmission-2.76-fix-regression.patch b/extra/transmission/transmission-2.76-fix-regression.patch deleted file mode 100644 index b3fb734ba..000000000 --- a/extra/transmission/transmission-2.76-fix-regression.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: branches/2.7x/cli/cli.c -=================================================================== ---- branches/2.7x/cli/cli.c (revision 13784) -+++ branches/2.7x/cli/cli.c (revision 13794) -@@ -268,14 +268,12 @@ - { - if (!tr_fileExists (str, NULL)) -- tr_mkdirp (str, 0700); -- -- if (tr_fileExists (str, NULL)) - { -- tr_bencDictAddStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, str); -- } -- else -- { -- fprintf (stderr, "Unable to create download directory \"%s\"!\n", str); -- return EXIT_FAILURE; -+ tr_mkdirp (str, 0700); -+ -+ if (!tr_fileExists (str, NULL)) -+ { -+ fprintf (stderr, "Unable to create download directory \"%s\"!\n", str); -+ return EXIT_FAILURE; -+ } - } - } diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index be0a6dd07..64b0b812b 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,12 +23,12 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/source/sid/iceape" -license=('MPL') +license=('MPL' 'GPL') depends=("iceape-libre>=$pkgver") makedepends=('unzip' 'zip') source=('region.properties') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index c46631628..01bc6558e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 -pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." +pkgrel=2 +pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') replaces=('mozilla' 'seamonkey') diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index 197e3e236..eeb2b0382 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -108,13 +108,13 @@ pkgname=( done) ) pkgver=17.0.1 -pkgrel=1 -pkgdesc='Language packs for GNUzilla IceCat.' +pkgrel=2 +pkgdesc='Language packs for GNU IceCat.' arch=( any ) license=( - MPL + MPL GPL ) url=http://www.gnu.org/software/gnuzilla/ depends=( diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index ec2a63dd8..337688d9c 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,10 +16,10 @@ _pgo=false pkgname=icecat pkgver=17.0.1 -pkgrel=5 -pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +pkgrel=6 +pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) -license=(GPL2 MPL LGPL) +license=(MPL GPL LGPL) depends=( alsa-lib dbus-glib diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 5ea3ff98f..1bf14850d 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 -pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird." +pkgrel=2 +pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/source/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 2e7160daf..607d15feb 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=18.0.2 +_debver=19.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -28,7 +28,7 @@ pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') url="http://www.geticeweasel.org/" -license=('MPL') +license=('MPL' 'GPL') depends=("iceweasel-libre>=$pkgver") makedepends=('unzip' 'zip') source=('region.properties') @@ -74,92 +74,92 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('428246ef3fb64103ff2cf5eaae2a92ca' - '31f654187e17bc58997481e8a56496b1' - 'fade60b00eb508d48a84d23c0e6541e5' - '3d7a74dbce2d48f3c1ee8b60790835b8' - '48d1d9fae40e1bef02c58e61bf7f539b' - '065b8ea8d4545358188bf1246936eb8b' - '3c70cb0d4212e2efbc90111cc3134e33' - 'dbc87745091f8da747656fff12823910' - 'ecbae99a66b2ce71cbbec6c73df8844d' - 'a154b28a9b0de83e7e4caa8522fe3241' - 'a38131384cebd05f97da8e61b549361f' - '4dfabf91b1bcf5c5917a30b6042ded81' - '376e3652e406c57e7f7a760094dad0ab' - 'cb6b6fda241231881fc88dd4123ffa39' - 'e940765847d1f83d03df11850fb9147b' - '09ec90ab9c064ed95ec94ddf8323394f' - 'cb436e667812f9031d450e58d66d932d' - 'b8e033ebf0dbf8b0a230f97910d71505' - '19208ca1053d4e64d651a19376dcd24a' - '9e7b3895ddc0abb9e11588f594d6e4af' - '0aa6613e504e5a3c05c47ba1219fbd08' - '170fe69ee60cec853063a7da4a874c7e' - '317b03437e37d65140850b6bbe72e76d' - 'ff81fab8ad6dea85bfd2e6cf19e15168' - 'e963bd288d0eef928c639cf474f66106' - '02ad1252186b093aa08213bc8e178c96' - 'abe884cc2b185ca7ffdba54bbeb56069' - '4cc3a9db198329fb9612a4171619f177' - 'af14e936a7ad830987464abb251a7e64' - '96652e4a21ea60e4c29ecbd2f20ab93b' - 'cea50d05ef64864b52eced984cdb6d09' - 'a496720ade4c5e27dc265d953a63f4f3' - 'cc0cf100ebe57c765b278c3a11fc6898' - 'bda56ca990bb70ebc2b17a6d6d078cc0' - '0d16cf2741ea660acf781a156e64a60b' - 'b773827e9d806722b4164338b1307cdb' - '73166bc2a29b207e3b0d724957b0c5ed' - 'f1b0c9f9fa3aa50a1837988efef95cf2' - '9b08f5fab447bf210282f470e447a3d4' - '330c9304f9ab0038c892c248246aea24' - 'aa7237a6ad341e4d3463b470265cb6f7' - '631646b52dd480126a5efb41d4f5fda4' - '89b783cd706c960c217283e0ffba02c1' - '0a23686cca72fa95f1ff54eec885b306' - 'ee0e262a083429d8388412955314a6f0' - '0714162d56a436394b9165f7ad2bf549' - '76a5096315e019234b4fe6b9e86c7ae9' - '4dc4688b90d81881e89af6b2ee3720ce' - 'ce0c82cc666abe518a24231803883d68' - 'b67193f83bad38939aafb8bb7368862a' - 'f23ac7cdabd042cbc841c408fbe69dff' - '422741d2bb3c3a272a94b2977de188b8' - 'f88e8e651933640877e9f088e77d503b' - 'cf9445ebf2852bc40e140d5cfca269d9' - '1cdeb5e3a3e4ccea28299ab21559dc27' - '2c4e7209039d4cab5d614419e7612079' - '3a9909afb4d73c12e36bd721d1504788' - '9bf880dd4d142e0f7adc3bdccf196a13' - 'cc7dc9f622ecf277da1598f2a7391936' - '70be0726c473cb814cbb59d8efbffac5' - '42f43f6ea94dbcc20c9052e5c86edb40' - 'ab3b4068e17b5ac765e0bbb29332b935' - 'e135b2bf59fe4f03c87fcddb626da4a5' - 'f1df05798115e9c7db8cc1ff1713e87e' - 'be849695d961f94ecbe95141c5be9b63' - '5763fabc54b0a6cc5f7ecbade138c819' - '12fc8c500e44a36081963d0b591b5ec7' - 'aed0dd9b85788b43916a927234e25a39' - '4c0b62ea092c34f8bc22caaacab4206c' - 'e31d50bef08bdc2b5b6e526d4aed8aa9' - '283f98e2175e01bee3b8b84237d24284' - 'fbeb003e7d0819903c415900bd874e4a' - '44b6504f4f4158b8439263118bfac99b' - '4b692c497769eda8778fd14c747b2f90' - '9e6dc514be82e7d9c9702c301525876a' - '6cccbbaa7835f4538caaf5b170b42390' - 'e43d96c0c4758f327ef28555cbfe3e1b' - '65850ad55182fca2a91e213ab25c9c93' - '891de1295abfcf21651f5996f2f9c5b8' - 'b8497fc27cbc81c54fda917317c0dc3f' - 'e9eecc0fe4c3dc4b9ab4c21714eb45c5' - 'a3a898b665e4044ea77f6e2a48e3f448' - '1dcea4aeeebe6010b95e85d2c4fead6c' - 'e063a63b1dd3fc4ab5947079fbb496d4' - '9165ab1d8d0b62a460b955129d160c3f' - '25b2dff9bdd8592e2ce11dbf53cc995c' - 'fdf6b9c514269c39f032d08889f77576' - '377c3e6358622323681387a15bf4de1e' - '5e72c0853f73aa7e60c8f1ceb95d2910') +md5sums=('97761543729499b0d5f150e0379a20b1' + '5f91205d41a4622848e61bee463f14a1' + 'e29da15887bb4ab2b569c5c4dd776a25' + '7b76f37c83a29b64749cdc22c5165631' + 'b42eef799d2a6366dd692c94a7ba51b8' + 'dfe01c69b2cbc023b68a8c25c1bf7157' + '8b6552b43d28b8350fe01211282a0229' + 'c17ca1f4717d1e146851a710a4e11274' + 'fde45fc9ad84a52a9f8d951f1962d29f' + '52c891a254642c6c57126b8466b55550' + 'bf1766232a1147d7b3568ade32072f06' + 'b19a611ee8613b7f47c4f0332e22189c' + '741639df355a097d09abae26b0ad629b' + '9f169c89de5585650f49f35d9c4c00e3' + 'd9bb7bc325a92068a4a76f69a1809bec' + 'd06e345a17c93cd5aa1374e0a003be0d' + '526c59a51339d48cab15fb15d2df64b5' + 'f2184c754da3f8e32ca787492eb9e81f' + '1c896e6053cae3dedbd9937aa756acb3' + '0d6cdeedaf9f50b8682b2d8c4f3950c1' + '517a64f66815fa0ae5fe79b78d95a8a5' + '9adeb6a16fa7f5c1d6e682a439f8d7c8' + 'c360a362b3c5f5b4dea198e8cdc58972' + '6724054975b42fa3d9ac850b435dfd69' + '7da94918a235f2fad8e3aac43cb26c03' + '36d880377ecd705a682bba4d184d29fd' + '50cc39790a2426fa1354b6a45eeb2db7' + '89551bdaf4f4c068e5e7e200541fee0e' + '5a71a10f64314d6301cde382728a41e2' + '9c771c75fd04926141c22ab283c51fb8' + '7ab22ad07dfb36ff6f4549f3c006b817' + '582e28127177c34367b1bbafcc166827' + 'd43ed904112b49a8a5b0bf822e95380f' + 'eb57146f92399128c89d36fdb4424926' + 'c0d97d469bffc37fa6fc0daeb23b1b26' + '067fc480ce411badf73a88e47681006b' + '63aaf6e27a6baf8f0b583b36c9b03d13' + '0effaa9e694c7af1a180627e5e74f8e4' + '4afeba0fa219ad7550e31f19edd4954b' + '1332c01febcfc25178832c8a787dd275' + '59763805b37328a4a35720e26b2aad3d' + 'a999f9794c15c0610cde1ca80c946b56' + 'e69f93aa1714cb299ac3fe2f757b5da3' + '4994b7840835108be65f5311f92289ff' + '74fa9ba4c7985d1c977a532b33784dfc' + 'a86f218b4ee854253c59a470e2abb1e4' + '347c714fa7ebf1cab9fa1b826e6de5ad' + '7308fdb420dc5fd1b94063f0c4f7e5a6' + '368cd804b844834dda83cfc802dd6453' + 'cbdd02277f61f778c95fd9fcc68fe878' + '5e88de028b72b6fa7c06d46a162c0861' + '26f0434e5e874e10db7afc36e7d0f63a' + '9f6d1ee3f20cea4a8e36fdb1e6276453' + '04b6e81adb4d9dfb609ebfca02c4dd86' + 'e4eb34249d58130caca84f7055f299c7' + '36122eaa69639618b8751c82a74b7201' + '2427c7e40800098fc46aad1860e42ee8' + 'f6dfbe879fbff17925795a86d1ae9a1a' + '178b26febee5f8c38cf1fee6e746f137' + '27268b250095ff1b8caa8e6d68430019' + '09f4eef9f51966142bc9d1f1ff887b5c' + '4b1398a607dec42ed99f6fae77acea57' + 'b1299e6cf360af3802a1ea3552914cc9' + 'c1baa88171934c561599f4d88739abe9' + '10f6a7fd51c0ddf3b08831fdbc307768' + '437a944516230463ce751bcfae379c6d' + 'd42385fb8538a655a181e7272f958597' + 'c12e192bc0e1b177f142bac914f422f3' + '2338bf2bc46a89f2057f2e271ed72487' + '928f1fe43d3179b83bb4219311e1b5e5' + '2b0d3bcccf7e8ebbf214248e88b3fbde' + 'bd5ed51ea0b44cc8c9034214d31eea23' + 'ee883df4c4847c34ae15e1ce9e18a160' + 'bb57f5e8bd20a5f516e8a682a1474dcf' + '6d2f66384f38318c41e19c2d9bf164b2' + '68f0d3236cdd7b6a6dda89d42330570a' + 'b181059e92f5ec62473710ad0313036b' + '602a7a4bec1702702b84d7c6aa64fc7b' + '3f4fc8c2ecd68a093f56619579ea4117' + '41cfc1edf0f4da00ee5a6e77cc49648c' + '71c9972d84bab5308c4c48ab620c82bb' + '89a12ce1e546cbf4258786b68862d8ed' + 'fc2a6dd3845adbe1c0e4e11906e7aba1' + 'c04628631d0990c622abd74012340e03' + '93d3fade386575e8c076bfa7241d4968' + '61a7451fba8a19370f0c3b2dca29c1d1' + '39259a63970379d04c0b234a9616f13d' + '16841d5e8539df48ce22ca2c812a3e0e' + 'f1c7c1f2e242f22e42cc2858a6f86bde') diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index 4399d8db7..a5870f54c 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -10,12 +10,6 @@ browser.search.order.1=DuckDuckGo HTML browser.search.order.2=DuckDuckGo Lite browser.search.order.3=Seeks Search -# URL for site-specific search engines -# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site -# to be searched and the user's search query. Place them in the appropriate location -# for your locale's URL but do not translate them. -browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the # profile database. Note that "new" is defined as "has a different URL"; this diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index f59454192..b7bd659a0 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index b08c813dd..1d6b07de8 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0.2 +_debver=19.0 _debrel=1 [ "$CARCH" == "mips64el" ] && { _debver=13.0.1; _debrel=2; } _debrepo=http://ftp.debian.org/debian/pool/main/ @@ -30,9 +30,9 @@ if $_pgo; then pkgname+='-pgo' fi -pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +license=('MPL' 'GPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification') makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') @@ -55,17 +55,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('9869f5aa42cf922526d34b4946fee867' - 'a7f261b9860b9af596e0d8614d52a8cd' +md5sums=('b4c109e987f869f94220188a901d4425' + 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'ac29b01c189f20abae2f3eef1618ffc0' - '1ee2d4bcacee73d671b9ffa17a02abaa' + 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '46a4b19b414065b99b870ea79b454f6e') + '2fde2f4bc158b217f3d71b33ef0bc626') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index f80295e55..1691a4aa1 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -156,9 +156,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 -@@ -3,25 +3,18 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 +@@ -3,19 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -180,16 +180,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search - # URL for site-specific search engines - # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site - # to be searched and the user's search query. Place them in the appropriate location - # for your locale's URL but do not translate them. --browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -30,20 +23,10 @@ +@@ -24,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 |