Merge pull request #60043 from dtzWill/update/qca-qt5-2.2.0
libsForQt5.qca-qt5: 2.1.3 -> 2.2.1
This commit is contained in:
commit
6eaf73868b
@ -1,11 +1,12 @@
|
|||||||
{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
|
{ stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "qca-qt5-2.1.3";
|
pname = "qca-qt5";
|
||||||
|
version = "2.2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz";
|
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||||
sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0";
|
sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl qtbase ];
|
buildInputs = [ openssl qtbase ];
|
||||||
|
@ -1,19 +1,17 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 453fd8a..5f6ee11 100644
|
index 2f2b5d0..971dee3 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX)
|
@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
|
||||||
unset(CMAKE_INSTALL_PREFIX CACHE)
|
unset(CMAKE_INSTALL_PREFIX CACHE)
|
||||||
endif(NOT CMAKE_INSTALL_PREFIX)
|
endif(NOT CMAKE_INSTALL_PREFIX)
|
||||||
|
|
||||||
-project(qca)
|
-project(qca)
|
||||||
|
|
||||||
if(NOT APPLE)
|
cmake_minimum_required(VERSION 3.4)
|
||||||
cmake_minimum_required(VERSION 2.8.12)
|
|
||||||
else()
|
|
||||||
cmake_minimum_required(VERSION 3.0)
|
|
||||||
endif()
|
|
||||||
+project(qca)
|
+project(qca)
|
||||||
|
+
|
||||||
set(QCA_LIB_MAJOR_VERSION "2")
|
set(QCA_LIB_MAJOR_VERSION "2")
|
||||||
set(QCA_LIB_MINOR_VERSION "1")
|
set(QCA_LIB_MINOR_VERSION "2")
|
||||||
|
set(QCA_LIB_PATCH_VERSION "1")
|
||||||
|
Loading…
Reference in New Issue
Block a user