[arch-commits] Commit in okteta/repos (10 files)
Felix Yan
fyan at archlinux.org
Fri Jan 16 10:45:15 UTC 2015
Date: Friday, January 16, 2015 @ 11:45:14
Author: fyan
Revision: 229379
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
okteta/repos/staging-i686/PKGBUILD
(from rev 229378, okteta/trunk/PKGBUILD)
okteta/repos/staging-i686/find_qca_qt5.patch
(from rev 229378, okteta/trunk/find_qca_qt5.patch)
okteta/repos/staging-i686/okteta.install
(from rev 229378, okteta/trunk/okteta.install)
okteta/repos/staging-x86_64/PKGBUILD
(from rev 229378, okteta/trunk/PKGBUILD)
okteta/repos/staging-x86_64/find_qca_qt5.patch
(from rev 229378, okteta/trunk/find_qca_qt5.patch)
okteta/repos/staging-x86_64/okteta.install
(from rev 229378, okteta/trunk/okteta.install)
Deleted:
okteta/repos/staging-i686/PKGBUILD
okteta/repos/staging-i686/okteta.install
okteta/repos/staging-x86_64/PKGBUILD
okteta/repos/staging-x86_64/okteta.install
-----------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++++++++++
/okteta.install | 24 +++++++++
staging-i686/PKGBUILD | 37 --------------
staging-i686/find_qca_qt5.patch | 18 +++++++
staging-i686/okteta.install | 12 ----
staging-x86_64/PKGBUILD | 37 --------------
staging-x86_64/find_qca_qt5.patch | 18 +++++++
staging-x86_64/okteta.install | 12 ----
8 files changed, 152 insertions(+), 98 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2015-01-16 10:44:31 UTC (rev 229378)
+++ staging-i686/PKGBUILD 2015-01-16 10:45:14 UTC (rev 229379)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=okteta
-pkgver=14.12.1
-pkgrel=1
-pkgdesc='Hex Editor'
-url='http://kde.org/applications/utilities/okteta/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-depends=('kcmutils' 'kparts' 'knewstuff' 'qca-qt5')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools')
-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')
-
-build() {
- mkdir build
- cd build
- cmake ../okteta-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: okteta/repos/staging-i686/PKGBUILD (from rev 229378, okteta/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-01-16 10:45:14 UTC (rev 229379)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=okteta
+pkgver=14.12.1
+pkgrel=2
+pkgdesc='Hex Editor'
+url='http://kde.org/applications/utilities/okteta/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdesdk')
+depends=('kcmutils' 'kparts' 'knewstuff' 'qca-qt5')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools')
+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"
+ 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() {
+ cd build
+ cmake ../okteta-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: okteta/repos/staging-i686/find_qca_qt5.patch (from rev 229378, okteta/trunk/find_qca_qt5.patch)
===================================================================
--- staging-i686/find_qca_qt5.patch (rev 0)
+++ staging-i686/find_qca_qt5.patch 2015-01-16 10:45:14 UTC (rev 229379)
@@ -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}
+ )
+
Deleted: staging-i686/okteta.install
===================================================================
--- staging-i686/okteta.install 2015-01-16 10:44:31 UTC (rev 229378)
+++ staging-i686/okteta.install 2015-01-16 10:45:14 UTC (rev 229379)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: okteta/repos/staging-i686/okteta.install (from rev 229378, okteta/trunk/okteta.install)
===================================================================
--- staging-i686/okteta.install (rev 0)
+++ staging-i686/okteta.install 2015-01-16 10:45:14 UTC (rev 229379)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2015-01-16 10:44:31 UTC (rev 229378)
+++ staging-x86_64/PKGBUILD 2015-01-16 10:45:14 UTC (rev 229379)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=okteta
-pkgver=14.12.1
-pkgrel=1
-pkgdesc='Hex Editor'
-url='http://kde.org/applications/utilities/okteta/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-depends=('kcmutils' 'kparts' 'knewstuff' 'qca-qt5')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools')
-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')
-
-build() {
- mkdir build
- cd build
- cmake ../okteta-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: okteta/repos/staging-x86_64/PKGBUILD (from rev 229378, okteta/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-01-16 10:45:14 UTC (rev 229379)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=okteta
+pkgver=14.12.1
+pkgrel=2
+pkgdesc='Hex Editor'
+url='http://kde.org/applications/utilities/okteta/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdesdk')
+depends=('kcmutils' 'kparts' 'knewstuff' 'qca-qt5')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools')
+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"
+ 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() {
+ cd build
+ cmake ../okteta-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: okteta/repos/staging-x86_64/find_qca_qt5.patch (from rev 229378, okteta/trunk/find_qca_qt5.patch)
===================================================================
--- staging-x86_64/find_qca_qt5.patch (rev 0)
+++ staging-x86_64/find_qca_qt5.patch 2015-01-16 10:45:14 UTC (rev 229379)
@@ -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}
+ )
+
Deleted: staging-x86_64/okteta.install
===================================================================
--- staging-x86_64/okteta.install 2015-01-16 10:44:31 UTC (rev 229378)
+++ staging-x86_64/okteta.install 2015-01-16 10:45:14 UTC (rev 229379)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: okteta/repos/staging-x86_64/okteta.install (from rev 229378, okteta/trunk/okteta.install)
===================================================================
--- staging-x86_64/okteta.install (rev 0)
+++ staging-x86_64/okteta.install 2015-01-16 10:45:14 UTC (rev 229379)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list