Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9814142c3184d8b1146c165a0eeb220e776cca69
commit 9814142c3184d8b1146c165a0eeb220e776cca69 Author: Miklos Vajna <[email protected]> Date: Sun Apr 8 10:01:13 2012 +0200 libreoffice-3.5.2.2-1-x86_64 - up to 3.5.2 - enable scripting-beanshell extension diff --git a/source/xapps/libreoffice/0001-yet-another-clash-with-macro-name.patch b/source/xapps/libreoffice/0001-yet-another-clash-with-macro-name.patch deleted file mode 100644 index 9daad67..0000000 --- a/source/xapps/libreoffice/0001-yet-another-clash-with-macro-name.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ee67c55260ec7723c39606955ccdbd3e2934935a Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -Date: Thu, 8 Mar 2012 14:15:09 +0100 -Subject: [PATCH] yet another clash with macro name - ---- - fpicker/source/unx/kde4/KDE4FilePicker.cxx | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx -index 269deee..8e8b3e8 100644 ---- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx -+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx -@@ -60,6 +60,8 @@ - #undef SETTINGS_MOUSE - #define LO_SETTINGS_LOCALE SETTINGS_LOCALE - #undef SETTINGS_LOCALE -+#define LO_SETTINGS_STYLE SETTINGS_STYLE -+#undef SETTINGS_STYLE - - #include <kfiledialog.h> - #include <kwindowsystem.h> -@@ -77,6 +79,8 @@ - #undef LO_SETTINGS_MOUSE - #define SETTINGS_LOCALE LO_SETTINGS_LOCALE - #undef LO_SETTINGS_LOCALE -+#define SETTINGS_STYLE LO_SETTINGS_STYLE -+#undef LO_SETTINGS_STYLE - - using namespace ::com::sun::star; - --- -1.7.7 - diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index 8c396c5..dde7c3f 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -3,10 +3,10 @@ # Contributor: Laszlo Dvornik <[email protected]> pkgname=libreoffice -pkgver=3.5.1.2 +pkgver=3.5.2.2 minor=${pkgver%%.?} # x.y.z major=${pkgver%%.?.?} # x.y -pkgrel=2 +pkgrel=1 pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org." url="http://www.documentfoundation.org/download/"; _F_gnome_desktop="y" @@ -31,8 +31,8 @@ mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; _F_archive_name="libreoffice-core" up2date="Flasttar http://dev-builds.libreoffice.org/pre-releases/src/"; modules=('core' 'binfilter' 'help' 'translations') -source=(0001-yet-another-clash-with-macro-name.patch) -signatures=('') +source=() +signatures=() for i in ${modules[@]} do source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.xz) @@ -117,7 +117,7 @@ do i=$(($i+1)) done -extensions=(presenter-minimizer presenter-console pdfimport nlpsolver) +extensions=(presenter-minimizer presenter-console pdfimport nlpsolver scripting-beanshell) for i in ${extensions[@]} do subpkgs=("${subpkgs[@]}" "$pkgname-$i") @@ -265,6 +265,7 @@ build() Fsplit $pkgname-presenter-console $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Extensions_PRESENTER_SCREEN|sort -u) Fsplit $pkgname-pdfimport $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Extensions_PDFIMPORT|sort -u) Fsplit $pkgname-nlpsolver $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Extensions_NLPSolver|sort -u) + Fsplit $pkgname-scripting-beanshell $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell|sort -u) # The rest stays. rm -f $Fdestdir/gid_* } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
