Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=70fd5619ec7bab9663e976241331f3c3d92ed8c2
commit 70fd5619ec7bab9663e976241331f3c3d92ed8c2 Author: Miklos Vajna <[email protected]> Date: Thu Jun 19 21:51:12 2014 +0200 libreoffice-4.3.0.1-1-x86_64 - 4.3 beta2 -> 4.3 RC 1 - remove upstreamed 0001-gbuild-move-vclplug_kde-to-the-kde-section.patch diff --git a/source/xapps/libreoffice/0001-gbuild-move-vclplug_kde-to-the-kde-section.patch b/source/xapps/libreoffice/0001-gbuild-move-vclplug_kde-to-the-kde-section.patch deleted file mode 100644 index 09dbf62..0000000 --- a/source/xapps/libreoffice/0001-gbuild-move-vclplug_kde-to-the-kde-section.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4d5de8092404bc82391d6bf98b5389ecc232fda8 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <[email protected]> -Date: Sun, 8 Jun 2014 21:46:53 +0200 -Subject: [PATCH] gbuild: move vclplug_kde* to the kde section - -Change-Id: Ia2b5df76be4d5a376fb28c2460f286e3f2b4acc0 ---- - Repository.mk | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Repository.mk b/Repository.mk -index 1f0d38b..8ba8f02 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -209,6 +209,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \ - $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \ - $(if $(ENABLE_KDE),kdebe1) \ - $(if $(ENABLE_KDE4),kde4be1) \ -+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ -+ $(if $(ENABLE_KDE),vclplug_kde) \ -+ $(if $(ENABLE_KDE4),vclplug_kde4) \ -+ ) \ - )) - - $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \ -@@ -366,8 +370,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ - $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ - vclplug_gen \ - $(if $(ENABLE_TDE),vclplug_tde) \ -- $(if $(ENABLE_KDE),vclplug_kde) \ -- $(if $(ENABLE_KDE4),vclplug_kde4) \ - $(if $(ENABLE_HEADLESS),,vclplug_svp) \ - ) \ - writerperfect \ --- -1.8.4.5 - diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index 048bb0a..ec027f9 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=libreoffice -pkgver=4.3.0.0.beta2_buildfix1 +pkgver=4.3.0.1 minor=${pkgver:0:5} # x.y.z major=${pkgver:0:3} # x.y pkgrel=1 @@ -48,8 +48,8 @@ mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; mirror="http://dev-builds.libreoffice.org/pre-releases/src"; up2date="Flasttar $mirror" modules=('' 'help-' 'translations-') -source=(0001-gbuild-move-vclplug_kde-to-the-kde-section.patch) -signatures=('') +source=() +signatures=() for i in "${modules[@]}" do source=(${source[@]} $mirror/libreoffice-$i${pkgver/_/-}.tar.xz) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
