Opened 12 years ago

Closed 12 years ago

#300 closed defect/bug (fixed)

Fix Makefile.am too produce nav png files

Reported by: Gerritv Owned by: KaZeR
Priority: major Milestone: version 0.2.0
Component: core Version: git master
Severity: Keywords: xpm nav-icons
Cc: gerritv@…

Description

The present Makefile.am in navit/xpm does not build default size .png files for some of the nav_ icons. The following patch fixes that:

Index: Makefile.am =================================================================== --- Makefile.am (revision 2039) +++ Makefile.am (working copy) @@ -192,6 +192,7 @@

xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) endif if USE_SVG2PNG_SCALES_NAV

+xpm_DATA += $(addsuffix .png,$(basename $(nav_svgs)))

xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs)))) endif endif

Change History (5)

comment:1 Changed 12 years ago by Gerritv

At the same time please add: --enable-svg2png-scaling="32,48" --enable-svg2png-scaling-nav="8,16,32,48" --enable-svg2png-scaling-flags="32,48" to the ./configure parameters for N8x0 builds.

comment:2 Changed 12 years ago by Gerritv

  • Cc gerritv@… added

cluk on #navit also found that some .svg files were not being installed:

Index: navit/xpm/Makefile.am =================================================================== --- navit/xpm/Makefile.am (revision 2029) +++ navit/xpm/Makefile.am (working copy)

-175,7 +175,7 @@ flag_svgs += country_WF.svgz country_WS.svgz country_YE.svgz country_YT.svgz country_ZA.svgz country_ZM.svgz country_ZW.svgz

if USE_SVG

  • xpm_DATA += $(svgs)

+ xpm_DATA += $(svgs) $(nav_svgs) $(flag_svgs)

endif

if USE_SVG2PNG

comment:3 Changed 12 years ago by Singesang

So it would be the following then?

Index: navit/xpm/Makefile.am
===================================================================
--- navit/xpm/Makefile.am       (Revision 2055)
+++ navit/xpm/Makefile.am       (Arbeitskopie)
@@ -175,7 +175,7 @@
 flag_svgs += country_WF.svgz country_WS.svgz country_YE.svgz country_YT.svgz country_ZA.svgz country_ZM.svgz country_ZW.svgz

 if USE_SVG
-   xpm_DATA += $(svgs)
+   xpm_DATA += $(svgs) $(nav_svgs) $(flag_svgs)
 endif

 if USE_SVG2PNG
@@ -192,6 +192,7 @@
 xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
 endif
 if USE_SVG2PNG_SCALES_NAV
+xpm_DATA += $(addsuffix .png,$(basename $(nav_svgs)))
 xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
 endif
 endif

comment:4 Changed 12 years ago by Gerritv

Yes, that is the diff file to apply, soon I hope :-) Until this is applied people need to get the icons from my blog.

Thanks Gerrit

comment:5 Changed 12 years ago by Singesang

  • Resolution set to fixed
  • Status changed from new to closed

The patch for Makefile.am got applied in r2070. Thanks gerrit

Note: See TracTickets for help on using tickets.