From 0475af7c589dcbd4f00805b933d90486394ab724 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:18:42 -0600 Subject: [PATCH 1/6] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- apps/internet/kbear/files/fix-gcc-semicolons.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/internet/kbear/files/fix-gcc-semicolons.diff b/apps/internet/kbear/files/fix-gcc-semicolons.diff index 168826d..68ca3f9 100644 --- a/apps/internet/kbear/files/fix-gcc-semicolons.diff +++ b/apps/internet/kbear/files/fix-gcc-semicolons.diff @@ -29,7 +29,7 @@ -}; +} - void KBearCopyJob::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list) + void KBearCopyJob::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list) { --- ./work/kbear-2.1/kbear/kbeartransferview.h.orig 2002-11-04 18:15:17.000000000 -0500 +++ ./work/kbear-2.1/kbear/kbeartransferview.h 2004-11-17 11:47:44.494017728 -0500 From f8f289b6782c8abc0d3f71eea91f7d2e2712dd48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:59:37 -0600 Subject: [PATCH 2/6] Rename a number of libraries and executables to avoid conflicts with KDE4 --- apps/system/kconfigeditor/checksums | 1 - apps/system/kio-locate/checksums | 2 +- apps/system/kiosktool/checksums | 2 +- apps/system/{kconfigeditor => tdeconfigeditor}/Makefile | 2 +- apps/system/tdeconfigeditor/checksums | 1 + meta/everything/Makefile | 2 +- misc/detektive/files/mandrake-101.lst | 2 +- misc/detektive/files/mandrake-91.lst | 2 +- misc/detektive/files/mandrake-92.lst | 2 +- misc/detektive/files/suse-81.lst | 2 +- misc/detektive/files/suse-82.lst | 2 +- misc/detektive/files/suse-90.lst | 2 +- misc/detektive/files/suse-91.lst | 2 +- misc/detektive/files/suse-92.lst | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 apps/system/kconfigeditor/checksums rename apps/system/{kconfigeditor => tdeconfigeditor}/Makefile (93%) create mode 100644 apps/system/tdeconfigeditor/checksums diff --git a/apps/system/kconfigeditor/checksums b/apps/system/kconfigeditor/checksums deleted file mode 100644 index d86fd92..0000000 --- a/apps/system/kconfigeditor/checksums +++ /dev/null @@ -1 +0,0 @@ -2a4c6ea286dd57f4ef23afb263f3d33c download/kconfigeditor-0.9.5.tar.bz2 diff --git a/apps/system/kio-locate/checksums b/apps/system/kio-locate/checksums index dd3005d..5767eb4 100644 --- a/apps/system/kio-locate/checksums +++ b/apps/system/kio-locate/checksums @@ -1 +1 @@ -a102912dcce87fb562913c573d8e4e1c download/kio-locate_0.3.4.tar.gz +a102912dcce87fb562913c573d8e4e1c download/tdeio-locate_0.3.4.tar.gz diff --git a/apps/system/kiosktool/checksums b/apps/system/kiosktool/checksums index eea9ee3..8fb6292 100644 --- a/apps/system/kiosktool/checksums +++ b/apps/system/kiosktool/checksums @@ -1 +1 @@ -1576cdaa3cff93255fd5d7f6835b07e2 download/kiosktool-1.0.tar.bz2 +1576cdaa3cff93255fd5d7f6835b07e2 download/tdeiosktool-1.0.tar.bz2 diff --git a/apps/system/kconfigeditor/Makefile b/apps/system/tdeconfigeditor/Makefile similarity index 93% rename from apps/system/kconfigeditor/Makefile rename to apps/system/tdeconfigeditor/Makefile index 5b3484e..818998a 100644 --- a/apps/system/kconfigeditor/Makefile +++ b/apps/system/tdeconfigeditor/Makefile @@ -1,4 +1,4 @@ -GARNAME = kconfigeditor +GARNAME = tdeconfigeditor GARVERSION = 0.9.5 CATEGORIES = apps DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 diff --git a/apps/system/tdeconfigeditor/checksums b/apps/system/tdeconfigeditor/checksums new file mode 100644 index 0000000..64c92db --- /dev/null +++ b/apps/system/tdeconfigeditor/checksums @@ -0,0 +1 @@ +2a4c6ea286dd57f4ef23afb263f3d33c download/tdeconfigeditor-0.9.5.tar.bz2 diff --git a/meta/everything/Makefile b/meta/everything/Makefile index 3d159f1..7725d83 100644 --- a/meta/everything/Makefile +++ b/meta/everything/Makefile @@ -2,7 +2,7 @@ GARNAME = everything GARVERSION = 1 CATEGORIES = meta -LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/kiosktool apps/system/kio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/kconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico +LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/tdeiosktool apps/system/tdeio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/tdeconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico DESCRIPTION = Everything except of i18n/, tdebindings and other stuff listed in the README diff --git a/misc/detektive/files/mandrake-101.lst b/misc/detektive/files/mandrake-101.lst index 0781c33..68968bc 100644 --- a/misc/detektive/files/mandrake-101.lst +++ b/misc/detektive/files/mandrake-101.lst @@ -20,4 +20,4 @@ cups RECOMMENDED libsmbclient0 RECOMMENDED libsmbclient0-devel RECOMMENDED libldap2 RECOMMENDED "LDAP functionality of KAddressBook" -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" diff --git a/misc/detektive/files/mandrake-91.lst b/misc/detektive/files/mandrake-91.lst index d600865..ab633bd 100644 --- a/misc/detektive/files/mandrake-91.lst +++ b/misc/detektive/files/mandrake-91.lst @@ -14,4 +14,4 @@ libbzip2_1-devel-1.0.2-13mdk REQUIRED libtiff3-devel-3.5.7-6mdk REQUIRED cups RECOMMENDED libldap2 RECOMMENDED "LDAP functionality of KAddressBook" -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" diff --git a/misc/detektive/files/mandrake-92.lst b/misc/detektive/files/mandrake-92.lst index bf6f48d..fb05ff0 100644 --- a/misc/detektive/files/mandrake-92.lst +++ b/misc/detektive/files/mandrake-92.lst @@ -19,4 +19,4 @@ cups RECOMMENDED libsmbclient0 RECOMMENDED libsmbclient0-devel RECOMMENDED libldap2 RECOMMENDED "LDAP functionality of KAddressBook" -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" diff --git a/misc/detektive/files/suse-81.lst b/misc/detektive/files/suse-81.lst index 4362e9a..31c359e 100644 --- a/misc/detektive/files/suse-81.lst +++ b/misc/detektive/files/suse-81.lst @@ -85,5 +85,5 @@ python-devel OPTIONAL "Scripting in some KOffice components" rpm OPTIONAL rpm-devel OPTIONAL tetex OPTIONAL -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" xscreensaver OPTIONAL diff --git a/misc/detektive/files/suse-82.lst b/misc/detektive/files/suse-82.lst index e68bb85..8a2b636 100644 --- a/misc/detektive/files/suse-82.lst +++ b/misc/detektive/files/suse-82.lst @@ -84,5 +84,5 @@ python-devel OPTIONAL "Scripting in some KOffice components" rpm OPTIONAL rpm-devel OPTIONAL tetex OPTIONAL -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" xscreensaver OPTIONAL diff --git a/misc/detektive/files/suse-90.lst b/misc/detektive/files/suse-90.lst index 8cd723a..cb54325 100644 --- a/misc/detektive/files/suse-90.lst +++ b/misc/detektive/files/suse-90.lst @@ -80,5 +80,5 @@ python-devel OPTIONAL "Scripting in some KOffice components" rpm OPTIONAL rpm-devel OPTIONAL tetex OPTIONAL -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" xscreensaver OPTIONAL diff --git a/misc/detektive/files/suse-91.lst b/misc/detektive/files/suse-91.lst index 8bdb54a..6574d24 100644 --- a/misc/detektive/files/suse-91.lst +++ b/misc/detektive/files/suse-91.lst @@ -81,5 +81,5 @@ python-devel OPTIONAL "Scripting in some KOffice components" rpm OPTIONAL rpm-devel OPTIONAL tetex OPTIONAL -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" xscreensaver OPTIONAL diff --git a/misc/detektive/files/suse-92.lst b/misc/detektive/files/suse-92.lst index 4e93f1a..683aeaa 100644 --- a/misc/detektive/files/suse-92.lst +++ b/misc/detektive/files/suse-92.lst @@ -84,5 +84,5 @@ python-devel OPTIONAL "Scripting in some KOffice components" rpm OPTIONAL rpm-devel OPTIONAL tetex OPTIONAL -xpdf OPTIONAL "Required by PDF kfile-Plugin" +xpdf OPTIONAL "Required by PDF tdefile-Plugin" xscreensaver OPTIONAL From bab85c1df0c9504e701d551ec31bd716f6435bf7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 17:25:38 -0600 Subject: [PATCH 3/6] Fix FTBFS --- apps/system/{kiosktool => kiostdetool}/Makefile | 0 apps/system/{kiosktool => kiostdetool}/checksums | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename apps/system/{kiosktool => kiostdetool}/Makefile (100%) rename apps/system/{kiosktool => kiostdetool}/checksums (100%) diff --git a/apps/system/kiosktool/Makefile b/apps/system/kiostdetool/Makefile similarity index 100% rename from apps/system/kiosktool/Makefile rename to apps/system/kiostdetool/Makefile diff --git a/apps/system/kiosktool/checksums b/apps/system/kiostdetool/checksums similarity index 100% rename from apps/system/kiosktool/checksums rename to apps/system/kiostdetool/checksums From 75a45785311225d9155d76beedb6556d1810aec6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:17:32 -0600 Subject: [PATCH 4/6] Rename many classes and header files to avoid conflicts with KDE4 --- CHANGELOG | 2 +- apps/system/{kiostdetool => kiosktool}/Makefile | 0 apps/system/kiosktool/checksums | 1 + apps/system/kiostdetool/checksums | 1 - meta/everything/Makefile | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename apps/system/{kiostdetool => kiosktool}/Makefile (100%) create mode 100644 apps/system/kiosktool/checksums delete mode 100644 apps/system/kiostdetool/checksums diff --git a/CHANGELOG b/CHANGELOG index f31b7ba..9131a84 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -154,7 +154,7 @@ 2005-04-28 kdetv 0.8.7, KMplayer 0.8.4b 2005-04-26 ImageMagick 6.2.2 (security), xine-lib 1.0.1 2005-04-25 + cyrus-sasl 2.1.20 -2005-04-25 Kiosktool 1.0 +2005-04-25 Kiostdetool 1.0 2005-04-22 tdelibs and tdewebdev security patches 2005-04-21 KRename 3.0.4 2005-04-19 + KOffice 1.4 Beta 1 (apps-unstable/), libwpd 0.8.0 diff --git a/apps/system/kiostdetool/Makefile b/apps/system/kiosktool/Makefile similarity index 100% rename from apps/system/kiostdetool/Makefile rename to apps/system/kiosktool/Makefile diff --git a/apps/system/kiosktool/checksums b/apps/system/kiosktool/checksums new file mode 100644 index 0000000..eea9ee3 --- /dev/null +++ b/apps/system/kiosktool/checksums @@ -0,0 +1 @@ +1576cdaa3cff93255fd5d7f6835b07e2 download/kiosktool-1.0.tar.bz2 diff --git a/apps/system/kiostdetool/checksums b/apps/system/kiostdetool/checksums deleted file mode 100644 index 8fb6292..0000000 --- a/apps/system/kiostdetool/checksums +++ /dev/null @@ -1 +0,0 @@ -1576cdaa3cff93255fd5d7f6835b07e2 download/tdeiosktool-1.0.tar.bz2 diff --git a/meta/everything/Makefile b/meta/everything/Makefile index 7725d83..e3c1a02 100644 --- a/meta/everything/Makefile +++ b/meta/everything/Makefile @@ -2,7 +2,7 @@ GARNAME = everything GARVERSION = 1 CATEGORIES = meta -LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/tdeiosktool apps/system/tdeio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/tdeconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico +LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/kiosktool apps/system/tdeio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/tdeconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico DESCRIPTION = Everything except of i18n/, tdebindings and other stuff listed in the README From 58102142a1a52944a6a89b3045e9b926c91cd78e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 2 Feb 2013 13:38:04 -0600 Subject: [PATCH 5/6] Fix unintended renaming --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9131a84..f31b7ba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -154,7 +154,7 @@ 2005-04-28 kdetv 0.8.7, KMplayer 0.8.4b 2005-04-26 ImageMagick 6.2.2 (security), xine-lib 1.0.1 2005-04-25 + cyrus-sasl 2.1.20 -2005-04-25 Kiostdetool 1.0 +2005-04-25 Kiosktool 1.0 2005-04-22 tdelibs and tdewebdev security patches 2005-04-21 KRename 3.0.4 2005-04-19 + KOffice 1.4 Beta 1 (apps-unstable/), libwpd 0.8.0 From d78f33315c6d5acdb8cb801751d37058dc4137a3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:12:50 -0600 Subject: [PATCH 6/6] Rename KIcon to enhance compatibility with KDE4 --- libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff b/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff index a1367af..0dfcf93 100644 --- a/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff +++ b/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff @@ -5,7 +5,7 @@ author: Enrico Ros Unwanted toggling QIconViewItem focus on click. This fixes the 'flashing' icon when clicking repeatedly on a QIconView or -derivates (ie KIconView, KonqIconViewWidget, the KDesktop and so on..). +derivates (ie TDEIconView, KonqIconViewWidget, the KDesktop and so on..). The current behavior considers that if not over an icon, the user is clicking down to perform icons selection (with the rubberband). This is not always true, since a click might be used to give focus to a