Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1a3935216cf261c93e4bc915bfc5ef5ef23298e8
commit 1a3935216cf261c93e4bc915bfc5ef5ef23298e8 Author: crazy <[email protected]> Date: Sun May 22 14:20:27 2016 +0200 Revert "fox-1.7.55-1-x86_64" This reverts commit 8faed8c4827f0b3b7616158006d22b47bdd38fa6. * this was meant to bump fox but mesa and llvm to devel ^^ diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild index 7617a8e..421f0a0 100644 --- a/source/devel/llvm/FrugalBuild +++ b/source/devel/llvm/FrugalBuild @@ -1,9 +1,6 @@ # Compiling Time: 4.74 SBU # Maintainer: Marius Cirsta <[email protected]> -: ${USE_DEVEL="y"} - - pkgname=llvm pkgver=3.8.0 pkgrel=1 @@ -19,22 +16,12 @@ makedepends=("${makedepends[@]}" 'libstdc++>=5.3.0-2' 'binutils>=2.25.1-6' 'glib rodepends=("$pkgname-libs") groups=('devel') archs=('i686' 'x86_64' 'arm') +up2date="Flastarchive $url/releases/download.html .src.tar.xz" +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \ + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz) -if Fuse DEVEL; then - unset source sha1sums - pkgver=999.gdc02050 - pkgrel=0 - _F_scm_type="git" - _F_scm_url="https://github.com/llvm-mirror/llvm.git"; - Finclude scm -else - up2date="Flastarchive $url/releases/download.html .src.tar.xz" - source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \ - http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz) - - _F_archive_ver="${pkgver}.src" - signatures=("${source[0]}.sig" "${source[1]}.sig" ) -fi +_F_archive_ver="${pkgver}.src" +signatures=("${source[0]}.sig" "${source[1]}.sig" ) subpkgs=("${subpkgs[@]}" "clang") subdescs=("${subdescs[@]}" "C language family frontend for LLVM") @@ -82,22 +69,11 @@ options+=('static') build() { - if Fuse DEVEL; then - Funpack_scm - fi - Fcd # clang must be copied here to build with llvm Fexec rm -rf tools/clang - - if Fuse DEVEL; then - Fexec cd tools - git clone --depth=1 https://github.com/llvm-mirror/clang.git - Fexec cd .. - else - Fexec mv -f ../cfe-${_F_archive_ver}/ tools/clang - fi + Fexec mv -f ../cfe-${_F_archive_ver}/ tools/clang # Fix for genesis32 @@ -116,27 +92,25 @@ build() { CMake_install - if ! Fuse DEVEL; then - # Install man pages - Fmkdir usr/share/man/man1 - Fcp ${_F_cd_path}/docs/_build/man/*.1 usr/share/man/man1/ - Fcp ${_F_cd_path}/tools/clang/docs/_build/man/*.1 usr/share/man/man1/ + # Install man pages + Fmkdir usr/share/man/man1 + Fcp ${_F_cd_path}/docs/_build/man/*.1 usr/share/man/man1/ + Fcp ${_F_cd_path}/tools/clang/docs/_build/man/*.1 usr/share/man/man1/ - # Install html docs - Fmkdir usr/share/doc/$pkgname-$pkgver/html/ - Fcp ${_F_cd_path}/docs/_build/html/* usr/share/doc/$pkgname-$pkgver/html/ - Frm usr/share/doc/$pkgname-$pkgver/html/_sources + # Install html docs + Fmkdir usr/share/doc/$pkgname-$pkgver/html/ + Fcp ${_F_cd_path}/docs/_build/html/* usr/share/doc/$pkgname-$pkgver/html/ + Frm usr/share/doc/$pkgname-$pkgver/html/_sources - # Install html docs of clang - Fmkdir usr/share/doc/$pkgname-$pkgver/html/clang - Fcp ${_F_cd_path}/tools/clang/docs/_build/html/* usr/share/doc/$pkgname-$pkgver/html/clang - Frm usr/share/doc/$pkgname-$pkgver/html/clang/_sources - fi + # Install html docs of clang + Fmkdir usr/share/doc/$pkgname-$pkgver/html/clang + Fcp ${_F_cd_path}/tools/clang/docs/_build/html/* usr/share/doc/$pkgname-$pkgver/html/clang + Frm usr/share/doc/$pkgname-$pkgver/html/clang/_sources # Install html docs of llvm-ocaml Fmkdir usr/share/doc/$pkgname-$pkgver/ocamldoc -# Fcp ${_F_cd_path}/${_F_cmake_build_dir}/docs/ocamldoc/html/* usr/share/doc/$pkgname-$pkgver/ocamldoc + Fcp ${_F_cd_path}/${_F_cmake_build_dir}/docs/ocamldoc/html/* usr/share/doc/$pkgname-$pkgver/ocamldoc Fmv usr/docs/ocaml/html usr/share/doc/$pkgname-$pkgver/ocamldoc/ Frm usr/docs @@ -145,19 +119,13 @@ build() { Fsplit clang usr/include/clang* Fsplit clang usr/lib/clang/ Fsplit clang usr/lib/libclang* - - if ! Fuse DEVEL; then - Fsplit clang usr/share/man/man1/clang* - Fsplit clang usr/share/doc/$pkgname-$pkgver/html/clang/ - fi + Fsplit clang usr/share/man/man1/clang* + Fsplit clang usr/share/doc/$pkgname-$pkgver/html/clang/ Fsplit $pkgname-ocaml usr/lib/ocaml/ - - if ! Fuse DEVEL; then - Fsplit $pkgname-ocaml usr/share/llvm/cmake/{Find,Add}OCaml.cmake - Fsplit $pkgname-ocaml usr/share/doc/$pkgname-$pkgver/ocamldoc/ - Fsplit $pkgname-ocaml usr/share/doc/$pkgname-$pkgver/html/tutorial/OCamlLangImpl*.html - fi + Fsplit $pkgname-ocaml usr/share/doc/$pkgname-$pkgver/ocamldoc/ + Fsplit $pkgname-ocaml usr/share/llvm/cmake/{Find,Add}OCaml.cmake + Fsplit $pkgname-ocaml usr/share/doc/$pkgname-$pkgver/html/tutorial/OCamlLangImpl*.html Fsplit $pkgname-libs usr/lib/*.so* } diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index bf9616b..e2cd6a2 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -7,7 +7,7 @@ # --enable-r600-llvm-compiler : ${USE_DEBUG="n"} -: ${USE_DEVEL="y"} +: ${USE_DEVEL="n"} : ${USE_DETECTDEPENDS="n"} # To detected dependecies with makepkg -a : ${USE_DRI="y"} @@ -51,7 +51,7 @@ xserverver=1.18.0 if Fuse DEVEL; then unset source sha1sums - pkgver=9999.g9bea018 + pkgver=9999.g23cd6c4 pkgrel=0 _F_scm_type="git" _F_scm_url="git://anongit.freedesktop.org/mesa/mesa" @@ -402,8 +402,8 @@ build() { Ffilerel src/mesa/x86/assyntax.h /usr/include/xorg Fmkdir /usr/share/doc/$pkgname-$pkgver -# cp -r docs/{README.*,*.html,COPYING} \ -# $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie + cp -r docs/{README.*,*.html,COPYING} \ + $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie Fsplit libglapi usr/lib/libglapi.* diff --git a/source/xlib-extra/fox/FrugalBuild b/source/xlib-extra/fox/FrugalBuild index 1b5484b..55823d2 100644 --- a/source/xlib-extra/fox/FrugalBuild +++ b/source/xlib-extra/fox/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: voroskoi <[email protected]> pkgname=fox -pkgver=1.7.55 +pkgver=1.7.54 pkgrel=1 pkgdesc="FOX is a C++ based Toolkit for developing Graphical User Interfaces easily and effectively." url="http://www.fox-toolkit.org/"; @@ -13,7 +13,7 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/download.html" source=(ftp://ftp.fox-toolkit.org/pub/$pkgname-$pkgver.tar.gz) -sha1sums=('014c829b48e1bb8db4306fd18296e34a991a1f5c') +sha1sums=('51ceb20e6f870b3f53081ec4cfc167e8c9152acf') Fconfopts+=" --with-opengl=yes \ --with-xft=yes \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
