Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37569785
en ru br
Репозитории ALT
S:1.4.27-alt2
5.1: 0.8.3-alt0.M51.1
www.altlinux.org/Changes

Группа :: Сети/Удалённый доступ
Пакет: remmina

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: fix_plugins_search_v1.2.0-rc21.patch
Скачать


diff -ur remmina/CMakeLists.txt remmina_contrib/remmina/CMakeLists.txt
--- remmina/CMakeLists.txt	2018-06-27 14:36:03.159441517 +0300
+++ remmina_contrib/remmina/CMakeLists.txt	2018-06-27 13:09:13.498923444 +0300
@@ -135,17 +135,11 @@
         set(REMMINA_RUNTIME_DATADIR "${REMMINA_DATADIR}")
     endif()
 endif()
-if(NOT REMMINA_LOCALEDIR)
-    set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
-    if(NOT REMMINA_RUNTIME_LOCALEDIR)
-        set(REMMINA_RUNTIME_LOCALEDIR "${REMMINA_LOCALEDIR}")
-    endif()
+if(NOT REMMINA_RUNTIME_LOCALEDIR)
+    set(REMMINA_RUNTIME_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
 endif()
 if(NOT REMMINA_PLUGINDIR)
     set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/remmina/plugins")
-    if(NOT REMMINA_RUNTIME_PLUGINDIR)
-        set(REMMINA_RUNTIME_PLUGINDIR "${REMMINA_PLUGINDIR}")
-    endif()
 endif()
 if(NOT REMMINA_UIDIR)
     set(REMMINA_UIDIR "${REMMINA_DATADIR}/remmina/ui")
diff -ur remmina/config.h.in remmina_contrib/remmina/config.h.in
--- remmina/config.h.in	2018-06-27 14:36:03.160441517 +0300
+++ remmina_contrib/remmina/config.h.in	2018-06-27 13:09:13.498923444 +0300
@@ -24,7 +24,7 @@
 
 #define REMMINA_RUNTIME_DATADIR	"${REMMINA_RUNTIME_DATADIR}"
 #define REMMINA_RUNTIME_LOCALEDIR	"${REMMINA_RUNTIME_LOCALEDIR}"
-#define REMMINA_RUNTIME_PLUGINDIR	"${REMMINA_RUNTIME_PLUGINDIR}"
+#define REMMINA_PLUGINDIR	"${REMMINA_PLUGINDIR}"
 #define REMMINA_RUNTIME_UIDIR		"${REMMINA_RUNTIME_UIDIR}"
 #define REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR	"${REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR}"
 
diff -ur remmina/remmina/src/remmina_plugin_manager.c remmina_contrib/remmina/remmina/src/remmina_plugin_manager.c
--- remmina/remmina/src/remmina_plugin_manager.c	2018-06-27 14:36:03.175441515 +0300
+++ remmina_contrib/remmina/remmina/src/remmina_plugin_manager.c	2018-06-27 13:09:13.489923445 +0300
@@ -233,7 +233,7 @@
 		return;
 	}
 
-	dir = g_dir_open(REMMINA_RUNTIME_PLUGINDIR, 0, NULL);
+	dir = g_dir_open(REMMINA_PLUGINDIR, 0, NULL);
 	if (dir == NULL)
 		return;
 	while ((name = g_dir_read_name(dir)) != NULL)
@@ -243,7 +243,7 @@
 		ptr++;
 		if (g_strcmp0(ptr, G_MODULE_SUFFIX) != 0)
 			continue;
-		fullpath = g_strdup_printf(REMMINA_RUNTIME_PLUGINDIR "/%s", name);
+		fullpath = g_strdup_printf(REMMINA_PLUGINDIR "/%s", name);
 		remmina_plugin_manager_load_plugin(fullpath);
 		g_free(fullpath);
 	}
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin