Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41af202e6ca3e8d51b5d3387026847d7b83ce095
commit 41af202e6ca3e8d51b5d3387026847d7b83ce095 Author: crazy <[email protected]> Date: Tue Nov 8 22:58:16 2016 +0100 xoffice - kill i686 diff --git a/source/xoffice/graphite2/FrugalBuild b/source/xoffice/graphite2/FrugalBuild index 75d9308..1f7b8aa 100644 --- a/source/xoffice/graphite2/FrugalBuild +++ b/source/xoffice/graphite2/FrugalBuild @@ -13,7 +13,7 @@ Finclude sourceforge cmake makedepends+=('freetype2>=2.7') depends=('libstdc++>=6.2.1-5') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('0c802628dacf3bfa2c1654d7d72b76e20e1adc97') # optimization OK diff --git a/source/xoffice/hyphen/FrugalBuild b/source/xoffice/hyphen/FrugalBuild index f706ca8..55c8386 100644 --- a/source/xoffice/hyphen/FrugalBuild +++ b/source/xoffice/hyphen/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_dirname="hunspell" Finclude sourceforge depends=('glibc>=2.24-4') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('0556c392beb59433e577e3517575801212201df6') build() diff --git a/source/xoffice/libabw/FrugalBuild b/source/xoffice/libabw/FrugalBuild index a6f894e..84caa9c 100644 --- a/source/xoffice/libabw/FrugalBuild +++ b/source/xoffice/libabw/FrugalBuild @@ -9,7 +9,7 @@ url="http://wiki.documentfoundation.org/DLP/Libraries/libabw"; depends=('libwpd>=0.10.1-5' 'libboost>=1.61.0') makedepends=('boost>=1.61.0' 'cppunit' 'gperf') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libabw"; source=(http://dev-www.libreoffice.org/src/libabw/libabw-$pkgver.tar.xz boost.patch) sha1sums=('b4ce343738228e235c9d378dc31b016462e7d984' \ diff --git a/source/xoffice/libcdr/FrugalBuild b/source/xoffice/libcdr/FrugalBuild index d36780e..3b27293 100644 --- a/source/xoffice/libcdr/FrugalBuild +++ b/source/xoffice/libcdr/FrugalBuild @@ -9,7 +9,7 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; depends=('libwpg>=0.3.1-4' 'libwpd>=0.10.1-5' 'lcms2>=2.8-2' 'icu4c>=55.1-4') makedepends=('boost>=1.61.0' 'x11-protos' 'cppunit') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libcdr"; source=(http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz) sha1sums=('af1cad13b431f31a27fb2a1b0599a9c479a732cf') diff --git a/source/xoffice/libcmis/FrugalBuild b/source/xoffice/libcmis/FrugalBuild index fda8e6c..6563544 100644 --- a/source/xoffice/libcmis/FrugalBuild +++ b/source/xoffice/libcmis/FrugalBuild @@ -9,7 +9,7 @@ Finclude sourceforge depends=('libboost>=1.61.0' 'curl>=7.50.3-2' 'libxml2>=2.9.4-3') makedepends=('cppunit' 'boost>=1.61.0') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") options=('scriptlet') source=("${source[@]}" libcmis-boost-gcc5.patch) sha1sums=('6c9d9011de4dbaab6fe5608a1c86ddcdef39bdb4' \ diff --git a/source/xoffice/libe-book/FrugalBuild b/source/xoffice/libe-book/FrugalBuild index e874983..6bd6138 100644 --- a/source/xoffice/libe-book/FrugalBuild +++ b/source/xoffice/libe-book/FrugalBuild @@ -11,7 +11,7 @@ source=($source boost.patch) depends=('libwpd>=0.10.1-5' 'libboost>=1.61.0') makedepends=('boost>=1.61.0' 'cppunit' 'gperf') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('94ccf0c70c3388e8f36b3acf8bd38c42bca0e6e5' \ 'c2f80ae551c5b1bc61c1a51c055f46449efddc93') Fconfopts="$Fconfopts --disable-werror" diff --git a/source/xoffice/libetonyek/FrugalBuild b/source/xoffice/libetonyek/FrugalBuild index e05efd6..da8f076 100644 --- a/source/xoffice/libetonyek/FrugalBuild +++ b/source/xoffice/libetonyek/FrugalBuild @@ -9,7 +9,7 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"; depends=('libwpd>=0.10.1-5' 'libboost>=1.61.0') makedepends=('boost>=1.61.0' 'cppunit' 'gperf' 'glm>=0.9.7.2-2' 'mdds>=1.2.1-2' 'liblangtag>=0.6.0-3') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libetonyek"; source=(http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$pkgver.tar.xz) sha1sums=('c2f8420f1e77141097a10a33d3b83d41c38b65f1') diff --git a/source/xoffice/libexttextcat/FrugalBuild b/source/xoffice/libexttextcat/FrugalBuild index 718cd01..6b2c3b1 100644 --- a/source/xoffice/libexttextcat/FrugalBuild +++ b/source/xoffice/libexttextcat/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Library implementing N-gram-based text categorization" url="http://cgit.freedesktop.org/libreoffice/libexttextcat/"; depends=('glibc>=2.24-4') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libexttextcat"; source=(http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-$pkgver.tar.xz) sha1sums=('445c4f0c2bd69850fbc79b540816e71062147180') diff --git a/source/xoffice/libfreehand/FrugalBuild b/source/xoffice/libfreehand/FrugalBuild index fb70282..628a770 100644 --- a/source/xoffice/libfreehand/FrugalBuild +++ b/source/xoffice/libfreehand/FrugalBuild @@ -10,7 +10,7 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"; depends=('libwpd>=0.10.1-5' 'libwpg>=0.3.1-4' 'lcms2>=2.8-2') makedepends=('gperf') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libfreehand"; source=(http://dev-www.libreoffice.org/src/libfreehand/libfreehand-$pkgver.tar.xz) sha1sums=('0ecf1289912d22881d6e1c757a90a5f72cb10ab5') diff --git a/source/xoffice/libgltf/FrugalBuild b/source/xoffice/libgltf/FrugalBuild index bb6db80..a2cd1c6 100644 --- a/source/xoffice/libgltf/FrugalBuild +++ b/source/xoffice/libgltf/FrugalBuild @@ -9,7 +9,7 @@ url="https://wiki.documentfoundation.org/Development/libgltf"; depends=('glew>=2.0.0-2') makedepends=('boost>=1.61.0' 'glm>=0.9.7.3-2' 'x11-protos') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libgltf/"; source=(http://dev-www.libreoffice.org/src/libgltf/libgltf-$pkgver.tar.bz2) sha1sums=('49860235c52b0be395b216d3f33955f935036f8e') diff --git a/source/xoffice/liblangtag/FrugalBuild b/source/xoffice/liblangtag/FrugalBuild index 510333d..4860eca 100644 --- a/source/xoffice/liblangtag/FrugalBuild +++ b/source/xoffice/liblangtag/FrugalBuild @@ -9,7 +9,7 @@ url="http://tagoh.bitbucket.org/liblangtag/"; depends=('libxml2>=2.9.4-3') makedepends=('gtk-doc' 'x11-protos' 'gobject-introspection>=1.50.0') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar https://bitbucket.org/tagoh/liblangtag/downloads"; source=(https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2 \ 0001-enum-must-be-declared-before-it-s-used.patch) diff --git a/source/xoffice/libmspub/FrugalBuild b/source/xoffice/libmspub/FrugalBuild index 2fae21a..19f2459 100644 --- a/source/xoffice/libmspub/FrugalBuild +++ b/source/xoffice/libmspub/FrugalBuild @@ -9,7 +9,7 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"; depends=('libwpg>=0.3.1-4' 'libwpd>=0.10.1-5' 'icu4c>=55.1-4') makedepends=('boost>=1.61.0' 'doxygen' 'x11-protos') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libmspub"; source=(http://dev-www.libreoffice.org/src/libmspub/libmspub-$pkgver.tar.xz) sha1sums=('e1bab3a4be9215b69700dcdb81cf27e194097776') diff --git a/source/xoffice/libmwaw/FrugalBuild b/source/xoffice/libmwaw/FrugalBuild index b5432bc..8f656ad 100644 --- a/source/xoffice/libmwaw/FrugalBuild +++ b/source/xoffice/libmwaw/FrugalBuild @@ -9,7 +9,7 @@ Finclude sourceforge depends=('libwpd>=0.10.1-5' 'libwpg>=0.3.1-4') makedepends=('doxygen' 'boost>=1.61.0' 'x11-protos') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('0e55a7f82f6be641a4460e50674a7318a0242234') # optimization OK diff --git a/source/xoffice/libodfgen/FrugalBuild b/source/xoffice/libodfgen/FrugalBuild index 8f2fe29..73d3db5 100644 --- a/source/xoffice/libodfgen/FrugalBuild +++ b/source/xoffice/libodfgen/FrugalBuild @@ -11,7 +11,7 @@ _F_sourceforge_ext=".tar.xz" _F_sourceforge_dirname="libwpd" Finclude sourceforge groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('49da7cc0dc4adfe0452e951d2dea3c225358fd63') Fconfopts+=" --disable-werror" diff --git a/source/xoffice/liborcus/FrugalBuild b/source/xoffice/liborcus/FrugalBuild index 20501f2..807fc3a 100644 --- a/source/xoffice/liborcus/FrugalBuild +++ b/source/xoffice/liborcus/FrugalBuild @@ -9,7 +9,7 @@ url="https://gitlab.com/orcus/orcus"; depends=('libboost>=1.61.0') makedepends=('mdds>=1.2.1-2' 'boost>=1.61.0') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar https://gitlab.com/orcus/orcus"; source=(http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz) sha1sums=('2ae75c98001eb227dd7de6a9a366c371f050ecee') diff --git a/source/xoffice/libpagemaker/FrugalBuild b/source/xoffice/libpagemaker/FrugalBuild index 0999212..144ba73 100644 --- a/source/xoffice/libpagemaker/FrugalBuild +++ b/source/xoffice/libpagemaker/FrugalBuild @@ -11,7 +11,7 @@ up2date="Flasttar http://dev-www.libreoffice.org/src/$pkgname"; depends=('librevenge>=0.0.4-2') makedepends=('doxygen' 'boost>=1.61.0') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('88fb5e15be25a0af9998b22e3927b7f4a4a92082') # optimization OK diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 90d0bcd..1045021 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -84,7 +84,7 @@ makedepends=( 'xorg-server' ) groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") #mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; mirror="http://dev-builds.libreoffice.org/pre-releases/src"; _F_archive_grepv="beta" @@ -128,7 +128,7 @@ subdepends=("gtk+2" \ subrodepends=("$pkgname=$pkgver" \ "$pkgname=$pkgver" \ "$pkgname=$pkgver libkrb5>=1.14.3") -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subarchs=("x86_64") # gnome subpkg goes to extra as it pulls in deprecated pkgs subgroups=('gnome-extra' 'devel-extra' 'xapps-extra') subinstall=("$_F_gnome_scriptlet" "" "") @@ -171,7 +171,7 @@ do subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") subgroups=("${subgroups[@]}" "locale-extra") - subarchs=("${subarchs[@]}" "i686 x86_64") + subarchs=("${subarchs[@]}" "x86_64") subreplaces=("${subreplaces[@]}" "calligra-l10n-`echo ${completelangiso[$i]}|tr '[A-Z]' '[a-z]'`") subconflicts=("${subconflicts[@]}" "calligra-l10n-`echo ${completelangiso[$i]}|tr '[A-Z]' '[a-z]'`") i=$(($i+1)) @@ -190,7 +190,7 @@ do fi subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver") subgroups=("${subgroups[@]}" "xapps-extra") - subarchs=("${subarchs[@]}" "i686 x86_64") + subarchs=("${subarchs[@]}" "x86_64") subreplaces=("${subreplaces[@]}" "") subconflicts=("${subconflicts[@]}" "") done @@ -205,15 +205,6 @@ build() { unset DISPLAY - - ## try to workaround OOM on genesis32 - - if [ "$CARCH" == "i686" ]; then - unset MAKEFLAGS - export MAKEFLAGS="-j2" - LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - fi - if [ ! -e src.downloaded ]; then for i in "${modules[@]}" do diff --git a/source/xoffice/librevenge/FrugalBuild b/source/xoffice/librevenge/FrugalBuild index b7eebeb..ee4d510 100644 --- a/source/xoffice/librevenge/FrugalBuild +++ b/source/xoffice/librevenge/FrugalBuild @@ -14,14 +14,14 @@ _F_sourceforge_dirname="libwpd" Finclude sourceforge url="http://libwpd.sourceforge.net/"; groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('39957fe3c289d7ba747af3aad2914ae985eae252') subpkgs=("$pkgname-docs") subdescs=("Librevenge Documentation") subdepends=() subgroups=('docs-extra') -subarchs=('i686 x86_64') +subarchs=("x86_64") build() { diff --git a/source/xoffice/libvisio/FrugalBuild b/source/xoffice/libvisio/FrugalBuild index 7d76d3c..d9c7ab5 100644 --- a/source/xoffice/libvisio/FrugalBuild +++ b/source/xoffice/libvisio/FrugalBuild @@ -9,7 +9,7 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; depends=('libwpg>=0.3.1-4' 'libwpd>=0.10.1-4' 'icu4c>=55.1-4') makedepends=('boost>=1.61.0' 'gperf' 'cppunit' 'x11-protos') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") up2date="Flasttar http://dev-www.libreoffice.org/src/libvisio"; source=(http://dev-www.libreoffice.org/src/libvisio/libvisio-$pkgver.tar.xz) sha1sums=('02daada854aee55ff847b42916536de143c7dda4') diff --git a/source/xoffice/libwpd/FrugalBuild b/source/xoffice/libwpd/FrugalBuild index 7f9d2a3..d2603bc 100644 --- a/source/xoffice/libwpd/FrugalBuild +++ b/source/xoffice/libwpd/FrugalBuild @@ -11,14 +11,14 @@ _F_sourceforge_rss_limit=100 Finclude sourceforge url="http://libwpd.sourceforge.net/"; groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('3c529cdfb578628e47fbb19acc41785c102d279b') subpkgs=("$pkgname-docs") subdescs=("Libwpd Documentation") subdepends=() subgroups=('docs-extra') -subarchs=('i686 x86_64') +subarchs=("x86_64") build() { diff --git a/source/xoffice/libwpg/FrugalBuild b/source/xoffice/libwpg/FrugalBuild index c18caf7..4b262fd 100644 --- a/source/xoffice/libwpg/FrugalBuild +++ b/source/xoffice/libwpg/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=4 pkgdesc="A C++ library to read and parse graphics in WPG" depends=('libstdc++>=6.2.1-5' 'libwpd>=0.10.1-5') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") _F_sourceforge_ext=".tar.bz2" Finclude sourceforge sha1sums=('9d9a38bfa97f1f75f5f79a68496dfdd9e5585fd2') diff --git a/source/xoffice/libwps/FrugalBuild b/source/xoffice/libwps/FrugalBuild index 815f9c0..554e51b 100644 --- a/source/xoffice/libwps/FrugalBuild +++ b/source/xoffice/libwps/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A Microsoft Works file format import filter." depends=('librevenge>=0.0.4-2') makedepends=('boost>=1.61.0') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") Finclude sourceforge sha1sums=('dd2d16a3e5ecc5767c198354f288325773dfba51') diff --git a/source/xoffice/lp_solve/FrugalBuild b/source/xoffice/lp_solve/FrugalBuild index 6d1c187..3068bad 100644 --- a/source/xoffice/lp_solve/FrugalBuild +++ b/source/xoffice/lp_solve/FrugalBuild @@ -12,7 +12,7 @@ Finclude sourceforge source+=(lpsolve-5.5.2.0.defines.patch) depends=('glibc>=2.24-4') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('e2830053cf079839b9ce21662cbc886ac6d31c80' \ 'c4e61302072adcd27aba5d966e33fa001f3599e2') diff --git a/source/xoffice/mythes/FrugalBuild b/source/xoffice/mythes/FrugalBuild index 70242aa..4121553 100644 --- a/source/xoffice/mythes/FrugalBuild +++ b/source/xoffice/mythes/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge depends=('libstdc++>=6.2.1-5') makedepends=('hunspell>=1.4.1-2') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") sha1sums=('c038831d84882cdf639e038e44decb1e40527591') # optimization OK diff --git a/source/xoffice/opencollada/FrugalBuild b/source/xoffice/opencollada/FrugalBuild index 3354acf..6ab5063 100644 --- a/source/xoffice/opencollada/FrugalBuild +++ b/source/xoffice/opencollada/FrugalBuild @@ -12,7 +12,7 @@ url="https://collada.org/mediawiki/index.php/OpenCOLLADA"; depends=('libxml2' 'pcre' 'xz') makedepends=('hd2u' 'fftw' 'cmake' 'zlib' 'x11-protos') groups=('xoffice') -archs=('i686' 'x86_64') +archs=("x86_64") # No idea how to check this automatically, I'll update this when depending packages require doing so. up2date="$pkgver" source=(https://github.com/KhronosGroup/OpenCOLLADA/archive/$commit/OpenCOLLADA-$shortcommit.tar.gz \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
