Ubuntu build

profibus/exe/profinet_viewer/gtk/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewer_gtk \
+link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/profinet_viewer_gtk \
 	$(bld_dir)/profinet_viewer_gtk.o \
 	$(bld_dir)/pn_viewer_gtk.o $(bld_dir)/pn_viewernav_gtk.o \
 	$(bld_dir)/pn_viewer.o $(bld_dir)/pn_viewernav.o $(bld_dir)/pn_viewer_pnac.o\

src/lib/co/src/co_ccm.c

@@ -2751,7 +2751,6 @@ int ccm_singleline_init(
 
   *ctx = (ccm_tSingleLineCtx)calloc( 1, sizeof(**ctx));
   (*ctx)->funcctx = (ccm_tFuncCtx)calloc( 1, sizeof(*(*ctx)->funcctx));
-  (*ctx)->funcctx->filectx = filectx;
 
   filectx = (ccm_tFileCtx)calloc( 1, sizeof( *filectx));
   filectx->errormessage_func = errormessage_func;

src/lib/co/src/co_ccm.h

@@ -64,28 +64,28 @@ typedef struct ccm_sLine_ {
   struct ccm_sLine_    	*prev;
 } ccm_sLine;
 
-typedef struct s_intvar_ {
+typedef struct ccm_sIntvar_ {
   char			name[32];
   ccm_tInt             	*value;
   int			elements;
   int			array;
-  struct s_intvar_	*next;
+  struct ccm_sIntvar_	*next;
 } ccm_sIntvar;
 
-typedef struct s_floatvar_ {
+typedef struct ccm_sFloatvar_ {
   char			name[32];
   ccm_tFloat           	*value;
   int			elements;
   int			array;
-  struct s_floatvar_	*next;
+  struct ccm_sFloatvar_ *next;
 } ccm_sFloatvar;
 
-typedef struct s_stringvar_ {
+typedef struct ccm_sStringvar_ {
   char			name[32];
   char    		*value;
   int			elements;
   int			array;
-  struct s_stringvar_	*next;
+  struct ccm_sStringvar_ *next;
 } ccm_sStringvar;
 
 typedef struct ccm_sOperand_ {

src/tools/pkg/ubu/pwr/control

-Package: pwr47
-Version: 4.7.1-1
+Package: pwr48
+Version: 4.8.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.10.1-0ubuntu16), libgtk2.0-0 (>= 2.18.3-1ubuntu2.2), libasound2 (>= 1.0.20-3ubuntu6.1), libdb4.7 (>=4.7.25-7ubuntu2), libdb4.7++ (>=4.7.25-7ubuntu2), libmysqlclient15off (>= 5.1.30really5.0.83-0ubuntu3), g++ (>= 4:4.4.1-1ubuntu2)
-Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46
+Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.7 (>=4.8.30-1), libdb4.7++ (>=4.8.30.1), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.4.4-1ubuntu2)
+Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package
  Proview development and runtime environment
- 4.7.1-1 Base release 
+ 4.8.0-1 Base release 

src/tools/pkg/ubu/pwrdemo/control

-Package: pwrdemo47
-Version: 4.7.1-1
+Package: pwrdemo48
+Version: 4.8.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr47 (>= 4.7.1-1)
+Depends: pwr48 (>= 4.8.0-1)
 Replaces:
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project
- 4.7.1-1 Base release 
+ 4.8.0-1 Base release 

src/tools/pkg/ubu/pwrrt/control

 Package: pwrrt
-Version: 4.7.1-1
+Version: 4.8.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.10.1-0ubuntu16), libgtk2.0-0 (>= 2.18.3-1ubuntu2.2), libasound2 (>= 1.0.20-3ubuntu6.1), libdb4.7 (>=4.7.25-7ubuntu2)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
+Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1)
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview runtime environment
- 4.7.1-1 Base release
+ 4.8.0-1 Base release

src/tools/pkg/ubu/pwrsev/control

 Package: pwrsev
-Version: 4.7.1-1
+Version: 4.8.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.10.1-0ubuntu16), libgtk2.0-0 (>= 2.18.3-1ubuntu2.2), libasound2 (>= 1.0.20-3ubuntu6.1), libdb4.7 (>=4.7.25-7ubuntu2), libmysqlclient15off (>= 5.1.30really5.0.83-0ubuntu3)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
+Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1), libmysql++3 (>= 3.0.9-1ubuntu2)
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48
 Maintainer: Proview <postmaster@proview.se>
 Description:
  Proview storage environment
- 4.7.1-1 Base release
+ 4.8.0-1 Base release