summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-07-06 22:47:30 +1000
committerMichael Palimaka <kensington@gentoo.org>2017-07-06 22:48:58 +1000
commit07319fb870a05e878406f2ae5ab497f87468306c (patch)
tree8c8a38468c1a8f7366399999900434d832971a3f /app-office/calligra/files
parentsci-libs/vtk: remove old (diff)
downloadgentoo-07319fb870a05e878406f2ae5ab497f87468306c.tar.gz
gentoo-07319fb870a05e878406f2ae5ab497f87468306c.tar.bz2
gentoo-07319fb870a05e878406f2ae5ab497f87468306c.zip
app-office/calligra: remove 2.9.11-r1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'app-office/calligra/files')
-rw-r--r--app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch14
-rw-r--r--app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch46
-rw-r--r--app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch19
3 files changed, 0 insertions, 79 deletions
diff --git a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
deleted file mode 100644
index 85f401bbd616..000000000000
--- a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt 2016-12-07 12:48:03.771533639 -0200
-+++ b/CMakeLists.txt 2016-12-07 12:49:07.534866207 -0200
-@@ -441,11 +441,6 @@
- endif()
- endmacro()
- endif()
--
-- if (NOT PACKAGERS_BUILD)
-- # Optimize the whole Calligra for current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
deleted file mode 100644
index 79595d9f883e..000000000000
--- a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Last-Update: 2015-06-17
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
-Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
-From: David Tardon <dtardon@redhat.com>
-Description: adapt to libwps 0.4
-
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -9,18 +9,18 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
-
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
-
- find_path(LIBWPS_INCLUDE_DIR
- NAMES libwps/libwps.h
- HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
-- PATH_SUFFIXES libwps-0.3
-+ PATH_SUFFIXES libwps-0.4
- )
-
- find_library(LIBWPS_LIBRARY
-- NAMES wps wps-0.3
-+ NAMES wps wps-0.4
- HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
-
- set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -90,9 +90,11 @@
- }
- bool isSupportedFormat(librevenge::RVNGInputStream &input)
- {
- WPSKind kind = WPS_TEXT;
-- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
-+ WPSCreator creator = WPS_MSWORKS;
-+ bool needsEncoding = false;
-+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
- if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
- return false;
- return true;
- }
diff --git a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
deleted file mode 100644
index 617a0c3358e4..000000000000
--- a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 843c41decfa85e351349f7a410893ac85c9d60b7
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Oct 8 16:17:17 2016 +0200
-
- cmake: find PostgreSQL 9.6
-
-diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake
-index 035508b..98a1e88 100644
---- a/cmake/modules/FindCalligraPostgreSQL.cmake
-+++ b/cmake/modules/FindCalligraPostgreSQL.cmake
-@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
-
-
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-- "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+ "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-
- # Define additional search paths for root directories.
- foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )