mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
testing/lomiri-libusermetrics: upgrade to 1.3.3
This commit is contained in:
Luca Weiss
Kevin Daudt
parent
16e85b5a09
commit
ee8b02d6a0
@ -1,135 +0,0 @@
|
||||
From e87aa75b004aef1ce74c6b92290c4c4ed047e8e4 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Weiss <luca@z3ntu.xyz>
|
||||
Date: Wed, 31 Jan 2024 22:49:40 +0100
|
||||
Subject: [PATCH] Use CMAKE_INSTALL_FULL_* for installing
|
||||
|
||||
While I don't think there should be a difference between the two
|
||||
variables for most cases, for SYSCONFDIR we might end up installing into
|
||||
/usr/etc/ if we don't use the FULL_SYSCONFDIR variable.
|
||||
---
|
||||
data/CMakeLists.txt | 8 ++++----
|
||||
doc/CMakeLists.txt | 2 +-
|
||||
src/libusermetricsinput/CMakeLists.txt | 10 +++++-----
|
||||
src/libusermetricsoutput/CMakeLists.txt | 6 +++---
|
||||
4 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
||||
index 87db31b..71d812c 100644
|
||||
--- a/data/CMakeLists.txt
|
||||
+++ b/data/CMakeLists.txt
|
||||
@@ -10,7 +10,7 @@ install(
|
||||
DIRECTORY
|
||||
libusermetrics
|
||||
DESTINATION
|
||||
- ${CMAKE_INSTALL_DATADIR}
|
||||
+ ${CMAKE_INSTALL_FULL_DATADIR}
|
||||
)
|
||||
|
||||
###########################
|
||||
@@ -19,7 +19,7 @@ install(
|
||||
|
||||
set(
|
||||
DBUSCONFDIR
|
||||
- "${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d"
|
||||
+ "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d"
|
||||
)
|
||||
|
||||
install(
|
||||
@@ -34,7 +34,7 @@ install(
|
||||
|
||||
set(
|
||||
DBUSIFACEDIR
|
||||
- "${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/"
|
||||
+ "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/interfaces/"
|
||||
)
|
||||
|
||||
install(
|
||||
@@ -52,7 +52,7 @@ install(
|
||||
|
||||
set(
|
||||
DBUSSERVICEDIR
|
||||
- "${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/"
|
||||
+ "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system-services/"
|
||||
)
|
||||
|
||||
set(USERMETRICS_SERVICE
|
||||
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
||||
index 46941d9..1e4ec27 100644
|
||||
--- a/doc/CMakeLists.txt
|
||||
+++ b/doc/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ add_doxygen(
|
||||
*::internal*
|
||||
*::Priv
|
||||
INSTALL
|
||||
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/libusermetrics-doc
|
||||
+ ${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/libusermetrics-doc
|
||||
XML
|
||||
ALL
|
||||
)
|
||||
diff --git a/src/libusermetricsinput/CMakeLists.txt b/src/libusermetricsinput/CMakeLists.txt
|
||||
index 9554117..206ff4a 100644
|
||||
--- a/src/libusermetricsinput/CMakeLists.txt
|
||||
+++ b/src/libusermetricsinput/CMakeLists.txt
|
||||
@@ -84,8 +84,8 @@ set_target_properties(
|
||||
|
||||
install(
|
||||
TARGETS usermetricsinput
|
||||
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsinput"
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
|
||||
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsinput"
|
||||
)
|
||||
|
||||
# Package config
|
||||
@@ -95,7 +95,7 @@ configure_file("libusermetricsinput.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSE
|
||||
|
||||
install(
|
||||
FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSERMETRICSINPUT_PC}"
|
||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
||||
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
|
||||
)
|
||||
|
||||
##########################
|
||||
@@ -115,7 +115,7 @@ set_target_properties(
|
||||
|
||||
install(
|
||||
TARGETS usermetricsinput-bin
|
||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
@@ -135,7 +135,7 @@ add_executable(
|
||||
|
||||
install(
|
||||
TARGETS usermetricsinput-increment
|
||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
diff --git a/src/libusermetricsoutput/CMakeLists.txt b/src/libusermetricsoutput/CMakeLists.txt
|
||||
index 9cdd56f..775cfa5 100644
|
||||
--- a/src/libusermetricsoutput/CMakeLists.txt
|
||||
+++ b/src/libusermetricsoutput/CMakeLists.txt
|
||||
@@ -76,8 +76,8 @@ set_target_properties(
|
||||
|
||||
install(
|
||||
TARGETS usermetricsoutput
|
||||
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsoutput"
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
|
||||
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsoutput"
|
||||
)
|
||||
|
||||
# Package config
|
||||
@@ -87,5 +87,5 @@ configure_file("libusermetricsoutput.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${LIBUS
|
||||
|
||||
install(
|
||||
FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSERMETRICSOUTPUT_PC}"
|
||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
||||
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
|
||||
)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
Patch-Source: https://gitlab.com/ubports/development/core/libusermetrics/-/commit/073b88128a3fd8f3333cae2ba933f29ea6e7a27e
|
||||
--
|
||||
From 073b88128a3fd8f3333cae2ba933f29ea6e7a27e Mon Sep 17 00:00:00 2001
|
||||
From: Marius <mariogrip@debian.org>
|
||||
Date: Thu, 1 Feb 2024 03:35:14 +0100
|
||||
Subject: [PATCH] tests: Use en_US.UTF-8 as gettext will ignore LANGUAGE in
|
||||
newer gettext versions
|
||||
|
||||
See: https://github.com/autotools-mirror/gettext/commit/3873b7f1c777e6b2c874ef7c8da3f66f3b02e3fc
|
||||
|
||||
[ratchanan@ubports.com:
|
||||
- Taken from Debian packaging.
|
||||
- Fix misspelling in the commit subject.
|
||||
]
|
||||
---
|
||||
tests/testutils/main.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/testutils/main.cpp b/tests/testutils/main.cpp
|
||||
index b9f2ce6..2a176e4 100644
|
||||
--- a/tests/testutils/main.cpp
|
||||
+++ b/tests/testutils/main.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <libintl.h>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
- setenv("LANG", "C.UTF-8", true);
|
||||
+ setenv("LANG", "en_US.UTF-8", true);
|
||||
unsetenv("LC_ALL");
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: Luca Weiss <luca@lucaweiss.eu>
|
||||
pkgname=lomiri-libusermetrics
|
||||
pkgver=1.3.2
|
||||
pkgrel=1
|
||||
pkgver=1.3.3
|
||||
pkgrel=0
|
||||
pkgdesc='Library for exporting anonymous metrics about users'
|
||||
arch="all !armhf" # blocked by qt5-qtxmlpatterns-dev
|
||||
url="https://gitlab.com/ubports/development/core/libusermetrics"
|
||||
@ -27,10 +27,7 @@ makedepends="
|
||||
samurai
|
||||
"
|
||||
checkdepends="dbus"
|
||||
source="https://gitlab.com/ubports/development/core/libusermetrics/-/archive/$pkgver/libusermetrics-$pkgver.tar.gz
|
||||
0001-Use-CMAKE_INSTALL_FULL_-for-installing.patch
|
||||
0002-Use-en_US.UTF-8-in-testutils.patch
|
||||
"
|
||||
source="https://gitlab.com/ubports/development/core/libusermetrics/-/archive/$pkgver/libusermetrics-$pkgver.tar.gz"
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
|
||||
builddir="$srcdir/libusermetrics-$pkgver"
|
||||
|
||||
@ -52,7 +49,5 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
6e790903e386f32585646c04867b49200acde335b69b16049c11a0a5db1402dee0bbabf16c89cd967efd0eca8e9bd3af93ba01f40b1d5bf0a90534d7f21a570e libusermetrics-1.3.2.tar.gz
|
||||
eb65d7bfcf5ffc0b71dc16fd847e999bea0976a04919afb61cdd1ec789015699693912aeef862576ede7734274b103bd0c0aab554967d99d8fc7470dd3bbf361 0001-Use-CMAKE_INSTALL_FULL_-for-installing.patch
|
||||
38217c8595f445b0c9cd31533094f7e216f960d2a24df1c6192c5114a1fca9d69bb14764c64cfcc45deddfaff78cb3b591d7d208937c71a0a9a46da90d93b37f 0002-Use-en_US.UTF-8-in-testutils.patch
|
||||
8592ee1da9b93ccaca27f77320670b44b522daa73f258c358b2944180956fc929743143b593c8bec98953e2ce09f5f0b0840b6bfdd22a0baa5ac497dadbe3bed libusermetrics-1.3.3.tar.gz
|
||||
"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user