Browse Source

Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/python-trinity@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 11 years ago
parent
commit
5d6448bc55
  1. 10
      ChangeLog
  2. 2
      ChangeLog.2001-4
  3. 16
      Changelog
  4. 2
      configure.py
  5. 12
      doc/switches.html
  6. 4
      doc/trouble.html
  7. 48
      pykde350.prj
  8. 48
      pykde351.prj
  9. 48
      pykde352.prj
  10. 48
      pykde353.prj
  11. 4
      pykdeconfig.py
  12. 2
      sip/kdecore/kuser.sip

10
ChangeLog

@ -298,7 +298,7 @@ Added ConvertToSubclassCode blocks for kmdi, kutils
------------------------------------------------------------------------
r65 | (jim) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
added kkeyserver.h to extra/kde340
added kkeyserver.h to extra/trinity40
------------------------------------------------------------------------
r64 | (jim) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines
@ -329,17 +329,17 @@ removed kjs support
------------------------------------------------------------------------
r58 | (jim) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines
update extra/kde340 h files
update extra/trinity40 h files
------------------------------------------------------------------------
r57 | (jim) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines
update .easibox - extra/kde340
update .easibox - extra/trinity40
------------------------------------------------------------------------
r56 | (jim) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines
added extra/kde340
added extra/trinity40
------------------------------------------------------------------------
r55 | (jim) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
@ -415,7 +415,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData ()
r39 | (jim) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines
KFileMetaInfo typedefs removed; KProcessController versioning
corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj
corrected; KRecentDirs (and extra/ hfiles) added; pytrinity32.prj
added
------------------------------------------------------------------------

2
ChangeLog.2001-4

@ -108,7 +108,7 @@ PyKDE-3.3.2-2: fix Qt versioning change
2002/8/9 13:00:00 jim
PyKDE-3.3.2-1: handle Qt versioning change in
Qt 3.0.5 (build.py); add '-I usr/X11R6/include'
in sip/kde30.kdecore.sip
in sip/trinity0.kdecore.sip
2002/8/8 13:10:00 jim
Cleaned up top-level sip files for all versions;

16
Changelog

@ -45,7 +45,7 @@ konsole_part stuff
r152 | (no author) | 2006-09-21 10:13:58 -0700 (Thu, 21 Sep 2006) | 3 lines
added konsole_part.h to versions missing it; added
extra/kde353 to base fileset
extra/trinity53 to base fileset
------------------------------------------------------------------------
r150 | (no author) | 2006-09-21 08:38:43 -0700 (Thu, 21 Sep 2006) | 3 lines
@ -93,7 +93,7 @@ remove top-level (*mod.sip) files
------------------------------------------------------------------------
r140 | (no author) | 2006-05-21 20:27:45 -0700 (Sun, 21 May 2006) | 2 lines
added extra/kde352
added extra/trinity52
------------------------------------------------------------------------
r139 | (no author) | 2006-05-21 20:06:53 -0700 (Sun, 21 May 2006) | 2 lines
@ -139,7 +139,7 @@ fully-qualified names in kabc/resourcefile.sip
r130 | (no author) | 2006-01-26 16:53:44 -0800 (Thu, 26 Jan 2006) | 3 lines
Put kabc/resourcefile.sip back into kabc for later
versions (missing in kdelibs tarball, but in kde3/include/kabc)
versions (missing in kdelibs tarball, but in trinity/include/kabc)
------------------------------------------------------------------------
r129 | (no author) | 2006-01-26 16:50:00 -0800 (Thu, 26 Jan 2006) | 3 lines
@ -475,7 +475,7 @@ Added ConvertToSubclassCode blocks for kmdi, kutils
------------------------------------------------------------------------
r65 | (no author) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines
added kkeyserver.h to extra/kde340
added kkeyserver.h to extra/trinity40
------------------------------------------------------------------------
r64 | (no author) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines
@ -506,17 +506,17 @@ removed kjs support
------------------------------------------------------------------------
r58 | (no author) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines
update extra/kde340 h files
update extra/trinity40 h files
------------------------------------------------------------------------
r57 | (no author) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines
update .easibox - extra/kde340
update .easibox - extra/trinity40
------------------------------------------------------------------------
r56 | (no author) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines
added extra/kde340
added extra/trinity40
------------------------------------------------------------------------
r55 | (no author) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines
@ -592,7 +592,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData ()
r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines
KFileMetaInfo typedefs removed; KProcessController versioning
corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj
corrected; KRecentDirs (and extra/ hfiles) added; pytrinity32.prj
added
------------------------------------------------------------------------

2
configure.py

@ -760,7 +760,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
if extra_lib == "kabc" and kde_version >= 0x030200:
makefile.extra_libs.append ("kabc_file")
if extra_lib == "kparts" and kde_version >= 0x030500:
makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "kde3"))
makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "trinity"))
if extra_lib == "kdeprint":
makefile.extra_cflags.append ("-fno-rtti")

12
doc/switches.html

@ -134,11 +134,11 @@ is split into two pieces by default to reduce memory consumption. Values for 'j'
<table width = "100%"><tr>
<td width = "20%"><u>Value:</u> directory path</td>
<td width = "20%"> </td>
<td width = "40%"><u>configure.py Default:</u> kde3/</td>
<td width = "40%"><u>configure.py Default:</u> trinity/</td>
<td width = "20%"> </td>
</tr></table>
The top level directory under which kde3/libs and kde3/include are located (these paths can also
be specified independently see -n and -o) On SuSE distributions, this is typically /opt/kde3. On
The top level directory under which trinity/libs and trinity/include are located (these paths can also
be specified independently see -n and -o) On SuSE distributions, this is typically /opt/trinity. On
Red Hat and Mandrake, this is typically /usr. configure.py will find the typical locations automatically.
configure .py will use the KDEDIR environment variable value if it is defined and the -k switch is NOT used.
</dd>
@ -148,7 +148,7 @@ configure .py will use the KDEDIR environment variable value if it is defined an
<table width = "100%"><tr>
<td width = "20%"><u>Value:</u> directory path</td>
<td width = "20%"> </td>
<td width = "40%"><u>configure.py Default:</u> kde3/libs</td>
<td width = "40%"><u>configure.py Default:</u> trinity/libs</td>
<td width = "20%"> </td>
</tr></table>
The path to KDE's library files (libkdecore.so, etc).
@ -159,11 +159,11 @@ The path to KDE's library files (libkdecore.so, etc).
<table width = "100%"><tr>
<td width = "20%"><u>Value:</u> directory path</td>
<td width = "20%"> </td>
<td width = "40%"><u>configure.py Default:</u> kde3/include</td>
<td width = "40%"><u>configure.py Default:</u> trinity/include</td>
<td width = "20%"> </td>
</tr></table>
The path to KDE's h files. (May require installation of kdelibs3-devel rpm package)
configure.py. PyKDE will locate h files in subdirectories of this path automatically (eg kde3/include/kio/*.h)
configure.py. PyKDE will locate h files in subdirectories of this path automatically (eg trinity/include/kio/*.h)
</dd>
<hr>
<dt><b>-r generate code with tracing enabled</b></dt>

4
doc/trouble.html

@ -225,7 +225,7 @@ compatible. The only solution I found was to:
<pre CLASS="PROGRAMLISTING">
/opt/kde
/opt/kde2
/opt/kde3
/opt/trinity
</pre>
</td>
</tr>
@ -237,7 +237,7 @@ compatible. The only solution I found was to:
<tr>
<td>
<pre CLASS="PROGRAMLISTING">
/opt/kde3
/opt/trinity
/opt/kde
/opt/kde2
</pre>

48
pykde350.prj

@ -27,7 +27,7 @@ project = PyKDE
destination = /home/jim/PyKDE350
source = /server/source/KDESrc/kdelibs-3.5.0
compare = /opt/kde3/include
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@ -44,14 +44,14 @@ copyright =
module = dcop
timeline = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0
source = $SRC/dcop $DST/extra/kde350/dcop
source = $SRC/dcop $DST/extra/trinity50/dcop
ignore = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
compare = $COMP $DST/extra/kde350/dcop
subst = $DST/extra/kde350
compare = $COMP $DST/extra/trinity50/dcop
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
importpath = $IMP
sipslot = callBackObj callBackSlot dcopClient
include = ../extra/kde350/dcop
include = ../extra/trinity50/dcop
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
define = "KDE_DEPRECATED", ""
define = "DCOP_EXPORT", ""
@ -71,8 +71,8 @@ ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde350
subst = $DST/extra/kde350
compare = $COMP $DST/extra/trinity50
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
importpath = $IMP
@ -101,7 +101,7 @@ module = kdesu
source = $SRC/kdesu
ignore =
compare = $COMP/kdesu
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -121,7 +121,7 @@ module = kdefx
ignore =
source = $SRC/kdefx
compare = $COMP
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -144,7 +144,7 @@ source = $SRC/kdeui/
ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
ignore = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
compare = $COMP
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -170,11 +170,11 @@ retain
module = kio
source = $SRC/kio/kio $DST/extra/kde350/kio
source = $SRC/kio/kio $DST/extra/trinity50/kio
ignore = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
ignore = kmimetyperesolver.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -184,7 +184,7 @@ import = kdeui
importpath = $IMP
amend = * ctor parent /TransferThis/
amend = * all parent /Transfer/
include = ../extra/kde350/kio @KDE_INCLUDEPATH@/kio ../kdecore
include = ../extra/trinity50/kio @KDE_INCLUDEPATH@/kio ../kdecore
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
-lkdecorecmodule -lkdeuicmodule
sipslot =
@ -248,7 +248,7 @@ module = kutils
source = $SRC/kutils/
ignore =
compare = $COMP
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
ignore = kcmodulecontainer.h
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
@ -276,7 +276,7 @@ module = kfile
source = $SRC/kio/kfile
ignore = kpropsdlg.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -300,7 +300,7 @@ module = kparts
source = $SRC/kparts
ignore = componentfactory.h
compare = $COMP/kparts
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -324,7 +324,7 @@ module = khtml
source = $SRC/khtml $SRC/khtml/dom
ignore = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
compare = $COMP $COMP/dom
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -351,8 +351,8 @@ retain
//source = $SRC/kjs
//ignore = global.h
//compare = $COMP/kjs $DST/extra/kde350
//subst = $DST/extra/kde350
//compare = $COMP/kjs $DST/extra/trinity50
//subst = $DST/extra/trinity50
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcop
@ -377,9 +377,9 @@ retain
module = kspell
ignore =
source = $DST/extra/kde350/kspell
source = $DST/extra/trinity50/kspell
compare = $COMP
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -411,7 +411,7 @@ module = kdeprint
ignore = driver.h
source = $SRC/kdeprint
compare = $COMP $COMP/kdeprint
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -434,7 +434,7 @@ module = kmdi
source = $SRC/kmdi/
ignore =
compare = $COMP
subst = $DST/extra/kde350
subst = $DST/extra/trinity50
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
import = kdecoremod.sip
@ -464,7 +464,7 @@ retain
//source = $SRC/kspell2/
//ignore =
//compare = $COMP
//subst = $DST/extra/kde350
//subst = $DST/extra/trinity50
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcopmod.sip
//import = kdecoremod.sip

48
pykde351.prj

@ -27,7 +27,7 @@ project = PyKDE
destination = /home/jim/PyKDE351
source = /server/source/KDESrc/kdelibs-3.5.1
compare = /opt/kde3/include
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@ -44,14 +44,14 @@ copyright =
module = dcop
timeline = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1
source = $SRC/dcop $DST/extra/kde351/dcop
source = $SRC/dcop $DST/extra/trinity51/dcop
ignore = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
compare = $COMP $DST/extra/kde351/dcop
subst = $DST/extra/kde351
compare = $COMP $DST/extra/trinity51/dcop
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
importpath = $IMP
sipslot = callBackObj callBackSlot dcopClient
include = ../extra/kde351/dcop
include = ../extra/trinity51/dcop
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
define = "KDE_DEPRECATED", ""
define = "DCOP_EXPORT", ""
@ -71,8 +71,8 @@ ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde351
subst = $DST/extra/kde351
compare = $COMP $DST/extra/trinity51
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
importpath = $IMP
@ -101,7 +101,7 @@ module = kdesu
source = $SRC/kdesu
ignore =
compare = $COMP/kdesu
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -121,7 +121,7 @@ module = kdefx
ignore =
source = $SRC/kdefx
compare = $COMP
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -144,7 +144,7 @@ source = $SRC/kdeui/
ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
ignore = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
compare = $COMP
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -170,11 +170,11 @@ retain
module = kio
source = $SRC/kio/kio $DST/extra/kde351/kio
source = $SRC/kio/kio $DST/extra/trinity51/kio
ignore = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
ignore = kmimetyperesolver.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -184,7 +184,7 @@ import = kdeui
importpath = $IMP
amend = * ctor parent /TransferThis/
amend = * all parent /Transfer/
include = ../extra/kde351/kio @KDE_INCLUDEPATH@/kio ../kdecore
include = ../extra/trinity51/kio @KDE_INCLUDEPATH@/kio ../kdecore
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
-lkdecorecmodule -lkdeuicmodule
sipslot =
@ -248,7 +248,7 @@ module = kutils
source = $SRC/kutils/
ignore =
compare = $COMP
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
ignore = kcmodulecontainer.h
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
@ -276,7 +276,7 @@ module = kfile
source = $SRC/kio/kfile
ignore = kpropsdlg.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -300,7 +300,7 @@ module = kparts
source = $SRC/kparts
ignore = componentfactory.h
compare = $COMP/kparts
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -324,7 +324,7 @@ module = khtml
source = $SRC/khtml $SRC/khtml/dom
ignore = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
compare = $COMP $COMP/dom
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -351,8 +351,8 @@ retain
//source = $SRC/kjs
//ignore = global.h
//compare = $COMP/kjs $DST/extra/kde351
//subst = $DST/extra/kde351
//compare = $COMP/kjs $DST/extra/trinity51
//subst = $DST/extra/trinity51
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcop
@ -377,9 +377,9 @@ retain
module = kspell
ignore =
source = $DST/extra/kde351/kspell
source = $DST/extra/trinity51/kspell
compare = $COMP
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -411,7 +411,7 @@ module = kdeprint
ignore = driver.h
source = $SRC/kdeprint
compare = $COMP $COMP/kdeprint
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -434,7 +434,7 @@ module = kmdi
source = $SRC/kmdi/
ignore =
compare = $COMP
subst = $DST/extra/kde351
subst = $DST/extra/trinity51
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
import = kdecoremod.sip
@ -464,7 +464,7 @@ retain
//source = $SRC/kspell2/
//ignore =
//compare = $COMP
//subst = $DST/extra/kde351
//subst = $DST/extra/trinity51
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcopmod.sip
//import = kdecoremod.sip

48
pykde352.prj

@ -27,7 +27,7 @@ project = PyKDE
destination = /home/jim/PyKDE352
source = /server/source/KDESrc/kdelibs-3.5.2
compare = /opt/kde3/include
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@ -44,14 +44,14 @@ copyright =
module = dcop
timeline = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1 KDE_3_5_2
source = $SRC/dcop $DST/extra/kde352/dcop
source = $SRC/dcop $DST/extra/trinity52/dcop
ignore = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
compare = $COMP $DST/extra/kde352/dcop
subst = $DST/extra/kde352
compare = $COMP $DST/extra/trinity52/dcop
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
importpath = $IMP
sipslot = callBackObj callBackSlot dcopClient
include = ../extra/kde352/dcop
include = ../extra/trinity52/dcop
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
define = "KDE_DEPRECATED", ""
define = "DCOP_EXPORT", ""
@ -71,8 +71,8 @@ ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde352
subst = $DST/extra/kde352
compare = $COMP $DST/extra/trinity52
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
importpath = $IMP
@ -101,7 +101,7 @@ module = kdesu
source = $SRC/kdesu
ignore =
compare = $COMP/kdesu
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -121,7 +121,7 @@ module = kdefx
ignore =
source = $SRC/kdefx
compare = $COMP
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -144,7 +144,7 @@ source = $SRC/kdeui/
ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
ignore = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
compare = $COMP
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -170,11 +170,11 @@ retain
module = kio
source = $SRC/kio/kio $DST/extra/kde352/kio
source = $SRC/kio/kio $DST/extra/trinity52/kio
ignore = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
ignore = kmimetyperesolver.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -184,7 +184,7 @@ import = kdeui
importpath = $IMP
amend = * ctor parent /TransferThis/
amend = * all parent /Transfer/
include = ../extra/kde352/kio @KDE_INCLUDEPATH@/kio ../kdecore
include = ../extra/trinity52/kio @KDE_INCLUDEPATH@/kio ../kdecore
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
-lkdecorecmodule -lkdeuicmodule
sipslot =
@ -248,7 +248,7 @@ module = kutils
source = $SRC/kutils/
ignore =
compare = $COMP
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
ignore = kcmodulecontainer.h
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
@ -276,7 +276,7 @@ module = kfile
source = $SRC/kio/kfile
ignore = kpropsdlg.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -300,7 +300,7 @@ module = kparts
source = $SRC/kparts
ignore = componentfactory.h
compare = $COMP/kparts
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -324,7 +324,7 @@ module = khtml
source = $SRC/khtml $SRC/khtml/dom
ignore = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
compare = $COMP $COMP/dom
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -351,8 +351,8 @@ retain
//source = $SRC/kjs
//ignore = global.h
//compare = $COMP/kjs $DST/extra/kde352
//subst = $DST/extra/kde352
//compare = $COMP/kjs $DST/extra/trinity52
//subst = $DST/extra/trinity52
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcop
@ -377,9 +377,9 @@ retain
module = kspell
ignore =
source = $DST/extra/kde352/kspell
source = $DST/extra/trinity52/kspell
compare = $COMP
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -411,7 +411,7 @@ module = kdeprint
ignore = driver.h
source = $SRC/kdeprint
compare = $COMP $COMP/kdeprint
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -434,7 +434,7 @@ module = kmdi
source = $SRC/kmdi/
ignore =
compare = $COMP
subst = $DST/extra/kde352
subst = $DST/extra/trinity52
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
import = kdecoremod.sip
@ -464,7 +464,7 @@ retain
//source = $SRC/kspell2/
//ignore =
//compare = $COMP
//subst = $DST/extra/kde352
//subst = $DST/extra/trinity52
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcopmod.sip
//import = kdecoremod.sip

48
pykde353.prj

@ -27,7 +27,7 @@ project = PyKDE
destination = /home/jim/PyKDE353
source = /server/source/KDESrc/kdelibs-3.5.3
compare = /opt/kde3/include
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@ -44,14 +44,14 @@ copyright =
module = dcop
timeline = KDE_3_0_0 KDE_3_0_1 KDE_3_0_3 KDE_3_1_0 KDE_3_1_1 KDE_3_1_2 KDE_3_1_3 KDE_3_1_4 KDE_3_1_5 KDE_3_2_0 KDE_3_2_1 KDE_3_2_2 KDE_3_2_3 KDE_3_3_0 KDE_3_3_1 KDE_3_3_2 KDE_3_4_0 KDE_3_4_1 KDE_3_4_2 KDE_3_4_3 KDE_3_5_0 KDE_3_5_1 KDE_3_5_2 KDE_3_5_3
source = $SRC/dcop $DST/extra/kde353/dcop
source = $SRC/dcop $DST/extra/trinity53/dcop
ignore = dcopc.h dcopserver.h dcopsignals.h kdatastream.h dcoptypes.h
compare = $COMP $DST/extra/kde353/dcop
subst = $DST/extra/kde353
compare = $COMP $DST/extra/trinity53/dcop
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
importpath = $IMP
sipslot = callBackObj callBackSlot dcopClient
include = ../extra/kde353/dcop
include = ../extra/trinity53/dcop
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
define = "KDE_DEPRECATED", ""
define = "DCOP_EXPORT", ""
@ -71,8 +71,8 @@ ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde353
subst = $DST/extra/kde353
compare = $COMP $DST/extra/trinity53
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
importpath = $IMP
@ -101,7 +101,7 @@ module = kdesu
source = $SRC/kdesu
ignore =
compare = $COMP/kdesu
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -121,7 +121,7 @@ module = kdefx
ignore =
source = $SRC/kdefx
compare = $COMP
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
import = kdecore
@ -144,7 +144,7 @@ source = $SRC/kdeui/
ignore = kcolorbutton.h kcolordlg.h kwidgetid.h kaccelgen.h kdatepik.h kdualcolorbtn.h kxmlgui.h kdockwidget_p.h
ignore = kdockwindow.h ksconfig.h kspell.h kspelldlg.h klistviewlineedit.h ksyntaxhighlighter.h ksharedpixmap.h
compare = $COMP
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -170,11 +170,11 @@ retain
module = kio
source = $SRC/kio/kio $DST/extra/kde353/kio
source = $SRC/kio/kio $DST/extra/trinity53/kio
ignore = kmdbase.h uiserver_stub.h kdirnotify_stub.h uiserver.h http_slave_defaults.h ioslave_defaults.h
ignore = kmimetyperesolver.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -184,7 +184,7 @@ import = kdeui
importpath = $IMP
amend = * ctor parent /TransferThis/
amend = * all parent /Transfer/
include = ../extra/kde353/kio @KDE_INCLUDEPATH@/kio ../kdecore
include = ../extra/trinity53/kio @KDE_INCLUDEPATH@/kio ../kdecore
libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -lkdeui -lkdecore -ldcopcmodule\
-lkdecorecmodule -lkdeuicmodule
sipslot =
@ -248,7 +248,7 @@ module = kutils
source = $SRC/kutils/
ignore =
compare = $COMP
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
ignore = kcmodulecontainer.h
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
@ -276,7 +276,7 @@ module = kfile
source = $SRC/kio/kfile
ignore = kpropsdlg.h
compare = $COMP $COMP/kio
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -300,7 +300,7 @@ module = kparts
source = $SRC/kparts
ignore = componentfactory.h
compare = $COMP/kparts
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -324,7 +324,7 @@ module = khtml
source = $SRC/khtml $SRC/khtml/dom
ignore = khtmldefaults.h dom_core.h dom_html.h khtml_events.h
compare = $COMP $COMP/dom
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -351,8 +351,8 @@ retain
//source = $SRC/kjs
//ignore = global.h
//compare = $COMP/kjs $DST/extra/kde353
//subst = $DST/extra/kde353
//compare = $COMP/kjs $DST/extra/trinity53
//subst = $DST/extra/trinity53
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcop
@ -377,9 +377,9 @@ retain
module = kspell
ignore =
source = $DST/extra/kde353/kspell
source = $DST/extra/trinity53/kspell
compare = $COMP
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -411,7 +411,7 @@ module = kdeprint
ignore = driver.h
source = $SRC/kdeprint
compare = $COMP $COMP/kdeprint
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = qtxmlmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcop
@ -434,7 +434,7 @@ module = kmdi
source = $SRC/kmdi/
ignore =
compare = $COMP
subst = $DST/extra/kde353
subst = $DST/extra/trinity53
import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
import = dcopmod.sip
import = kdecoremod.sip
@ -464,7 +464,7 @@ retain
//source = $SRC/kspell2/
//ignore =
//compare = $COMP
//subst = $DST/extra/kde353
//subst = $DST/extra/trinity53
//import = qtmod.sip (Qt_3_0_0 Qt_4_0_0 WS_X11)
//import = dcopmod.sip
//import = kdecoremod.sip

4
pykdeconfig.py

@ -29,8 +29,8 @@ import sipconfig, pyqtconfig
_pkg_config = {
'dist_name': '',
'kde_version': 0x030503,
'kde_version_extra': 'kde353',
'kde_version_sfx': '-kde353.diff',
'kde_version_extra': 'trinity53',
'kde_version_sfx': '-trinity53.diff',
'kde_version_str': '3.5.3',
'kdebasedir': '/opt/trinity',
'kdeincdir': '/opt/trinity/include',

2
sip/kdecore/kuser.sip

@ -29,7 +29,7 @@
class KUser
{
%TypeHeaderCode
#include <../extra/kde320/ksharedptr.h>
#include <../extra/trinity20/ksharedptr.h>
#include <kuser.h>
%End

Loading…
Cancel
Save