From 69cd351b7fb2429aef3ba4483539f1f1da88c414 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 3 Nov 2007 09:26:04 +0000 Subject: [PATCH] Clifford Wolf: Fixed kdebindings package [2007092012420120529] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8788 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- ....5.6-build-against-python-before-2.5.patch | 340 ------------------ package/kde/kdebindings/kdebindings.conf | 3 + package/kde/kdebindings/sipgen-hotfix.patch | 10 + package/kde/kdebindings/sipgen-parts.patch | 40 +++ 4 files changed, 53 insertions(+), 340 deletions(-) delete mode 100644 package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch create mode 100644 package/kde/kdebindings/sipgen-hotfix.patch create mode 100644 package/kde/kdebindings/sipgen-parts.patch diff --git a/package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch b/package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch deleted file mode 100644 index 8c3dc5cef..000000000 --- a/package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - KDE Download - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - -
-
- - - - - - - - - -
-
- - - - -

You Are About to Download...

-

- When you click one of the mirror links below you will be redirected to the download - you have just selected. -

- -

Please Contribute!

-

- KDE is a very large project and depends on people volunteering time, code, money, - and energy to keep it going. If you are interested in supporting KDE in any way, - please read the Supporting KDE page. -

- -

KDE is available for free and will always be available for free, including each - and every line of its source code for everyone to modify and distribute. If you - enjoy and use KDE please consider supporting the KDE Project financially. KDE - is in constant need of funds in order to finance its operations.

- -
- -
- -

Download Locations

-

The following is a list of KDE FTP mirrors that have recently updated -from our master ftp distribution site. The "hours" display tells you how many hours ago -a mirror has been detected to have synced last time. A sorted list of -all known KDE FTP mirrors is available, as well as -status of all KDE FTP mirrors.

- -

You seem to be located in AUSTRIA (AT).

-

Local mirrors

- - - -

Other mirrors

- - - -

[ Edit ]

- -
- -
-

Download

-Skip menu "Download" - - -
- -
-

Communicate

-Skip menu "Communicate" - - -
- -
-

Explore

-Skip menu "Explore" - - -
- -
-

Global navigation links

- -
- - -
-
- -
-
- - - - diff --git a/package/kde/kdebindings/kdebindings.conf b/package/kde/kdebindings/kdebindings.conf index 1323c1825..3414b3420 100644 --- a/package/kde/kdebindings/kdebindings.conf +++ b/package/kde/kdebindings/kdebindings.conf @@ -25,3 +25,6 @@ # do not yet build q# var_append confopt " " "--without-mcs" +# do not yet build java bindings +var_append confopt " " "--without-java" + diff --git a/package/kde/kdebindings/sipgen-hotfix.patch b/package/kde/kdebindings/sipgen-hotfix.patch new file mode 100644 index 000000000..53c1b10ae --- /dev/null +++ b/package/kde/kdebindings/sipgen-hotfix.patch @@ -0,0 +1,10 @@ +--- ./python/sip/sipgen/gencode.c.orig 2007-09-20 02:03:50.000000000 +0200 ++++ ./python/sip/sipgen/gencode.c 2007-09-20 02:23:04.000000000 +0200 +@@ -2082,6 +2082,7 @@ + + prcode(fp, + "\n" ++"#include \n" // HACK! HACK! HACK! + "#include \"sipAPI%s.h\"\n" + "#include \"sip%s%F.h\"\n" + ,cmname diff --git a/package/kde/kdebindings/sipgen-parts.patch b/package/kde/kdebindings/sipgen-parts.patch new file mode 100644 index 000000000..19f686e23 --- /dev/null +++ b/package/kde/kdebindings/sipgen-parts.patch @@ -0,0 +1,40 @@ +--- ./python/Makefile.am.orig 2007-09-20 01:03:25.000000000 +0200 ++++ ./python/Makefile.am 2007-09-20 01:03:47.000000000 +0200 +@@ -40,7 +40,7 @@ + export PYTHONPATH=$$builddir/pyqt:$$PYTHONPATH ; \ + cd $(srcdir)/pyqt ; \ + export QTDIR=${qt_dir} ; \ +- echo "yes" | @PYTHON@ configure.py -c -b @bindir@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pyqt" ++ echo "yes" | @PYTHON@ configure.py -j 100 -c -b @bindir@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pyqt" + echo "" > prepqt + + prepkde: prepqt +@@ -54,7 +54,7 @@ + export PYTHONPATH=$$builddir/pykde:$$PYTHONPATH ; \ + cd $(srcdir)/pykde ; \ + export QTDIR=${qt_dir} ; \ +- @PYTHON@ configure.py -c -k @prefix@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pykde" ++ @PYTHON@ configure.py -j 100 -c -k @prefix@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pykde" + echo "" > prepkde + + install: +--- ./python/Makefile.in.orig 2007-09-20 01:02:26.000000000 +0200 ++++ ./python/Makefile.in 2007-09-20 01:03:21.000000000 +0200 +@@ -593,7 +593,7 @@ + export PYTHONPATH=$$builddir/pyqt:$$PYTHONPATH ; \ + cd $(srcdir)/pyqt ; \ + export QTDIR=${qt_dir} ; \ +- echo "yes" | @PYTHON@ configure.py -c -b @bindir@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pyqt" ++ echo "yes" | @PYTHON@ configure.py -j 100 -c -b @bindir@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pyqt" + echo "" > prepqt + + prepkde: prepqt +@@ -607,7 +607,7 @@ + export PYTHONPATH=$$builddir/pykde:$$PYTHONPATH ; \ + cd $(srcdir)/pykde ; \ + export QTDIR=${qt_dir} ; \ +- @PYTHON@ configure.py -c -k @prefix@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pykde" ++ @PYTHON@ configure.py -j 100 -c -k @prefix@ -d ${site_packages} -v ${sip_dir} -t "$$builddir/pykde" + echo "" > prepkde + + install: