From 77fff6b8dc92a9535c0a19f84e9260b71a6818ea Mon Sep 17 00:00:00 2001 From: Alexander Kapshuna Date: Sun, 8 Apr 2018 16:08:14 +0300 Subject: [PATCH 1/2] remmina: version bump to 1.2.0-rc28 --- .../0001-CMAKE-fix-GNUInstallDirs-usage.patch | 93 ------------------- ...eres-0 => remmina-1.2.0_rc28-r2.exheres-0} | 4 - 2 files changed, 97 deletions(-) delete mode 100644 packages/net-misc/remmina/files/0001-CMAKE-fix-GNUInstallDirs-usage.patch rename packages/net-misc/remmina/{remmina-1.2.0_rc15-r2.exheres-0 => remmina-1.2.0_rc28-r2.exheres-0} (71%) diff --git a/packages/net-misc/remmina/files/0001-CMAKE-fix-GNUInstallDirs-usage.patch b/packages/net-misc/remmina/files/0001-CMAKE-fix-GNUInstallDirs-usage.patch deleted file mode 100644 index 93254fc..0000000 --- a/packages/net-misc/remmina/files/0001-CMAKE-fix-GNUInstallDirs-usage.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 223fef7a99661608ae7f7aef426fbd1174878080 Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Thu, 29 Sep 2016 22:56:59 +0200 -Subject: [PATCH] CMAKE: fix GNUInstallDirs usage -Upstream: submitted, https://github.com/FreeRDP/Remmina/pull/1004 - -* fix locale install destination -* fix include dir install destination -* don't assume CMAKE_INSTALL_BINDIR is relative ---- - CMakeLists.txt | 2 +- - cmake/GETTEXT.cmake | 2 +- - remmina/CMakeLists.txt | 2 +- - remmina/desktop/remmina.desktop.in | 8 ++++---- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1bd5ca..1f9ea35 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,7 +125,7 @@ endif() - message(STATUS "Git Revision ${GIT_REVISION}") - - set(REMMINA_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}") --set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale") -+set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") - set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins") - set(REMMINA_UIDIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/ui") - -diff --git a/cmake/GETTEXT.cmake b/cmake/GETTEXT.cmake -index ec49870..368a6be 100644 ---- a/cmake/GETTEXT.cmake -+++ b/cmake/GETTEXT.cmake -@@ -32,11 +32,11 @@ - if($ENV{LINGUAS} MATCHES "^.*${lang}.*$" OR "${UNSETLINGUAS}" STREQUAL "") - set(mo_file ${CMAKE_CURRENT_BINARY_DIR}/${lang}.mo) - add_custom_command(OUTPUT ${mo_file} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo_file} ${po_file} DEPENDS ${po_file}) -- install(FILES ${mo_file} DESTINATION share/locale/${lang}/LC_MESSAGES RENAME ${package_name}.mo) -+ install(FILES ${mo_file} DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${package_name}.mo) - set(mo_files ${mo_files} ${mo_file}) - endif() - add_custom_command(OUTPUT ${mo_file} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo_file} ${po_file} DEPENDS ${po_file}) -- install(FILES ${mo_file} DESTINATION share/locale/${lang}/LC_MESSAGES RENAME ${package_name}.mo) -+ install(FILES ${mo_file} DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${package_name}.mo) - set(mo_files ${mo_files} ${mo_file}) - endforeach() - set(translations-target "${package_name}-translations") -diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt -index c6869cd..5d3900d 100644 ---- a/remmina/CMakeLists.txt -+++ b/remmina/CMakeLists.txt -@@ -219,7 +219,7 @@ add_subdirectory(external_tools) - add_subdirectory(ui) - - install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR}) --install(DIRECTORY include/remmina/ DESTINATION include/remmina FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY include/remmina/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/remmina FILES_MATCHING PATTERN "*.h") - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.pc.in ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/remmina/desktop/remmina.desktop.in b/remmina/desktop/remmina.desktop.in -index a40e50a..f427d7a 100644 ---- a/remmina/desktop/remmina.desktop.in -+++ b/remmina/desktop/remmina.desktop.in -@@ -65,8 +65,8 @@ Comment[th]=เชื่อมต่อไปยังพื้นโต๊ะ - Comment[tr]=Uzak masaüstlerine bağlan - Comment[uk]=Приєднатися до віддаленого комп’ютера - Comment[zh_CN]=连接到远程桌面 --TryExec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/remmina --Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/remmina -+TryExec=@CMAKE_INSTALL_FULL_BINDIR@/remmina -+Exec=@CMAKE_INSTALL_FULL_BINDIR@/remmina - Icon=remmina - Terminal=false - Type=Application -@@ -94,7 +94,7 @@ Name[sv]=Skapa en ny anslutningsprofil - Name[tr]=Yeni Bir Bağlantı Profili Oluştur - Name[uk]=Створити новий профіль з’єднання - Name[zh_CN]=新建连接配置 --Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/remmina --new -+Exec=@CMAKE_INSTALL_FULL_BINDIR@/remmina --new - - [Desktop Action Tray] - Name=Start Remmina Minimized -@@ -117,4 +117,4 @@ Name[sv]=Starta Remmina minimerat - Name[tr]=Remmina'yı Küçültülmüş Başlat - Name[uk]=Запустити Rammina у системному лотку - Name[zh_CN]=启动后自动最小化 --Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/remmina --icon -+Exec=@CMAKE_INSTALL_FULL_BINDIR@/remmina --icon --- -2.10.0 - diff --git a/packages/net-misc/remmina/remmina-1.2.0_rc15-r2.exheres-0 b/packages/net-misc/remmina/remmina-1.2.0_rc28-r2.exheres-0 similarity index 71% rename from packages/net-misc/remmina/remmina-1.2.0_rc15-r2.exheres-0 rename to packages/net-misc/remmina/remmina-1.2.0_rc28-r2.exheres-0 index 7496345..7aba52b 100644 --- a/packages/net-misc/remmina/remmina-1.2.0_rc15-r2.exheres-0 +++ b/packages/net-misc/remmina/remmina-1.2.0_rc28-r2.exheres-0 @@ -8,7 +8,3 @@ require remmina SLOT="0" PLATFORMS="~amd64 ~x86" -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-CMAKE-fix-GNUInstallDirs-usage.patch -) - From 615c9329b73d8d1fe17a8e3160d2cce995f115bd Mon Sep 17 00:00:00 2001 From: Alexander Kapshuna Date: Sun, 8 Apr 2018 16:56:33 +0300 Subject: [PATCH 2/2] remmina: add ssh option --- ...eres-0 => remmina-1.2.0_rc28-r3.exheres-0} | 0 packages/net-misc/remmina/remmina.exlib | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) rename packages/net-misc/remmina/{remmina-1.2.0_rc28-r2.exheres-0 => remmina-1.2.0_rc28-r3.exheres-0} (100%) diff --git a/packages/net-misc/remmina/remmina-1.2.0_rc28-r2.exheres-0 b/packages/net-misc/remmina/remmina-1.2.0_rc28-r3.exheres-0 similarity index 100% rename from packages/net-misc/remmina/remmina-1.2.0_rc28-r2.exheres-0 rename to packages/net-misc/remmina/remmina-1.2.0_rc28-r3.exheres-0 diff --git a/packages/net-misc/remmina/remmina.exlib b/packages/net-misc/remmina/remmina.exlib index 12e3776..c00625c 100644 --- a/packages/net-misc/remmina/remmina.exlib +++ b/packages/net-misc/remmina/remmina.exlib @@ -12,7 +12,7 @@ Remmina is a remote desktop client written in GTK+, aiming to be useful for syst HOMEPAGE+=" http://remmina.org/" LICENCES="GPL-2" -MYOPTIONS="" +MYOPTIONS="ssh" DEPENDENCIES=" build: @@ -20,34 +20,39 @@ DEPENDENCIES=" sys-devel/gettext virtual/pkg-config build+run: + core/json-glib dev-libs/glib:2 dev-libs/libgcrypt - dev-libs/vte:2.91 - net-libs/libssh + dev-libs/libsecret net-libs/libvncserver + net-remote/FreeRDP x11-libs/gtk+:3 x11-libs/libxkbfile + ssh? ( + net-libs/libssh + dev-libs/vte:2.91 + ) " BUGS_TO="hasufell@posteo.de" CMAKE_SRC_CONFIGURE_PARAMS=( # on + -DWITH_FREERDP=ON -DWITH_GCRYPT=ON -DWITH_GETTEXT=ON -DWITH_LIBSECRET=ON - -DWITH_LIBSSH=ON + -DWITH_LIBVNCSERVER=ON -DWITH_TRANSLATIONS=ON - -DWITH_VTE=ON - -DWITH_ZLIB=ON # off -DWITH_APPINDICATOR=OFF -DWITH_AVAHI=OFF - -DWITH_FREERDP=OFF -DWITH_SPICE=OFF - -DWITH_SURVEY=OFF -DWITH_TELEPATHY=OFF ) - +CMAKE_SRC_CONFIGURE_OPTION_WITHS=( + "ssh LIBSSH" + "ssh VTE" +)