From 4ecdc0ed490f7e1f8212f5f204e30e26ca40186d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 5 Mar 2007 00:32:21 +0000 Subject: [PATCH] Stefan Fiedler: update kde (3.5.5 -> 3.5.6) improve update-kde.sh a bit UNTESTED [2007020309525414264] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8233 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kde/arts/arts.desc | 4 +- .../kdeaccessibility/kdeaccessibility.desc | 4 +- .../kdeaddons/kdeaddons-security-fix.patch | 25 ++ package/kde/kdeaddons/kdeaddons.desc | 4 +- package/kde/kdeadmin/kdeadmin.desc | 4 +- package/kde/kdeartwork/kdeartwork.desc | 4 +- package/kde/kdebase/kdebase.desc | 4 +- ....5.6-build-against-python-before-2.5.patch | 340 ++++++++++++++++++ package/kde/kdebindings/kdebindings.desc | 4 +- package/kde/kdeedu/kdeedu.desc | 4 +- package/kde/kdegames/kdegames.desc | 4 +- package/kde/kdegraphics/kdegraphics.desc | 4 +- package/kde/kdelibs/kdelibs.desc | 4 +- package/kde/kdemultimedia/kdemultimedia.desc | 4 +- package/kde/kdenetwork/kdenetwork.desc | 4 +- package/kde/kdepim/kdepim.desc | 4 +- package/kde/kdesdk/kdesdk.desc | 4 +- package/kde/kdetoys/kdetoys.desc | 4 +- package/kde/kdeutils/kdeutils.desc | 4 +- package/kde/kdevelop/kdevelop.desc | 4 +- package/kde/kdewebdev/kdewebdev.desc | 4 +- package/kde/update-kde.sh | 18 +- 22 files changed, 419 insertions(+), 40 deletions(-) create mode 100644 package/kde/kdeaddons/kdeaddons-security-fix.patch create mode 100644 package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch diff --git a/package/kde/arts/arts.desc b/package/kde/arts/arts.desc index ff96da768..c29448264 100644 --- a/package/kde/arts/arts.desc +++ b/package/kde/arts/arts.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.5.5 +[V] 1.5.6 [P] X -?---5---9 128.200 -[D] 4108547853 arts-1.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 388946242 arts-1.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeaccessibility/kdeaccessibility.desc b/package/kde/kdeaccessibility/kdeaccessibility.desc index a0c404709..c80315369 100644 --- a/package/kde/kdeaccessibility/kdeaccessibility.desc +++ b/package/kde/kdeaccessibility/kdeaccessibility.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 171.500 -[D] 642742027 kdeaccessibility-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1933783436 kdeaccessibility-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeaddons/kdeaddons-security-fix.patch b/package/kde/kdeaddons/kdeaddons-security-fix.patch new file mode 100644 index 000000000..71fa34733 --- /dev/null +++ b/package/kde/kdeaddons/kdeaddons-security-fix.patch @@ -0,0 +1,25 @@ +Fixes "a minor but annoying privacy issue," see http://kde.org/info/3.5.6.php + +--- kdeaddons/konq-plugins/webarchiver/archivedialog.cpp 2006/06/25 12:30:34 554811 ++++ kdeaddons/konq-plugins/webarchiver/archivedialog.cpp 2007/01/24 17:16:52 626814 +@@ -395,12 +395,15 @@ + QString ArchiveDialog::handleLink(const KURL& _url, const QString& _link) + { + KURL url(getAbsoluteURL(_url, _link)); +- QString tarFileName; + +- if (m_state==Retrieving) +- m_urlsToDownload.append(url); +- else if (m_state==Saving) +- tarFileName = m_downloadedURLDict[url.url()]; ++ QString tarFileName; ++ if (kapp->authorizeURLAction("redirect", _url, url)) ++ { ++ if (m_state==Retrieving) ++ m_urlsToDownload.append(url); ++ else if (m_state==Saving) ++ tarFileName = m_downloadedURLDict[url.url()]; ++ } + + return tarFileName; + } diff --git a/package/kde/kdeaddons/kdeaddons.desc b/package/kde/kdeaddons/kdeaddons.desc index 6c618e2fd..6659588fc 100644 --- a/package/kde/kdeaddons/kdeaddons.desc +++ b/package/kde/kdeaddons/kdeaddons.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 196.500 -[D] 3404032699 kdeaddons-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 602063496 kdeaddons-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeadmin/kdeadmin.desc b/package/kde/kdeadmin/kdeadmin.desc index d9855824b..29a9a68fb 100644 --- a/package/kde/kdeadmin/kdeadmin.desc +++ b/package/kde/kdeadmin/kdeadmin.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 169.600 -[D] 25330256 kdeadmin-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1005706253 kdeadmin-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeartwork/kdeartwork.desc b/package/kde/kdeartwork/kdeartwork.desc index bd3d87bde..5c43b3b1f 100644 --- a/package/kde/kdeartwork/kdeartwork.desc +++ b/package/kde/kdeartwork/kdeartwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 176.400 -[D] 1956144281 kdeartwork-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 710331624 kdeartwork-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdebase/kdebase.desc b/package/kde/kdebase/kdebase.desc index 81413d573..d6727adaa 100644 --- a/package/kde/kdebase/kdebase.desc +++ b/package/kde/kdebase/kdebase.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 166.700 -[D] 3861209140 kdebase-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 794104401 kdebase-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ 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 new file mode 100644 index 000000000..8c3dc5cef --- /dev/null +++ b/package/kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch @@ -0,0 +1,340 @@ + + + + + + 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.desc b/package/kde/kdebindings/kdebindings.desc index fa285d4ac..bf982a2e4 100644 --- a/package/kde/kdebindings/kdebindings.desc +++ b/package/kde/kdebindings/kdebindings.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 199.200 -[D] 1173859297 kdebindings-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1348132683 kdebindings-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeedu/kdeedu.desc b/package/kde/kdeedu/kdeedu.desc index 3e1784efb..85e334716 100644 --- a/package/kde/kdeedu/kdeedu.desc +++ b/package/kde/kdeedu/kdeedu.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 176.000 -[D] 403723484 kdeedu-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 123070682 kdeedu-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdegames/kdegames.desc b/package/kde/kdegames/kdegames.desc index 95a8038c6..e23232630 100644 --- a/package/kde/kdegames/kdegames.desc +++ b/package/kde/kdegames/kdegames.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 167.700 -[D] 294161056 kdegames-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 2914860366 kdegames-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdegraphics/kdegraphics.desc b/package/kde/kdegraphics/kdegraphics.desc index 0381b29dd..f674038f7 100644 --- a/package/kde/kdegraphics/kdegraphics.desc +++ b/package/kde/kdegraphics/kdegraphics.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 216.700 -[D] 899737592 kdegraphics-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 398340295 kdegraphics-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdelibs/kdelibs.desc b/package/kde/kdelibs/kdelibs.desc index 4e3657c67..2c1287f3a 100644 --- a/package/kde/kdelibs/kdelibs.desc +++ b/package/kde/kdelibs/kdelibs.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 166.500 -[D] 3341190838 kdelibs-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1234416266 kdelibs-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdemultimedia/kdemultimedia.desc b/package/kde/kdemultimedia/kdemultimedia.desc index 8f398a50f..977b43353 100644 --- a/package/kde/kdemultimedia/kdemultimedia.desc +++ b/package/kde/kdemultimedia/kdemultimedia.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 193.700 -[D] 527464185 kdemultimedia-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1574391653 kdemultimedia-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdenetwork/kdenetwork.desc b/package/kde/kdenetwork/kdenetwork.desc index f056adbe6..1345596f7 100644 --- a/package/kde/kdenetwork/kdenetwork.desc +++ b/package/kde/kdenetwork/kdenetwork.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 185.400 -[D] 4115634363 kdenetwork-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 3391116246 kdenetwork-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdepim/kdepim.desc b/package/kde/kdepim/kdepim.desc index 34edb1fdc..5c5a9b3bf 100644 --- a/package/kde/kdepim/kdepim.desc +++ b/package/kde/kdepim/kdepim.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 167.000 -[D] 1579773981 kdepim-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 3788796975 kdepim-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ [D] 1403856925 ksyncml-20050314.tar.gz http://www.borowka.net/~maciek/ksyncml/data/ diff --git a/package/kde/kdesdk/kdesdk.desc b/package/kde/kdesdk/kdesdk.desc index d36184bfd..6376149f0 100644 --- a/package/kde/kdesdk/kdesdk.desc +++ b/package/kde/kdesdk/kdesdk.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 195.900 -[D] 1520200347 kdesdk-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 3761157286 kdesdk-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdetoys/kdetoys.desc b/package/kde/kdetoys/kdetoys.desc index 45d8460f0..0b61ef10d 100644 --- a/package/kde/kdetoys/kdetoys.desc +++ b/package/kde/kdetoys/kdetoys.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 193.900 -[D] 4098717607 kdetoys-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 2436952865 kdetoys-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdeutils/kdeutils.desc b/package/kde/kdeutils/kdeutils.desc index a548f738d..7478784e9 100644 --- a/package/kde/kdeutils/kdeutils.desc +++ b/package/kde/kdeutils/kdeutils.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 166.900 -[D] 954354887 kdeutils-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 2812455031 kdeutils-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdevelop/kdevelop.desc b/package/kde/kdevelop/kdevelop.desc index fda8ed52f..e629b54c3 100644 --- a/package/kde/kdevelop/kdevelop.desc +++ b/package/kde/kdevelop/kdevelop.desc @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 3.3.5 +[V] 3.3.6 [P] X -?---5---9 208.300 -[D] 1604164365 kdevelop-3.3.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 3056295616 kdevelop-3.3.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/kdewebdev/kdewebdev.desc b/package/kde/kdewebdev/kdewebdev.desc index d69304c2c..46d84abba 100644 --- a/package/kde/kdewebdev/kdewebdev.desc +++ b/package/kde/kdewebdev/kdewebdev.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.5.5 +[V] 3.5.6 [P] X -?---5---9 196.000 -[D] 2943756577 kdewebdev-3.5.5.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.5/src/ +[D] 1075711919 kdewebdev-3.5.6.tar.bz2 http://gd.tuwien.ac.at/kde/stable/3.5.6/src/ diff --git a/package/kde/update-kde.sh b/package/kde/update-kde.sh index 9fc86487a..e37c7e360 100755 --- a/package/kde/update-kde.sh +++ b/package/kde/update-kde.sh @@ -1,5 +1,11 @@ #!/bin/bash +( +oldver="${1//./\.}" +newver="${2//./\.}" + +cd package/kde + if [ ! "$1" -o ! "$2" ] ; then echo "You must specify old and new version ..." exit -1 @@ -8,7 +14,7 @@ fi for x in kde* arts ; do [ -f $x/$x.desc ] || continue echo "Updating $x ..." - sed -e s,$1,$2,g \ + sed -e "s,$oldver,$newver,g" \ -e "s/\[D\] [0-9]* /\[D\] 0 /" $x/$x.desc > $x/$x.desc.new mv $x/$x.desc.new $x/$x.desc done @@ -17,6 +23,14 @@ done # the arts.desc is changed above and below. x="arts" echo "Updating $x ..." -sed -e s,1.${1:2},1.${2:2},g \ +sed -e "s,1\.${oldver:3},1\.${newver:3},g" \ + -e "s/\[D\] [0-9]* /\[D\] 0 /" $x/$x.desc > $x/$x.desc.new +mv $x/$x.desc.new $x/$x.desc + +# Likewise for kdevelop, but the version number is 3.3.x. +x="kdevelop" +echo "Updating $x ..." +sed -e "s,3\.3\.${oldver:6},3\.3\.${newver:6},g" \ -e "s/\[D\] [0-9]* /\[D\] 0 /" $x/$x.desc > $x/$x.desc.new mv $x/$x.desc.new $x/$x.desc +)