Hello community, here is the log from the commit of package rekall checked in at Fri Oct 6 18:49:40 CEST 2006. -------- --- KDE/rekall/rekall.changes 2006-06-19 10:46:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/rekall/rekall.changes 2006-10-03 16:08:07.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 3 16:08:00 CEST 2006 - dmueller@suse.de + +- build against python 2.5 + +------------------------------------------------------------------- Old: ---- rekall-2.2.6.tar.gz rekall-python24.diff New: ---- rekall-2.2.6.tar.bz2 rekall-python25.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekall.spec ++++++ --- /var/tmp/diff_new_pack.nZ145P/_old 2006-10-06 18:47:49.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ145P/_new 2006-10-06 18:47:49.000000000 +0200 @@ -12,24 +12,24 @@ Name: rekall BuildRequires: kdelibs3-devel krb5-devel mysql-devel postgresql-devel python-devel xbsql -URL: http://www.rekall.a-i-s.co.uk/ +URL: http://www.rekallrevealed.org/ License: GPL Group: Productivity/Databases/Clients Summary: Universal Database Application Version: 2.2.6 -Release: 18 +Release: 23 %define rversion %version Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: %name-database-backend = %version BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{rversion}.tar.gz +Source0: %{name}-%{rversion}.tar.bz2 Source1: de.po Source2: cs.po Source3: mushroomDAT.tar.bz2 Source4: mushroomDAT_en.tar.bz2 Patch0: %name.diff Patch1: i18n.diff -Patch2: rekall-python24.diff +Patch2: rekall-python25.diff Patch3: rekall-2.2.6-gcc4.diff Patch4: autotools.diff Patch5: fix-desktop-file-location.diff @@ -139,7 +139,7 @@ --with-mysql-libraries=%_libdir/mysql \ --with-pgsql-libraries=%_libdir \ --with-xbsql-libraries=%_libdir -make %{?jobs:-j%jobs} +do_make %{?jobs:-j%jobs} %install rm -rf $RPM_BUILD_ROOT @@ -275,6 +275,8 @@ /opt/kde3/share/apps/rekall/examples %changelog -n rekall +* Tue Oct 03 2006 - dmueller@suse.de +- build against python 2.5 * Wed May 24 2006 - adrian@suse.de - fix build for < 10.1 * Mon May 22 2006 - dmueller@suse.de ++++++ fix-desktop-file-location.diff ++++++ --- /var/tmp/diff_new_pack.nZ145P/_old 2006-10-06 18:47:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ145P/_new 2006-10-06 18:47:50.000000000 +0200 @@ -1,5 +1,5 @@ ---- kbase/Makefile.am 2005/10/25 11:48:35 1.1 -+++ kbase/Makefile.am 2005/10/25 11:49:02 +--- kbase/Makefile.am ++++ kbase/Makefile.am @@ -61,7 +61,7 @@ -rm r-f $(DESTDIR)$(kde_datadir)/rekall ++++++ i18n.diff ++++++ --- /var/tmp/diff_new_pack.nZ145P/_old 2006-10-06 18:47:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ145P/_new 2006-10-06 18:47:50.000000000 +0200 @@ -1,5 +1,5 @@ --- kbase/kb_about.cpp -+++ kbase/kb_about.cpp 2004/04/28 09:43:37 ++++ kbase/kb_about.cpp @@ -119,7 +119,7 @@ { mb->removeItem (mid) ; mb->insertItem (i18n("&Help"), customHelpMenu()) ; @@ -37,7 +37,7 @@ aboutApp->showPage (showPlugins ? (QWidget *)plugins : (QWidget *)about) ; --- libs/kbase/kb_parsereport.cpp -+++ libs/kbase/kb_parsereport.cpp 2004/04/28 09:43:37 ++++ libs/kbase/kb_parsereport.cpp @@ -112,7 +112,7 @@ if (m_kbTOS == 0) ++++++ rekall-2.2.6-gcc4.diff ++++++ --- /var/tmp/diff_new_pack.nZ145P/_old 2006-10-06 18:47:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ145P/_new 2006-10-06 18:47:50.000000000 +0200 @@ -1,8 +1,8 @@ Only in rekall-2.2.1/libs/common: .kb_classes.h.swp -diff -pur rekall-2.2.1-9/libs/el32/hash.cpp rekall-2.2.1/libs/el32/hash.cpp ---- rekall-2.2.1-9/libs/el32/hash.cpp 2003-11-15 00:08:42.000000000 +0100 -+++ rekall-2.2.1/libs/el32/hash.cpp 2005-05-09 17:26:43.000000000 +0200 -@@ -113,7 +113,7 @@ VALUE *HASH::entry +================================================================================ +--- rekall-2.2.6/libs/el32/hash.cpp ++++ rekall-2.2.6/libs/el32/hash.cpp +@@ -113,7 +113,7 @@ { extern int hashval (const char *) ; @@ -11,7 +11,7 @@ HITEM *item ; /* Determine the hash value. This depends on the type of the */ -@@ -141,7 +141,7 @@ VALUE *HASH::entry +@@ -141,7 +141,7 @@ /* otherwise use just the tag (pretty useless */ /* but so what, not a common case). */ if ((key.tag->flags & TF_SHARED) == 0) @@ -20,11 +20,9 @@ else hval = key.tag->tag ; break ; } -Only in rekall-2.2.1/libs/kbase: .kb_complink.cpp.swp -diff -pur rekall-2.2.1-9/libs/kbase/kb_configdlg.cpp rekall-2.2.1/libs/kbase/kb_configdlg.cpp ---- rekall-2.2.1-9/libs/kbase/kb_configdlg.cpp 2003-11-15 00:09:13.000000000 +0100 -+++ rekall-2.2.1/libs/kbase/kb_configdlg.cpp 2005-05-12 15:13:44.891041733 +0200 -@@ -337,7 +337,7 @@ void KBConfigDlg::fixUp () +--- rekall-2.2.6/libs/kbase/kb_configdlg.cpp ++++ rekall-2.2.6/libs/kbase/kb_configdlg.cpp +@@ -339,7 +339,7 @@ old.clear () ; QListViewItem *item = m_lvConfigs.firstChild() ; @@ -33,10 +31,9 @@ while (item != 0) { -diff -pur rekall-2.2.1-9/libs/kbase/kb_formblock.cpp rekall-2.2.1/libs/kbase/kb_formblock.cpp ---- rekall-2.2.1-9/libs/kbase/kb_formblock.cpp 2004-06-08 16:58:51.000000000 +0200 -+++ rekall-2.2.1/libs/kbase/kb_formblock.cpp 2005-05-09 17:32:59.000000000 +0200 -@@ -1500,7 +1500,7 @@ bool KBFormBlock::playerAdd +--- rekall-2.2.6/libs/kbase/kb_formblock.cpp ++++ rekall-2.2.6/libs/kbase/kb_formblock.cpp +@@ -1510,7 +1510,7 @@ return false ; } @@ -45,10 +42,9 @@ return true ; } -diff -pur rekall-2.2.1-9/libs/kbase/kb_framer.cpp rekall-2.2.1/libs/kbase/kb_framer.cpp ---- rekall-2.2.1-9/libs/kbase/kb_framer.cpp 2004-03-12 19:09:20.000000000 +0100 -+++ rekall-2.2.1/libs/kbase/kb_framer.cpp 2005-05-09 17:33:52.000000000 +0200 -@@ -321,7 +321,7 @@ bool KBFramer::playerAdd +--- rekall-2.2.6/libs/kbase/kb_framer.cpp ++++ rekall-2.2.6/libs/kbase/kb_framer.cpp +@@ -321,7 +321,7 @@ return false ; } @@ -57,10 +53,9 @@ return true ; } -diff -pur rekall-2.2.1-9/libs/kbase/kb_link.cpp rekall-2.2.1/libs/kbase/kb_link.cpp ---- rekall-2.2.1-9/libs/kbase/kb_link.cpp 2003-11-15 00:09:51.000000000 +0100 -+++ rekall-2.2.1/libs/kbase/kb_link.cpp 2005-05-09 17:31:12.000000000 +0200 -@@ -770,21 +770,21 @@ static void makeLinkPopup +--- rekall-2.2.6/libs/kbase/kb_link.cpp ++++ rekall-2.2.6/libs/kbase/kb_link.cpp +@@ -851,21 +851,21 @@ receiver, SLOT(newNode(int)), 0, @@ -85,10 +80,9 @@ ) ; popup->insertItem (TR("New &Link"), lp) ; -diff -pur rekall-2.2.1-9/libs/kbase/kb_overridedlg.cpp rekall-2.2.1/libs/kbase/kb_overridedlg.cpp ---- rekall-2.2.1-9/libs/kbase/kb_overridedlg.cpp 2004-02-06 18:44:51.000000000 +0100 -+++ rekall-2.2.1/libs/kbase/kb_overridedlg.cpp 2005-05-12 15:20:35.085597934 +0200 -@@ -333,7 +333,7 @@ void KBOverrideDlg::fixUp () +--- rekall-2.2.6/libs/kbase/kb_overridedlg.cpp ++++ rekall-2.2.6/libs/kbase/kb_overridedlg.cpp +@@ -333,7 +333,7 @@ old.clear () ; QListViewItem *item = m_lvOverride.firstChild() ; @@ -97,10 +91,9 @@ while (item != 0) { -diff -pur rekall-2.2.1-9/libs/kbase/kb_parse.cpp rekall-2.2.1/libs/kbase/kb_parse.cpp ---- rekall-2.2.1-9/libs/kbase/kb_parse.cpp 2003-11-15 00:10:12.000000000 +0100 -+++ rekall-2.2.1/libs/kbase/kb_parse.cpp 2005-05-12 15:07:11.222873760 +0200 -@@ -971,7 +971,7 @@ LIBKBASE_API +--- rekall-2.2.6/libs/kbase/kb_parse.cpp ++++ rekall-2.2.6/libs/kbase/kb_parse.cpp +@@ -971,7 +971,7 @@ receiver, SLOT (newNode(int)), 0, @@ -109,7 +102,7 @@ ) ; sep = true ; -@@ -1025,7 +1025,7 @@ LIBKBASE_API +@@ -1025,7 +1025,7 @@ receiver, SLOT (newNode(int)), 0, @@ -118,7 +111,7 @@ ) ; } -@@ -1043,7 +1043,7 @@ LIBKBASE_API +@@ -1043,7 +1043,7 @@ receiver, SLOT (newNode(int)), 0, @@ -127,10 +120,9 @@ ) ; ) -diff -pur rekall-2.2.1-9/script/python/lib/tkc_pydebugbase.cpp rekall-2.2.1/script/python/lib/tkc_pydebugbase.cpp ---- rekall-2.2.1-9/script/python/lib/tkc_pydebugbase.cpp 2003-11-18 15:17:44.000000000 +0100 -+++ rekall-2.2.1/script/python/lib/tkc_pydebugbase.cpp 2005-05-12 14:15:11.742469890 +0200 -@@ -550,7 +550,7 @@ void TKCPyDebugBase::setTracePoint +--- rekall-2.2.6/script/python/lib/tkc_pydebugbase.cpp ++++ rekall-2.2.6/script/python/lib/tkc_pydebugbase.cpp +@@ -550,7 +550,7 @@ if (PyModule_Check (pyObj) || PyCode_Check (pyObj)) if (findTracePoint (pyObj, lineNo) == 0) { @@ -139,7 +131,7 @@ tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ; enable () ; } -@@ -573,7 +573,7 @@ void TKCPyDebugBase::clearTracePoint +@@ -573,7 +573,7 @@ if (PyModule_Check (pyObj) || PyCode_Check (pyObj)) if ((tp = findTracePoint (pyObj, lineNo)) != 0) { ++++++ rekall-python24.diff -> rekall-python25.diff ++++++ --- KDE/rekall/rekall-python24.diff 2006-02-15 11:23:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/rekall/rekall-python25.diff 2006-10-06 15:11:32.000000000 +0200 @@ -1,13 +1,42 @@ --- configure.in.in -+++ configure.in.in 2004/11/25 00:42:44 -@@ -81,6 +81,10 @@ ++++ configure.in.in +@@ -85,6 +85,10 @@ USESYSPY=1 ;; -+ 2.4) SYSPYVER="2.4" ++ 2.5) SYSPYVER="2.5" + USESYSPY=1 + ;; + *) AC_MSG_ERROR([Unrecognised python version: $pyver]) ;; esac +--- script/python/lib-sys/tkc_pydebugbase.cpp ++++ script/python/lib-sys/tkc_pydebugbase.cpp +@@ -550,7 +550,7 @@ + if (PyModule_Check (pyObj) || PyCode_Check (pyObj)) + if (findTracePoint (pyObj, lineNo) == 0) + { +- fprintf (stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ; ++ fprintf (stderr, "Set trace: %p:%d\n", pyObj, lineNo) ; + tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ; + enable () ; + } +@@ -573,7 +573,7 @@ + if (PyModule_Check (pyObj) || PyCode_Check (pyObj)) + if ((tp = findTracePoint (pyObj, lineNo)) != 0) + { +- fprintf (stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ; ++ fprintf (stderr, "Rem trace: %p:%d\n", pyObj, lineNo) ; + tracePoints.remove (tp) ; + delete tp ; + disable () ; +@@ -1089,7 +1089,7 @@ + PyObject *pyKey ; + PyObject *pyValue ; + QString name ; +- int dictPos = 0 ; ++ ssize_t dictPos = 0 ; + + /* See if we have been here before, in which case there is no */ + /* point in going there again. This also prevents infinite */ ++++++ rekall.diff ++++++ --- /var/tmp/diff_new_pack.nZ145P/_old 2006-10-06 18:47:50.000000000 +0200 +++ /var/tmp/diff_new_pack.nZ145P/_new 2006-10-06 18:47:50.000000000 +0200 @@ -1,5 +1,5 @@ --- kbase/rekall.desktop -+++ kbase/rekall.desktop 2004/04/28 11:44:37 ++++ kbase/rekall.desktop @@ -2,7 +2,7 @@ [KDE Desktop Entry] Type=Application @@ -9,20 +9,55 @@ DocPath=rekall/index.html Comment= Comment[de]= ---- script/python/lib-sys/kb_basic.cpp -+++ script/python/lib-sys/kb_basic.cpp 2004/04/28 11:44:37 -@@ -229,7 +229,7 @@ - return Py_None ; - } +--- script/python/lib-2.2.0/Makefile.am ++++ script/python/lib-2.2.0/Makefile.am +@@ -45,15 +45,14 @@ + ../../../libs/common/libkbase_common.la \ + ../../../libs/app/libkbase_app.la \ + ../../../libs/tkwidgets/libkbase_tkwidgets.la \ +- -lkbase_python2.2 \ ++ ../../../python/Python-2.2.0/libkbase_python2.2.la \ + $(PYTHONLIBDB) $(LIBQT) -lpthread -lutil + # ../../../sip/siplib-2.2.0/libkbase_siplib22.la + + + libkbase_script_py22_la_LDFLAGS = \ + $(all_libraries) \ +- $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 \ +- -L../../../python/Python-2.2.0 ++ $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 -- cchar *msg = 0 ; -+ const char *msg = 0 ; - PyArg_ParseTuple (args, _C("s"), &msg) ; + uninstall-local: + +@@ -65,7 +64,6 @@ + -I$(srcdir)/../../../libs/app \ + -I$(srcdir)/../../../libs/$(PORTDIR) \ + -I$(srcdir)/../../../libs/tkwidgets \ +- -I/usr/include/python2.3 \ + $(all_includes) + # -I$(srcdir)/../../../python/Python-2.2.0 + # -I$(srcdir)/../../../python/Python-2.2.0/Include +--- script/python/lib-2.2.0_rt/Makefile.am ++++ script/python/lib-2.2.0_rt/Makefile.am +@@ -44,13 +44,12 @@ + ../../../libs/app_rt/libkbasert_app.la \ + ../../../libs/tkwidgets/libkbase_tkwidgets.la \ + ../../../sip/siplib-2.2.0/libkbase_siplib22.la \ +- -lkbase_python2.2 \ ++ ../../../python/Python-2.2.0/libkbase_python2.2.la \ + $(PYTHONLIBDB) $(LIBQT) -lpthread -lutil + + libkbasert_script_py22_la_LDFLAGS = \ + $(all_libraries) \ +- $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 \ +- -L../../../python/Python-2.2.0 ++ $(KDE_PLUGIN) $(GUILIBS) -version-info 0:7:0 + + uninstall-local: - return deb->debugHook (PyEval_GetFrame(), msg) ; --- script/python/lib-sys/Makefile.am -+++ script/python/lib-sys/Makefile.am 2004/04/27 08:42:08 -@@ -59,7 +59,7 @@ ++++ script/python/lib-sys/Makefile.am +@@ -60,7 +60,7 @@ uninstall-local: @@ -31,8 +66,41 @@ INCLUDES = \ -I$(srcdir)/../../../libs/kbase \ +--- script/python/lib-sys/kb_basic.cpp ++++ script/python/lib-sys/kb_basic.cpp +@@ -229,7 +229,7 @@ + return Py_None ; + } + +- cchar *msg = 0 ; ++ const char *msg = 0 ; + PyArg_ParseTuple (args, _C("s"), &msg) ; + + return deb->debugHook (PyEval_GetFrame(), msg) ; +--- script/python/lib-sys/kb_pysupport.cpp ++++ script/python/lib-sys/kb_pysupport.cpp +@@ -25,7 +25,7 @@ + { + PyObject *key ; + PyObject *value ; +- int pos = 0 ; ++ ssize_t pos = 0 ; + + kbDict.setAutoDelete (true) ; + +--- script/python/lib-sys/tkc_pydebugbase.cpp ++++ script/python/lib-sys/tkc_pydebugbase.cpp +@@ -1042,7 +1042,7 @@ + { + PyObject *pkey ; + PyObject *pvalue ; +- int dictPos = 0 ; ++ ssize_t dictPos = 0 ; + + while (PyDict_Next (pyDict, &dictPos, &pkey, &pvalue)) + tkcDict.insert --- script/python/lib-sys/tkc_pydebugbase.h -+++ script/python/lib-sys/tkc_pydebugbase.h 2004/04/28 11:44:37 ++++ script/python/lib-sys/tkc_pydebugbase.h @@ -16,6 +16,8 @@ #include "kb_python.h" @@ -42,3 +110,27 @@ #if (PY_MAJOR_VERSION > 2) #define __PY22PLUS 1 #endif +--- script/python/lib-sys/tkc_pyvaluelist.cpp ++++ script/python/lib-sys/tkc_pyvaluelist.cpp +@@ -187,7 +187,7 @@ + ADDSUBVAL ("Locals", frame->f_locals ) ; + ADDSUBVAL ("Code", frame->f_code ) ; + +-#if __PY22PLUS ++#if 0 + PyObject *floc ; + PyObject *map = frame->f_code->co_varnames ; + +--- sip/siplib-2.2.0/Makefile.am ++++ sip/siplib-2.2.0/Makefile.am +@@ -5,8 +5,8 @@ + qtlib.cpp \ + siplib.c + +-libkbase_siplib22_la_LIBADD = -lkbase_python2.2 +-libkbase_siplib22_la_LDFLAGS = $(all_libraries) -version-info 0:7:0 -L../../python/Python-2.2.0 ++libkbase_siplib22_la_LIBADD = ../../python/Python-2.2.0/libkbase_python2.2.la ++libkbase_siplib22_la_LDFLAGS = $(all_libraries) -version-info 0:7:0 + libkbase_siplib22_la_METASOURCES = AUTO + + EXFLAGS = -DHAVE_STDARG_PROTOTYPES -DHAVE_PROTOTYPES ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de