From 63ae23c3bde8d899f053498c35d4369010755927 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 7 Aug 2015 21:58:26 +1000 Subject: [PATCH] New version 4.4.5.2 Drop merged string format patch --- .abf.yml | 8 ++++---- libreoffice-4.4.2.2-sfmt.patch | 12 ------------ libreoffice.spec | 3 +-- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 libreoffice-4.4.2.2-sfmt.patch diff --git a/.abf.yml b/.abf.yml index 7a55ae3..587c802 100644 --- a/.abf.yml +++ b/.abf.yml @@ -31,7 +31,7 @@ sources: b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a - libreoffice-4.4.3.2.tar.xz: 0b7b553d72de80b21d4055502fddbc7dee7289c3 - libreoffice-dictionaries-4.4.3.2.tar.xz: 831a4fa23d674f9084053893a98e3e57762b21c1 - libreoffice-help-4.4.3.2.tar.xz: bbbf93f224ebc0aa3c06c52d5aef855d4c2df7c1 - libreoffice-translations-4.4.3.2.tar.xz: 3067f3c05c0b717237429c88070f026c01d84363 + libreoffice-4.4.5.2.tar.xz: dca6d5f31facfa28661909700e1eba5e69da9d2a + libreoffice-dictionaries-4.4.5.2.tar.xz: 1d5844b77cae947f1827bc520d376faf59c43dd5 + libreoffice-help-4.4.5.2.tar.xz: b6e28c5944072a478237c97188dbbdd5a271c867 + libreoffice-translations-4.4.5.2.tar.xz: fd2acb72f1109f78d38663f3089f48c7aebbea8c diff --git a/libreoffice-4.4.2.2-sfmt.patch b/libreoffice-4.4.2.2-sfmt.patch deleted file mode 100644 index fe2b427..0000000 --- a/libreoffice-4.4.2.2-sfmt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libreoffice-4.4.2.2/vcl/unx/gtk/a11y/atktextattributes.cxx libreoffice-4.4.2.2-patched/vcl/unx/gtk/a11y/atktextattributes.cxx ---- libreoffice-4.4.2.2/vcl/unx/gtk/a11y/atktextattributes.cxx 2015-03-26 21:51:14.000000000 +1000 -+++ libreoffice-4.4.2.2-patched/vcl/unx/gtk/a11y/atktextattributes.cxx 2015-04-03 23:23:10.113442272 +1000 -@@ -1235,7 +1235,7 @@ - - pSet = attribute_set_prepend( pSet, - atk_text_attribute_register( sPropertyName.getStr() ), -- g_strdup_printf( sPropertyValue.getStr() ) ); -+ g_strdup_printf( "%s", sPropertyValue.getStr() ) ); - } - while ( nIndex >= 0 && nIndex < sExtendedAttrs.getLength() ); - diff --git a/libreoffice.spec b/libreoffice.spec index 10d8cc0..069d850 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 4.4.3 +Version: 4.4.5 %if "%{beta}" != "" Release: 0.%{beta}.1 %else @@ -104,7 +104,6 @@ Patch1: libreoffice-4.2.5-icu-49.patch Patch2: help-images-mdv64789.patch Patch3: 0002-fix-tubes-build.patch Patch4: libreoffice-4.4.2.2-disable-test2.patch -Patch5: libreoffice-4.4.2.2-sfmt.patch Patch51: libreoffice-4.4.1.2-impress-kde-crash-hack.patch