Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2013-08-21 15:09:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2012-12-10 17:18:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2013-08-21 15:09:23.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Aug 20 03:16:20 UTC 2013 - [email protected] + +- Pass "-DUSE_INTERP_RESULT" to CFLAGS for openSUSE >= 13.1 to fix + build failures from usage of interp->result which is deprecated + in Tcl 8.6 +- In addition, use plplot-tcl-import-usage.patch to fix type + inconsistency in Tcl_Import (for >= 13.1 only); re-enable + building of tck/tk bindings for openSUSE 13.1. + +------------------------------------------------------------------- +Tue Aug 20 03:06:46 UTC 2013 - [email protected] + +- Disable tck/tk bindings completely for Factory to workaround + build failures from usage of interp->result which is deprecated + in Tcl 8.6. + +------------------------------------------------------------------- New: ---- plplot-tcl-import-usage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.p3ECqM/_old 2013-08-21 15:09:23.000000000 +0200 +++ /var/tmp/diff_new_pack.p3ECqM/_new 2013-08-21 15:09:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package plplot # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ Patch2: plplot-gcc-ada46-libs.patch # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch [email protected] -- Compile Ada code with -fPIC Patch3: plplot-5.9.9-ada-pic.patch +# PATCH-FIX-UPSTREAM plplot-tcl-import-usage.patch [email protected] -- Fix type inconsistency for Tcl_Import for Tcl 8.6 +Patch4: plplot-tcl-import-usage.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: freefont @@ -506,6 +508,9 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%if 0%{?suse_version} >= 1310 +%patch4 -p1 +%endif for file in NEWS README.release do @@ -515,7 +520,11 @@ done %build +%if 0%{?suse_version} >= 1310 +export CFLAGS="%{optflags} -DUSE_INTERP_RESULT" +%else export CFLAGS="%{optflags}" +%endif export CXXFLAGS="%{optflags}" export FFLAGS="%{optflags}" mkdir builddir @@ -537,13 +546,13 @@ -DENABLE_d:BOOL=ON \\\ -DENABLE_itcl:BOOL=ON \\\ -DENABLE_itk:BOOL=ON \\\ - -DENABLE_ocaml:BOOL=ON \\\ -DENABLE_tk:BOOL=ON \\\ + -DPLD_ntk:BOOL=ON \\\ + -DENABLE_ocaml:BOOL=ON \\\ -DHAVE_PTHREAD:BOOL=ON \\\ -DPLD_aqt:BOOL=ON \\\ -DPLD_conex:BOOL=ON \\\ -DPLD_mskermit:BOOL=ON \\\ - -DPLD_ntk:BOOL=ON \\\ -DPLD_pstex:BOOL=ON \\\ -DPLD_svg:BOOL=ON \\\ -DPLD_tek4010:BOOL=ON \\\ @@ -581,7 +590,6 @@ grep -v '^[# ]' ${file} | sort > tclIndex cat tclIndex.hd tclIndex > ${file} done - rm -rf %{buildroot}%{_datadir}/plplot%{version}/examples/cmake/modules/Platform #Remove unnecessary examples that trigger build errors or warnings ++++++ plplot-tcl-import-usage.patch ++++++ Index: plplot-5.9.9/bindings/tk/tkMain.c =================================================================== --- plplot-5.9.9.orig/bindings/tk/tkMain.c +++ plplot-5.9.9/bindings/tk/tkMain.c @@ -87,7 +87,7 @@ EXTERN int Itk_Init _ANSI_ARGS_( ( Tcl_I #ifndef Tcl_Import_TCL_DECLARED EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp, - Tcl_Namespace * nsPtr, char * pattern, + Tcl_Namespace * nsPtr, CONST char * pattern, int allowOverwrite ) ); #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
