diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-02-04 02:58:02 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-02-04 02:58:02 +1100 |
| commit | 03e549f52003f69b4529d07fcafcf9afec78019a (patch) | |
| tree | 236ecec13bf2d3346298368de7f0035187c56913 /kde-base | |
| parent | cdab8fa86ac4361df6a333aec6def547c36d45c0 (diff) | |
| download | kde-03e549f52003f69b4529d07fcafcf9afec78019a.tar.gz kde-03e549f52003f69b4529d07fcafcf9afec78019a.tar.bz2 kde-03e549f52003f69b4529d07fcafcf9afec78019a.zip | |
[kde-base/kdelibs] Rebase failing patches.
Package-Manager: portage-2.2.14
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch | 16 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch | 27 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.5.ebuild | 4 |
3 files changed, 45 insertions, 2 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch new file mode 100644 index 00000000000..78c1ac77dcb --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch @@ -0,0 +1,16 @@ +Avoid build failure due to harmless warnings on some platforms (eg. ARM) being +forced fatal. + +--- cmake/modules/FindKDE4Internal.cmake ++++ cmake/modules/FindKDE4Internal.cmake +@@ -1100,8 +1100,8 @@ + if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) + if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE) +- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") +- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") ++ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") ++ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") + + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch new file mode 100644 index 00000000000..dc8f87e678e --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch @@ -0,0 +1,27 @@ +Remove fake MIME types that cause warnings. + +The offending MIME types are commented out rather than +physically removed because doing so would cause the patch +to be too large. + +--- mimetypes/kde.xml ++++ mimetypes/kde.xml +@@ -1784,7 +1784,8 @@ + <glob pattern="*.abc"/> + </mime-type> + +- <!-- all/ fake mime types --> ++ <!-- ++ all/ fake mime types + <mime-type type="all/all"> + <comment>all files and folders</comment> + <comment xml:lang="ar">كل الملفات و المجلدات</comment> +@@ -1901,7 +1902,7 @@ + <comment xml:lang="zh_CN">全部文件</comment> + <comment xml:lang="zh_TW">所有檔案</comment> + </mime-type> +- ++ --> + <mime-type type="application/vnd.kde.fontspackage"> + <sub-class-of type="application/zip"/> + <comment>fonts package</comment> diff --git a/kde-base/kdelibs/kdelibs-4.14.5.ebuild b/kde-base/kdelibs/kdelibs-4.14.5.ebuild index e80ddfc4424..f0bb08d0645 100644 --- a/kde-base/kdelibs/kdelibs-4.14.5.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.5.ebuild @@ -133,9 +133,9 @@ PDEPEND=" PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.0-mimetypes.patch" + "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" + "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.2-armlinking.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.8.1-norpath.patch" "${FILESDIR}/${PN}-4.9.3-werror.patch" |