Merge pull request #5733 from Rmys/master

falkon:ver.bump

network/web/falkon/files/bookmarks_json.diff

@@ -1,71 +1,16 @@
 diff -Nuar a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json
---- a/src/lib/data/data/bookmarks.json	2018-02-27 16:56:58.000000000 +0300
+--- a/src/lib/data/data/bookmarks.json	2018-05-08 17:18:50.000000000 +0300
-+++ b/src/lib/data/data/bookmarks.json	2018-04-09 13:37:41.572383827 +0300
++++ b/src/lib/data/data/bookmarks.json	2018-09-11 16:18:33.130790019 +0300
-@@ -1,65 +1,1052 @@
+@@ -1,29 +1,1053 @@
  {
-- "roots": {
+  "roots": {
--  "bookmark_bar": {
+   "bookmark_bar": {
--   "children": [
+-   "children": [ ],
--    {
--     "description": "Source code of Falkon",
--     "keyword": "falkon-git",
--     "name": "Falkon Git",
--     "type": "url",
--     "url": "https://phabricator.kde.org/source/falkon/",
--     "visit_count": 0
--    },
--    {
--     "description": "KDE Bug Tracker for Falkon",
--     "keyword": "falkon-bugs",
--     "name": "Falkon Bug Tracker",
--     "type": "url",
--     "url": "https://bugs.kde.org/describecomponents.cgi?product=Falkon",
--     "visit_count": 0
--    },
--    {
--     "description": "Falkon KDE UserBase Wiki",
--     "keyword": "falkon-wiki",
--     "name": "Falkon Wiki",
--     "type": "url",
--     "url": "https://userbase.kde.org/Falkon",
--     "visit_count": 0
--    },
--    {
--     "type": "separator"
--    },
--    {
--     "description": "KDE Community Home",
--     "keyword": "kde-home",
--     "name": "KDE Homepage",
--     "type": "url",
--     "url": "https://www.kde.org/",
--     "visit_count": 0
--    }
--   ],
 -   "description": "Bookmarks located in Bookmarks Toolbar",
 -   "expanded": true,
 -   "expanded_sidebar": true,
 -   "name": "Bookmarks Toolbar",
 -   "type": "folder"
--  },
--  "bookmark_menu": {
--   "children": [],
--   "description": "Bookmarks located in Bookmarks Menu",
--   "expanded": true,
--   "expanded_sidebar": true,
--   "name": "Bookmarks Menu",
--   "type": "folder"
--  },
--  "other": {
--   "children": [],
--   "description": "All other bookmarks",
--   "expanded": true,
--   "expanded_sidebar": true,
--   "name": "Unsorted Bookmarks",
--   "type": "folder"
--  }
-+     "roots": {
-+        "bookmark_bar": {
 +      "children": [
 +          {
 +              "children": [
@@ -1093,8 +1038,14 @@ diff -Nuar a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json
 +      "expanded_sidebar": true,
 +      "name": "Yer İmler Araç Çubuğu",
 +      "type": "folder"
-+        },
+   },
-+        "bookmark_menu": {
+   "bookmark_menu": {
+-   "children": [],
+-   "description": "Bookmarks located in Bookmarks Menu",
+-   "expanded": true,
+-   "expanded_sidebar": true,
+-   "name": "Bookmarks Menu",
+-   "type": "folder"
 +      "children": [
 +      ],
 +      "description": "Yer imleri menüye kaydedildi",
@@ -1102,8 +1053,14 @@ diff -Nuar a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json
 +      "expanded_sidebar": true,
 +      "name": "Yer İmleri Menüsü",
 +      "type": "folder"
-+        },
+   },
-+        "other": {
+   "other": {
+-   "children": [],
+-   "description": "All other bookmarks",
+-   "expanded": true,
+-   "expanded_sidebar": true,
+-   "name": "Unsorted Bookmarks",
+-   "type": "folder"
 +      "children": [
 +      ],
 +      "description": "Diğer tüm yer imleri",
@@ -1111,7 +1068,10 @@ diff -Nuar a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json
 +      "expanded_sidebar": true,
 +      "name": "Sıralanmamış Yerimleri",
 +      "type": "folder"
-+        }
-  },
-  "version": 1
    }
+- },
+- "version": 1
++  },
++  "version": 1
+ }
++

network/web/falkon/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:web</IsA>
         <Summary>Cross-platform QtWebKit browser</Summary>
         <Description>falkon is a new and very fast QtWebEngine browser</Description>
-        <Archive sha1sum="ecc07f37e5e902aba11c049ca50a05841cfeca17" type="tarxz">https://download.kde.org/stable/falkon/3.0/src/falkon-3.0.0.tar.xz</Archive>
+        <Archive sha1sum="1c3b75b8c156b4f28ebb3c30e60e72c57233d47c" type="tarxz">https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.27.0">extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.27.0">kwallet-devel</Dependency>
@@ -27,7 +27,7 @@
             <Dependency versionFrom="5.9.0">qt5-sql-odbc</Dependency>
             <Dependency versionFrom="5.9.0">qt5-linguist</Dependency>
             <Dependency versionFrom="5.9.0">qt5-sql-sqlite</Dependency>
-            <Dependency>libgnome-keyring-devel</Dependency>
+            <Dependency>libgnome-keyring</Dependency>
             <Dependency>python3-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>libxcb-devel</Dependency>
@@ -35,9 +35,9 @@
             <Dependency>cmake</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch>speeddial.diff</Patch>
+<!--             <Patch>speeddial.diff</Patch> -->
-            <Patch>bookmarks_json.diff</Patch>
+            <Patch>bookmarks_json.patch</Patch>
-            <Patch>homepage.patch</Patch>
+<!--             <Patch>homepage.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -73,6 +73,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2018-09-11</Date>
+            <Version>3.1.0</Version>
+            <Comment>First release</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2018-04-08</Date>
             <Version>3.0.0</Version>