Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df6eaaa9a5de7b3f4bad4ce34c636e5e58eab825
commit df6eaaa9a5de7b3f4bad4ce34c636e5e58eab825 Author: Miklos Vajna <[email protected]> Date: Mon Mar 26 09:04:41 2012 +0200 libreoffice-3.5.1.2-2-x86_64 - fix build with kde-4.8.1 - enable and split nlpsolver 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 new file mode 100644 index 0000000..9daad67 --- /dev/null +++ b/source/xapps/libreoffice/0001-yet-another-clash-with-macro-name.patch @@ -0,0 +1,34 @@ +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 794acf2..8c396c5 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -6,7 +6,7 @@ pkgname=libreoffice pkgver=3.5.1.2 minor=${pkgver%%.?} # x.y.z major=${pkgver%%.?.?} # x.y -pkgrel=1 +pkgrel=2 pkgdesc="LibreOffice Productivity Suite, a fork of OpenOffice.org." url="http://www.documentfoundation.org/download/"; _F_gnome_desktop="y" @@ -31,7 +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=() +source=(0001-yet-another-clash-with-macro-name.patch) +signatures=('') for i in ${modules[@]} do source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.xz) @@ -116,8 +117,7 @@ do i=$(($i+1)) done -# TODO: report-builder wiki-publisher -extensions=(presenter-minimizer presenter-console pdfimport) +extensions=(presenter-minimizer presenter-console pdfimport nlpsolver) for i in ${extensions[@]} do subpkgs=("${subpkgs[@]}" "$pkgname-$i") @@ -129,13 +129,6 @@ do subarchs=("${subarchs[@]}" "i686 x86_64") done -install_bundled_extension() -{ - Fmkdir /usr/lib/libreoffice/share/extensions/$1 - unzip -qqo solver/unxlng*/bin/$2 -d $Fdestdir/usr/lib/libreoffice/share/extensions/$1 || Fdie - Fsplit $pkgname-$3 /usr/lib/libreoffice/share/extensions/$1 -} - build() { if [ ! -e src.downloaded ]; then @@ -234,11 +227,6 @@ build() Fmanrel sysui/desktop/man/*.1 - # Enable and split extensions - install_bundled_extension presentation-minimizer minimizer/presentation-minimizer.oxt presenter-minimizer - install_bundled_extension presenter-screen presenter/presenter-screen.oxt presenter-console - install_bundled_extension pdfimport pdfimport/pdfimport.oxt pdfimport - # Enable and split the mozilla plugin Fmkdir /usr/lib/mozilla/plugins Fln /usr/lib/$pkgname/program/libnpsoplugin.so /usr/lib/mozilla/plugins/ @@ -273,6 +261,10 @@ build() Fsplit $pkgname-binfilter $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Binfilter|sort -u) Fsplit $pkgname-postgresql $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_PostgresqlSdbc|sort -u) + Fsplit $pkgname-presenter-minimizer $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Extensions_MINIMIZER|sort -u) + 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) # The rest stays. rm -f $Fdestdir/gid_* } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
