Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 29028 Details for
Bug 37452
Kportage is hardcoded to python 2.2 (?), wont compile with 2.3.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
kportage-0.6.1-python2.3.patch
kportage-0.6.1-python2.3.patch (text/plain), 10.87 KB, created by
Carsten Lohrke (RETIRED)
on 2004-04-10 08:13:31 UTC
(
hide
)
Description:
kportage-0.6.1-python2.3.patch
Filename:
MIME Type:
Creator:
Carsten Lohrke (RETIRED)
Created:
2004-04-10 08:13:31 UTC
Size:
10.87 KB
patch
obsolete
>diff -ur kportage-0.6.1/kportage/config/Makefile.am kportage-0.6.1-r1/kportage/config/Makefile.am >--- kportage-0.6.1/kportage/config/Makefile.am 2003-02-07 23:32:40.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/config/Makefile.am 2004-04-10 16:18:45.000000000 +0200 >@@ -1,7 +1,7 @@ > ####### kdevelop will overwrite this part!!! (begin)########## > noinst_LIBRARIES = libconfig.a > >-INCLUDES = $(all_includes) -I/usr/include/python2.2/ >+INCLUDES = $(all_includes) -I/usr/include/python2.3/ > > libconfig_a_METASOURCES = AUTO > >diff -ur kportage-0.6.1/kportage/config/Makefile.in kportage-0.6.1-r1/kportage/config/Makefile.in >--- kportage-0.6.1/kportage/config/Makefile.in 2003-02-08 17:16:22.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/config/Makefile.in 2004-04-10 16:18:45.000000000 +0200 >@@ -246,7 +246,7 @@ > ####### kdevelop will overwrite this part!!! (begin)########## > noinst_LIBRARIES = libconfig.a > >-INCLUDES = $(all_includes) -I/usr/include/python2.2/ >+INCLUDES = $(all_includes) -I/usr/include/python2.3/ > > #>- libconfig_a_METASOURCES = AUTO > >diff -ur kportage-0.6.1/kportage/config/parsemakeconfs.cpp kportage-0.6.1-r1/kportage/config/parsemakeconfs.cpp >--- kportage-0.6.1/kportage/config/parsemakeconfs.cpp 2003-02-08 16:30:09.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/config/parsemakeconfs.cpp 2004-04-10 16:03:59.000000000 +0200 >@@ -15,11 +15,11 @@ > * * > ***************************************************************************/ > >+#include "../portage/portagepython.h" > #include "parsemakeconfs.h" > #include "../portage/packagebase.h" > #include "../portage/portagemap.h" > #include "../portage/virtuals.h" >-#include "../portage/portagepython.h" > #include <kdebug.h> > #include <qregexp.h> > #include <qfile.h> >diff -ur kportage-0.6.1/kportage/Makefile.am kportage-0.6.1-r1/kportage/Makefile.am >--- kportage-0.6.1/kportage/Makefile.am 2003-02-02 19:26:26.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/Makefile.am 2004-04-10 16:18:45.000000000 +0200 >@@ -4,7 +4,7 @@ > ## INCLUDES were found outside kdevelop specific part > > kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp >-kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.2 >+kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.3 > > SUBDIRS = images portage processes config > >@@ -51,7 +51,7 @@ > METASOURCES = AUTO > > # the library search path. >-kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.2/config >+kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.3/config > > rcdir = $(kde_datadir)/kportage > rc_DATA = kportageui.rc >diff -ur kportage-0.6.1/kportage/Makefile.in kportage-0.6.1-r1/kportage/Makefile.in >--- kportage-0.6.1/kportage/Makefile.in 2003-02-08 17:16:21.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/Makefile.in 2004-04-10 16:18:45.000000000 +0200 >@@ -249,7 +249,7 @@ > #>- kportage_SOURCES = portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp ebuildview.ui kportageview.cpp kportage.cpp main.cpp > #>+ 1 > kportage_SOURCES=portageview.cpp listviewitem.cpp finddialog.cpp treeicons.cpp namelistviewitem.cpp optionsdialog.cpp catlistviewitem.cpp plistviewitem.cpp treeview.cpp kportageview.cpp kportage.cpp main.cpp ebuildview.cpp >-kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.2 >+kportage_LDADD = ./portage/libportage.a ./processes/libprocesses.a ./config/libconfig.a $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lpython2.3 > > SUBDIRS = images portage processes config > >@@ -283,7 +283,7 @@ > #>- METASOURCES = AUTO > > # the library search path. >-kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.2/config >+kportage_LDFLAGS = -Xlinker -export-dynamic $(all_libraries) $(KDE_RPATH) -L/usr/lib/python2.3/config > > rcdir = $(kde_datadir)/kportage > rc_DATA = kportageui.rc >diff -ur kportage-0.6.1/kportage/portage/kportagemask.py kportage-0.6.1-r1/kportage/portage/kportagemask.py >--- kportage-0.6.1/kportage/portage/kportagemask.py 2002-12-08 15:45:44.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/portage/kportagemask.py 2004-04-10 16:18:45.000000000 +0200 >@@ -1,5 +1,5 @@ > #!/usr/bin/python >-#!/usr/bin/env python2.2 >+#!/usr/bin/env python2.3 > > import portage, sys > >diff -ur kportage-0.6.1/kportage/portage/Makefile.am kportage-0.6.1-r1/kportage/portage/Makefile.am >--- kportage-0.6.1/kportage/portage/Makefile.am 2002-12-15 14:40:27.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/portage/Makefile.am 2004-04-10 16:18:45.000000000 +0200 >@@ -1,14 +1,14 @@ > noinst_LIBRARIES = libportage.a >-INCLUDES = $(all_includes) -I/usr/include/python2.2/ >+INCLUDES = $(all_includes) -I/usr/include/python2.3/ > libportage_a_METASOURCES = AUTO > > libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp > EXTRA_DIST = portagepython.h portagepython.cpp mapfile.h mergedreader.h mergedreader.cpp packagedirreader.h packagedirreader.cpp parseebuild.h parseebuild.cpp package.cpp package.h portagereader.h portagereader.cpp packagebase.h packagebase.cpp portagemap.h portagemap.cpp maskprocess.cpp maskprocess.h > > install-data-local: >- $(INSTALL_DATA) -D kportage.py /usr/lib/python2.2/site-packages/kportage.py >+ $(INSTALL_DATA) -D kportage.py /usr/lib/python2.3/site-packages/kportage.py > $(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py > > uninstall-local: >- -rm -f /usr/lib/python2.2/site-packages/kportage.py >+ -rm -f /usr/lib/python2.3/site-packages/kportage.py > -rm -f $(kde_datadir)/kportage/kportagemask.py >diff -ur kportage-0.6.1/kportage/portage/Makefile.in kportage-0.6.1-r1/kportage/portage/Makefile.in >--- kportage-0.6.1/kportage/portage/Makefile.in 2003-02-08 17:16:22.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/portage/Makefile.in 2004-04-10 16:18:45.000000000 +0200 >@@ -243,7 +243,7 @@ > x_includes = @x_includes@ > x_libraries = @x_libraries@ > noinst_LIBRARIES = libportage.a >-INCLUDES = $(all_includes) -I/usr/include/python2.2/ >+INCLUDES = $(all_includes) -I/usr/include/python2.3/ > #>- libportage_a_METASOURCES = AUTO > > libportage_a_SOURCES = portagemap.cpp packagebase.cpp portagereader.cpp mergedreader.cpp packagedirreader.cpp parseebuild.cpp package.cpp maskprocess.cpp portagepython.cpp >@@ -553,17 +553,17 @@ > > > install-data-local: >-#>- $(INSTALL_DATA) -D kportage.py /usr/lib/python2.2/site-packages/kportage.py >+#>- $(INSTALL_DATA) -D kportage.py /usr/lib/python2.3/site-packages/kportage.py > #>+ 1 >- $(INSTALL_DATA) -D kportage.py $(DESTDIR)/usr/lib/python2.2/site-packages/kportage.py >+ $(INSTALL_DATA) -D kportage.py $(DESTDIR)/usr/lib/python2.3/site-packages/kportage.py > #>- $(INSTALL_DATA) $(srcdir)/kportagemask.py $(kde_datadir)/kportage/kportagemask.py > #>+ 1 > $(INSTALL_DATA) $(srcdir)/kportagemask.py $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py > > uninstall-local: >-#>- -rm -f /usr/lib/python2.2/site-packages/kportage.py >+#>- -rm -f /usr/lib/python2.3/site-packages/kportage.py > #>+ 1 >- -rm -f $(DESTDIR)/usr/lib/python2.2/site-packages/kportage.py >+ -rm -f $(DESTDIR)/usr/lib/python2.3/site-packages/kportage.py > #>- -rm -f $(kde_datadir)/kportage/kportagemask.py > #>+ 1 > -rm -f $(DESTDIR)$(kde_datadir)/kportage/kportagemask.py >diff -ur kportage-0.6.1/kportage/portage/portagemap.cpp kportage-0.6.1-r1/kportage/portage/portagemap.cpp >--- kportage-0.6.1/kportage/portage/portagemap.cpp 2003-02-08 02:29:31.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/portage/portagemap.cpp 2004-04-10 16:05:22.000000000 +0200 >@@ -15,6 +15,7 @@ > * * > ***************************************************************************/ > >+#include "portagepython.h" > #include <qdir.h> > #include <qstring.h> > #include <qtimer.h> >@@ -31,7 +32,6 @@ > #include "packagedirreader.h" > #include "mapfile.h" > #include "maskprocess.h" >-#include "portagepython.h" > > PortageMap *PortageMap::s_instance=0L; > >diff -ur kportage-0.6.1/kportage/portage/portagepython.h kportage-0.6.1-r1/kportage/portage/portagepython.h >--- kportage-0.6.1/kportage/portage/portagepython.h 2003-02-08 11:59:10.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/portage/portagepython.h 2004-04-10 16:06:36.000000000 +0200 >@@ -18,8 +18,8 @@ > #ifndef _PORTAGEPYTHON_H_ > #define _PORTAGEPYTHON_H_ > >-#include <qobject.h> > #include <Python.h> >+#include <qobject.h> > #include <qstring.h> > #include "portagemap.h" > >diff -ur kportage-0.6.1/kportage/processes/Makefile.am kportage-0.6.1-r1/kportage/processes/Makefile.am >--- kportage-0.6.1/kportage/processes/Makefile.am 2003-02-06 16:49:21.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/processes/Makefile.am 2004-04-10 16:18:45.000000000 +0200 >@@ -1,7 +1,7 @@ > ####### kdevelop will overwrite this part!!! (begin)########## > noinst_LIBRARIES = libprocesses.a > #libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a >-INCLUDES = $(all_includes) -I/usr/include/python2.2 >+INCLUDES = $(all_includes) -I/usr/include/python2.3 > > libprocesses_a_METASOURCES = AUTO > >diff -ur kportage-0.6.1/kportage/processes/Makefile.in kportage-0.6.1-r1/kportage/processes/Makefile.in >--- kportage-0.6.1/kportage/processes/Makefile.in 2003-02-08 17:16:22.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/processes/Makefile.in 2004-04-10 16:18:45.000000000 +0200 >@@ -246,7 +246,7 @@ > ####### kdevelop will overwrite this part!!! (begin)########## > noinst_LIBRARIES = libprocesses.a > #libprocesses_a_LIBADD = $(top_builddir)/kportage/portage/libpython.a >-INCLUDES = $(all_includes) -I/usr/include/python2.2 >+INCLUDES = $(all_includes) -I/usr/include/python2.3 > > #>- libprocesses_a_METASOURCES = AUTO > >diff -ur kportage-0.6.1/kportage/processes/processes.cpp kportage-0.6.1-r1/kportage/processes/processes.cpp >--- kportage-0.6.1/kportage/processes/processes.cpp 2003-02-08 15:27:47.000000000 +0100 >+++ kportage-0.6.1-r1/kportage/processes/processes.cpp 2004-04-10 16:04:37.000000000 +0200 >@@ -15,6 +15,7 @@ > * * > ***************************************************************************/ > >+#include "../portage/portagepython.h" > #include "processes.h" > #include "procemerge.h" > #include "procrsync.h" >@@ -23,7 +24,6 @@ > #include "procinject.h" > #include "procclean.h" > #include "../kportageview.h" >-#include "../portage/portagepython.h" > > #include <klocale.h> > #include <kdebug.h>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=29028">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 37452
:
29027
| 29028
