[packages/xcircuit] - up to 3.8.37 - patch1 against new autotools - patch2 against format not a string literal and no fo

[blekot]

commit 079a6c1aa8d1e622d903c818e2d39b11810b5bbe
Author: Lukasz Glebicki <blekot at pld-linux.org>
Date:   Sun Apr 14 13:09:22 2013 +0200

    - up to 3.8.37
    - patch1 against new autotools
    - patch2 against format not a string literal and no format arguments
    - fixed removing man from install dir

 xcircuit-configure.in.patch         | 10 +++++++
 xcircuit-not-a-string-literal.patch | 56 +++++++++++++++++++++++++++++++++++++
 xcircuit.spec                       | 12 +++++---
 3 files changed, 74 insertions(+), 4 deletions(-)
---
diff --git a/xcircuit.spec b/xcircuit.spec
index 495964a..a7578b7 100644
--- a/xcircuit.spec
+++ b/xcircuit.spec
@@ -4,15 +4,17 @@ Summary:	Drawing electrical circuit schematic diagrams and related figure
 Summary(hu.UTF-8):	Elektromos áramkörök rajzolása
 Summary(pl.UTF-8):	Rysowanie schematów elektronicznych i zbliżonych diagramów
 Name:		xcircuit
-Version:	3.6.165
+Version:	3.8.37
 Release:	1
 License:	GPL
 Group:		Applications/Engineering
 Source0:	http://opencircuitdesign.com/xcircuit/archive/%{name}-%{version}.tgz
-# Source0-md5:	f90891db67c27708af01ca5f043db6df
+# Source0-md5:	f61f304a6babf085eec55c73d3096d0e
 Source1:	%{name}.desktop
 Source2:	http://opencircuitdesign.com/xcircuit/archive/tutorial.tar.gz
 # Source2-md5:	16aaa9c90b0cc83f69c1837365817fe4
+Patch1:		%{name}-configure.in.patch
+Patch2:		%{name}-not-a-string-literal.patch
 URL:		http://opencircuitdesign.com/xcircuit/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -20,7 +22,7 @@ BuildRequires:	tk-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _xcircuitdir    %{_libdir}/%{name}-3.6
+%define         _xcircuitdir    %{_libdir}/%{name}-3.8
 
 %description
 XCircuit is a UNIX/X11 program for drawing publishable-quality
@@ -66,6 +68,8 @@ Tutorial az XCircuithoz.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -93,7 +97,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install -d $RPM_BUILD_ROOT%{_docdir}/xcircuit-tutorial
 tar xf %{SOURCE2} -C $RPM_BUILD_ROOT%{_docdir}/xcircuit-tutorial
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/xcircuit-3.6/man
+rm -rf $RPM_BUILD_ROOT%{_xcircuitdir}/man
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/xcircuit-configure.in.patch b/xcircuit-configure.in.patch
new file mode 100644
index 0000000..14b298f
--- /dev/null
+++ b/xcircuit-configure.in.patch
@@ -0,0 +1,10 @@
+--- xcircuit-3.8.37/configure.in~	2012-05-03 19:31:58.000000000 +0200
++++ xcircuit-3.8.37/configure.in	2013-04-14 12:56:56.000000000 +0200
+@@ -43,7 +43,6 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi
diff --git a/xcircuit-not-a-string-literal.patch b/xcircuit-not-a-string-literal.patch
new file mode 100644
index 0000000..cce434d
--- /dev/null
+++ b/xcircuit-not-a-string-literal.patch
@@ -0,0 +1,56 @@
+--- xcircuit-3.8.37/svg.c~	2012-12-29 16:34:05.000000000 +0100
++++ xcircuit-3.8.37/svg.c	2013-04-14 13:01:38.000000000 +0200
+@@ -1109,12 +1109,12 @@
+ 
+    if (locobjc >= 2) {
+       /* If there is a non-option argument, use it for the output filename */
+-      sprintf(filename, Tcl_GetString(objv[1]));
++      sprintf(filename,"%s", Tcl_GetString(objv[1]));
+    }
+    else if (xobjs.pagelist[areawin->page]->pageinst->thisobject->name == NULL)
+-      sprintf(filename, xobjs.pagelist[areawin->page]->filename);
++      sprintf(filename,"%s", xobjs.pagelist[areawin->page]->filename);
+    else
+-      sprintf(filename, xobjs.pagelist[areawin->page]->pageinst->thisobject->name);
++      sprintf(filename,"%s", xobjs.pagelist[areawin->page]->pageinst->thisobject->name);
+ 
+    pptr = strrchr(filename, '.');
+    if (pptr != NULL)
+--- xcircuit-3.8.37/tclxcircuit.c~	2013-03-03 17:37:46.000000000 +0100
++++ xcircuit-3.8.37/tclxcircuit.c	2013-04-14 13:04:36.000000000 +0200
+@@ -3858,7 +3858,7 @@
+       case NameIdx:
+ 	 if (nidx == 1 || areawin->selects == 0) {
+ 	    if (objc == 3) {
+-	       sprintf(thisinst->thisobject->name, Tcl_GetString(objv[nidx + 2]));
++	       sprintf(thisinst->thisobject->name,"%s", Tcl_GetString(objv[nidx + 2]));
+ 	       checkname(thisinst->thisobject);
+ 	    }
+ 	    Tcl_AppendElement(interp, thisinst->thisobject->name);
+@@ -7187,7 +7187,7 @@
+ 
+       case LoadIdx:
+ 	 TechReplaceSave();
+-	 sprintf(_STR2, Tcl_GetString(objv[2 + nidx]));
++	 sprintf(_STR2,"%s", Tcl_GetString(objv[2 + nidx]));
+ 	 for (i = 3 + nidx; i < objc; i++) {
+ 	    argv = Tcl_GetString(objv[i]);
+ 	    if ((*argv == '-') && !strncmp(argv, "-repl", 5)) {
+@@ -7273,7 +7273,7 @@
+ 
+ 	 switch (importtype) {
+ 	    case XCircuitIdx:
+-	       sprintf(_STR2, Tcl_GetString(objv[3 + nidx]));
++	       sprintf(_STR2,"%s",Tcl_GetString(objv[3 + nidx]));
+ 	       for (i = 4; i < objc; i++) {
+ 		  strcat(_STR2, ",");
+ 		  strcat(_STR2, Tcl_GetString(objv[i + nidx]));
+@@ -7290,7 +7290,7 @@
+ 		  Tcl_SetObjResult(interp, objPtr);
+ 		  return XcTagCallback(interp, objc, objv);
+ 	       }
+-	       sprintf(_STR2, Tcl_GetString(objv[3 + nidx]));
++	       sprintf(_STR2,"%s", Tcl_GetString(objv[3 + nidx]));
+ 	       if (savepage != pageno) newpage(pageno);
+ 	       loadbackground();
+ 	       if (savepage != pageno) newpage(savepage);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xcircuit.git/commitdiff/079a6c1aa8d1e622d903c818e2d39b11810b5bbe