From e11b25652fceed38363788583cab3d48b869c3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 7 Feb 2012 13:43:29 +0000 Subject: [PATCH] Resolves: rhbz#788042 skip splashscreen with quickstarter --- ...8042-skip-splashscreen-with-quicksta.patch | 24 +++++++++++++++++++ libreoffice.spec | 8 +++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch diff --git a/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch b/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch new file mode 100644 index 0000000..3e61acb --- /dev/null +++ b/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch @@ -0,0 +1,24 @@ +From 13b6afe8c8e26d837fc9de9428fe2bfca1b551c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 7 Feb 2012 13:36:50 +0000 +Subject: [PATCH] Resolves: rhbz#788042 skip splashscreen with --quickstart + +--- + desktop/unx/source/args.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c +index 367bac2..0952911 100644 +--- a/desktop/unx/source/args.c ++++ b/desktop/unx/source/args.c +@@ -58,6 +58,7 @@ static struct { + { "nologo", 0, 1, 0, 0, NULL }, + { "headless", 0, 1, 0, 0, NULL }, + { "invisible", 0, 1, 0, 0, NULL }, ++ { "quickstart", 0, 1, 0, 0, NULL }, + { "minimized", 0, 1, 0, 0, NULL }, + + /* pagein bits */ +-- +1.7.6.5 + diff --git a/libreoffice.spec b/libreoffice.spec index 5337109..2614055 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -121,8 +121,7 @@ Patch12: libreoffice-rhel6poppler.patch %if %{with binfilter} Patch13: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch %endif -# TODO: this in S390 only, so it can wait .-) -#Patch13: solenv.fix.mk.inheritance.patch +Patch14: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -815,7 +814,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %if %{with binfilter} %patch13 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch %endif -#%patch13 -p1 -b .solenv.fix.mk.inheritance.patch +%patch14 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2115,8 +2114,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Tue Feb 07 2012 Stephan Bergmann - 3.5.0.3-2-UNBUILT +* Tue Feb 07 2012 Stephan Bergmann - 3.5.0.3-2 - junit4 -> junit +- Resolves: rhbz#788042 skip splashscreen with quickstarter * Thu Feb 02 2012 David Tardon - 3.5.0.3-1 - 3.5.0 rc3