[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.14.5-mimetypes.patch kdelibs-4.14.5-fatalwarnings.patch kdelibs-4.15.6-fix-bic.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.14.5-mimetypes.patch kdelibs-4.14.5-fatalwarnings.patch kdelibs-4.15.6-fix-bic.patch

[Michael Palimaka (kensington)]

kensington    15/03/21 18:24:15

  Added:                kdelibs-4.14.5-mimetypes.patch
                        kdelibs-4.14.5-fatalwarnings.patch
                        kdelibs-4.15.6-fix-bic.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

Revision  Changes    Path
1.1                  kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch?rev=1.1&content-type=text/plain

Index: kdelibs-4.14.5-mimetypes.patch
===================================================================
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>



1.1                  kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch?rev=1.1&content-type=text/plain

Index: kdelibs-4.14.5-fatalwarnings.patch
===================================================================
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}")



1.1                  kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch?rev=1.1&content-type=text/plain

Index: kdelibs-4.15.6-fix-bic.patch
===================================================================
diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
index 087f697..b269213 100644
--- a/khtml/dom/dom_string.h
+++ b/khtml/dom/dom_string.h
@@ -124,10 +124,23 @@ public:
     bool endsWith(const DOMString& str) const;
     bool startsWith(const DOMString& str) const;
 
-    // http://www.w3.org/TR/html/infrastructure.html#urls
+    /**
+     * Return a parsed url.
+     * Used to parse SRC url attribute,
+     * see http://www.w3.org/TR/html/infrastructure.html#urls
+     *
+     * @since 4.14.6
+     */
     DOMString parsedUrl() const;
 
     /**
+     * @deprecated, use parsedUrl()
+     */
+#ifndef KDE_NO_DEPRECATED
+    KDE_DEPRECATED DOMString trimSpaces() const;
+#endif
+
+    /**
      * @internal get a handle to the imlementation of the DOMString
      * Use at own risk!!!
      */
diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
index a3c4abd..4da676b 100644
--- a/khtml/dom/dom_string.cpp
+++ b/khtml/dom/dom_string.cpp
@@ -336,6 +336,13 @@ DOMString DOMString::parsedUrl() const
     return out;
 }
 
+#ifndef KDE_NO_DEPRECATED
+DOMString DOMString::trimSpaces() const
+{
+    return parsedUrl();
+}
+#endif
+
 // ------------------------------------------------------------------------
 
 bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )