Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3011ee4c61513e2e27a5b4f20476464e8770b206
commit 3011ee4c61513e2e27a5b4f20476464e8770b206 Author: crazy <[email protected]> Date: Sun Nov 26 02:40:46 2017 +0100 libreoffice-5.4.3.2-2-x86_64 * Version bump ( Ok @ vmiklos ) * renamed -gnome subpackage to -gtk3 also really enabled gtk3 and disabled gtk2 now * up2date=() fix , grepv alpha too diff --git a/source/xoffice/libreoffice/FrugalBuild b/source/xoffice/libreoffice/FrugalBuild index 6522391..9e1a8eb 100644 --- a/source/xoffice/libreoffice/FrugalBuild +++ b/source/xoffice/libreoffice/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik <[email protected]> pkgname=libreoffice -pkgver=5.4.2.2 +pkgver=5.4.3.2 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y pkgrel=2 @@ -90,7 +90,7 @@ groups=('xoffice') archs=("x86_64") mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; mirror="http://dev-builds.libreoffice.org/pre-releases/src"; -_F_archive_grepv="beta" +_F_archive_grepv="beta\|alpha" up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') source=( @@ -127,20 +127,19 @@ replaces=('calligra' 'calligra-libs' 'calligra-data' 'calligra-tools' 'calligra- conflicts=("$replaces[@]}") -subpkgs=("$pkgname-gnome" "$pkgname-sdk" "$pkgname-postgresql") -subdescs=("$pkgname gnome integration" \ +subpkgs=("$pkgname-gtk3" "$pkgname-sdk" "$pkgname-postgresql") +subdescs=("$pkgname GTK3 integration" \ "The $pkgname Software Development Kit" \ "$pkgname postgresql SDBC driver") -subdepends=("gtk+2" "openjdk>=6" "libpq") +subdepends=("gtk+3" "openjdk>=6" "libpq") subrodepends=("$pkgname=$pkgver" \ "$pkgname=$pkgver" \ "$pkgname=$pkgver libkrb5>=1.14.3") subarchs=("x86_64" 'x86_64' 'x86_64') -# gnome subpkg goes to extra as it pulls in deprecated pkgs -subgroups=('gnome-extra' 'devel-extra' 'xapps-extra') +subgroups=('xapps-extra' 'devel-extra' 'xapps-extra') subinstall=("$_F_gnome_scriptlet" "" "") -subreplaces=("" "" "") -subconflicts=("" "" "") +subreplaces=("$pkgname-gnome" "" "") +subconflicts=("$pkgname-gnome" "" "") # sed ':a;N;$!ba;s/\\\n//g' solenv/inc/langlist.mk|grep ^completelangiso=|sed 's/completelangiso=//;s/en-US //' completelangiso=(af am ar as ast be bg bn bn-IN bo br brx bs ca ca-valencia cs @@ -279,7 +278,9 @@ build() --enable-release-build \ --disable-dependency-tracking \ --disable-pdfium \ - --disable-firebird-sdbc + --disable-firebird-sdbc \ + --enable-gtk3 \ + --disable-gtk sed -i 's/test `id -u` = 0/false/' Makefile # missing fakeroot detection if [ ! -e src.built ]; then @@ -365,7 +366,7 @@ build() done done - Fsplitgid $pkgname-gnome $Fdestdir/gid_Module_Optional_Gnome + Fsplitgid $pkgname-gtk3 $Fdestdir/gid_Module_Optional_Gnome Fbuild_gnome_scriptlet Fsplitgid $pkgname-sdk $Fdestdir/gid_Module_Root_SDK Fsplitgid $pkgname-postgresql $Fdestdir/gid_Module_Optional_PostgresqlSdbc _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
