Hello community, here is the log from the commit of package skencil checked in at Tue Aug 15 18:34:44 CEST 2006. -------- --- skencil/skencil.changes 2006-01-25 21:41:38.000000000 +0100 +++ skencil/skencil.changes 2006-08-15 15:23:25.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 15 15:23:08 CEST 2006 - lmichnovic@suse.cz + +- adjusted setup paths for X.org 7.x (xorg7.patch,xorg7_64.patch) + +------------------------------------------------------------------- Old: ---- skencil-0.6.17-lib64.dif skencil-0.6.17-ruler_font.diff skencil-0.6.17-strict-alias-fix.diff New: ---- skencil-0.6.17-lib64.patch skencil-0.6.17-ruler_font.patch skencil-0.6.17-strict-alias-fix.patch skencil-0.6.17-xorg7.patch skencil-0.6.17-xorg7_64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skencil.spec ++++++ --- /var/tmp/diff_new_pack.fCI7fA/_old 2006-08-15 18:34:32.000000000 +0200 +++ /var/tmp/diff_new_pack.fCI7fA/_new 2006-08-15 18:34:32.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package skencil (Version 0.6.17) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,15 +19,17 @@ Obsoletes: sketch Autoreqprov: on Version: 0.6.17 -Release: 1 +Release: 15 Summary: Python-Based Vector Drawing Program URL: http://www.skencil.org/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png -Patch1: %{name}-%{version}-lib64.dif -Patch2: %{name}-%{version}-ruler_font.diff -Patch3: %{name}-%{version}-strict-alias-fix.diff +Patch1: %{name}-%{version}-lib64.patch +Patch2: %{name}-%{version}-ruler_font.patch +Patch3: %{name}-%{version}-strict-alias-fix.patch +Patch4: %{name}-%{version}-xorg7.patch +Patch5: %{name}-%{version}-xorg7_64.patch Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,11 +47,20 @@ %prep %setup -q +# if using lib64 dir then patch the paths if test "%_lib" = "lib64" ; then %patch1 fi %patch2 %patch3 +# the files includes lib64 paths so use the suitable patch +%if "%(xft-config --prefix)" == "/usr" +if test "%_lib" = "lib64" ; then +%patch5 +else +%patch4 +fi +%endif find -type d | xargs chmod 755 %build @@ -57,7 +68,6 @@ ./setup.py build %install -rm -rf $RPM_BUILD_ROOT ./setup.py install --prefix=%{prefix} --dest-dir=$RPM_BUILD_ROOT mv Pax/README Pax/README.pax mv Pax/COPYING Pax/COPYING.pax @@ -79,6 +89,8 @@ /usr/share/pixmaps/skencil.png %changelog -n skencil +* Tue Aug 15 2006 - lmichnovic@suse.cz +- adjusted setup paths for X.org 7.x (xorg7.patch,xorg7_64.patch) * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Aug 03 2005 - anicka@suse.cz ++++++ skencil-0.6.17-lib64.dif -> skencil-0.6.17-lib64.patch ++++++ ++++++ skencil-0.6.17-ruler_font.patch ++++++ --- Sketch/Base/config.py +++ Sketch/Base/config.py @@ -380,12 +380,12 @@ ruler_max_text_step = 100 #ruler_font = '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-iso8859-1' - ruler_font = '-misc-fixed-medium-*-*-*-11-*-*-*-*-*-iso8859-1' + ruler_font = '-*-luxi sans-medium-r-*-*-11-*-*-*-*-*-iso8859-1' #ruler_font = '-*-lucida-medium-r-*-*-11-*-*-*-*-*-iso8859-1' ruler_text_type = 'rotated' # can be 'rotated', 'horizontal' or 'vertical' #ruler_text_type = 'horizontal' #ruler_font_rotated = '-*-helvetica-medium-r-*-*-[0 10 ~10 0]-*-*-*-*-*-iso8859-1' - ruler_font_rotated = '-misc-fixed-medium-*-*-*-[0 11 ~11 0]-*-*-*-*-*-iso8859-1' + ruler_font_rotated = '-*-luxi sans-medium-r-*-*-[0 11 ~11 0]-*-*-*-*-*-iso8859-1' #ruler_font_rotated = '-*-lucida-medium-r-*-*-[0 11 ~11 0]-*-*-*-*-*-iso8859-1' # ++++++ skencil-0.6.17-strict-alias-fix.patch ++++++ --- Filter/streamfilter.c +++ Filter/streamfilter.c @@ -82,10 +82,15 @@ { PyObject * d, *m, *v; + union { + PyTypeObject* tFilterType; + PyObject* pFilterType; + } uFilterType = { &FilterType }; + m = Py_InitModule("streamfilter", filter_functions); d = PyModule_GetDict(m); - PyDict_SetItemString(d, "FilterType", (PyObject*)(&FilterType)); + PyDict_SetItemString(d, "FilterType", uFilterType.pFilterType); v = PyCObject_FromVoidPtr(&functions, NULL); PyDict_SetItemString(d, "Filter_Functions", v); Py_DECREF(v); --- Pax/borderobject.c +++ Pax/borderobject.c @@ -100,13 +100,17 @@ Drawable drawable; PyObject *list; XPoint *points; + union { + XPoint** xpoints; + short** spoints; + } upoints = { &points }; int npoints; int border_width, left_relief; if (!PyArg_ParseTuple(args, "O&Oii", pax_convert_drawable, &drawable, &list, &border_width, &left_relief)) return NULL; - if (!pax_checkshortlist(2, list, (short**)&points, &npoints)) + if (!pax_checkshortlist(2, list, upoints.spoints, &npoints)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "argument should be XPoint[]"); @@ -127,13 +131,17 @@ Drawable drawable; PyObject *list; XPoint *points; + union { + XPoint** xpoints; + short** spoints; + } upoints = { &points }; int npoints; int border_width, left_relief; if (!PyArg_ParseTuple(args, "O&Oii", pax_convert_drawable, &drawable, &list, &border_width, &left_relief)) return NULL; - if (!pax_checkshortlist(2, list, (short**)&points, &npoints)) + if (!pax_checkshortlist(2, list, upoints.spoints, &npoints)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "argument should be XPoint[]"); --- Pax/gcmethods.c +++ Pax/gcmethods.c @@ -35,10 +35,15 @@ PaxGC_DrawArcs(PaxGCObject * self, PyObject *args) { PyObject *arg1; XArc *arcs_arg1; int narcs_arg1; + union { + XArc** xarcs_arg1; + short** sarcs_arg1; + } uarcs_arg1 = { &arcs_arg1 }; + if (!PyArg_ParseTuple(args, "O", &arg1)) return NULL; - if (!checkshortlist(6, arg1, (short**)&arcs_arg1, &narcs_arg1)) { + if (!checkshortlist(6, arg1, uarcs_arg1.sarcs_arg1, &narcs_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XArc[]"); return NULL; @@ -100,12 +105,17 @@ PaxGC_DrawLines(PaxGCObject * self, PyObject *args) { PyObject *arg1; XPoint *pts_arg1; int npts_arg1; + union { + XPoint** xpts_arg1; + short** spts_arg1; + } upts_arg1 = { &pts_arg1 }; + int arg2; if (!PyArg_ParseTuple(args, "Oi", &arg1, &arg2)) return NULL; - if (!checkshortlist(2, arg1, (short**)&pts_arg1, &npts_arg1)) { + if (!checkshortlist(2, arg1, upts_arg1.spts_arg1, &npts_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XPoint[]"); return NULL; @@ -138,12 +148,17 @@ PaxGC_DrawPoints(PaxGCObject * self, PyObject *args) { PyObject *arg1; XPoint *pts_arg1; int npts_arg1; + union { + XPoint** xpts_arg1; + short** spts_arg1; + } upts_arg1 = { &pts_arg1 }; + int arg2; if (!PyArg_ParseTuple(args, "Oi", &arg1, &arg2)) return NULL; - if (!checkshortlist(2, arg1, (short**)&pts_arg1, &npts_arg1)) { + if (!checkshortlist(2, arg1, upts_arg1.spts_arg1, &npts_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XPoint[]"); return NULL; @@ -182,10 +197,15 @@ PaxGC_DrawRectangles(PaxGCObject * self, PyObject *args) { PyObject *arg1; XRectangle *rects_arg1; int nrects_arg1; + union { + XRectangle** xrects_arg1; + short** srects_arg1; + } urects_arg1 = { &rects_arg1 }; + if (!PyArg_ParseTuple(args, "O", &arg1)) return NULL; - if (!checkshortlist(4, arg1, (short**)&rects_arg1, &nrects_arg1)) { + if (!checkshortlist(4, arg1, urects_arg1.srects_arg1, &nrects_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XRectangle[]"); return NULL; @@ -201,10 +221,15 @@ PaxGC_DrawSegments(PaxGCObject * self, PyObject *args) { PyObject *arg1; XSegment *segs_arg1; int nsegs_arg1; + union { + XSegment** xsegs_arg1; + short** ssegs_arg1; + } usegs_arg1 = { &segs_arg1 }; + if (!PyArg_ParseTuple(args, "O", &arg1)) return NULL; - if (!checkshortlist(4, arg1, (short**)&segs_arg1, &nsegs_arg1)) { + if (!checkshortlist(4, arg1, usegs_arg1.ssegs_arg1, &nsegs_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XSegment[]"); return NULL; @@ -272,10 +297,15 @@ PaxGC_FillArcs(PaxGCObject * self, PyObject *args) { PyObject *arg1; XArc *arcs_arg1; int narcs_arg1; + union { + XArc** xarcs_arg1; + short** sarcs_arg1; + } uarcs_arg1 = { &arcs_arg1 }; + if (!PyArg_ParseTuple(args, "O", &arg1)) return NULL; - if (!checkshortlist(6, arg1, (short**)&arcs_arg1, &narcs_arg1)) { + if (!checkshortlist(6, arg1, uarcs_arg1.sarcs_arg1, &narcs_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XArc[]"); return NULL; @@ -291,6 +321,11 @@ PaxGC_FillPolygon(PaxGCObject * self, PyObject *args) { PyObject *arg1; XPoint *pts_arg1; int npts_arg1; + union { + XPoint** xpts_arg1; + short** spts_arg1; + } upts_arg1 = { &pts_arg1 }; + int arg2; int arg3; if (!PyArg_ParseTuple(args, "Oii", @@ -298,7 +333,7 @@ &arg2, &arg3)) return NULL; - if (!checkshortlist(2, arg1, (short**)&pts_arg1, &npts_arg1)) { + if (!checkshortlist(2, arg1, upts_arg1.spts_arg1, &npts_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XPoint[]"); return NULL; @@ -338,10 +373,14 @@ PaxGC_FillRectangles(PaxGCObject * self, PyObject *args) { PyObject *arg1; XRectangle *rects_arg1; int nrects_arg1; + union { + XRectangle** xrects_arg1; + short** srects_arg1; + } urects_arg1 = { &rects_arg1 }; if (!PyArg_ParseTuple(args, "O", &arg1)) return NULL; - if (!checkshortlist(4, arg1, (short**)&rects_arg1, &nrects_arg1)) { + if (!checkshortlist(4, arg1, urects_arg1.srects_arg1, &nrects_arg1)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XRectangle[]"); return NULL; @@ -471,6 +510,10 @@ int arg1; int arg2; PyObject *arg3; XRectangle *rects_arg3; int nrects_arg3; + union { + XRectangle** xrects_arg3; + short** srects_arg3; + } urects_arg3 = { &rects_arg3 }; int arg4; if (self->shared) { PyErr_SetString(PyExc_TypeError, "can't modify shared GC"); @@ -482,7 +525,7 @@ &arg3, &arg4)) return NULL; - if (!checkshortlist(4, arg3, (short**)&rects_arg3, &nrects_arg3)) { + if (!checkshortlist(4, arg3, urects_arg3.srects_arg3, &nrects_arg3)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg3 should be XRectangle[]"); return NULL; --- Pax/paxmodule.c +++ Pax/paxmodule.c @@ -916,7 +916,12 @@ v = PyCObject_FromVoidPtr(&pax_functions, NULL); PyDict_SetItemString(d, "Pax_Functions", v); -#define ADD_TYPE(type) PyDict_SetItemString(d, #type, (PyObject*)(&type)) +#define ADD_TYPE(type) \ + union { \ + PyTypeObject* t_ ## type; \ + PyObject* p_ ## type; \ + } u ## type = { &type }; \ + PyDict_SetItemString(d, #type, u ## type.p_ ## type) ADD_TYPE(TkWinType); ADD_TYPE(PaxPixmapType); --- Pax/paxtkinter.c +++ Pax/paxtkinter.c @@ -2024,6 +2024,10 @@ initpaxtkinter(void) /* function name changed for pax */ { PyObject *m, *d; + union { + PyTypeObject* t_Type; + PyObject* p_Type; + } uType = { &Tkapp_Type }; Tkapp_Type.ob_type = &PyType_Type; @@ -2050,10 +2054,11 @@ ins_string(d, "TK_VERSION", TK_VERSION); ins_string(d, "TCL_VERSION", TCL_VERSION); - PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type); + PyDict_SetItemString(d, "TkappType", uType.p_Type); Tktt_Type.ob_type = &PyType_Type; - PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type); + uType.t_Type = &Tktt_Type; + PyDict_SetItemString(d, "TkttType", uType.p_Type); /* This helps the dynamic loader; in Unicode aware Tcl versions it also helps Tcl find its encodings. */ --- Pax/tkwinobject.c +++ Pax/tkwinobject.c @@ -693,11 +693,16 @@ Region reg; PyObject *list; XPoint *points; + union { + XPoint** xpoints; + short** spoints; + } upoints = { &points }; + int npoints, fill_rule = EvenOddRule; if (!PyArg_ParseTuple(args, "O|i", &list, &fill_rule)) return NULL; - if (!pax_checkshortlist(2, list, (short**)&points, &npoints)) + if (!pax_checkshortlist(2, list, upoints.spoints, &npoints)) { if (!PyErr_Occurred()) PyErr_SetString(PyExc_TypeError, "arg1 should be XPoint[]"); --- Sketch/Modules/_sketchmodule.c +++ Sketch/Modules/_sketchmodule.c @@ -129,6 +129,10 @@ init_sketch() { PyObject * d, *m, *r, *pax; + union { + PyTypeObject* ptypeobject; + PyObject* pobject; + } uobject; m = Py_InitModule("_sketch", curve_functions); d = PyModule_GetDict(m); @@ -159,13 +163,18 @@ { PyDict_SetItemString(d, "SingularMatrix", SKTrafo_ExcSingular); } - + /* Sketch type objects */ - PyDict_SetItemString(d, "RectType", (PyObject*)&SKRectType); - PyDict_SetItemString(d, "PointType", (PyObject*)&SKPointType); - PyDict_SetItemString(d, "TrafoType", (PyObject*)&SKTrafoType); - PyDict_SetItemString(d, "CurveType", (PyObject*)&SKCurveType); - PyDict_SetItemString(d, "ColorType", (PyObject*)&SKColorType); + uobject.pobject = &SKRectType; + PyDict_SetItemString(d, "RectType", uobject.pobject); + uobject.pobject = &SKPointType; + PyDict_SetItemString(d, "PointType", uobject.pobject); + uobject.pobject = &SKTrafoType; + PyDict_SetItemString(d, "TrafoType", uobject.pobject); + uobject.pobject = &SKCurveType; + PyDict_SetItemString(d, "CurveType", uobject.pobject); + uobject.pobject = &SKColorType; + PyDict_SetItemString(d, "ColorType", uobject.pobject); /* Curve specific initialization */ #define ADD_INT(name) add_int(d, name, #name) ++++++ skencil-0.6.17-xorg7.patch ++++++ --- Pax/Setup.in +++ Pax/Setup.in @@ -21,7 +21,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk8.0 -ltcl8.0 \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/lib \ # *** Always uncomment this; X11 libraries to link with: -lX11 -lXext @@ -35,6 +35,6 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk8.0 -ltcl8.0 \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/lib \ # *** Always uncomment this; X11 libraries to link with: -lX11 --- Sketch/Base/config.py +++ Sketch/Base/config.py @@ -61,7 +61,7 @@ # # On platforms other than Linux this probably needs a few additional # directories. (non-existing dirs are automatically removed) -font_path = ['/usr/X11R6/lib/X11/fonts/Type1', +font_path = ['/usr/lib/X11/fonts/Type1', '/usr/share/ghostscript/fonts', '/usr/lib/ghostscript/fonts'] --- Sketch/Modules/Setup.in +++ Sketch/Modules/Setup.in @@ -21,7 +21,7 @@ # *** Edit to reflect where the file Imaging.h of the Imaging library is: -I/home/tester/Python-1.5.1/Imaging-0.3b2/libImaging/ \ # *** X libraries (should be correct for Linux) --L/usr/X11R6/lib -lX11 -lm +-L/usr/lib -lX11 -lm _type1module _type1module.c --- setup.py +++ setup.py @@ -314,9 +314,9 @@ if platform == 'sunos5': config.inc_dirs.append('-I/usr/openwin/include') config.lib_dirs.append('-L/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): - config.inc_dirs.append('-I/usr/X11R6/include') - config.lib_dirs.append('-L/usr/X11R6/lib') + elif os.path.exists('/usr/include'): + config.inc_dirs.append('-I/usr/include') + config.lib_dirs.append('-L/usr/lib') elif os.path.exists('/usr/X11R5/include'): config.inc_dirs.append('-I/usr/X11R5/include') config.lib_dirs.append('-L/usr/X11R5/lib') ++++++ skencil-0.6.17-xorg7_64.patch ++++++ --- Pax/Setup.in +++ Pax/Setup.in @@ -21,7 +21,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk8.0 -ltcl8.0 \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/lib \ # *** Always uncomment this; X11 libraries to link with: -lX11 -lXext @@ -35,6 +35,6 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk8.0 -ltcl8.0 \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/lib \ # *** Always uncomment this; X11 libraries to link with: -lX11 --- Sketch/Base/config.py +++ Sketch/Base/config.py @@ -61,7 +61,7 @@ # # On platforms other than Linux this probably needs a few additional # directories. (non-existing dirs are automatically removed) -font_path = ['/usr/X11R6/lib/X11/fonts/Type1', +font_path = ['/usr/lib/X11/fonts/Type1', '/usr/share/ghostscript/fonts', '/usr/lib/ghostscript/fonts'] --- Sketch/Modules/Setup.in +++ Sketch/Modules/Setup.in @@ -21,7 +21,7 @@ # *** Edit to reflect where the file Imaging.h of the Imaging library is: -I/home/tester/Python-1.5.1/Imaging-0.3b2/libImaging/ \ # *** X libraries (should be correct for Linux) --L/usr/X11R6/lib -lX11 -lm +-L/usr/lib -lX11 -lm _type1module _type1module.c --- setup.py +++ setup.py @@ -314,9 +314,9 @@ if platform == 'sunos5': config.inc_dirs.append('-I/usr/openwin/include') config.lib_dirs.append('-L/usr/openwin/lib64') - elif os.path.exists('/usr/X11R6/include'): - config.inc_dirs.append('-I/usr/X11R6/include') - config.lib_dirs.append('-L/usr/X11R6/lib64') + elif os.path.exists('/usr/include'): + config.inc_dirs.append('-I/usr/include') + config.lib_dirs.append('-L/usr/lib64') elif os.path.exists('/usr/X11R5/include'): config.inc_dirs.append('-I/usr/X11R5/include') config.lib_dirs.append('-L/usr/X11R5/lib64') ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org