[arch-commits] Commit in kdelibs4support/repos (6 files)
Date: Saturday, October 14, 2017 @ 09:33:04
Author: arojas
Revision: 307911
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kdelibs4support/repos/testing-i686/
kdelibs4support/repos/testing-i686/PKGBUILD
(from rev 307910, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/testing-i686/kdelibs4support-openssl-1.1.patch
(from rev 307910, kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch)
kdelibs4support/repos/testing-x86_64/
kdelibs4support/repos/testing-x86_64/PKGBUILD
(from rev 307910, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/testing-x86_64/kdelibs4support-openssl-1.1.patch
(from rev 307910, kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch)
--+
testing-i686/PKGBUILD| 48
testing-i686/kdelibs4support-openssl-1.1.patch | 1024 +
testing-x86_64/PKGBUILD | 48
testing-x86_64/kdelibs4support-openssl-1.1.patch | 1024 +
4 files changed, 2144 insertions(+)
Copied: kdelibs4support/repos/testing-i686/PKGBUILD (from rev 307910,
kdelibs4support/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-10-14 09:33:04 UTC (rev 307911)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Felix Yan
+# Contributor: Andrea Scarpino
+
+pkgname=kdelibs4support
+pkgver=5.39.0
+pkgrel=1
+pkgdesc='Porting aid from KDELibs4'
+arch=('i686' 'x86_64')
+url='https://community.kde.org/Frameworks'
+license=('LGPL')
+depends=('kunitconversion' 'kitemmodels' 'kemoticons' 'kded' 'kparts')
+makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools' 'networkmanager'
'perl-uri' 'python' 'kdesignerplugin')
+groups=('kf5-aids')
+source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"{,.sig}
+kdelibs4support-openssl-1.1.patch)
+sha256sums=('d735000260d8565e812b96c81d510acef14f7b66e9fcbbd2d42711bd1bfcb20f'
+'SKIP'
+'e33de96fae2b93c3fa06b4219205ae188b214be8c5e84b8d0426217fd65a5d48')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kdelibs4support-openssl-1.1.patch # Fix build with openssl
1.1
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DKDE_INSTALL_LIBDIR=lib \
+-DKDE_INSTALL_LIBEXECDIR=lib \
+-DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+# cert bundle seems to be hardcoded
+# link it to the one from ca-certificates
+ rm -f "$pkgdir"/usr/share/kf5/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/kf5/kssl/ca-bundle.crt
+}
Copied: kdelibs4support/repos/testing-i686/kdelibs4support-openssl-1.1.patch
(from rev 307910, kdelibs4support/trunk/kdelibs4support-openssl-1.1.patch)
===
--- testing-i686/kdelibs4support-openssl-1.1.patch
(rev 0)
+++ testing-i686/kdelibs4support-openssl-1.1.patch 2017-10-14 09:33:04 UTC
(rev 307911)
@@ -0,0 +1,1024 @@
+diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h
+--- a/src/kssl/kopenssl.h
b/src/kssl/kopenssl.h
+@@ -278,6 +278,16 @@
+ X509 *X509_dup(X509 *x509);
+
+ /*
++ * X509_getm_notBefore - get validity start
++ */
++ASN1_TIME *X509_getm_notBefore(const X509 *x);
++
++/*
++ * X509_getm_notAfter - get validity end
++ */
++ASN1_TIME *X509_getm_notAfter(const X509 *x);
++
++/*
+ * X509_STORE_CTX_new - create an X509 store context
+ */
+ X509_STORE_CTX *X509_STORE_CTX_new(void);
+@@ -297,6 +307,21 @@
+ */
+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
+
++/**
++ * X509_STORE_CTX_get_current_cert - get the current certificate
++ */
++X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v);
++
++/**
++ * X509_STORE_CTX_set_error - set certificate error
++ */
++void X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error);
++
++/**
++ * X509_STORE_CTX_get_error - get certificate error
++ */
++int X509_STORE_CTX_get_error(X509_STORE_CTX *v);
++
+ /*
+ * X509_verify_cert - verify the certificate
+ */
+@@ -313,6 +338,11 @@
+ void X509_STORE_free(X509_STORE *v);
+
+ /*
++ * X509_STORE_set_verify_cb - set verify callback
++ */
++void X509_STORE_set_verify_cb(X509_STORE *v, int (*verify_cb)(int,
X509_STORE_CTX *));
++
++/*
+ * X509_free - free up an X509
+ */
+ void X509_free(X509 *v);
+@@ -333,6 +363,11 @@
+ X509_NAME *X509_get_issuer_name(X509 *a);
+
+ /*
++ * X509_get0_signature - return X5
[arch-commits] Commit in kdelibs4support/repos (6 files)
Date: Thursday, August 7, 2014 @ 14:12:21
Author: andrea
Revision: 219449
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdelibs4support/repos/extra-i686/PKGBUILD
(from rev 219448, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/extra-x86_64/PKGBUILD
(from rev 219448, kdelibs4support/trunk/PKGBUILD)
Deleted:
kdelibs4support/repos/extra-i686/PKGBUILD
kdelibs4support/repos/extra-i686/update-FindGettext.patch
kdelibs4support/repos/extra-x86_64/PKGBUILD
kdelibs4support/repos/extra-x86_64/update-FindGettext.patch
---+
/PKGBUILD | 76
extra-i686/PKGBUILD | 43 --
extra-i686/update-FindGettext.patch | 37 ---
extra-x86_64/PKGBUILD | 43 --
extra-x86_64/update-FindGettext.patch | 37 ---
5 files changed, 76 insertions(+), 160 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-08-07 12:12:10 UTC (rev 219448)
+++ extra-i686/PKGBUILD 2014-08-07 12:12:21 UTC (rev 219449)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino
-
-pkgname=kdelibs4support
-pkgver=5.0.0
-pkgrel=3
-pkgdesc='KDE 4 Support'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kdelibs4support'
-license=('LGPL')
-depends=('kunitconversion' 'kdesignerplugin' 'kinit' 'kitemmodels'
'kemoticons')
-makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
-groups=('kf5-aids')
-replaces=('kde4support')
-conflicts=('kde4support')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz";
-'update-FindGettext.patch')
-md5sums=('1fe3fc10a31a2c123338c3a8ae82455a'
- 'cfde4360628836b039cb614f6641112d')
-
-prepare() {
- mkdir -p build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/update-FindGettext.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DLIB_INSTALL_DIR=lib \
--DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
--DSYSCONF_INSTALL_DIR=/etc \
--DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdelibs4support/repos/extra-i686/PKGBUILD (from rev 219448,
kdelibs4support/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-07 12:12:21 UTC (rev 219449)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino
+
+pkgname=kdelibs4support
+pkgver=5.1.0
+pkgrel=1
+pkgdesc='KDE 4 Support'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kdelibs4support'
+license=('LGPL')
+depends=('kunitconversion' 'kdesignerplugin' 'kinit' 'kitemmodels'
'kemoticons')
+makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
+groups=('kf5-aids')
+replaces=('kde4support')
+conflicts=('kde4support')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz";)
+md5sums=('3e97f7a6eb9120b00ced27b8abd02c5e')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DLIB_INSTALL_DIR=lib \
+-DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+-DSYSCONF_INSTALL_DIR=/etc \
+-DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/update-FindGettext.patch
===
--- extra-i686/update-FindGettext.patch 2014-08-07 12:12:10 UTC (rev 219448)
+++ extra-i686/update-FindGettext.patch 2014-08-07 12:12:21 UTC (rev 219449)
@@ -1,37 +0,0 @@
-From: Alex Merry
-Date: Fri, 04 Jul 2014 10:10:27 +
-Subject: Make FindGettext compatible with the one provided by CMake
-X-Git-Url:
http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea
-Make FindGettext compatible with the one provided by CMake
-
-This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no
-PO_FILES argument), but will also accept the new syntax required by
-CMake's version of this file. It will also warn when PO_FILES is not
-given.
-
-REVIEW: 119111
-
-
a/cmake/modules/FindGettext.cmake
-+++ b/cmake/modules/FindGettext.cmake
-@@ -212,7 +212,16 @@
- LIST(REMOVE_AT _args 0 1)
-ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
-
--#message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}")
-+ LIST(GET _args 0 _tmp)
-+ IF("${_tmp}" STREQUAL "PO_FILES")
-+ LIST(REMOVE_AT _args 0)
-+ ELSE()
-+ SET(_deprecation_arg DEPRECATION)
-+ IF(CMAKE_VERSION VERSION_LESS 3.0.0)
-+ SET(
[arch-commits] Commit in kdelibs4support/repos (6 files)
Date: Friday, July 11, 2014 @ 13:50:04
Author: andrea
Revision: 216790
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdelibs4support/repos/extra-i686/PKGBUILD
(from rev 216789, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/extra-i686/update-FindGettext.patch
(from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
kdelibs4support/repos/extra-x86_64/PKGBUILD
(from rev 216789, kdelibs4support/trunk/PKGBUILD)
kdelibs4support/repos/extra-x86_64/update-FindGettext.patch
(from rev 216789, kdelibs4support/trunk/update-FindGettext.patch)
Deleted:
kdelibs4support/repos/extra-i686/PKGBUILD
kdelibs4support/repos/extra-x86_64/PKGBUILD
---+
/PKGBUILD | 86
extra-i686/PKGBUILD | 38 --
extra-i686/update-FindGettext.patch | 37 +
extra-x86_64/PKGBUILD | 38 --
extra-x86_64/update-FindGettext.patch | 37 +
5 files changed, 160 insertions(+), 76 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-07-11 11:49:56 UTC (rev 216789)
+++ extra-i686/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino
-
-pkgname=kdelibs4support
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='KDE 4 Support'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kdelibs4support'
-license=('LGPL')
-depends=('kunitconversion' 'kdesignerplugin')
-makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
-groups=('kf5-aids')
-replaces=('kde4support')
-conflicts=('kde4support')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz";)
-md5sums=('1fe3fc10a31a2c123338c3a8ae82455a')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DLIB_INSTALL_DIR=lib \
--DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
--DSYSCONF_INSTALL_DIR=/etc \
--DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdelibs4support/repos/extra-i686/PKGBUILD (from rev 216789,
kdelibs4support/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino
+
+pkgname=kdelibs4support
+pkgver=5.0.0
+pkgrel=2
+pkgdesc='KDE 4 Support'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kdelibs4support'
+license=('LGPL')
+depends=('kunitconversion' 'kdesignerplugin')
+makedepends=('extra-cmake-modules' 'kdoctools' 'qt5-tools') # 'networkmanager'
+groups=('kf5-aids')
+replaces=('kde4support')
+conflicts=('kde4support')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/portingAids/${pkgname}-${pkgver}.tar.xz";
+'update-FindGettext.patch')
+md5sums=('1fe3fc10a31a2c123338c3a8ae82455a'
+ 'cfde4360628836b039cb614f6641112d')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/update-FindGettext.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DLIB_INSTALL_DIR=lib \
+-DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+-DSYSCONF_INSTALL_DIR=/etc \
+-DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kdelibs4support/repos/extra-i686/update-FindGettext.patch (from rev
216789, kdelibs4support/trunk/update-FindGettext.patch)
===
--- extra-i686/update-FindGettext.patch (rev 0)
+++ extra-i686/update-FindGettext.patch 2014-07-11 11:50:04 UTC (rev 216790)
@@ -0,0 +1,37 @@
+From: Alex Merry
+Date: Fri, 04 Jul 2014 10:10:27 +
+Subject: Make FindGettext compatible with the one provided by CMake
+X-Git-Url:
http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea
+---
+Make FindGettext compatible with the one provided by CMake
+
+This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no
+PO_FILES argument), but will also accept the new syntax required by
+CMake's version of this file. It will also warn when PO_FILES is not
+given.
+
+REVIEW: 119111
+---
+
+
+--- a/cmake/modules/FindGettext.cmake
b/cmake/modules/FindGettext.cmake
+@@ -212,7 +212,16 @@
+ LIST(REMOVE_AT _args 0 1)
+ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
+
+-#message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}")
++ LIST(GET _args 0 _tmp)
++ IF("${_tmp}" STREQUAL "PO_FILES")
++ LI
