1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
Description: Install icons into NAVIT_SHAREDIR/icons
It doesn't make sense to put icons into a directory named "xpm" since most
of them are png and svg files.
Author: Gilles Filippini <pini@debian.org>
Forwarded: http://trac.navit-project.org/ticket/681
Last-Update: 2011-04-17
Index: navit/CMakeLists.txt
===================================================================
--- navit.orig/CMakeLists.txt
+++ navit/CMakeLists.txt
@@ -30,7 +30,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
set(BIN_DIR bin)
set(SHARE_DIR share/navit)
set(LOCALE_DIR share/locale)
-set(IMAGE_DIR share/navit/xpm)
+set(IMAGE_DIR share/navit/icons)
set(MAN_DIR share/man/man1)
# LIB_DIR
IF(UNIX AND NOT ANDROID AND NOT APPLE)
@@ -487,7 +487,7 @@ if(WIN32 OR WINCE)
set(BIN_DIR bin)
set(SHARE_DIR ./)
set(LOCALE_DIR locale)
- set(IMAGE_DIR xpm)
+ set(IMAGE_DIR icons)
if(HAVE_GTK2 AND NOT MSVC)
Index: navit/navit/graphics.c
===================================================================
--- navit.orig/navit/graphics.c
+++ navit/navit/graphics.c
@@ -1960,7 +1960,7 @@ graphics_icon_path(const char *icon)
#else
if (! navit_sharedir)
navit_sharedir = getenv("NAVIT_SHAREDIR");
- ret=g_strdup_printf("%s/xpm/%s", navit_sharedir, icon);
+ ret=g_strdup_printf("%s/icons/%s", navit_sharedir, icon);
#endif
}
if (wordexp)
Index: navit/navit/gui/qml/gui_qml.cpp
===================================================================
--- navit.orig/navit/gui/qml/gui_qml.cpp
+++ navit/navit/gui/qml/gui_qml.cpp
@@ -460,7 +460,7 @@ static struct gui_priv * gui_qml_new(str
this_->skin=g_strdup("navit");
}
if ( this_->icon_src==NULL ) {
- this_->icon_src=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"),"/xpm/",NULL);
+ this_->icon_src=graphics_icon_path("");
}
if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
|
