Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2014-10-16 18:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2014-08-25 11:06:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2014-10-16 18:17:06.000000000 +0200 @@ -1,0 +2,112 @@ +Sun Sep 28 19:01:03 UTC 2014 - asterios.dra...@gmail.com + +- Update to 2.8.6: + * General + - Make rulers accept minimum length equal to zero. (kde#334968) + - Fix a crash while copy/pasting (kde#334832) + - Set the docker’s small font also on tool option panels for consistency. + - Use the list of available file types when setting the file filter for + picture shape. (kde#327782) + - Put the New view action back to the View menu. + - Prevent backtracking to undo the layout of a whole page, thus starting an + infinite loop. This can be triggered by a page break in the middle of + keepWithNext paragraphs. (kde#306000) + * Kexi + - Fix logic behind visibility of editing indicator in tabular and form + views + - Make Next and Last button in Page selector of Report data view to be + disabled on last page. + - Fix build error on OpenBSD operating system (missing include directory + for ICU). + - Fix row selection/highlighting when clicking/hovering over record + marker. (kde#337914) + - Fix an issue with resolving version of plugins (at least) on Linux. + - Improve behaviour of tabbed toolbar when Design Tab is present. + - Avoid displaying actions for parts that do not create objects. + - Set labels to right in the Find dialog. + - Fix a crash when pressed Tab on a form with one date picker. (kde#338766) + - Avoid crashes when closing Kexi views. + - Allow to create report items of specific size using mouse drag. + (kde#334967) + - Fix crash in Report designer. + - Fix possible crash on opening report with a barcode element. + - Fix icon alignment in Kexi record navigator buttons. + - Add running desktop name and version to the feedback agent. Recognizes + Plasma 4 and 5 at least. + - Position pasted report element with an offset to the active element or to + the corner. (kde#334967) + - Add donations info to Kexi’s status bar. Currently only opens a + BountySource page. + - Improve experience by adding a dedicated database password dialog. + - Avoid keeping potentially wrong password entered in the password dialog. + We don’t want to re-use it. + - Improve default size of modal assistant dialogs. + - Hide system PostgreSQL (postgres) and MySQL (performance_schema) + databases from the visible database list. + - Use consistent sorting of unicode text values. (kde#338808) + - Fix background opacity handling and new background/foreground’s defaults + for report elements. + - Many fixes for Kexi’s Database Import assistant (bugs kde#336556, + kde#336557, kde#336558): + - When needed ask for password to access source or destination servers. + - Reload source database list if user pressed back and selected different + connection. + - Improve saving recent directories. + - Do not ask twice about destination filename. + - In addition to title, properly ask for database name for server + destination databases. + - Properly open imported database (file). + * Krita + - Fix bug that randomly disables tablet support. + - Fix a crash with the latest evdev tablet drier. + - Fix recognition of the Wacom stylus’ serial ID. + - Add an option to disable touch capabilities of Wacom tablets. If you want + to use it, please add the following option to your kritarc configuration + file: disableTouchOnCanvas=true. (kde#332773) + - Make rotation on Linux be consistent with rotation on Windows. + (kde#331358) + - Fix tablet stylus rotation on Linux. + - Improve performance of the OpenGL canvas, it’s twice faster now. + - Reduce memory consumption when textures are updated. + - Fix a crash in Channels docker when the image is closed. + - Fix a crash when the number of patches that fits in a column is zero. + - Use period key instead of non-standard stop key for the "Select previous + favourite preset" command. (kde#331105) + - Fix moving of shapes in groups in shape layers. (kde#308942) + - Set focus to layer name text input in layer properties dialog. + - Fix the HSV options bug. (kde#313494) + - Round the corner point position of the rectangle base tool, otherwise + there is some odd jumping. (kde#335144) + - Fix Erase composite operation to handle the selections properly. + - Fix the Blur filter when Y>X. (kde#336914) + - Fix a crash after selecting Layer array clones more than a couple times. + (kde#336804) + - Don’t crash when trying to Ctrl-Alt pick a color from a group layer. + - Don’t show icons in the menus on Windows. + - Fix anisotropy in Color Smudge brush engine (offset calculation). + (kde#334538) + - Fix Lens Blur filter artifacts when used as an Adjustment Layer. + (kde#336470) + - Fix a hang-up when opening the filter dialog twice or running any + stroke-based action while having the dialog open. (kde#334982) + - Fix misbehavior of the Brush tool when selected on a vector layer. + (kde#335660) + - Fix saving 16 bit grayscale images to tiff, jpeg and ppm. (kde#338478) + * Calligra Stage + - Let Ctrl+Home and Ctrl+End keys go to top and bottom of text shape in + stage. + - Allow to exit text-edit mode by pressing Escape. +- Moved OpenColorIO-devel build requirement out of librevenge %if conditional + (not related). +- Fixed rpmlint error "summary-not-capitalized". +- Remove build time references so build-compare can do its work (fix rpmlint + warning "file-contains-date-and-time"). +- Rebased calligra-2.8.5-librevenge.patch to apply cleanly. + +------------------------------------------------------------------- +Thu Sep 4 00:33:55 UTC 2014 - nico.kru...@gmail.com + +- support build without librevenge framework based libraries on + openSUSE <= 13.1 + +------------------------------------------------------------------- Old: ---- calligra-2.8.5.tar.xz New: ---- calligra-2.8.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.7Fj91B/_old 2014-10-16 18:17:11.000000000 +0200 +++ /var/tmp/diff_new_pack.7Fj91B/_new 2014-10-16 18:17:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: calligra -Version: 2.8.5 +Version: 2.8.6 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 @@ -26,6 +26,9 @@ Source0: http://download.kde.org/stable/%{name}-%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM calligra-2.8.5-librevenge.patch fst...@suse.com -- port to librevenge based libwpg Patch0: calligra-2.8.5-librevenge.patch +%if 0%{?suse_version} > 1230 +BuildRequires: OpenColorIO-devel +%endif BuildRequires: OpenEXR-devel BuildRequires: create-resources BuildRequires: fdupes @@ -35,7 +38,6 @@ BuildRequires: gsl-devel BuildRequires: libQtWebKit-devel BuildRequires: libeigen2-devel -BuildRequires: libetonyek-devel >= 0.1.0 BuildRequires: libexiv2-devel BuildRequires: libgsf-devel BuildRequires: libicu-devel @@ -44,12 +46,10 @@ BuildRequires: liblcms-devel BuildRequires: liblcms2-devel BuildRequires: libmysqld-devel -BuildRequires: libodfgen-devel >= 0.1.0 BuildRequires: libpoppler-qt4-devel BuildRequires: libpqxx-devel BuildRequires: libqca2-devel BuildRequires: librcps-devel -BuildRequires: librevenge-devel >= 0.0.0 BuildRequires: libspnav-devel BuildRequires: marble-devel BuildRequires: mysql-devel @@ -62,10 +62,21 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libkactivities) +%if 0%{?suse_version} > 1310 +BuildRequires: libetonyek-devel >= 0.1.0 +BuildRequires: libodfgen-devel >= 0.1.0 +BuildRequires: librevenge-devel >= 0.0.0 BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libwpd-0.10) BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.3) +%else +BuildRequires: libodfgen-devel +BuildRequires: libvisio-devel +BuildRequires: libwpd-devel +BuildRequires: libwpg-devel +BuildRequires: libwps-devel +%endif Requires(post): shared-mime-info Requires(postun): shared-mime-info Recommends: %{name}-doc = %{version} @@ -198,9 +209,6 @@ # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kexi < %{version} %{kde4_runtime_requires} -%if 0%{?suse_version} < 1310 -Suggests: kexi-postgresql-driver -%endif %description kexi Kexi is the database application of the Calligra Suite. @@ -359,17 +367,17 @@ Common files for the Author and Words applications of the Calligra Suite. %package extras-converter -Summary: commandline tool for conversion +Summary: Commandline tool for conversion License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite %{kde4_runtime_requires} %description extras-converter -commandline tool for conversion between any file formats for which -there is a chain of Calligra import/export filters +Commandline tool for conversion between any file formats for which +there is a chain of Calligra import/export filters. %package extras-okular -Summary: plugin for Okular +Summary: Plugin for Okular License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: calligra-stage = %{version} @@ -377,7 +385,7 @@ %{kde4_runtime_requires} %description extras-okular -plugin for Okular supporting files in the formats ODP and MS PPT/PPTX +Plugin for Okular supporting files in the formats ODP and MS PPT/PPTX. %package extras-dolphin Summary: Diverse plugins for Dolphin @@ -387,14 +395,22 @@ %{kde4_runtime_requires} %description extras-dolphin -plugin for the Dolphin file properties dialog, displaying the +Plugin for the Dolphin file properties dialog, displaying the metadata of files in the ODF formats and a plugin adding a "Print" action for several formats to the filemanager context menu and -calling the related Calligra programs +calling the related Calligra programs. %prep %setup -q +%if 0%{?suse_version} > 1310 %patch0 -p1 +%endif + +# Remove build time references so build-compare can do its work +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" krita/plugins/extensions/gmic/CImg.h +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" krita/plugins/extensions/gmic/CImg.h %build %cmake_kde4 -d build -- -DBUILD_active=false -DIHAVEPATCHEDQT=true @@ -550,7 +566,9 @@ %dir %{_kde4_sharedir}/*/.source %dir %{_kde4_iconsdir}/hicolor/* %dir %{_kde4_iconsdir}/hicolor/*/* +%dir %{_kde4_servicesdir}/calligra/ %exclude %{_kde4_modulesdir}/kexi*.so +%exclude %{_kde4_servicesdir}/calligra/kexi*.desktop %exclude %{_kde4_servicesdir}/kexi*.desktop %files devel -f filelists/devel @@ -602,60 +620,59 @@ %files kexi -f filelists/kexi %defattr(-,root,root,-) %doc kexi/CHANGES kexi/README -%dir %{_kde4_servicesdir}/kexi/ -%dir %{_kde4_servicesdir}/kformdesigner/ +%dir %{_kde4_servicesdir}/calligra/ # Included in kexi-*-driver packages %exclude %{_kde4_modulesdir}/kexi*_mysql*.so -%exclude %{_kde4_servicesdir}/kexi*_mysql*.desktop +%exclude %{_kde4_servicesdir}/calligra/kexi*_mysql*.desktop %exclude %{_kde4_modulesdir}/kexi*_pqxx*.so -%exclude %{_kde4_servicesdir}/kexi*_pqxx*.desktop +%exclude %{_kde4_servicesdir}/calligra/kexi*_pqxx*.desktop %exclude %{_kde4_modulesdir}/kexi*_sqlite3*.so -%exclude %{_kde4_servicesdir}/kexi*_sqlite3*.desktop +%exclude %{_kde4_servicesdir}/calligra/kexi*_sqlite3*.desktop %exclude %{_kde4_modulesdir}/kexi*_sybase*.so -%exclude %{_kde4_servicesdir}/kexi*_sybase*.desktop +%exclude %{_kde4_servicesdir}/calligra/kexi*_sybase*.desktop %exclude %{_kde4_modulesdir}/kexi*_xbase*.so -%exclude %{_kde4_servicesdir}/kexi*_xbase*.desktop +%exclude %{_kde4_servicesdir}/calligra/kexi*_xbase*.desktop %exclude %{_kde4_modulesdir}/keximigrate_spreadsheet.so -%exclude %{_kde4_servicesdir}/keximigrate_spreadsheet.desktop +%exclude %{_kde4_servicesdir}/calligra/keximigrate_spreadsheet.desktop %files kexi-mssql-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_sybasedriver.so %{_kde4_modulesdir}/keximigrate_sybase.so -%{_kde4_servicesdir}/kexidb_sybasedriver.desktop -%{_kde4_servicesdir}/keximigrate_sybase.desktop +%{_kde4_servicesdir}/calligra/kexidb_sybasedriver.desktop +%{_kde4_servicesdir}/calligra/keximigrate_sybase.desktop %files kexi-mysql-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_mysqldriver.so %{_kde4_modulesdir}/keximigrate_mysql.so -%{_kde4_servicesdir}/kexidb_mysqldriver.desktop -%{_kde4_servicesdir}/keximigrate_mysql.desktop +%{_kde4_servicesdir}/calligra/kexidb_mysqldriver.desktop +%{_kde4_servicesdir}/calligra/keximigrate_mysql.desktop %files kexi-postgresql-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_pqxxsqldriver.so %{_kde4_modulesdir}/keximigrate_pqxx.so -%{_kde4_servicesdir}/kexidb_pqxxsqldriver.desktop -%{_kde4_servicesdir}/keximigrate_pqxx.desktop +%{_kde4_servicesdir}/calligra/kexidb_pqxxsqldriver.desktop +%{_kde4_servicesdir}/calligra/keximigrate_pqxx.desktop %files kexi-spreadsheet-import %defattr(-,root,root,-) %{_kde4_modulesdir}/keximigrate_spreadsheet.so -%{_kde4_servicesdir}/keximigrate_spreadsheet.desktop +%{_kde4_servicesdir}/calligra/keximigrate_spreadsheet.desktop %files kexi-sqlite3-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_sqlite3_icu.so %{_kde4_modulesdir}/kexidb_sqlite3driver.so -%{_kde4_servicesdir}/kexidb_sqlite3driver.desktop +%{_kde4_servicesdir}/calligra/kexidb_sqlite3driver.desktop %files kexi-xbase-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_xbasedriver.so %{_kde4_modulesdir}/keximigrate_xbase.so -%{_kde4_servicesdir}/kexidb_xbasedriver.desktop -%{_kde4_servicesdir}/keximigrate_xbase.desktop +%{_kde4_servicesdir}/calligra/kexidb_xbasedriver.desktop +%{_kde4_servicesdir}/calligra/keximigrate_xbase.desktop %files krita -f filelists/krita %defattr(-,root,root,-) ++++++ calligra-2.8.5-librevenge.patch ++++++ --- /var/tmp/diff_new_pack.7Fj91B/_old 2014-10-16 18:17:11.000000000 +0200 +++ /var/tmp/diff_new_pack.7Fj91B/_new 2014-10-16 18:17:11.000000000 +0200 @@ -1,5 +1,26 @@ ---- calligra-2.8.5/cmake/modules/FindLibEtonyek.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibEtonyek.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/CMakeLists.txt calligra-2.8.6/CMakeLists.txt +--- calligra-2.8.6.orig/CMakeLists.txt 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/CMakeLists.txt 2014-09-27 23:45:32.139825583 +0300 +@@ -661,6 +661,16 @@ + macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/"; FALSE "" "Required to build the Okular OpenDocument Presenter plugin") + + ## ++## Test for librevenge ++## ++macro_optional_find_package(LibRevenge) ++macro_log_feature(LIBREVENGE_FOUND "LibRevenge" ++ "A base library for writing document import filters" ++ "http://sf.net/p/libwpd/librevenge/"; FALSE "" ++ "Required by various import filters" ++) ++ ++## + ## Test for libodfgen + ## + macro_optional_find_package(LibOdfGen) +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibEtonyek.cmake calligra-2.8.6/cmake/modules/FindLibEtonyek.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibEtonyek.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibEtonyek.cmake 2014-09-27 23:45:32.137825553 +0300 @@ -10,16 +10,16 @@ include(LibFindMacros) @@ -20,8 +41,9 @@ HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR} ) ---- calligra-2.8.5/cmake/modules/FindLibOdfGen.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibOdfGen.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibOdfGen.cmake calligra-2.8.6/cmake/modules/FindLibOdfGen.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibOdfGen.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibOdfGen.cmake 2014-09-27 23:45:32.137825553 +0300 @@ -9,16 +9,16 @@ # Redistribution and use is allowed according to the terms of the BSD license. @@ -42,8 +64,9 @@ HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR} ) ---- calligra-2.8.5/cmake/modules/FindLibRevenge.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ calligra-2.8.5/cmake/modules/FindLibRevenge.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibRevenge.cmake calligra-2.8.6/cmake/modules/FindLibRevenge.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibRevenge.cmake 1970-01-01 02:00:00.000000000 +0200 ++++ calligra-2.8.6/cmake/modules/FindLibRevenge.cmake 2014-09-27 23:45:32.138825568 +0300 @@ -0,0 +1,37 @@ +# - Try to find the librevenge +# Once done this will define @@ -82,8 +105,9 @@ +set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY) +set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR) +libfind_process(LIBREVENGE) ---- calligra-2.8.5/cmake/modules/FindLibVisio.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibVisio.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibVisio.cmake calligra-2.8.6/cmake/modules/FindLibVisio.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibVisio.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibVisio.cmake 2014-09-27 23:45:32.138825568 +0300 @@ -12,16 +12,16 @@ include(LibFindMacros) libfind_package(LIBWPD LibWpd) @@ -104,8 +128,9 @@ HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR} ) ---- calligra-2.8.5/cmake/modules/FindLibWpd.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibWpd.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibWpd.cmake calligra-2.8.6/cmake/modules/FindLibWpd.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibWpd.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibWpd.cmake 2014-09-27 23:45:32.138825568 +0300 @@ -8,31 +8,19 @@ # @@ -143,8 +168,9 @@ +set(LIBWPD_PROCESS_LIBS WPD_LIBRARY) +set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR) libfind_process(LIBWPD) ---- calligra-2.8.5/cmake/modules/FindLibWpg.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibWpg.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibWpg.cmake calligra-2.8.6/cmake/modules/FindLibWpg.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibWpg.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibWpg.cmake 2014-09-27 23:45:32.138825568 +0300 @@ -11,16 +11,16 @@ include(LibFindMacros) @@ -165,8 +191,9 @@ HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR} ) ---- calligra-2.8.5/cmake/modules/FindLibWps.cmake 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/cmake/modules/FindLibWps.cmake 2014-07-22 10:16:56.424383665 +0200 +diff -Naur calligra-2.8.6.orig/cmake/modules/FindLibWps.cmake calligra-2.8.6/cmake/modules/FindLibWps.cmake +--- calligra-2.8.6.orig/cmake/modules/FindLibWps.cmake 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/cmake/modules/FindLibWps.cmake 2014-09-27 23:45:32.138825568 +0300 @@ -10,16 +10,16 @@ include(LibFindMacros) @@ -187,27 +214,9 @@ HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} ) ---- calligra-2.8.5/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/CMakeLists.txt 2014-07-22 10:16:56.424383665 +0200 -@@ -661,6 +661,16 @@ - macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/"; FALSE "" "Required to build the Okular OpenDocument Presenter plugin") - - ## -+## Test for librevenge -+## -+macro_optional_find_package(LibRevenge) -+macro_log_feature(LIBREVENGE_FOUND "LibRevenge" -+ "A base library for writing document import filters" -+ "http://sf.net/p/libwpd/librevenge/"; FALSE "" -+ "Required by various import filters" -+) -+ -+## - ## Test for libodfgen - ## - macro_optional_find_package(LibOdfGen) ---- calligra-2.8.5/filters/flow/visio/import/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/flow/visio/import/CMakeLists.txt 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/flow/visio/import/CMakeLists.txt calligra-2.8.6/filters/flow/visio/import/CMakeLists.txt +--- calligra-2.8.6.orig/filters/flow/visio/import/CMakeLists.txt 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/flow/visio/import/CMakeLists.txt 2014-09-27 23:45:32.139825583 +0300 @@ -1,6 +1,7 @@ include_directories( ../../../libodfhandler/ @@ -225,8 +234,9 @@ install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ---- calligra-2.8.5/filters/flow/visio/import/VSDXImport.cpp 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/flow/visio/import/VSDXImport.cpp 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/flow/visio/import/VSDXImport.cpp calligra-2.8.6/filters/flow/visio/import/VSDXImport.cpp +--- calligra-2.8.6.orig/filters/flow/visio/import/VSDXImport.cpp 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/flow/visio/import/VSDXImport.cpp 2014-09-27 23:45:32.140825597 +0300 @@ -17,7 +17,7 @@ #include "VSDXImport.h" @@ -258,17 +268,18 @@ return libvisio::VisioDocument::parse(input, &exporter); } }; ---- calligra-2.8.5/filters/flow/wpg/import/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/flow/wpg/import/CMakeLists.txt 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/flow/wpg/import/CMakeLists.txt calligra-2.8.6/filters/flow/wpg/import/CMakeLists.txt +--- calligra-2.8.6.orig/filters/flow/wpg/import/CMakeLists.txt 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/flow/wpg/import/CMakeLists.txt 2014-09-27 23:45:32.140825597 +0300 @@ -1,6 +1,7 @@ include_directories( ../../../libodfhandler/ ${LIBODFGEN_INCLUDE_DIRS} + ${LIBREVENGE_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS} + ${LIBWPG_INCLUDE_DIRS} ${KOMAIN_INCLUDES} - ) -@@ -15,7 +16,7 @@ +@@ -16,7 +17,7 @@ kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS}) @@ -277,8 +288,39 @@ install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ---- calligra-2.8.5/filters/flow/wpg/import/WPGImport.cpp 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/flow/wpg/import/WPGImport.cpp 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/flow/wpg/import/CMakeLists.txt.orig calligra-2.8.6/filters/flow/wpg/import/CMakeLists.txt.orig +--- calligra-2.8.6.orig/filters/flow/wpg/import/CMakeLists.txt.orig 1970-01-01 02:00:00.000000000 +0200 ++++ calligra-2.8.6/filters/flow/wpg/import/CMakeLists.txt.orig 2014-09-20 19:42:13.000000000 +0300 +@@ -0,0 +1,26 @@ ++include_directories( ++ ../../../libodfhandler/ ++ ${LIBODFGEN_INCLUDE_DIRS} ++ ${LIBVISIO_INCLUDE_DIRS} ++ ${LIBWPG_INCLUDE_DIRS} ++ ${KOMAIN_INCLUDES} ++) ++ ++set(wpg2odg_PART_SRCS ++ WPGImport.cpp ++ ../../../libodfhandler/DiskDocumentHandler.cxx ++ ../../../libodfhandler/FemtoZip.cxx ++ ../../../libodfhandler/OutputFileHelper.cxx ++ ../../../libodfhandler/StdOutHandler.cxx ++) ++ ++kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS}) ++ ++target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES}) ++ ++install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR}) ++install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ++ ++if(SHOULD_BUILD_EXTRA_THUMBNAIL) ++ install(FILES flow_wpg_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ++endif(SHOULD_BUILD_EXTRA_THUMBNAIL) +diff -Naur calligra-2.8.6.orig/filters/flow/wpg/import/WPGImport.cpp calligra-2.8.6/filters/flow/wpg/import/WPGImport.cpp +--- calligra-2.8.6.orig/filters/flow/wpg/import/WPGImport.cpp 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/flow/wpg/import/WPGImport.cpp 2014-09-27 23:45:32.140825597 +0300 @@ -17,7 +17,7 @@ #include "WPGImport.h" @@ -310,8 +352,9 @@ return libwpg::WPGraphics::parse(input, &exporter); } }; ---- calligra-2.8.5/filters/karbon/wpg/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/karbon/wpg/CMakeLists.txt 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/karbon/wpg/CMakeLists.txt calligra-2.8.6/filters/karbon/wpg/CMakeLists.txt +--- calligra-2.8.6.orig/filters/karbon/wpg/CMakeLists.txt 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/karbon/wpg/CMakeLists.txt 2014-09-27 23:45:32.141825612 +0300 @@ -1,11 +1,11 @@ -include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/) @@ -326,8 +369,9 @@ install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ---- calligra-2.8.5/filters/karbon/wpg/WPGImport.cpp 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/karbon/wpg/WPGImport.cpp 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/karbon/wpg/WPGImport.cpp calligra-2.8.6/filters/karbon/wpg/WPGImport.cpp +--- calligra-2.8.6.orig/filters/karbon/wpg/WPGImport.cpp 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/karbon/wpg/WPGImport.cpp 2014-09-27 23:45:32.141825612 +0300 @@ -32,14 +32,12 @@ #include <QString> #include <QFile> @@ -405,8 +449,9 @@ outputFile.close(); return KoFilter::OK; ---- calligra-2.8.5/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/DiskDocumentHandler.cxx calligra-2.8.6/filters/libodfhandler/DiskDocumentHandler.cxx +--- calligra-2.8.6.orig/filters/libodfhandler/DiskDocumentHandler.cxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/DiskDocumentHandler.cxx 2014-09-27 23:45:32.141825612 +0300 @@ -37,7 +37,7 @@ { } @@ -449,8 +494,9 @@ if (sEscapedCharacters.len() > 0) PUTSTRING(sEscapedCharacters.cstr()); } ---- calligra-2.8.5/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/DiskDocumentHandler.hxx calligra-2.8.6/filters/libodfhandler/DiskDocumentHandler.hxx +--- calligra-2.8.6.orig/filters/libodfhandler/DiskDocumentHandler.hxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/DiskDocumentHandler.hxx 2014-09-27 23:45:32.142825626 +0300 @@ -23,7 +23,7 @@ #ifndef _DISKDOCUMENTHANDLER_H #define _DISKDOCUMENTHANDLER_H @@ -481,8 +527,9 @@ }; #endif ---- calligra-2.8.5/filters/libodfhandler/OutputFileHelper.cxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/OutputFileHelper.cxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/OutputFileHelper.cxx calligra-2.8.6/filters/libodfhandler/OutputFileHelper.cxx +--- calligra-2.8.6.orig/filters/libodfhandler/OutputFileHelper.cxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/OutputFileHelper.cxx 2014-09-27 23:45:32.142825626 +0300 @@ -37,7 +37,7 @@ #include "DiskDocumentHandler.hxx" @@ -507,8 +554,9 @@ OdfDocumentHandler *pHandler; #ifdef USE_GSF_OUTPUT ---- calligra-2.8.5/filters/libodfhandler/OutputFileHelper.hxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/OutputFileHelper.hxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/OutputFileHelper.hxx calligra-2.8.6/filters/libodfhandler/OutputFileHelper.hxx +--- calligra-2.8.6.orig/filters/libodfhandler/OutputFileHelper.hxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/OutputFileHelper.hxx 2014-09-27 23:45:32.142825626 +0300 @@ -22,9 +22,10 @@ #ifndef _OUTPUTFILEHELPER_HXX #define _OUTPUTFILEHELPER_HXX @@ -533,8 +581,9 @@ OutputFileHelperImpl *m_impl; private: ---- calligra-2.8.5/filters/libodfhandler/StdOutHandler.cxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/StdOutHandler.cxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/StdOutHandler.cxx calligra-2.8.6/filters/libodfhandler/StdOutHandler.cxx +--- calligra-2.8.6.orig/filters/libodfhandler/StdOutHandler.cxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/StdOutHandler.cxx 2014-09-27 23:45:32.142825626 +0300 @@ -31,7 +31,7 @@ printf("<?xml version=\"1.0\"?>\n"); } @@ -577,8 +626,9 @@ } void StdOutHandler::endDocument() ---- calligra-2.8.5/filters/libodfhandler/StdOutHandler.hxx 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/libodfhandler/StdOutHandler.hxx 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/libodfhandler/StdOutHandler.hxx calligra-2.8.6/filters/libodfhandler/StdOutHandler.hxx +--- calligra-2.8.6.orig/filters/libodfhandler/StdOutHandler.hxx 2014-09-20 19:42:13.000000000 +0300 ++++ calligra-2.8.6/filters/libodfhandler/StdOutHandler.hxx 2014-09-27 23:45:32.143825641 +0300 @@ -23,7 +23,7 @@ #ifndef _STDOUTHANDLER_H #define _STDOUTHANDLER_H @@ -604,8 +654,9 @@ }; #endif ---- calligra-2.8.5/filters/words/wordperfect/import/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/words/wordperfect/import/CMakeLists.txt 2014-07-22 10:16:56.425383643 +0200 +diff -Naur calligra-2.8.6.orig/filters/words/wordperfect/import/CMakeLists.txt calligra-2.8.6/filters/words/wordperfect/import/CMakeLists.txt +--- calligra-2.8.6.orig/filters/words/wordperfect/import/CMakeLists.txt 2014-09-20 19:42:14.000000000 +0300 ++++ calligra-2.8.6/filters/words/wordperfect/import/CMakeLists.txt 2014-09-27 23:45:32.143825641 +0300 @@ -1,6 +1,7 @@ include_directories( ../../../libodfhandler/ @@ -623,8 +674,9 @@ install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR}) ---- calligra-2.8.5/filters/words/wordperfect/import/WPDImport.cpp 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/words/wordperfect/import/WPDImport.cpp 2014-07-22 10:16:56.426383621 +0200 +diff -Naur calligra-2.8.6.orig/filters/words/wordperfect/import/WPDImport.cpp calligra-2.8.6/filters/words/wordperfect/import/WPDImport.cpp +--- calligra-2.8.6.orig/filters/words/wordperfect/import/WPDImport.cpp 2014-09-20 19:42:14.000000000 +0300 ++++ calligra-2.8.6/filters/words/wordperfect/import/WPDImport.cpp 2014-09-27 23:45:32.143825641 +0300 @@ -18,8 +18,7 @@ #include <libwpd/libwpd.h> @@ -729,8 +781,9 @@ return true; return false; } ---- calligra-2.8.5/filters/words/works/import/CMakeLists.txt 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/words/works/import/CMakeLists.txt 2014-07-22 10:16:56.426383621 +0200 +diff -Naur calligra-2.8.6.orig/filters/words/works/import/CMakeLists.txt calligra-2.8.6/filters/words/works/import/CMakeLists.txt +--- calligra-2.8.6.orig/filters/words/works/import/CMakeLists.txt 2014-09-20 19:42:14.000000000 +0300 ++++ calligra-2.8.6/filters/words/works/import/CMakeLists.txt 2014-09-27 23:45:32.143825641 +0300 @@ -1,6 +1,7 @@ include_directories( ../../../libodfhandler/ @@ -748,8 +801,9 @@ install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ---- calligra-2.8.5/filters/words/works/import/WPSImport.cpp 2014-07-03 09:52:39.000000000 +0200 -+++ calligra-2.8.5/filters/words/works/import/WPSImport.cpp 2014-07-22 10:16:56.426383621 +0200 +diff -Naur calligra-2.8.6.orig/filters/words/works/import/WPSImport.cpp calligra-2.8.6/filters/words/works/import/WPSImport.cpp +--- calligra-2.8.6.orig/filters/words/works/import/WPSImport.cpp 2014-09-20 19:42:14.000000000 +0300 ++++ calligra-2.8.6/filters/words/works/import/WPSImport.cpp 2014-09-27 23:45:32.144825655 +0300 @@ -16,9 +16,9 @@ #include "WPSImport.h" ++++++ calligra-2.8.5.tar.xz -> calligra-2.8.6.tar.xz ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.8.5.tar.xz /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.8.6.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
