[arch-commits] Commit in okteta/trunk (PKGBUILD find_qca_qt5.patch)
Felix Yan
fyan at archlinux.org
Fri Jan 16 10:44:31 UTC 2015
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
===================================================================
--- PKGBUILD 2015-01-16 08:53:26 UTC (rev 229377)
+++ PKGBUILD 2015-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-okteta<4.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}
+ )
+
More information about the arch-commits
mailing list