[gentoo-commits] repo/proj/guru:master commit in: sys-auth/AusweisApp2/files/, sys-auth/AusweisApp2/
commit: efba1ad4b10b867dae503a43f1402c187abec32a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Apr 5 06:33:04 2020 +
Commit: Andrew Ammerlaan riseup net>
CommitDate: Sun Apr 5 06:33:04 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=efba1ad4
sys-auth/AusweisApp2: get rid of scr_install()
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild | 33 +--
sys-auth/AusweisApp2/AusweisApp2-.ebuild | 38 +-
sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch | 12 ---
.../files/1.20.0-fix-Install.cmake.patch | 18 ++
4 files changed, 20 insertions(+), 81 deletions(-)
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
index 6265462..b71dce5 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
@@ -32,35 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
-PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
-
-src_install() {
- cmake_src_install
- dolib.so "${BUILD_DIR}"/src/activation/base/libAusweisAppActivation.so
- dolib.so
"${BUILD_DIR}"/src/activation/customscheme/libAusweisAppActivationCustomScheme.so
- dolib.so
"${BUILD_DIR}"/src/activation/intent/libAusweisAppActivationIntent.so
- dolib.so
"${BUILD_DIR}"/src/activation/internal/libAusweisAppActivationInternal.so
- dolib.so
"${BUILD_DIR}"/src/activation/webservice/libAusweisAppActivationWebservice.so
- dolib.so "${BUILD_DIR}"/src/card/base/libAusweisAppCard.so
- dolib.so "${BUILD_DIR}"/src/card/drivers/libAusweisAppCardDrivers.so
- dolib.so "${BUILD_DIR}"/src/card/pcsc/libAusweisAppCardPcsc.so
- dolib.so "${BUILD_DIR}"/src/configuration/libAusweisAppConfiguration.so
- dolib.so "${BUILD_DIR}"/src/core/libAusweisAppCore.so
- dolib.so "${BUILD_DIR}"/src/export/libAusweisAppExport.so
- dolib.so "${BUILD_DIR}"/src/file_provider/libAusweisAppFileProvider.so
- dolib.so "${BUILD_DIR}"/src/global/libAusweisAppGlobal.so
- dolib.so "${BUILD_DIR}"/src/init/libAusweisAppInit.so
- dolib.so "${BUILD_DIR}"/src/network/libAusweisAppNetwork.so
- dolib.so "${BUILD_DIR}"/src/remote_device/libAusweisAppRemoteDevice.so
- dolib.so "${BUILD_DIR}"/src/secure_storage/libAusweisAppSecureStorage.so
- dolib.so "${BUILD_DIR}"/src/services/libAusweisAppServices.so
- dolib.so "${BUILD_DIR}"/src/settings/libAusweisAppSettings.so
- dolib.so "${BUILD_DIR}"/src/ui/aidl/libAusweisAppUiAidl.so
- dolib.so "${BUILD_DIR}"/src/ui/base/libAusweisAppUi.so
- dolib.so "${BUILD_DIR}"/src/ui/common/libAusweisAppUiCommon.so
- dolib.so "${BUILD_DIR}"/src/ui/json/libAusweisAppUiJson.so
- dolib.so "${BUILD_DIR}"/src/ui/qml/libAusweisAppUiQml.so
- dolib.so "${BUILD_DIR}"/src/ui/websocket/libAusweisAppUiWebsocket.so
- dolib.so "${BUILD_DIR}"/src/ui/widget/libAusweisAppUiWidget.so
- dolib.so
"${BUILD_DIR}"/src/whitelist_client/libAusweisAppWhitelistClient.so
-}
+PATCHES=( "${FILESDIR}"/1.20.0-fix-Install.cmake.patch )
diff --git a/sys-auth/AusweisApp2/AusweisApp2-.ebuild
b/sys-auth/AusweisApp2/AusweisApp2-.ebuild
index ac1500b..5b4754d 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-.ebuild
@@ -32,40 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
-PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
-
-src_prepare() {
- cmake_src_prepare
- eautoreconf
-}
-
-src_install() {
- cmake_src_install
- dolib.so "${BUILD_DIR}"/src/activation/base/libAusweisAppActivation.so
- dolib.so
"${BUILD_DIR}"/src/activation/customscheme/libAusweisAppActivationCustomScheme.so
- dolib.so
"${BUILD_DIR}"/src/activation/intent/libAusweisAppActivationIntent.so
- dolib.so
"${BUILD_DIR}"/src/activation/internal/libAusweisAppActivationInternal.so
- dolib.so
"${BUILD_DIR}"/src/activation/webservice/libAusweisAppActivationWebservice.so
- dolib.so "${BUILD_DIR}"/src/card/base/libAusweisAppCard.so
- dolib.so "${BUILD_DIR}"/src/card/drivers/libAusweisAppCardDrivers.so
- dolib.so "${BUILD_DIR}"/src/card/pcsc/libAusweisAppCardPcsc.so
- dolib.so "${BUILD_DIR}"/src/configuration/libAusweisAppConfiguration.so
- dolib.so "${BUILD_DIR}"/src/core/libAusweisAppCore.so
- dolib.so "${BUILD_DIR}"/src/export/libAusweisAppExport.so
- dolib.so "${BUILD_DIR}"/src/file_provider/libAusweisAppFileProvider.so
- dolib.so "${BUILD_DIR}"/src/global/libAusweisAppGlobal.so
- dolib.so "${BUILD_DIR}"/src/init/libAusweisAppInit.so
- dolib.so "${BUILD_DIR}"/src/network/libAusweisAppNetwork.so
- dolib.so
[gentoo-commits] repo/proj/guru:master commit in: sys-auth/AusweisApp2/files/, sys-auth/AusweisApp2/
commit: e0e7652141b12716016e421ff7ac2b9003dad4da
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Apr 3 15:04:36 2020 +
Commit: Haelwenn Monnier hacktivis me>
CommitDate: Fri Apr 3 15:04:36 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e0e76521
sys-auth/AusweisApp2: fix build system
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild | 6 +-
sys-auth/AusweisApp2/AusweisApp2-.ebuild | 8 ++--
sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch | 12
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
index a5b7e33..6265462 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
@@ -32,11 +32,7 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
-src_configure() {
- # get rid of QA Notice: The following files contain insecure RUNPATHs
- local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON )
- cmake_src_configure
-}
+PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
src_install() {
cmake_src_install
diff --git a/sys-auth/AusweisApp2/AusweisApp2-.ebuild
b/sys-auth/AusweisApp2/AusweisApp2-.ebuild
index ad3c6f9..ac1500b 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-.ebuild
@@ -32,17 +32,13 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
+PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
+
src_prepare() {
cmake_src_prepare
eautoreconf
}
-src_configure() {
- # get rid of QA Notice: The following files contain insecure RUNPATHs
- local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON )
- cmake_src_configure
-}
-
src_install() {
cmake_src_install
dolib.so "${BUILD_DIR}"/src/activation/base/libAusweisAppActivation.so
diff --git a/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch
b/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch
new file mode 100644
index 000..2ba3dc8
--- /dev/null
+++ b/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e958954..ae85daa 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -57,6 +57,7 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND (IOS OR
ANDROID))
+ ENDIF()
+ SET(CMAKE_DIR "${PROJECT_SOURCE_DIR}/cmake")
+ SET(CMAKE_MODULE_PATH "${CMAKE_DIR}")
++SET(CMAKE_SKIP_RPATH YES CACHE BOOL "Remove RUNPATH from ELF dynamic
sections" FORCE)
+ OPTION(BUILD_SHARED_LIBS "Enable build of shared libraries")
+ OPTION(INTEGRATED_SDK "Build platform specific SDK" OFF)
+
