[arch-commits] Commit in okteta/trunk (PKGBUILD find_qca_qt5.patch)
Date: Wednesday, February 4, 2015 @ 09:41:40
Author: fyan
Revision: 230689
upgpkg: okteta 14.12.2-1
Modified:
okteta/trunk/PKGBUILD
Deleted:
okteta/trunk/find_qca_qt5.patch
+
PKGBUILD | 14 +
find_qca_qt5.patch | 137 ---
2 files changed, 4 insertions(+), 147 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-04 08:40:34 UTC (rev 230688)
+++ PKGBUILD2015-02-04 08:41:40 UTC (rev 230689)
@@ -3,8 +3,8 @@
# Contributor: Andrea Scarpino and...@archlinux.org
pkgname=okteta
-pkgver=14.12.1
-pkgrel=3
+pkgver=14.12.2
+pkgrel=1
pkgdesc='Hex Editor'
url='http://kde.org/applications/utilities/okteta/'
arch=('i686' 'x86_64')
@@ -15,17 +15,11 @@
replaces=('kdesdk-okteta')
conflicts=('kdesdk-okteta4.14.3-2')
install=${pkgname}.install
-source=(http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz;
-find_qca_qt5.patch)
-sha1sums=('3d9caab4e6fa31e96ceb51032e9a97db663f0060'
- '9f618cc26f417bd72ff7f38fd11f2df997550992')
+source=(http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz;)
+sha1sums=('d40cb092e622ed0f31303229737782b26c57f434')
prepare() {
mkdir build
-
- cd okteta-${pkgver}
- # https://bugs.kde.org/show_bug.cgi?id=341509
- patch -p1 -i ../find_qca_qt5.patch
}
build() {
Deleted: find_qca_qt5.patch
===
--- find_qca_qt5.patch 2015-02-04 08:40:34 UTC (rev 230688)
+++ find_qca_qt5.patch 2015-02-04 08:41:40 UTC (rev 230689)
@@ -1,137 +0,0 @@
-From 4e66154c1a13775b78e98592a2597a6d1b9cd264 Mon Sep 17 00:00:00 2001
-From: Heiko Becker heire...@exherbo.org
-Date: Tue, 13 Jan 2015 14:06:41 +0100
-Subject: [PATCH] Use co-installable qca-qt5 version
-
-Without this okteta links to the Qt4 version of qca resulting on
-a crash on startup.
- CMakeLists.txt| 6 ++---
- cmake/modules/FindQCA2.cmake | 53 ---
- kasten/controllers/CMakeLists.txt | 16 +---
- 3 files changed, 9 insertions(+), 66 deletions(-)
- delete mode 100644 cmake/modules/FindQCA2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8495f14..b85ebd4 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,9 +55,9 @@ if( UNIX )
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall -std=c++0x -fno-rtti)
- endif()
-
--find_package(QCA2 2.1.0)
--set_package_properties(QCA2 PROPERTIES DESCRIPTION Qt Cryptographic
Architecture
-- URL https://projects.kde.org/projects/kdesupport/qca;
TYPE OPTIONAL
-+find_package(Qca-qt5 2.1.0)
-+set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION Qt Cryptographic
Architecture
-+ URL http:/download.kde.org/stable/qca-qt5 TYPE
OPTIONAL
-PURPOSE Needed for most of the algorithms of the
checksum tool)
-
- # control build scope
-diff --git a/cmake/modules/FindQCA2.cmake b/cmake/modules/FindQCA2.cmake
-deleted file mode 100644
-index b9432d2..000
a/cmake/modules/FindQCA2.cmake
-+++ /dev/null
-@@ -1,53 +0,0 @@
--# - Try to find QCA2 (Qt Cryptography Architecture 2)
--# Once done this will define
--#
--# QCA2_FOUND - system has QCA2
--# QCA2_INCLUDE_DIR - the QCA2 include directory
--# QCA2_LIBRARIES - the libraries needed to use QCA2
--# QCA2_DEFINITIONS - Compiler switches required for using QCA2
--#
--# use pkg-config to get the directories and then use these values
--# in the FIND_PATH() and FIND_LIBRARY() calls
--
--# Copyright (c) 2006, Michael Larouche, michael.larou...@kdemail.net
--# Copyright (c) 2014, Friedrich W. H. Kossebau, kosse...@kde.org
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if (NOT WIN32)
-- find_package(PkgConfig QUIET)
-- pkg_check_modules(PC_QCA2 QUIET qca2)
-- set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
--endif (NOT WIN32)
--
--find_library(QCA2_LIBRARIES
-- WIN32_DEBUG_POSTFIX d
-- NAMES qca
-- HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
--)
--
--find_path(QCA2_INCLUDE_DIR QtCrypto
-- HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
-- PATH_SUFFIXES QtCrypto
--)
--
--find_file(QCA2_VERSION_FILE
-- QtCrypto/qca_version.h
-- HINTS ${QCA2_INCLUDE_DIR}
--)
--
--if(QCA2_VERSION_FILE)
-- file(READ ${QCA2_VERSION_FILE} QCA2_VERSION_CONTENT)
-- string (REGEX MATCH QCA_VERSION_STR \.*\\n QCA2_VERSION_MATCH
${QCA2_VERSION_CONTENT})
--
-- if(QCA2_VERSION_MATCH)
--string(REGEX REPLACE QCA_VERSION_STR \(.*)\\n \\1 QCA2_VERSION
${QCA2_VERSION_MATCH})
-- endif(QCA2_VERSION_MATCH)
--endif(QCA2_VERSION_FILE)
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(QCA2 REQUIRED_VARS QCA2_LIBRARIES
[arch-commits] Commit in okteta/trunk (PKGBUILD find_qca_qt5.patch)
Date: Saturday, January 24, 2015 @ 04:04:06
Author: fyan
Revision: 229683
upgpkg: okteta 14.12.1-3
update qca-qt5 patch
Modified:
okteta/trunk/PKGBUILD
okteta/trunk/find_qca_qt5.patch
+
PKGBUILD |6 +-
find_qca_qt5.patch | 145 ++-
2 files changed, 135 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-24 02:59:49 UTC (rev 229682)
+++ PKGBUILD2015-01-24 03:04:06 UTC (rev 229683)
@@ -4,7 +4,7 @@
pkgname=okteta
pkgver=14.12.1
-pkgrel=2
+pkgrel=3
pkgdesc='Hex Editor'
url='http://kde.org/applications/utilities/okteta/'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
source=(http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz;
find_qca_qt5.patch)
sha1sums=('3d9caab4e6fa31e96ceb51032e9a97db663f0060'
- 'ff51e1448f4df5c2715bdcad57560e82acfbacbf')
+ '9f618cc26f417bd72ff7f38fd11f2df997550992')
prepare() {
mkdir build
@@ -25,7 +25,7 @@
cd okteta-${pkgver}
# https://bugs.kde.org/show_bug.cgi?id=341509
- patch -p0 -i ../find_qca_qt5.patch
+ patch -p1 -i ../find_qca_qt5.patch
}
build() {
Modified: find_qca_qt5.patch
===
--- find_qca_qt5.patch 2015-01-24 02:59:49 UTC (rev 229682)
+++ find_qca_qt5.patch 2015-01-24 03:04:06 UTC (rev 229683)
@@ -1,18 +1,137 @@
cmake/modules/FindQCA2.cmake.orig 2014-12-02 22:38:40.129259069 +0100
-+++ cmake/modules/FindQCA2.cmake 2014-12-02 23:05:45.986414768 +0100
-@@ -17,13 +17,13 @@
+From 4e66154c1a13775b78e98592a2597a6d1b9cd264 Mon Sep 17 00:00:00 2001
+From: Heiko Becker heire...@exherbo.org
+Date: Tue, 13 Jan 2015 14:06:41 +0100
+Subject: [PATCH] Use co-installable qca-qt5 version
+
+Without this okteta links to the Qt4 version of qca resulting on
+a crash on startup.
+---
+ CMakeLists.txt| 6 ++---
+ cmake/modules/FindQCA2.cmake | 53 ---
+ kasten/controllers/CMakeLists.txt | 16 +---
+ 3 files changed, 9 insertions(+), 66 deletions(-)
+ delete mode 100644 cmake/modules/FindQCA2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8495f14..b85ebd4 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -55,9 +55,9 @@ if( UNIX )
+ set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall -std=c++0x -fno-rtti)
+ endif()
- if (NOT WIN32)
- find_package(PkgConfig QUIET)
+-find_package(QCA2 2.1.0)
+-set_package_properties(QCA2 PROPERTIES DESCRIPTION Qt Cryptographic
Architecture
+- URL https://projects.kde.org/projects/kdesupport/qca;
TYPE OPTIONAL
++find_package(Qca-qt5 2.1.0)
++set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION Qt Cryptographic
Architecture
++ URL http:/download.kde.org/stable/qca-qt5 TYPE
OPTIONAL
+PURPOSE Needed for most of the algorithms of the
checksum tool)
+
+ # control build scope
+diff --git a/cmake/modules/FindQCA2.cmake b/cmake/modules/FindQCA2.cmake
+deleted file mode 100644
+index b9432d2..000
+--- a/cmake/modules/FindQCA2.cmake
/dev/null
+@@ -1,53 +0,0 @@
+-# - Try to find QCA2 (Qt Cryptography Architecture 2)
+-# Once done this will define
+-#
+-# QCA2_FOUND - system has QCA2
+-# QCA2_INCLUDE_DIR - the QCA2 include directory
+-# QCA2_LIBRARIES - the libraries needed to use QCA2
+-# QCA2_DEFINITIONS - Compiler switches required for using QCA2
+-#
+-# use pkg-config to get the directories and then use these values
+-# in the FIND_PATH() and FIND_LIBRARY() calls
+-
+-# Copyright (c) 2006, Michael Larouche, michael.larou...@kdemail.net
+-# Copyright (c) 2014, Friedrich W. H. Kossebau, kosse...@kde.org
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if (NOT WIN32)
+- find_package(PkgConfig QUIET)
- pkg_check_modules(PC_QCA2 QUIET qca2)
-+ pkg_search_module(PC_QCA2 QUIET qca2-qt5 qca2)
- set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
- endif (NOT WIN32)
-
- find_library(QCA2_LIBRARIES
- WIN32_DEBUG_POSTFIX d
+- set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
+-endif (NOT WIN32)
+-
+-find_library(QCA2_LIBRARIES
+- WIN32_DEBUG_POSTFIX d
- NAMES qca
-+ NAMES qca-qt5 qca
- HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
+- HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
+-)
+-
+-find_path(QCA2_INCLUDE_DIR QtCrypto
+- HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
+- PATH_SUFFIXES QtCrypto
+-)
+-
+-find_file(QCA2_VERSION_FILE
+- QtCrypto/qca_version.h
+- HINTS ${QCA2_INCLUDE_DIR}
+-)
+-
+-if(QCA2_VERSION_FILE)
+- file(READ ${QCA2_VERSION_FILE} QCA2_VERSION_CONTENT)
+- string (REGEX MATCH QCA_VERSION_STR \.*\\n QCA2_VERSION_MATCH
[arch-commits] Commit in okteta/trunk (PKGBUILD find_qca_qt5.patch)
Date: Friday, January 16, 2015 @ 11:44:31
Author: fyan
Revision: 229378
upgpkg: okteta 14.12.1-2
Added:
okteta/trunk/find_qca_qt5.patch
Modified:
okteta/trunk/PKGBUILD
+
PKGBUILD | 17 +
find_qca_qt5.patch | 18 ++
2 files changed, 31 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-16 08:53:26 UTC (rev 229377)
+++ PKGBUILD2015-01-16 10:44:31 UTC (rev 229378)
@@ -4,7 +4,7 @@
pkgname=okteta
pkgver=14.12.1
-pkgrel=1
+pkgrel=2
pkgdesc='Hex Editor'
url='http://kde.org/applications/utilities/okteta/'
arch=('i686' 'x86_64')
@@ -15,11 +15,20 @@
replaces=('kdesdk-okteta')
conflicts=('kdesdk-okteta4.14.3-2')
install=${pkgname}.install
-source=(http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz;)
-sha1sums=('3d9caab4e6fa31e96ceb51032e9a97db663f0060')
+source=(http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz;
+find_qca_qt5.patch)
+sha1sums=('3d9caab4e6fa31e96ceb51032e9a97db663f0060'
+ 'ff51e1448f4df5c2715bdcad57560e82acfbacbf')
+prepare() {
+ mkdir build
+
+ cd okteta-${pkgver}
+ # https://bugs.kde.org/show_bug.cgi?id=341509
+ patch -p0 -i ../find_qca_qt5.patch
+}
+
build() {
- mkdir build
cd build
cmake ../okteta-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
Added: find_qca_qt5.patch
===
--- find_qca_qt5.patch (rev 0)
+++ find_qca_qt5.patch 2015-01-16 10:44:31 UTC (rev 229378)
@@ -0,0 +1,18 @@
+--- cmake/modules/FindQCA2.cmake.orig 2014-12-02 22:38:40.129259069 +0100
cmake/modules/FindQCA2.cmake 2014-12-02 23:05:45.986414768 +0100
+@@ -17,13 +17,13 @@
+
+ if (NOT WIN32)
+ find_package(PkgConfig QUIET)
+- pkg_check_modules(PC_QCA2 QUIET qca2)
++ pkg_search_module(PC_QCA2 QUIET qca2-qt5 qca2)
+ set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
+ endif (NOT WIN32)
+
+ find_library(QCA2_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES qca
++ NAMES qca-qt5 qca
+ HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
+ )
+
