nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

0001-fix-build.patch (2728B)

      1 diff --git i/SConstruct w/SConstruct
      2 index 67f5f276..919005ac 100644
      3 --- i/SConstruct
      4 +++ w/SConstruct
      5 @@ -16,7 +16,7 @@ else:
      6  ######################################
      7  # Create environment, add some methods
      8  
      9 -env = Environment ()
     10 +env = Environment (ENV = {'PATH' : os.environ['PATH']})
     11  Export('env')
     12  
     13  # UseLibs -- use pkg-config libraries
     14 @@ -52,10 +52,13 @@ env.Append (CCFLAGS=['-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1'])
     15  env.Append (CCFLAGS=['-Werror=return-type', '-Wall'])
     16  env.Append (CCFLAGS='-std=gnu++11')
     17  
     18 -env.Append (ENV = {'PKG_CONFIG_PATH': os.getcwd()+'/core/pc'})
     19  if os.getenv('PKG_CONFIG_PATH'):
     20 -  env.Append (ENV = {'PKG_CONFIG_PATH':
     21 -    [ os.getcwd()+'/core/pc', os.getenv('PKG_CONFIG_PATH')]})
     22 +  env.Append (ENV = {'PKG_CONFIG_PATH': os.getenv('PKG_CONFIG_PATH')})
     23 +
     24 +if os.getenv('CPPFLAGS'):
     25 +  env.Append (CPPFLAGS=os.getenv('CPPFLAGS'))
     26 +if os.getenv('LINKFLAGS'):
     27 +  env.Append (LINKFLAGS=os.getenv('LINKFLAGS'))
     28  
     29  env.Append (CPPPATH = "#core")
     30  env.Append (LIBPATH = "#core")
     31 @@ -64,13 +67,13 @@ env.Append (LIBS    = "mapsoft")
     32  ######################################
     33  ## Parse command-line arguments:
     34  
     35 -env.PREFIX = ARGUMENTS.get('prefix', '')
     36 -env.bindir=env.PREFIX+'/usr/bin'
     37 -env.datadir=env.PREFIX+'/usr/share/mapsoft'
     38 -env.man1dir=env.PREFIX+'/usr/share/man/man1'
     39 -env.figlibdir=env.PREFIX+'/usr/share/xfig/Libraries'
     40 -env.libdir=env.PREFIX+ sysconfig.get_config_var('LIBDIR')
     41 -env.desktopdir=env.PREFIX+'/usr/share/applications'
     42 +env.PREFIX = ARGUMENTS.get('prefix', '/usr')
     43 +env.bindir=env.PREFIX+'/bin'
     44 +env.datadir=env.PREFIX+'/share/mapsoft'
     45 +env.man1dir=env.PREFIX+'/share/man/man1'
     46 +env.figlibdir=env.PREFIX+'/share/xfig/Libraries'
     47 +env.libdir=env.PREFIX+ '/lib'
     48 +env.desktopdir=env.PREFIX+'/share/applications'
     49  
     50  env.Alias('install', [env.bindir, env.man1dir,
     51    env.datadir, env.figlibdir, env.libdir, env.desktopdir])
     52 diff --git i/core/SConscript w/core/SConscript
     53 index fe5f1802..7238c176 100644
     54 --- i/core/SConscript
     55 +++ w/core/SConscript
     56 @@ -13,7 +13,7 @@ import os
     57  ##################################################
     58  ## build mapsoft library
     59  
     60 -env.UseLibs('libxml-2.0 libzip libproj libgif libjpeg libpng libtiff-4 libcurl zlib yaml-0.1 shp jansson')
     61 +env.UseLibs('libxml-2.0 libzip libjpeg libpng libtiff-4 libcurl zlib yaml-0.1 shapelib jansson')
     62  env.UseLibs('glibmm-2.4 gtkmm-2.4 gthread-2.0')
     63  env.UseLibs('cairomm-1.0 pixman-1 freetype2 libusb-1.0')
     64  
     65 diff --git i/vector/vmap3/SConscript w/vector/vmap3/SConscript
     66 index 6ef77d1b..1f0caff5 100644
     67 --- i/vector/vmap3/SConscript
     68 +++ w/vector/vmap3/SConscript
     69 @@ -13,4 +13,6 @@ env.Install(env.bindir, Split("""
     70    vmap_mmb_filter
     71    vmap_1km_filter
     72    vmap_fix_diff
     73 +  vmap_get_track
     74 +  vmap_put_track
     75  """))