aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-05-12 13:13:53 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2021-05-12 13:15:04 +0200
commit8d484c2ee14a79655cf2bb99edf2e66a987482b9 (patch)
tree89c1010410cc3895a87d7c6a928a349a10dcf9a0
parent44881f99d0606064e17167c757d04da1cea76aad (diff)
downloadaports-8d484c2ee14a79655cf2bb99edf2e66a987482b9.tar.gz
aports-8d484c2ee14a79655cf2bb99edf2e66a987482b9.tar.bz2
aports-8d484c2ee14a79655cf2bb99edf2e66a987482b9.tar.xz
community/remmina: upgrade to 1.4.16
libintl patch submitted upstream: https://gitlab.com/Remmina/Remmina/-/merge_requests/2259
-rw-r--r--community/remmina/0001-Fix-build-with-musl-libc.patch54
-rw-r--r--community/remmina/APKBUILD10
-rw-r--r--community/remmina/libintl-underlink.patch13
3 files changed, 60 insertions, 17 deletions
diff --git a/community/remmina/0001-Fix-build-with-musl-libc.patch b/community/remmina/0001-Fix-build-with-musl-libc.patch
new file mode 100644
index 0000000000..023abf5286
--- /dev/null
+++ b/community/remmina/0001-Fix-build-with-musl-libc.patch
@@ -0,0 +1,54 @@
+From 8a13b8a0ee22fa05f282553ec1acfdb291267d24 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 12 May 2021 13:07:05 +0200
+Subject: [PATCH] Fix build with musl libc
+
+Use FindIntl cmake modules which will leave Intl_LIBRARIES empty if
+libintl is provided by the libc.
+---
+ CMakeLists.txt | 1 +
+ plugins/nx/CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 3 +--
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fb635b05..c187d701 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,6 +52,7 @@ include(GtkUpdateIconCache)
+ include(CheckHasModule)
+ include(FindPCRE2)
+ include(GlibCompileResourcesSupport)
++include(FindIntl)
+
+ #---------------------------------------------------------------------
+ # Package creation with CMake depends on the value of umask - if permissions
+diff --git a/plugins/nx/CMakeLists.txt b/plugins/nx/CMakeLists.txt
+index 0106aa73..275a3a6d 100644
+--- a/plugins/nx/CMakeLists.txt
++++ b/plugins/nx/CMakeLists.txt
+@@ -53,6 +53,7 @@ target_link_libraries(remmina-plugin-nx
+ ${REMMINA_COMMON_LIBRARIES}
+ ${XKBFILE_LIBRARIES}
+ ${LIBSSH_LIBRARIES}
++ ${Intl_LIBRARIES}
+ ${X11_X11_LIB})
+
+ install(TARGETS remmina-plugin-nx DESTINATION ${REMMINA_PLUGINDIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 08e54043..c670c55d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -207,8 +207,7 @@ target_link_libraries(remmina ${X11_LIBRARIES})
+
+ target_link_libraries(remmina ${CMAKE_THREAD_LIBS_INIT})
+
+-find_package(Intl)
+-if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD|OpenBSD|NetBSD")
++if(Intl_FOUND)
+ message(STATUS "${CMAKE_SYSTEM_NAME} detected, building with Intl")
+ include_directories(${Intl_INCLUDE_DIRS})
+ target_link_libraries(remmina ${Intl_LIBRARIES})
+--
+2.31.1
+
diff --git a/community/remmina/APKBUILD b/community/remmina/APKBUILD
index 55c836e70b..b4ab655b56 100644
--- a/community/remmina/APKBUILD
+++ b/community/remmina/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=remmina
-pkgver=1.4.12
+pkgver=1.4.16
pkgrel=0
pkgdesc="Remmina is a remote desktop client written in GTK+"
url="https://www.remmina.org/"
@@ -14,7 +14,7 @@ replaces="remmina-plugins"
subpackages="$pkgname-dev $pkgname-lang $pkgname-doc"
source="https://gitlab.com/Remmina/Remmina/-/archive/v$pkgver/Remmina-v$pkgver.tar.gz
remmina-1.0.0-dsofix.patch
- libintl-underlink.patch
+ 0001-Fix-build-with-musl-libc.patch
"
options="!check" # No test suite available
builddir="$srcdir"/Remmina-v$pkgver
@@ -46,6 +46,8 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7ae8031ff64c113b0ed792c6ba56c42918ccce5a30fe0255f730ef7a5a712dc500495e591598fd6cc553c09c6d5a2457e33f4dc1019403e89b25cc02e491515d Remmina-v1.4.12.tar.gz
+sha512sums="
+a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78 Remmina-v1.4.16.tar.gz
8c06cfb4cd7eb74f641d6524c2fb5c941022df1d3f428c9f57a88b9714ec602b0baf962a9947aa83de3ccfaed237956743b4eb0083c4dde0cc9740b958bba007 remmina-1.0.0-dsofix.patch
-08e93d4c7e6c3010d3f924cc001ea9bf6082ebcb460a79769f816a2bd736815fbbcc72d5bc865aa74689c9275a0f94805f17d75419952715497d45e5febbd36c libintl-underlink.patch"
+e0b4e19959a3f208b433ba9641b388eca8a23f87b4421eb8670b1f298471cbbce3fe89f019e2059ddb00b928d3d467b18a6402a808237670d1d58875f21e061d 0001-Fix-build-with-musl-libc.patch
+"
diff --git a/community/remmina/libintl-underlink.patch b/community/remmina/libintl-underlink.patch
deleted file mode 100644
index 29f9bf1fad..0000000000
--- a/community/remmina/libintl-underlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 08e5404..300c051 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -188,7 +188,7 @@ compile_gresources(RESOURCE_FILE
- add_custom_target(resource DEPENDS ${RESOURCE_FILE})
- add_executable(remmina ${REMMINA_SRCS} ${RESOURCE_FILE})
- add_dependencies(remmina resource)
--target_link_libraries(remmina ${GTK_LIBRARIES})
-+target_link_libraries(remmina ${GTK_LIBRARIES} -lintl)
-
- if(WITH_PYTHONLIBS)
- if(PythonLibs_FOUND)