From a0964d0ee93b4c2bbf75697995248786fecd1799 Mon Sep 17 00:00:00 2001 From: fake Date: Sat, 18 Sep 2004 19:33:15 +0000 Subject: [PATCH] fake: the great kde 3.3 rediff: Daniel Jahre: - updated kde to version 3.3 - adotpted kde prefix for kde and no kde packages - removed quanta package (obsolete) - please svn rm the quanta package - added kdewebdev package which replaces quanta (thx to SMP for testing and advice) Stefan Fiedler: - kdebase/post-3.2.3-kdebase-htmlframes.patch, kdelibs/post-3.2.3-kdelibs-*.patch obsoleted - kdebase/konsole-fix.patch adapted - kdebindings 3.3: use libqt-mt with sip - kdevelop 3.1.0: don't install kdevelops bdb fake: - kdeadmin/pam-fix.patch adoption - kdeaddons/gcc34.patch obsoleted - package/kde/*/*.conf: include kde-3.conf - kde-3.conf: kde needs .la files at runtime [2004091311570102157] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4298 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../gnome2/gnome-desktop/gnome-desktop.conf | 2 +- package/gnome2/scrollkeeper/scrollkeeper.conf | 2 +- package/kde/arts/arts.conf | 2 +- package/kde/arts/arts.desc | 4 +- package/kde/k3b/k3b.conf | 2 +- package/kde/kde-i18n-de/kde-i18n-de.conf | 2 +- package/kde/kde-i18n-de/kde-i18n-de.desc | 4 +- package/kde/kde-i18n-es/kde-i18n-es.conf | 2 +- package/kde/kde-i18n-es/kde-i18n-es.desc | 4 +- package/kde/kde-i18n-fr/kde-i18n-fr.conf | 2 +- package/kde/kde-i18n-fr/kde-i18n-fr.desc | 4 +- package/kde/kde-i18n-it/kde-i18n-it.conf | 2 +- package/kde/kde-i18n-it/kde-i18n-it.desc | 4 +- .../kdeaccessibility/kdeaccessibility.conf | 2 +- .../kdeaccessibility/kdeaccessibility.desc | 4 +- package/kde/kdeaddons/gcc34.patch | 177 ------- package/kde/kdeaddons/kdeaddons.conf | 2 +- package/kde/kdeaddons/kdeaddons.desc | 4 +- package/kde/kdeadmin/kdeadmin.conf | 2 +- package/kde/kdeadmin/kdeadmin.desc | 4 +- package/kde/kdeadmin/pam-fix.patch | 16 +- package/kde/kdeartwork/kdeartwork.conf | 2 +- package/kde/kdeartwork/kdeartwork.desc | 4 +- package/kde/kdebase/kdebase.conf | 6 +- package/kde/kdebase/kdebase.desc | 4 +- package/kde/kdebase/kdm.cron | 2 +- package/kde/kdebase/konsole-fix.patch | 12 - .../post-3.2.3-kdebase-htmlframes.patch | 138 ------ package/kde/kdebindings/kdebindings.conf | 2 +- package/kde/kdebindings/kdebindings.desc | 4 +- .../kde/kdebindings/sip_use_libqt-mt.patch | 22 + package/kde/kdeedu/kdeedu.conf | 2 +- package/kde/kdeedu/kdeedu.desc | 4 +- package/kde/kdegames/kdegames.conf | 2 +- package/kde/kdegames/kdegames.desc | 4 +- package/kde/kdegraphics/kdegraphics.conf | 2 +- package/kde/kdegraphics/kdegraphics.desc | 4 +- package/kde/kdelibs/config.hlp | 6 +- package/kde/kdelibs/config.in | 8 +- .../kde/kdelibs/{kde-32.conf => kde-3.conf} | 6 +- package/kde/kdelibs/kdelibs.conf | 8 +- package/kde/kdelibs/kdelibs.desc | 4 +- .../post-3.2.3-kdelibs-dcopserver.patch | 185 -------- .../post-3.2.3-kdelibs-htmlframes.patch | 434 ------------------ .../post-3.2.3-kdelibs-kstandarddirs.patch | 38 -- package/kde/kdemultimedia/kdemultimedia.conf | 2 +- package/kde/kdemultimedia/kdemultimedia.desc | 4 +- package/kde/kdenetwork/kdenetwork.conf | 2 +- package/kde/kdenetwork/kdenetwork.desc | 4 +- package/kde/kdepim/kdepim.conf | 2 +- package/kde/kdepim/kdepim.desc | 4 +- package/kde/kdesdk/kdesdk.conf | 2 +- package/kde/kdesdk/kdesdk.desc | 4 +- package/kde/kdetoys/kdetoys.conf | 2 +- package/kde/kdetoys/kdetoys.desc | 4 +- package/kde/kdeutils/kdeutils.conf | 2 +- package/kde/kdeutils/kdeutils.desc | 4 +- package/kde/kdevelop/kdevelop.conf | 2 +- package/kde/kdevelop/kdevelop.desc | 4 +- package/kde/kdevelop/no-bdb-install.patch | 11 + package/kde/kdewebdev/kdewebdev.conf | 23 + package/kde/kdewebdev/kdewebdev.desc | 44 ++ package/kde/kdirstat/kdirstat.conf | 2 +- package/kde/koffice-i18n/koffice-i18n.conf | 2 +- package/kde/koffice/koffice.conf | 2 +- package/kde/quanta/quanta.conf | 2 +- .../noia-icons-kde/noia-icons-kde.conf | 4 +- package/sirkull/qtcurve/qtcurve.desc | 4 +- package/stefanp/psi/psi.conf | 6 +- 69 files changed, 205 insertions(+), 1087 deletions(-) delete mode 100644 package/kde/kdeaddons/gcc34.patch delete mode 100644 package/kde/kdebase/post-3.2.3-kdebase-htmlframes.patch create mode 100644 package/kde/kdebindings/sip_use_libqt-mt.patch rename package/kde/kdelibs/{kde-32.conf => kde-3.conf} (81%) delete mode 100644 package/kde/kdelibs/post-3.2.3-kdelibs-dcopserver.patch delete mode 100644 package/kde/kdelibs/post-3.2.3-kdelibs-htmlframes.patch delete mode 100644 package/kde/kdelibs/post-3.2.3-kdelibs-kstandarddirs.patch create mode 100644 package/kde/kdevelop/no-bdb-install.patch create mode 100644 package/kde/kdewebdev/kdewebdev.conf create mode 100644 package/kde/kdewebdev/kdewebdev.desc diff --git a/package/gnome2/gnome-desktop/gnome-desktop.conf b/package/gnome2/gnome-desktop/gnome-desktop.conf index 716167425..56dac9dcd 100644 --- a/package/gnome2/gnome-desktop/gnome-desktop.conf +++ b/package/gnome2/gnome-desktop/gnome-desktop.conf @@ -25,7 +25,7 @@ var_append confopt ' ' '--with-gnome-distributor=ROCK-Linux' -for dir in usr opt/kde32 $ROCKCFG_PKG_KDE32_CORE_PREFIX ; do +for dir in usr opt/kde3 $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && kdeprefix="$dir" done diff --git a/package/gnome2/scrollkeeper/scrollkeeper.conf b/package/gnome2/scrollkeeper/scrollkeeper.conf index 5505ecef8..b42151294 100644 --- a/package/gnome2/scrollkeeper/scrollkeeper.conf +++ b/package/gnome2/scrollkeeper/scrollkeeper.conf @@ -22,7 +22,7 @@ . $base/package/*/*/gnome-2.conf -confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde32/omf" +confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde3/omf" scrollkeeper_pm() { echo "Installing cron script ..." diff --git a/package/kde/arts/arts.conf b/package/kde/arts/arts.conf index d0fb51de2..6ffa62e7c 100644 --- a/package/kde/arts/arts.conf +++ b/package/kde/arts/arts.conf @@ -21,4 +21,4 @@ # --- ROCK-COPYRIGHT-NOTE-END --- NO_SANITY_CHECK=1 -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/arts/arts.desc b/package/kde/arts/arts.desc index 2837afa62..eb84866a8 100644 --- a/package/kde/arts/arts.desc +++ b/package/kde/arts/arts.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 1.2.3 +[V] 1.3.0 [P] X -?---5---9 128.900 -[D] 468910527 arts-1.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 3348026567 arts-1.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/k3b/k3b.conf b/package/kde/k3b/k3b.conf index 9a0c7d0e6..46148ed76 100644 --- a/package/kde/k3b/k3b.conf +++ b/package/kde/k3b/k3b.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kde-i18n-de/kde-i18n-de.conf b/package/kde/kde-i18n-de/kde-i18n-de.conf index 9482dec0b..cb51c3dbf 100644 --- a/package/kde/kde-i18n-de/kde-i18n-de.conf +++ b/package/kde/kde-i18n-de/kde-i18n-de.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf createdocs=0 diff --git a/package/kde/kde-i18n-de/kde-i18n-de.desc b/package/kde/kde-i18n-de/kde-i18n-de.desc index aa8c3e0ec..9bedb59a1 100644 --- a/package/kde/kde-i18n-de/kde-i18n-de.desc +++ b/package/kde/kde-i18n-de/kde-i18n-de.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 166.100 -[D] 983027130 kde-i18n-de-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/kde-i18n/ +[D] 2544103609 kde-i18n-de-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/kde-i18n/ diff --git a/package/kde/kde-i18n-es/kde-i18n-es.conf b/package/kde/kde-i18n-es/kde-i18n-es.conf index e2a9042e3..1d7a24927 100644 --- a/package/kde/kde-i18n-es/kde-i18n-es.conf +++ b/package/kde/kde-i18n-es/kde-i18n-es.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf createdocs=0 diff --git a/package/kde/kde-i18n-es/kde-i18n-es.desc b/package/kde/kde-i18n-es/kde-i18n-es.desc index cabc6182e..6e9de82a6 100644 --- a/package/kde/kde-i18n-es/kde-i18n-es.desc +++ b/package/kde/kde-i18n-es/kde-i18n-es.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 166.500 -[D] 166190134 kde-i18n-es-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/kde-i18n/ +[D] 3988356553 kde-i18n-es-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/kde-i18n/ diff --git a/package/kde/kde-i18n-fr/kde-i18n-fr.conf b/package/kde/kde-i18n-fr/kde-i18n-fr.conf index 01f2d6a80..4f912782b 100644 --- a/package/kde/kde-i18n-fr/kde-i18n-fr.conf +++ b/package/kde/kde-i18n-fr/kde-i18n-fr.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf createdocs=0 diff --git a/package/kde/kde-i18n-fr/kde-i18n-fr.desc b/package/kde/kde-i18n-fr/kde-i18n-fr.desc index 4f4db65fe..2f30b0e8e 100644 --- a/package/kde/kde-i18n-fr/kde-i18n-fr.desc +++ b/package/kde/kde-i18n-fr/kde-i18n-fr.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 166.700 -[D] 1320611928 kde-i18n-fr-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/kde-i18n/ +[D] 1662257804 kde-i18n-fr-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/kde-i18n/ diff --git a/package/kde/kde-i18n-it/kde-i18n-it.conf b/package/kde/kde-i18n-it/kde-i18n-it.conf index 45fd04d7c..33ef9fbf2 100644 --- a/package/kde/kde-i18n-it/kde-i18n-it.conf +++ b/package/kde/kde-i18n-it/kde-i18n-it.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf createdocs=0 diff --git a/package/kde/kde-i18n-it/kde-i18n-it.desc b/package/kde/kde-i18n-it/kde-i18n-it.desc index 77c120660..f81da7335 100644 --- a/package/kde/kde-i18n-it/kde-i18n-it.desc +++ b/package/kde/kde-i18n-it/kde-i18n-it.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 166.200 -[D] 3930312783 kde-i18n-it-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/kde-i18n/ +[D] 2751255444 kde-i18n-it-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/kde-i18n/ diff --git a/package/kde/kdeaccessibility/kdeaccessibility.conf b/package/kde/kdeaccessibility/kdeaccessibility.conf index 72d097c11..7b95d8f05 100644 --- a/package/kde/kdeaccessibility/kdeaccessibility.conf +++ b/package/kde/kdeaccessibility/kdeaccessibility.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeaccessibility/kdeaccessibility.desc b/package/kde/kdeaccessibility/kdeaccessibility.desc index bb754b527..9be8cf1d5 100644 --- a/package/kde/kdeaccessibility/kdeaccessibility.desc +++ b/package/kde/kdeaccessibility/kdeaccessibility.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 171.300 -[D] 2464077756 kdeaccessibility-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 4071011090 kdeaccessibility-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdeaddons/gcc34.patch b/package/kde/kdeaddons/gcc34.patch deleted file mode 100644 index 46abf9ed0..000000000 --- a/package/kde/kdeaddons/gcc34.patch +++ /dev/null @@ -1,177 +0,0 @@ -Nur in kdeaddons-3.2.3-patch/noatun-plugins/jefferson: .deps. -Nur in kdeaddons-3.2.3-patch/noatun-plugins/jefferson: Makefile. -Nur in kdeaddons-3.2.3-patch/noatun-plugins/nexscope: .deps. -Nur in kdeaddons-3.2.3-patch/noatun-plugins/nexscope: Makefile. -diff -dur kdeaddons-3.2.3/noatun-plugins/synaescope/polygon.h kdeaddons-3.2.3-patch/noatun-plugins/synaescope/polygon.h ---- kdeaddons-3.2.3/noatun-plugins/synaescope/polygon.h 2001-04-16 23:20:34.000000000 +0000 -+++ kdeaddons-3.2.3-patch/noatun-plugins/synaescope/polygon.h 2004-06-20 13:56:39.000000000 +0000 -@@ -9,46 +9,31 @@ - Bitmap(int e=0) : extra(e), data(0) { }; - ~Bitmap() { delete[] data; }; - -- void size(int w,int h) { -- delete[] data; -- width = w; -- height = h; -- data = new Pixel[w*h+extra]; -- clear(); -- } -+ void size(int w,int h); - - void clear() { - memset(data,0,sizeof(Pixel)*(width*height+extra)); - } - }; - -+template void Bitmap::size(int w,int h) { -+ delete[] data; -+ width = w; -+ height = h; -+ data = new Pixel[w*h+extra]; -+ clear(); -+} -+ - template - struct PolygonEngine : public Bitmap - { -- PolygonEngine() : Bitmap(1) { } -+ PolygonEngine() : Bitmap(1) { } - - #define super (1<= height) return; -- if (x < 0) x = 0; -- if (x > width) x = width; -- data[x+y*width] += color; -- } -+ void apply(Pixel *dest); -+ -+ void add(Pixel color,int x,int y); - - /* Color is char[layers] */ - -@@ -104,3 +89,26 @@ - } - #undef super - }; -+ -+template -+void PolygonEngine::apply(Pixel *dest) -+ { -+ unsigned short sum=0; -+ int count = Bitmap::width*Bitmap::height; -+ unsigned short* src = Bitmap::data; -+ while(count--) { -+ sum += *(src++); -+ if (sum) -+ *dest = Combiner::combine(sum,*dest); -+ dest++; -+ } -+ } -+template -+void PolygonEngine::add(Pixel color,int x,int y) -+ { -+ if (y < 0) return; -+ if (y >= Bitmap::height) return; -+ if (x < 0) x = 0; -+ if (x > Bitmap::width) x = Bitmap::width; -+ Bitmap::data[x+y*Bitmap::width] += color; -+ } -diff -dur kdeaddons-3.2.3/noatun-plugins/tippercanoe/polygon.h kdeaddons-3.2.3-patch/noatun-plugins/tippercanoe/polygon.h ---- kdeaddons-3.2.3/noatun-plugins/tippercanoe/polygon.h 2001-04-16 22:04:03.000000000 +0000 -+++ kdeaddons-3.2.3-patch/noatun-plugins/tippercanoe/polygon.h 2004-06-20 14:12:12.000000000 +0000 -@@ -8,43 +8,29 @@ - Bitmap(int e=0) : extra(e), data(0) { }; - ~Bitmap() { delete[] data; }; - -- void size(int w,int h) { -+ void size(int w, int h); -+ -+ void clear() { -+ memset(data,0,sizeof(Pixel)*(width*height+extra)); -+ } -+}; -+ -+ template void Bitmap::size(int w,int h) { - delete[] data; - width = w; - height = h; - data = new Pixel[w*h+extra]; - clear(); - } -- -- void clear() { -- memset(data,0,sizeof(Pixel)*(width*height+extra)); -- } --}; - - template - struct PolygonEngine : public Bitmap { - PolygonEngine() : Bitmap(1) { } - - #define super (1<= height) return; -- if (x < 0) x = 0; -- if (x > width) x = width; -- data[x+y*width] += color; -- } -+ void add(Pixel color,int x,int y); - - /* Color is char[layers] */ - -@@ -96,3 +82,24 @@ - } - #undef super - }; -+ -+template -+void PolygonEngine::apply(Pixel *dest) { -+ Pixel sum=0; -+ int count = Bitmap::width*Bitmap::height; -+ Pixel *src = Bitmap::data; -+ while(count--) { -+ sum += *(src++); -+ if (sum) -+ *dest = Combiner::combine(sum,*dest); -+ dest++; -+ } -+ } -+template -+void PolygonEngine::add(Pixel color,int x,int y) { -+ if (y < 0) return; -+ if (y >= Bitmap::height) return; -+ if (x < 0) x = 0; -+ if (x > Bitmap::width) x = Bitmap::width; -+ Bitmap::data[x+y*Bitmap::width] += color; -+ } -Nur in kdeaddons-3.2.3-patch/noatun-plugins/tippercanoe: polygon.h~. diff --git a/package/kde/kdeaddons/kdeaddons.conf b/package/kde/kdeaddons/kdeaddons.conf index e0a852306..058fb118a 100644 --- a/package/kde/kdeaddons/kdeaddons.conf +++ b/package/kde/kdeaddons/kdeaddons.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeaddons/kdeaddons.desc b/package/kde/kdeaddons/kdeaddons.desc index a44c0e456..63e740deb 100644 --- a/package/kde/kdeaddons/kdeaddons.desc +++ b/package/kde/kdeaddons/kdeaddons.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 195.400 -[D] 3906793476 kdeaddons-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 1287456061 kdeaddons-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdeadmin/kdeadmin.conf b/package/kde/kdeadmin/kdeadmin.conf index 2c7c72270..c593eea88 100644 --- a/package/kde/kdeadmin/kdeadmin.conf +++ b/package/kde/kdeadmin/kdeadmin.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeadmin/kdeadmin.desc b/package/kde/kdeadmin/kdeadmin.desc index b36c5501d..fd43503a6 100644 --- a/package/kde/kdeadmin/kdeadmin.desc +++ b/package/kde/kdeadmin/kdeadmin.desc @@ -41,8 +41,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 162.700 -[D] 3929242283 kdeadmin-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2551667114 kdeadmin-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdeadmin/pam-fix.patch b/package/kde/kdeadmin/pam-fix.patch index 42497163c..9081a724f 100644 --- a/package/kde/kdeadmin/pam-fix.patch +++ b/package/kde/kdeadmin/pam-fix.patch @@ -33,14 +33,14 @@ We need libpam and libpam_misc for kuser. use_pam=yes if test "$pam_header" = "pam/pam_appl.h"; then ---- kdeadmin-3.2.0/kuser/Makefile.in.orig 2004-01-25 19:58:43.000000000 +0100 -+++ kdeadmin-3.2.0/kuser/Makefile.in 2004-03-02 21:59:14.000000000 +0100 -@@ -289,7 +289,7 @@ - AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -D_SVID_SOURCE -D_GNU_SOURCE -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII - +--- ./kuser/Makefile.in.orig 2004-09-01 05:42:07.355495936 +0200 ++++ ./kuser/Makefile.in 2004-09-01 05:42:38.739724808 +0200 +@@ -393,7 +393,7 @@ + # May be -D_XU_QUOTA -D_XU_SHADOW + #AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) -+kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(PAMLIBS) $(LIBGEN) - +-kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) ++kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(PAMLIBS) $(LIBGEN) $(LIB_KABC) ####### Files + #>- kuser_SOURCES = \ diff --git a/package/kde/kdeartwork/kdeartwork.conf b/package/kde/kdeartwork/kdeartwork.conf index 69fd4e3ae..5620e6085 100644 --- a/package/kde/kdeartwork/kdeartwork.conf +++ b/package/kde/kdeartwork/kdeartwork.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeartwork/kdeartwork.desc b/package/kde/kdeartwork/kdeartwork.desc index e79a9b70d..0f3cce073 100644 --- a/package/kde/kdeartwork/kdeartwork.desc +++ b/package/kde/kdeartwork/kdeartwork.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 165.700 -[D] 2366487758 kdeartwork-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 1642332982 kdeartwork-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdebase/kdebase.conf b/package/kde/kdebase/kdebase.conf index 86b03b1f6..7b906884c 100644 --- a/package/kde/kdebase/kdebase.conf +++ b/package/kde/kdebase/kdebase.conf @@ -20,15 +20,15 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf pkginstalled samba && var_append confopt " " \ "--with-extra-includes=$root/$pkg_samba_prefix/include" kde_base_pi() { - register_xdm kdm 'KDE v3.2 display manager' $bindir/kdm - register_wm kde 'KDE v3.2' /$prefix/bin/startkde + register_xdm kdm 'KDE v3.3 display manager' $bindir/kdm + register_wm kde 'KDE v3.3' /$prefix/bin/startkde cp -fv $confdir/kdm.cron $root/etc/cron.daily/90-kdm chmod +x $root/etc/cron.daily/90-kdm diff --git a/package/kde/kdebase/kdebase.desc b/package/kde/kdebase/kdebase.desc index 7f400879a..6d78a57d8 100644 --- a/package/kde/kdebase/kdebase.desc +++ b/package/kde/kdebase/kdebase.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 162.400 -[D] 2448208654 kdebase-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 3520603950 kdebase-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdebase/kdm.cron b/package/kde/kdebase/kdm.cron index 00ef9ae6d..0ea867b69 100755 --- a/package/kde/kdebase/kdm.cron +++ b/package/kde/kdebase/kdm.cron @@ -1,6 +1,6 @@ #!/bin/sh -prefix=/opt/kde32/share/config/kdm/ +prefix=/opt/kde3/share/config/kdm/ echo "Creating kdm session scripts from ROCK wm registry ..." diff --git a/package/kde/kdebase/konsole-fix.patch b/package/kde/kdebase/konsole-fix.patch index 3b24cecc1..13e8444dc 100644 --- a/package/kde/kdebase/konsole-fix.patch +++ b/package/kde/kdebase/konsole-fix.patch @@ -39,15 +39,3 @@ diff -urN ./konsole/other.orig/shell.desktop ./konsole/other/shell.desktop -Exec= +Exec=bash --login Cwd= -diff -urN ./konsole/other.orig/su.desktop ./konsole/other/su.desktop ---- ./konsole/other.orig/su.desktop 2004-03-12 16:20:32.000000000 -0500 -+++ ./konsole/other/su.desktop 2004-03-12 16:22:15.000000000 -0500 -@@ -121,7 +121,7 @@ - Comment[zh_CN]=新建 Root 控制台 - Comment[zh_TW]=新增 Root 主控台 - Comment[zu]=Ikhonsoli Yempande Entsha --Exec=su -+Exec=su - - Schema=BlackOnLightYellow.schema - #Schema=Linux.schema - #VGA diff --git a/package/kde/kdebase/post-3.2.3-kdebase-htmlframes.patch b/package/kde/kdebase/post-3.2.3-kdebase-htmlframes.patch deleted file mode 100644 index 56acecab3..000000000 --- a/package/kde/kdebase/post-3.2.3-kdebase-htmlframes.patch +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- kde-old/konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ kde-new/konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); -+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); -+ if ( ext ) -+ { -+ ext = ext->findFrameParent(callingPart, name); -+ } -+ -+// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); - - if ( ext ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- kde-old/konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ kde-new/konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/package/kde/kdebindings/kdebindings.conf b/package/kde/kdebindings/kdebindings.conf index ca19b9672..f3bf8ca1d 100644 --- a/package/kde/kdebindings/kdebindings.conf +++ b/package/kde/kdebindings/kdebindings.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf # do not yet build q# var_append confopt " " "--without-mcs" diff --git a/package/kde/kdebindings/kdebindings.desc b/package/kde/kdebindings/kdebindings.desc index 8c42511cb..6f0a0c127 100644 --- a/package/kde/kdebindings/kdebindings.desc +++ b/package/kde/kdebindings/kdebindings.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 200.500 -[D] 1824533458 kdebindings-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2802043192 kdebindings-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdebindings/sip_use_libqt-mt.patch b/package/kde/kdebindings/sip_use_libqt-mt.patch new file mode 100644 index 000000000..51e7d04eb --- /dev/null +++ b/package/kde/kdebindings/sip_use_libqt-mt.patch @@ -0,0 +1,22 @@ +--- kdebindings-3.3.0/python/Makefile.am 2004-08-05 20:58:06.000000000 +0200 ++++ src.kdebindings.1094394624.26020.3134666954/kdebindings-3.3.0/python/Makefile.am 2004-09-05 17:16:08.000000000 +0200 +@@ -21,7 +21,7 @@ + @(cd pykde && $(MAKE)) + + sipdone: +- cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir} ++ cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir} -lqt-mt + @(cd sip && $(MAKE)) + echo "" > sipdone + +--- kdebindings-3.3.0/python/Makefile.in 2004-08-14 01:47:27.000000000 +0200 ++++ src.kdebindings.1094394624.26020.3134666954/kdebindings-3.3.0/python/Makefile.in 2004-09-05 17:14:40.000000000 +0200 +@@ -549,7 +549,7 @@ + @(cd pykde && $(MAKE)) + + sipdone: +- cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir} ++ cd sip && export QTDIR=${qt_dir} && @PYTHON@ configure.py -b @bindir@ -d ${site_packages} -e ${python_inc_dir} -v ${sip_dir} -lqt-mt + @(cd sip && $(MAKE)) + echo "" > sipdone + diff --git a/package/kde/kdeedu/kdeedu.conf b/package/kde/kdeedu/kdeedu.conf index 39933e7d6..08ed50cd8 100644 --- a/package/kde/kdeedu/kdeedu.conf +++ b/package/kde/kdeedu/kdeedu.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeedu/kdeedu.desc b/package/kde/kdeedu/kdeedu.desc index 23b77587d..54c1e4a14 100644 --- a/package/kde/kdeedu/kdeedu.desc +++ b/package/kde/kdeedu/kdeedu.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 166.000 -[D] 1412359173 kdeedu-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 3783385779 kdeedu-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdegames/kdegames.conf b/package/kde/kdegames/kdegames.conf index 51f6cf8c6..b12d9e915 100644 --- a/package/kde/kdegames/kdegames.conf +++ b/package/kde/kdegames/kdegames.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdegames/kdegames.desc b/package/kde/kdegames/kdegames.desc index 64b86686f..b8c43af16 100644 --- a/package/kde/kdegames/kdegames.desc +++ b/package/kde/kdegames/kdegames.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 165.800 -[D] 3591172436 kdegames-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 1458919223 kdegames-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdegraphics/kdegraphics.conf b/package/kde/kdegraphics/kdegraphics.conf index cda0d30ba..d0a87655d 100644 --- a/package/kde/kdegraphics/kdegraphics.conf +++ b/package/kde/kdegraphics/kdegraphics.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdegraphics/kdegraphics.desc b/package/kde/kdegraphics/kdegraphics.desc index 0ace7c02f..f9e82a817 100644 --- a/package/kde/kdegraphics/kdegraphics.desc +++ b/package/kde/kdegraphics/kdegraphics.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 204.300 -[D] 3606274186 kdegraphics-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2691430259 kdegraphics-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdelibs/config.hlp b/package/kde/kdelibs/config.hlp index df0e74040..ee89bdfba 100644 --- a/package/kde/kdelibs/config.hlp +++ b/package/kde/kdelibs/config.hlp @@ -20,13 +20,13 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -MENU_PKG_KDE32 +MENU_PKG_KDE3 Here you'll find options for KDE 3.2. -ROCKCFG_PKG_KDE32_CORE_PREFIX +ROCKCFG_PKG_KDE3_CORE_PREFIX Please enter the prefix where you want KDE installed. -ROCKCFG_PKG_KDE32_APIDOX +ROCKCFG_PKG_KDE3_APIDOX Generate documentation about the KDE library API (Application Programmers' Interface), especially useful to developers of KDE-based software. KDevelop can link to this documentation. This option diff --git a/package/kde/kdelibs/config.in b/package/kde/kdelibs/config.in index 4147fa6e8..1fa37eaaa 100644 --- a/package/kde/kdelibs/config.in +++ b/package/kde/kdelibs/config.in @@ -21,11 +21,11 @@ # --- ROCK-COPYRIGHT-NOTE-END --- if pkgcheck kdelibs X ; then - menu_begin MENU_PKG_KDE32 'KDE 3.2 Package Options' - text 'Install prefix for KDE 3.2 packages' \ - ROCKCFG_PKG_KDE32_CORE_PREFIX "opt/kde32" + menu_begin MENU_PKG_KDE3 'KDE 3.x Package Options' + text 'Install prefix for KDE 3.x packages' \ + ROCKCFG_PKG_KDE3_CORE_PREFIX "opt/kde3" bool 'Generate KDE library documentation' \ - ROCKCFG_PKG_KDE32_APIDOX 0 + ROCKCFG_PKG_KDE3_APIDOX 0 menu_end fi diff --git a/package/kde/kdelibs/kde-32.conf b/package/kde/kdelibs/kde-3.conf similarity index 81% rename from package/kde/kdelibs/kde-32.conf rename to package/kde/kdelibs/kde-3.conf index fbed07572..12afc64ea 100644 --- a/package/kde/kdelibs/kde-32.conf +++ b/package/kde/kdelibs/kde-3.conf @@ -1,9 +1,9 @@ if [ "$prefix_auto" = 1 ] ; then if [ "$NO_SANITY_CHECK" ] ; then - prefix=$ROCKCFG_PKG_KDE32_CORE_PREFIX + prefix=$ROCKCFG_PKG_KDE3_CORE_PREFIX else - for dir in usr opt/kde32 $ROCKCFG_PKG_KDE32_CORE_PREFIX ; do + for dir in usr opt/kde3 $ROCKCFG_PKG_KDE3_CORE_PREFIX ; do [ -f "$root/$dir/bin/artsd" ] && prefix="$dir" done @@ -29,3 +29,5 @@ var_append confopt " " "--with-xinerama --enable-dnotify" [ $arch = x86 ] && var_append confopt " " "--enable-fast-malloc=full" +# keep .la files in the main packages, kde needs them at runtime +splitreg 45 . '/.*\.la$' diff --git a/package/kde/kdelibs/kdelibs.conf b/package/kde/kdelibs/kdelibs.conf index 6537bc4b6..d99d8d22b 100644 --- a/package/kde/kdelibs/kdelibs.conf +++ b/package/kde/kdelibs/kdelibs.conf @@ -20,17 +20,17 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf -if [ "$ROCKCFG_PKG_KDE32_APIDOX" ] ; then +if [ "$ROCKCFG_PKG_KDE3_APIDOX" ] ; then echo_status "KDE library documentation will be generated." var_insert makeinstopt " " "apidox" fi kde_pm() { - cat > $root/etc/profile.d/kde32 <<-EOP -KDEDIR31=/$prefix + cat > $root/etc/profile.d/kde3 <<-EOP +KDEDIR33=/$prefix KDEDIR=/$prefix PATH="\$PATH:\$KDEDIR/bin" MANPATH="\$MANPATH:\$KDEDIR/man" diff --git a/package/kde/kdelibs/kdelibs.desc b/package/kde/kdelibs/kdelibs.desc index c9dcb4848..dd9eef04c 100644 --- a/package/kde/kdelibs/kdelibs.desc +++ b/package/kde/kdelibs/kdelibs.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 142.500 -[D] 1307150562 kdelibs-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2106616369 kdelibs-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdelibs/post-3.2.3-kdelibs-dcopserver.patch b/package/kde/kdelibs/post-3.2.3-kdelibs-dcopserver.patch deleted file mode 100644 index a52191514..000000000 --- a/package/kde/kdelibs/post-3.2.3-kdelibs-dcopserver.patch +++ /dev/null @@ -1,185 +0,0 @@ -Index: dcopserver.cpp -=================================================================== -RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v -retrieving revision 1.160.2.3 -diff -u -p -r1.160.2.3 dcopserver.cpp ---- kde-old/dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 -+++ kde-new/dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 -@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE - fprintf (addfp, "\n"); - } - -+#ifndef HAVE_MKSTEMPS -+#include -+#include - --#ifndef HAVE_MKSTEMP --static char *unique_filename (const char *path, const char *prefix) --#else --static char *unique_filename (const char *path, const char *prefix, int *pFd) --#endif -+/* this is based on code taken from the GNU libc, distributed under the LGPL license */ -+ -+/* Generate a unique temporary file name from TEMPLATE. -+ -+ TEMPLATE has the form: -+ -+ /ccXXXXXX -+ -+ SUFFIX_LEN tells us how long is (it can be zero length). -+ -+ The last six characters of TEMPLATE before must be "XXXXXX"; -+ they are replaced with a string that makes the filename unique. -+ -+ Returns a file descriptor open on the file for reading and writing. */ -+ -+int mkstemps (char* _template, int suffix_len) - { --#ifndef HAVE_MKSTEMP --#ifndef X_NOT_POSIX -- return ((char *) tempnam (path, prefix)); --#else -- char tempFile[PATH_MAX]; -- char *tmp; -+ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -+ char *XXXXXX; -+ int len; -+ int count; -+ int value; -+ -+ len = strlen (_template); -+ -+ if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) -+ return -1; -+ -+ XXXXXX = &_template[len - 6 - suffix_len]; -+ -+ value = rand(); -+ for (count = 0; count < 256; ++count) -+ { -+ int v = value; -+ int fd; -+ -+ /* Fill in the random bits. */ -+ XXXXXX[0] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[1] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[2] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[3] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[4] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[5] = letters[v % 62]; -+ -+ fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); -+ if (fd >= 0) -+ /* The file does not exist. */ -+ return fd; -+ -+ /* This is a random value. It is only necessary that the next -+ TMP_MAX values generated by adding 7777 to VALUE are different -+ with (module 2^32). */ -+ value += 7777; -+ } -+ /* We return the null string if we can't find a unique file name. */ -+ _template[0] = '\0'; -+ return -1; -+} - -- snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); -- tmp = (char *) mktemp (tempFile); -- if (tmp) -- { -- char *ptr = (char *) malloc (strlen (tmp) + 1); -- if (ptr != NULL) -- { -- strcpy (ptr, tmp); -- } -- return (ptr); -- } -- else -- return (NULL); - #endif --#else -+ -+static char *unique_filename (const char *path, const char *prefix, int *pFd) -+{ - char tempFile[PATH_MAX]; - char *ptr; - -@@ -480,43 +523,10 @@ static char *unique_filename (const char - if (ptr != NULL) - { - strcpy(ptr, tempFile); -- *pFd = mkstemp(ptr); -+ *pFd = mkstemps(ptr, 0); - } - return ptr; --#endif --} -- --#if 0 --Status SetAuthentication_local (int count, IceListenObj *listenObjs) --{ -- int i; -- for (i = 0; i < count; i ++) { -- char *prot = IceGetListenConnectionString(listenObjs[i]); -- if (!prot) continue; -- char *host = strchr(prot, '/'); -- char *sock = 0; -- if (host) { -- *host=0; -- host++; -- sock = strchr(host, ':'); -- if (sock) { -- *sock = 0; -- sock++; -- } -- } --#ifndef NDEBUG -- qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", -- (unsigned)i, prot, sock); --#endif -- if (sock && !strcmp(prot, "local")) { -- chmod(sock, 0700); -- } -- IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); -- free(prot); -- } -- return 1; - } --#endif - - #define MAGIC_COOKIE_LEN 16 - -@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO - int original_umask; - int i; - QCString command; --#ifdef HAVE_MKSTEMP - int fd; --#endif - - original_umask = umask (0077); /* disallow non-owner access */ - - path = getenv ("DCOP_SAVE_DIR"); - if (!path) - path = "/tmp"; --#ifndef HAVE_MKSTEMP -- if ((addAuthFile = unique_filename (path, "dcop")) == NULL) -- goto bad; - -- if (!(addfp = fopen (addAuthFile, "w"))) -- goto bad; --#else - if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) - goto bad; - - if (!(addfp = fdopen(fd, "wb"))) - goto bad; --#endif - - if ((*_authDataEntries = static_cast(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) - goto bad; diff --git a/package/kde/kdelibs/post-3.2.3-kdelibs-htmlframes.patch b/package/kde/kdelibs/post-3.2.3-kdelibs-htmlframes.patch deleted file mode 100644 index cf070dcf1..000000000 --- a/package/kde/kdelibs/post-3.2.3-kdelibs-htmlframes.patch +++ /dev/null @@ -1,434 +0,0 @@ -Index: khtml/khtml_ext.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.cpp,v -retrieving revision 1.85.2.2 -diff -u -p -r1.85.2.2 khtml_ext.cpp ---- kde-old/khtml/khtml_ext.cpp 24 Apr 2004 08:20:46 -0000 1.85.2.2 -+++ kde-new/khtml/khtml_ext.cpp 3 Aug 2004 14:36:43 -0000 -@@ -646,6 +646,19 @@ bool KHTMLPartBrowserHostExtension::open - return m_part->openURLInFrame( url, urlArgs ); - } - -+void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) -+{ -+ if (id == VIRTUAL_FIND_FRAME_PARENT) -+ { -+ FindFrameParentParams *param = static_cast(data); -+ KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); -+ if (parentPart) -+ param->parent = parentPart->browserHostExtension(); -+ return; -+ } -+ BrowserHostExtension::virtual_hook( id, data ); -+} -+ - // BCI: remove in KDE 4 - KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const QString &text, const QString &icon, const QObject *receiver, const char *slot, QObject *parent, const char *name ) - : KAction( text, icon, 0, receiver, slot, parent, name ) -Index: khtml/khtml_ext.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.h,v -retrieving revision 1.26.2.1 -diff -u -p -r1.26.2.1 khtml_ext.h ---- kde-old/khtml/khtml_ext.h 29 Feb 2004 15:27:43 -0000 1.26.2.1 -+++ kde-new/khtml/khtml_ext.h 3 Aug 2004 14:36:43 -0000 -@@ -98,6 +98,9 @@ public: - virtual const QPtrList frames() const; - - virtual bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); -+ -+protected: -+ virtual void virtual_hook( int id, void* data ); - private: - KHTMLPart *m_part; - }; -Index: khtml/khtml_part.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v -retrieving revision 1.959.2.20 -diff -u -p -r1.959.2.20 khtml_part.cpp ---- kde-old/khtml/khtml_part.cpp 29 Jun 2004 09:08:16 -0000 1.959.2.20 -+++ kde-new/khtml/khtml_part.cpp 3 Aug 2004 14:36:46 -0000 -@@ -757,12 +757,16 @@ DOM::Document KHTMLPart::document() cons - return d->m_doc; - } - -- - KParts::BrowserExtension *KHTMLPart::browserExtension() const - { - return d->m_extension; - } - -+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const -+{ -+ return d->m_hostExtension; -+} -+ - KHTMLView *KHTMLPart::view() const - { - return d->m_view; -@@ -880,29 +884,18 @@ QVariant KHTMLPart::crossFrameExecuteScr - // we always allow these - } - else { -- while (destpart->parentPart()) -- destpart = destpart->parentPart(); -- destpart = destpart->findFrame(target); -- -+ destpart = findFrame(target); - if (!destpart) -- destpart = this; // ### doesn't make sense, does it? -+ destpart = this; - } - - // easy way out? - if (destpart == this) - return executeScript(DOM::Node(), script); - -- - // now compare the domains -- if (!destpart->htmlDocument().isNull() && -- !htmlDocument().isNull()) { -- DOM::DOMString actDomain = htmlDocument().domain(); -- DOM::DOMString destDomain = destpart->htmlDocument().domain(); -- -- if (actDomain == destDomain) -- return destpart->executeScript(DOM::Node(), script); -- } -- -+ if (destpart->checkFrameAccess(this)) -+ return destpart->executeScript(DOM::Node(), script); - - // eww, something went wrong. better execute it in our frame - return executeScript(DOM::Node(), script); -@@ -3358,7 +3351,7 @@ void KHTMLPart::urlSelected( const QStri - if ( hasTarget ) - { - // unknown frame names should open in a new window. -- khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false ); -+ khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false ); - if ( frame ) - { - args.metaData()["referrer"] = d->m_referrer; -@@ -4364,6 +4357,7 @@ void KHTMLPart::slotChildDocCreated() - void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) - { - khtml::ChildFrame *child = frame( sender()->parent() ); -+ KHTMLPart *callingHtmlPart = const_cast(dynamic_cast(sender()->parent())); - - // TODO: handle child target correctly! currently the script are always executed fur the parent - QString urlStr = url.url(); -@@ -4395,7 +4389,7 @@ void KHTMLPart::slotChildURLRequest( con - } - else if ( frameName != QString::fromLatin1( "_self" ) ) - { -- khtml::ChildFrame *_frame = recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); - - if ( !_frame ) - { -@@ -4437,46 +4431,92 @@ khtml::ChildFrame *KHTMLPart::frame( con - return 0L; - } - --//#define DEBUG_FINDFRAME -+//#define DEBUG_FINDFRAME - --KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) - { -+ if (callingHtmlPart == this) -+ return true; // trivial -+ -+ if (htmlDocument().isNull()) { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl; -- FrameIt it2 = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it2 != end; ++it2 ) -- kdDebug(6050) << " - having frame '" << (*it2).m_name << "'" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl; - #endif -- // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames -- ConstFrameIt it = d->m_frames.find( f ); -- if ( it == d->m_frames.end() ) -- { -+ return false; // we are empty? -+ } -+ -+ // now compare the domains -+ if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() && -+ !htmlDocument().isNull()) { -+ DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain(); -+ DOM::DOMString destDomain = htmlDocument().domain(); -+ - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl; - #endif -- return 0L; -+ -+ if (actDomain == destDomain) -+ return true; - } -- else { -- KParts::ReadOnlyPart *p = (*it).m_part; -- if ( p && p->inherits( "KHTMLPart" )) -- { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl; -+ else -+ { -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl; -+ } - #endif -- return (KHTMLPart*)p; -- } -- else -- { -+ return false; -+} -+ -+KHTMLPart * -+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) -+{ - #ifdef DEBUG_FINDFRAME -- if (p) -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl; -- else -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl; -+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; -+#endif -+ // Check access -+ KHTMLPart *callingHtmlPart = dynamic_cast(callingPart); -+ -+ if (!checkFrameAccess(callingHtmlPart)) -+ return 0; -+ -+ FrameIt it = d->m_frames.find( f ); -+ FrameIt end = d->m_frames.end(); -+ if ( it != end ) -+ { -+#ifdef DEBUG_FINDFRAME -+ kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl; - #endif -- return 0L; -+ if (childFrame) -+ *childFrame = &(*it); -+ return this; -+ } -+ -+ it = d->m_frames.begin(); -+ for (; it != end; ++it ) -+ { -+ KParts::ReadOnlyPart *p = (*it).m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ { -+ KHTMLPart *frameParent = static_cast(p)->findFrameParent(callingPart, f, childFrame); -+ if (frameParent) -+ return frameParent; - } - } -+ return 0; -+} -+ -+ -+KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+{ -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); -+ if (parentFrame) -+ { -+ KParts::ReadOnlyPart *p = childFrame->m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ return static_cast(p); -+ } -+ return 0; - } - - KParts::ReadOnlyPart *KHTMLPart::currentFrame() const -@@ -4514,37 +4554,29 @@ KHTMLPart *KHTMLPart::parentPart() - return (KHTMLPart *)parent(); - } - --khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, -- bool callParent ) -+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, -+ const KParts::URLArgs &args, bool callParent ) - { -- FrameIt it = d->m_frames.find( args.frameName ); -- -- if ( it != d->m_frames.end() ) -- return &(*it); -- -- it = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it != end; ++it ) -- if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) ) -- { -- KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part; -- -- khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false ); -- if ( !res ) -- continue; -- -- childPart->requestObject( res, url, args ); -- return 0L; -- } -+#ifdef DEBUG_FINDFRAME -+ kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; -+#endif -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); -+ if (childPart) -+ { -+ if (childPart == this) -+ return childFrame; -+ -+ childPart->requestObject( childFrame, url, args ); -+ return 0; -+ } - - if ( parentPart() && callParent ) - { -- khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent ); - -- if ( res ) -- parentPart()->requestObject( res, url, args ); -- -- return 0L; -+ if ( res ) -+ parentPart()->requestObject( res, url, args ); - } - - return 0L; -@@ -4552,7 +4584,7 @@ khtml::ChildFrame *KHTMLPart::recursiveF - - void KHTMLPart::saveState( QDataStream &stream ) - { -- kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl; -+ kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl; - - stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() - << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); -Index: khtml/khtml_part.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v -retrieving revision 1.248.2.5 -diff -u -p -r1.248.2.5 khtml_part.h ---- kde-old/khtml/khtml_part.h 29 Jun 2004 09:08:16 -0000 1.248.2.5 -+++ kde-new/khtml/khtml_part.h 3 Aug 2004 14:36:47 -0000 -@@ -287,6 +287,7 @@ public: - */ - KParts::BrowserExtension *browserExtension() const; - KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const; -+ KParts::BrowserHostExtension *browserHostExtension() const; - - /** - * Returns a pointer to the HTML document's view. -@@ -812,6 +813,16 @@ public: - KHTMLPart *findFrame( const QString &f ); - - /** -+ * @internal -+ * Recursively finds the part containing the frame with name @p f -+ * and checks if it is accessible by @p callingPart -+ * Returns 0L if no suitable frame can't be found. -+ * Returns parent part if a suitable frame was found and -+ * frame info in @p *childFrame -+ */ -+ KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame=0 ); -+ -+ /** - * Return the current frame (the one that has focus) - * Not necessarily a direct child of ours, framesets can be nested. - * Returns "this" if this part isn't a frameset. -@@ -1376,6 +1387,8 @@ private: - - bool restoreURL( const KURL &url ); - void emitSelectionChanged(); -+ // Returns whether callingHtmlPart may access this part -+ bool checkFrameAccess(KHTMLPart *callingHtmlPart); - bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); - void startAutoScroll(); - void stopAutoScroll(); -@@ -1434,7 +1447,7 @@ private: - DOM::DocumentImpl *xmlDocImpl() const; - khtml::ChildFrame *frame( const QObject *obj ); - -- khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true ); -+ khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true ); - - bool checkLinkSecurity( const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null ); - QVariant executeScript( const QString& filename, int baseLine, const DOM::Node &n, const QString& script ); -Index: kparts/browserextension.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.cpp,v -retrieving revision 1.60.2.1 -diff -u -p -r1.60.2.1 browserextension.cpp ---- kde-old/kparts/browserextension.cpp 10 Apr 2004 15:08:49 -0000 1.60.2.1 -+++ kde-new/kparts/browserextension.cpp 3 Aug 2004 14:36:48 -0000 -@@ -636,6 +636,17 @@ BrowserHostExtension *BrowserHostExtensi - void BrowserExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+BrowserHostExtension * -+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame) -+{ -+ FindFrameParentParams param; -+ param.parent = 0; -+ param.callingPart = callingPart; -+ param.frame = frame; -+ virtual_hook(VIRTUAL_FIND_FRAME_PARENT, ¶m); -+ return param.parent; -+} -+ - void BrowserHostExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -Index: kparts/browserextension.h -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.h,v -retrieving revision 1.110 -diff -u -p -r1.110 browserextension.h ---- kde-old/kparts/browserextension.h 26 Sep 2003 07:13:13 -0000 1.110 -+++ kde-new/kparts/browserextension.h 3 Aug 2004 14:36:48 -0000 -@@ -671,10 +671,16 @@ public: - * - * Note that this method does not query the child objects recursively. - */ -- - virtual const QPtrList frames() const; - - /** -+ * @internal -+ * Returns the part that contains @p frame and that may be accessed -+ * by @p callingPart -+ */ -+ BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame); -+ -+ /** - * Opens the given url in a hosted child frame. The frame name is specified in the - * frameName variable in the urlArgs argument structure (see KParts::URLArgs ) . - */ -@@ -687,6 +693,19 @@ public: - static BrowserHostExtension *childObject( QObject *obj ); - - protected: -+ /** This 'enum' along with the structure below is NOT part of the public API. -+ * It's going to disappear in KDE 4.0 and is likely to change inbetween. -+ * -+ * @internal -+ */ -+ enum { VIRTUAL_FIND_FRAME_PARENT = 0x10 }; -+ struct FindFrameParentParams -+ { -+ BrowserHostExtension *parent; -+ KParts::ReadOnlyPart *callingPart; -+ QString frame; -+ }; -+ - virtual void virtual_hook( int id, void* data ); - private: - class BrowserHostExtensionPrivate; diff --git a/package/kde/kdelibs/post-3.2.3-kdelibs-kstandarddirs.patch b/package/kde/kdelibs/post-3.2.3-kdelibs-kstandarddirs.patch deleted file mode 100644 index 169952b18..000000000 --- a/package/kde/kdelibs/post-3.2.3-kdelibs-kstandarddirs.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: kstandarddirs.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kstandarddirs.cpp,v -retrieving revision 1.168.2.3 -retrieving revision 1.168.2.4 -diff -u -p -r1.168.2.3 -r1.168.2.4 ---- kde-old/kdecore/kstandarddirs.cpp 8 Jun 2004 09:27:57 -0000 1.168.2.3 -+++ kde-new/kdecore/kstandarddirs.cpp 26 Jun 2004 14:42:16 -0000 1.168.2.4 -@@ -651,7 +651,28 @@ void KStandardDirs::createSpecialResourc - char link[1024]; - link[1023] = 0; - int result = readlink(QFile::encodeName(dir).data(), link, 1023); -- if ((result == -1) && (errno == ENOENT)) -+ bool relink = (result == -1) && (errno == ENOENT); -+ if ((result > 0) && (link[0] == '/')) -+ { -+ link[result] = 0; -+ struct stat stat_buf; -+ int res = lstat(link, &stat_buf); -+ if ((res == -1) && (errno == ENOENT)) -+ { -+ relink = true; -+ } -+ else if ((res == -1) || (!S_ISDIR(stat_buf.st_mode))) -+ { -+ fprintf(stderr, "Error: \"%s\" is not a directory.\n", link); -+ relink = true; -+ } -+ else if (stat_buf.st_uid != getuid()) -+ { -+ fprintf(stderr, "Error: \"%s\" is owned by uid %d instead of uid %d.\n", link, stat_buf.st_uid, getuid()); -+ relink = true; -+ } -+ } -+ if (relink) - { - QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin")); - if (srv.isEmpty()) diff --git a/package/kde/kdemultimedia/kdemultimedia.conf b/package/kde/kdemultimedia/kdemultimedia.conf index af398d16f..8c794b998 100644 --- a/package/kde/kdemultimedia/kdemultimedia.conf +++ b/package/kde/kdemultimedia/kdemultimedia.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdemultimedia/kdemultimedia.desc b/package/kde/kdemultimedia/kdemultimedia.desc index ee00dcc29..d58ec1bcf 100644 --- a/package/kde/kdemultimedia/kdemultimedia.desc +++ b/package/kde/kdemultimedia/kdemultimedia.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 168.800 -[D] 1452172450 kdemultimedia-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 1235809772 kdemultimedia-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdenetwork/kdenetwork.conf b/package/kde/kdenetwork/kdenetwork.conf index 116159756..dd03ba963 100644 --- a/package/kde/kdenetwork/kdenetwork.conf +++ b/package/kde/kdenetwork/kdenetwork.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdenetwork/kdenetwork.desc b/package/kde/kdenetwork/kdenetwork.desc index 76ee4e9c2..dc5c02c3a 100644 --- a/package/kde/kdenetwork/kdenetwork.desc +++ b/package/kde/kdenetwork/kdenetwork.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 171.400 -[D] 115482730 kdenetwork-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2143603329 kdenetwork-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdepim/kdepim.conf b/package/kde/kdepim/kdepim.conf index 2856c21d9..ce321c7b9 100644 --- a/package/kde/kdepim/kdepim.conf +++ b/package/kde/kdepim/kdepim.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdepim/kdepim.desc b/package/kde/kdepim/kdepim.desc index 107296980..561566cd6 100644 --- a/package/kde/kdepim/kdepim.desc +++ b/package/kde/kdepim/kdepim.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 163.100 -[D] 1971785720 kdepim-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 3431420068 kdepim-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdesdk/kdesdk.conf b/package/kde/kdesdk/kdesdk.conf index 329c411ee..22b594513 100644 --- a/package/kde/kdesdk/kdesdk.conf +++ b/package/kde/kdesdk/kdesdk.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdesdk/kdesdk.desc b/package/kde/kdesdk/kdesdk.desc index f01a4a611..4342d1025 100644 --- a/package/kde/kdesdk/kdesdk.desc +++ b/package/kde/kdesdk/kdesdk.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 167.500 -[D] 974299534 kdesdk-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 433455897 kdesdk-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdetoys/kdetoys.conf b/package/kde/kdetoys/kdetoys.conf index 5fdb1be5f..66b56b2b6 100644 --- a/package/kde/kdetoys/kdetoys.conf +++ b/package/kde/kdetoys/kdetoys.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdetoys/kdetoys.desc b/package/kde/kdetoys/kdetoys.desc index dd1893f74..14b3f4699 100644 --- a/package/kde/kdetoys/kdetoys.desc +++ b/package/kde/kdetoys/kdetoys.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 192.800 -[D] 2528384672 kdetoys-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 736526458 kdetoys-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdeutils/kdeutils.conf b/package/kde/kdeutils/kdeutils.conf index 5894b64f2..a52c0b01b 100644 --- a/package/kde/kdeutils/kdeutils.conf +++ b/package/kde/kdeutils/kdeutils.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdeutils/kdeutils.desc b/package/kde/kdeutils/kdeutils.desc index 111067335..3fb0c793b 100644 --- a/package/kde/kdeutils/kdeutils.desc +++ b/package/kde/kdeutils/kdeutils.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 3.2.3 +[V] 3.3.0 [P] X -?---5---9 162.600 -[D] 2999348230 kdeutils-3.2.3.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 2949181613 kdeutils-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdevelop/kdevelop.conf b/package/kde/kdevelop/kdevelop.conf index 31c8acb04..223d8adfc 100644 --- a/package/kde/kdevelop/kdevelop.conf +++ b/package/kde/kdevelop/kdevelop.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdevelop/kdevelop.desc b/package/kde/kdevelop/kdevelop.desc index 996f72231..0faed9cf0 100644 --- a/package/kde/kdevelop/kdevelop.desc +++ b/package/kde/kdevelop/kdevelop.desc @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 3.0.4 +[V] 3.1.0 [P] X -?---5---9 206.800 -[D] 2802775826 kdevelop-3.0.4.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2.3/src/ +[D] 1365849383 kdevelop-3.1.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ diff --git a/package/kde/kdevelop/no-bdb-install.patch b/package/kde/kdevelop/no-bdb-install.patch new file mode 100644 index 000000000..7139e583f --- /dev/null +++ b/package/kde/kdevelop/no-bdb-install.patch @@ -0,0 +1,11 @@ +--- kdevelop-3.1.0/bdb/Makefile.in 2004-08-14 02:06:59.000000000 +0200 ++++ kdevelop-3.1.0/bdb/Makefile.in.patch 2004-09-06 17:44:02.000000000 +0200 +@@ -596,7 +596,7 @@ + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +-install: install-recursive ++install: + install-exec: install-exec-recursive + install-data: install-data-recursive + uninstall: uninstall-recursive diff --git a/package/kde/kdewebdev/kdewebdev.conf b/package/kde/kdewebdev/kdewebdev.conf new file mode 100644 index 000000000..872e5b896 --- /dev/null +++ b/package/kde/kdewebdev/kdewebdev.conf @@ -0,0 +1,23 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/kde/quanta/quanta.conf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +. $base/package/*/*/kde-3.conf diff --git a/package/kde/kdewebdev/kdewebdev.desc b/package/kde/kdewebdev/kdewebdev.desc new file mode 100644 index 000000000..f7eb5aa58 --- /dev/null +++ b/package/kde/kdewebdev/kdewebdev.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/kde/kdewebdev/kdewebdev.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A KDE web development tool + +[T] kdewebdev is a web development tool for the K Desktop Environment. +[T] kdewebdev is designed for quick web development and is rapidly becoming +[T] a mature editor with a number of great features. Formally known as +[T] Quanta + +[U] http://quanta.sourceforge.net/ + +[A] The Quanta crew +[M] Rene Rebe + +[C] extra/editor extra/office extra/desktop/kde + +[L] GPL +[S] Stable +[V] 3.3.0 +[P] X -?---5---9 166.300 + +[D] 3607107348 kdewebdev-3.3.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.3/src/ + diff --git a/package/kde/kdirstat/kdirstat.conf b/package/kde/kdirstat/kdirstat.conf index 547b337a7..068a8c90a 100644 --- a/package/kde/kdirstat/kdirstat.conf +++ b/package/kde/kdirstat/kdirstat.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf var_append GCC_WRAPPER_REMOVE " " "-Wmissing-prototypes" diff --git a/package/kde/koffice-i18n/koffice-i18n.conf b/package/kde/koffice-i18n/koffice-i18n.conf index 1d237e0a8..5fd7c876c 100644 --- a/package/kde/koffice-i18n/koffice-i18n.conf +++ b/package/kde/koffice-i18n/koffice-i18n.conf @@ -21,7 +21,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf koffice_i18n_main() { diff --git a/package/kde/koffice/koffice.conf b/package/kde/koffice/koffice.conf index bf4f3efbf..f272b570f 100644 --- a/package/kde/koffice/koffice.conf +++ b/package/kde/koffice/koffice.conf @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf #var_append makeopt " " "LIBPYTHON=\'-lpython2.2 -ldb -lreadline -ltermcap \ #-lssl -lcrypto -lcrypt -lgdbm -lz -lpthread\'" diff --git a/package/kde/quanta/quanta.conf b/package/kde/quanta/quanta.conf index dc343bf4a..872e5b896 100644 --- a/package/kde/quanta/quanta.conf +++ b/package/kde/quanta/quanta.conf @@ -20,4 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf diff --git a/package/sirkull/noia-icons-kde/noia-icons-kde.conf b/package/sirkull/noia-icons-kde/noia-icons-kde.conf index 19c4dccf8..c47f99a75 100644 --- a/package/sirkull/noia-icons-kde/noia-icons-kde.conf +++ b/package/sirkull/noia-icons-kde/noia-icons-kde.conf @@ -1,8 +1,8 @@ -. $base/package/*/*/kde-32.conf +. $base/package/*/*/kde-3.conf function noia_kde_custmain() { - tar $taropt $archdir/$xsrctar -C $root/$ROCKCFG_PKG_KDE32_CORE_PREFIX/share/icons + tar $taropt $archdir/$xsrctar -C $root/$ROCKCFG_PKG_KDE3CORE_PREFIX/share/icons } custmain=noia_kde_custmain diff --git a/package/sirkull/qtcurve/qtcurve.desc b/package/sirkull/qtcurve/qtcurve.desc index 4cbc1636e..3a58425ec 100644 --- a/package/sirkull/qtcurve/qtcurve.desc +++ b/package/sirkull/qtcurve/qtcurve.desc @@ -57,6 +57,6 @@ [D] 1467293591 QtCurve-0.22.tar.gz http://www.cpdrummond.freeuk.com/ -[O] . $base/package/*/*/kde-32.conf -[O] postmake="install -m 644 $confdir/QtCurve.kcsrc $root/$ROCKCFG_PKG_KDE32_CORE_PREFIX/share/apps/kdisplay/color-schemes/" +[O] . $base/package/*/*/kde-3.conf +[O] postmake="install -m 644 $confdir/QtCurve.kcsrc $root/$ROCKCFG_PKG_KDE3_CORE_PREFIX/share/apps/kdisplay/color-schemes/" diff --git a/package/stefanp/psi/psi.conf b/package/stefanp/psi/psi.conf index 52782dacb..91d2c76f5 100644 --- a/package/stefanp/psi/psi.conf +++ b/package/stefanp/psi/psi.conf @@ -21,9 +21,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if [ "$prefix_auto" = 1 -a -n "$ROCKCFG_PKG_KDE32_CORE_PREFIX" ] ; then - export KDEDIR="$root/$ROCKCFG_PKG_KDE32_CORE_PREFIX" - prefix=${ROCKCFG_PKG_KDE32_CORE_PREFIX} ; set_confopt +if [ "$prefix_auto" = 1 -a -n "$ROCKCFG_PKG_KDE3_CORE_PREFIX" ] ; then + export KDEDIR="$root/$ROCKCFG_PKG_KDE3_CORE_PREFIX" + prefix=${ROCKCFG_PKG_KDE3_CORE_PREFIX} ; set_confopt fi confopt="--prefix=$root/$prefix"