⬆️ Update qtkeychain to 0.13.2

.github/workflows/build.yml

@@ -11,25 +11,25 @@ jobs:
       - name: Add Conan to path
         run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
         with:
           submodules: true
 
       - name: Install deps
-        run: choco install jom conan -y
+        run: choco install ninja conan -y
 
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1.10.0
 
       - name: Cache conan packages
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           key: win-conan-${{ hashFiles('**/conanfile.txt') }}
           path: ~/.conan/
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           path: "${{ github.workspace }}/qt/"
           key: ${{ runner.os }}-QtCache
@@ -41,23 +41,22 @@ jobs:
           modules: qtwebengine
           dir: "${{ github.workspace }}/qt/"
 
-      - name: Export qtkeychain
+      - name: Add conan remote
-        run: |
+        run: conan remote add fuel-scm https://artifactory.anotherfoxguy.com/artifactory/api/conan/fuel-scm -f
-          conan export recipes/qtkeychain
 
       - name: Build
         run: |
           mkdir build
           cd build
           conan install .. --build=missing
-          cmake -G"NMake Makefiles JOM" -DCMAKE_INSTALL_PREFIX=redist ..
+          cmake -GNinja -DCMAKE_INSTALL_PREFIX=redist ..
-          jom
+          ninja
         shell: cmd
 
       - name: Install
         run: |
           cd build
-          jom install
+          ninja install
         shell: cmd
 
       - name: Upload redist folder
@@ -70,7 +69,7 @@ jobs:
     name: Build Linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
         with:
           submodules: true
 
@@ -85,4 +84,4 @@ jobs:
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release ..
           make -j4
-        shell: bash
+        shell: bash

conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
-qtkeychain/0.12.0
+qtkeychain/0.13.2
 
 [generators]
 qmake

dist/debian/changelog

@@ -1,8 +0,0 @@
-fuel (1.0.0-1) unstable; urgency=low
-  * Feature: Long Operations can now be aborted by pressing the Escape key
-  * Improvement: Better support for commit messages with international characters
-  * Improvement: Fossil queries about CR/NL inconsistencies are now handled better
-  * Improvement: Files in Conflicted state are now shown
-  * Added localisations: Russia, Portuguese
- 
- -- Kostas <karanikolas@gmail.com>  Sat, 28 Mar 2015 12:00:00 +0200

dist/debian/compat

@@ -1 +0,0 @@
-9

dist/debian/control

@@ -1,17 +0,0 @@
-Source: fuel
-Section: x11
-Priority: optional
-Maintainer: Kostas Karanikolas <karanikolas@gmail.com>
-Build-Depends: cdbs, debhelper (>= 8.0.0), qtbase5-dev, qttools5-dev-tools, 
- libqt5webkit5-dev
-Standards-Version: 3.9.4
-Homepage: http://fuelscm.org
-#Vcs-Git: git://git.debian.org/collab-maint/fuel.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/fuel.git;a=summary
-
-Package: fuel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: fossil
-Description: Fossil SCM GUI
- Fuel is cross-platform GUI front-end for the Fossil SCM tool written in Qt. 

dist/debian/copyright

@@ -1,38 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: fuel
-Source: <url://example.com>
-
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
-
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2014 Kostas <kostas@unknown>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

dist/debian/fuel.install

@@ -1 +0,0 @@
-rsrc/icons/fuel.png usr/share/pixmaps

dist/debian/menu

@@ -1,6 +0,0 @@
-?package(fuel):\
-  needs="X11"\
-  section="Applications/File Management"\
-  title="Fuel"\
-  icon32x32="/usr/share/pixmaps/fuel.png"\
-  command="/usr/bin/fuel"

dist/debian/rules

@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
-

dist/debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

dist/debian/watch

@@ -1,24 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php fuel-(.*)\.tar\.gz
-http://fuelscm.org/files/releases fuel-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/fuel-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/fuel-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/fuel/fuel-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html fuel-(.*)\.tar\.gz

dist/makedeb/PKGBUILD

@@ -0,0 +1,27 @@
+# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
+pkgname=fuel-git
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="A GUI front-end to Fossil SCM"
+arch=(i686 x86_64)
+url="https://fuel-scm.org/"
+license=('GPL2')
+depends=('qtbase5-dev' 'qtwebengine5-dev' 'qttools5-dev' 'fossil' 'qt5keychain-dev')
+makedepends=('git' 'cmake')
+source=("git://github.com/AnotherFoxGuy/fuel-scm")
+md5sums=('SKIP')
+
+build() {
+  cd "$srcdir/fuel-scm"
+  [ -d build ] && rm -r build
+  mkdir build
+  cd build
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
+  make -j$(nproc)
+}
+
+package() {
+  cd "$srcdir/fuel-scm/build"
+  make DESTDIR="${pkgdir}" install
+}
+

recipes/qtkeychain/conanfile.py

@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
 
 class QtkeychainConan(ConanFile):
     name = "qtkeychain"
-    version = "0.12.0"
+    version = "0.13.2"
     license = "BSD-3"
     author = "Edgar"
     url = "https://github.com/AnotherFoxGuy/fuel-scm"
@@ -14,7 +14,7 @@ class QtkeychainConan(ConanFile):
     scm = {
         "type": "git",
         "url": "https://github.com/frankosterfeld/qtkeychain.git",
-        "revision": "v0.12.0"
+        "revision": "v0.13.2"
     }
 
     def build(self):