aboutsummaryrefslogtreecommitdiffstats
path: root/games/gcompris/files
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2011-08-14 04:58:26 +0800
committerkwm <kwm@FreeBSD.org>2011-08-14 04:58:26 +0800
commita7635e40e7b5dc1adea35a79159534d97d0320a1 (patch)
tree219750d6ce02b462c7eadffc69eaf542e690ff85 /games/gcompris/files
parent6b068ed360d2dc619214bdb5e529e746562cd837 (diff)
downloadfreebsd-ports-gnome-a7635e40e7b5dc1adea35a79159534d97d0320a1.tar.gz
freebsd-ports-gnome-a7635e40e7b5dc1adea35a79159534d97d0320a1.tar.zst
freebsd-ports-gnome-a7635e40e7b5dc1adea35a79159534d97d0320a1.zip
Update to 9.6.1.
PR: ports/159718 Submitted by: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Diffstat (limited to 'games/gcompris/files')
-rw-r--r--games/gcompris/files/patch-src_gcompris_gameutil.c19
-rw-r--r--games/gcompris/files/patch-src_gcompris_gcompris.c14
2 files changed, 7 insertions, 26 deletions
diff --git a/games/gcompris/files/patch-src_gcompris_gameutil.c b/games/gcompris/files/patch-src_gcompris_gameutil.c
deleted file mode 100644
index 81486b605499..000000000000
--- a/games/gcompris/files/patch-src_gcompris_gameutil.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gcompris/gameutil.c.orig 2010-03-21 17:02:26.000000000 -0400
-+++ src/gcompris/gameutil.c 2010-03-21 17:03:23.000000000 -0400
-@@ -568,6 +568,7 @@ gc_file_find_absolute(const gchar *forma
- int i = 0;
- gchar *filename;
- gchar *absolute_filename;
-+ gchar rpath[PATH_MAX];
- gchar *dir_to_search[4];
- GcomprisProperties *properties = gc_prop_get();
-
-@@ -654,7 +655,7 @@ gc_file_find_absolute(const gchar *forma
-
- FOUND:
- g_free(filename);
-- char *abs_name = realpath(absolute_filename, NULL);
-+ char *abs_name = g_strdup (realpath(absolute_filename, rpath));
- g_free(absolute_filename);
- return abs_name;
- }
diff --git a/games/gcompris/files/patch-src_gcompris_gcompris.c b/games/gcompris/files/patch-src_gcompris_gcompris.c
index 5403d9cbc8c9..4784afb13e1f 100644
--- a/games/gcompris/files/patch-src_gcompris_gcompris.c
+++ b/games/gcompris/files/patch-src_gcompris_gcompris.c
@@ -1,11 +1,11 @@
---- src/gcompris/gcompris.c.orig 2010-02-13 08:38:20.000000000 -0500
-+++ src/gcompris/gcompris.c 2010-03-21 14:22:42.000000000 -0400
-@@ -1202,7 +1202,7 @@ static void load_properties ()
- #ifdef NSBUNDLE
- exec_prefix = gcompris_nsbundle_resource ();
- #else
+--- src/gcompris/gcompris.c.orig 2011-02-22 23:55:08.000000000 +0300
++++ src/gcompris/gcompris.c 2011-08-12 10:54:59.000000000 +0400
+@@ -1295,7 +1295,7 @@
+ g_error_free (error);
+ }
+
- exec_prefix = gbr_find_exe_dir(NULL);
+ exec_prefix = gbr_find_exe_dir("%%PREFIX%%");
- #endif
g_warning("exec_prefix %s\n", (exec_prefix==NULL ? "NONE" : exec_prefix));
+ {