From a1922d0ec660fdc1892f2783515f781c090df0a9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Jan 2012 23:14:48 +0000 Subject: Fri Jan 20 23:14:48 UTC 2012 --- staging/kdelibs3/kde4-compatibility.patch | 1012 +++++++++++++++++++++++++++++ 1 file changed, 1012 insertions(+) create mode 100644 staging/kdelibs3/kde4-compatibility.patch (limited to 'staging/kdelibs3/kde4-compatibility.patch') diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch new file mode 100644 index 000000000..129c314ae --- /dev/null +++ b/staging/kdelibs3/kde4-compatibility.patch @@ -0,0 +1,1012 @@ +diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp +--- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 ++++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 +@@ -158,7 +158,7 @@ + int i = 0; + + // argument 0 has to be drkonqi +- argv[i++] = "drkonqi"; ++ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; + + #if defined Q_WS_X11 + // start up on the correct display +@@ -325,7 +325,7 @@ + _exit(253); + if(!geteuid() && setuid(getuid()) < 0) + _exit(253); +- execvp("drkonqi", const_cast< char** >( argv )); ++ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); + _exit(errno); + } + else +diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am +--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 +@@ -58,7 +58,7 @@ + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) + +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update +diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in +--- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 +@@ -535,7 +535,7 @@ + + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update + #>- all: all-am +@@ -1173,7 +1173,7 @@ + -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc + + #>+ 2 +-KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am ++KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am + + #>+ 2 + docs-am: +diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu +--- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 +@@ -1,469 +0,0 @@ +- +- +- +- Applications +- kde-main.directory +- +- +- +- +- +- +- +- +- More +- +- +- +- Applications +- +- +- +- +- Applications +- kde-unknown.directory +- +- +- +- +- +- Core +- KDE +- +- +- X-SuSE-YaST +- +- +- +- +- Development +- kde-development.directory +- +- X-KDE-KDevelopIDE +- kde-development-kdevelop.directory +- +- +- Development +- X-KDE-KDevelopIDE +- +- +- +- +- Translation +- kde-development-translation.directory +- +- +- Development +- Translation +- +- +- +- +- Web Development +- kde-development-webdevelopment.directory +- +- +- Development +- WebDevelopment +- +- +- +- +- +- Development +- X-KDE-KDevelopIDE +- Translation +- WebDevelopment +- +- +- +- +- Science +- kde-science.directory +- +- +- +- Astronomy +- Biology +- Chemistry +- Geology +- MedicalSoftware +- Physics +- Math +- Science +- +- Education +- +- +- +- +- Edutainment +- kde-edutainment.directory +- +- Languages +- kde-edu-languages.directory +- +- +- Education +- +- Languages +- X-KDE-Edu-Language +- +- +- +- +- +- Mathematics +- kde-edu-mathematics.directory +- +- +- Education +- Math +- +- +- +- +- Miscellaneous +- kde-edu-miscellaneous.directory +- +- +- Education +- +- Languages +- X-KDE-Edu-Language +- Math +- Science +- Teaching +- X-KDE-Edu-Teaching +- +- +- +- +- +- Science +- kde-edu-science.directory +- +- +- Education +- Science +- +- +- +- +- Tools +- kde-edu-tools.directory +- +- +- Education +- +- Teaching +- X-KDE-Edu-Teaching +- +- +- +- +- +- +- Games +- kde-games.directory +- +- Arcade +- kde-games-arcade.directory +- +- +- Game +- ArcadeGame +- +- +- +- +- Board +- kde-games-board.directory +- +- +- Game +- BoardGame +- +- +- +- +- Card +- kde-games-card.directory +- +- +- Game +- CardGame +- +- +- +- +- Kidsgames +- kde-games-kids.directory +- +- +- Game +- +- X-KDE-KidsGame +- KidsGame +- +- +- +- +- +- TacticStrategy +- kde-games-strategy.directory +- +- +- Game +- StrategyGame +- +- +- +- +- +- Game +- +- ArcadeGame +- BoardGame +- CardGame +- X-KDE-KidsGame +- KidsGame +- StrategyGame +- +- +- +- +- Toys +- kde-toys.directory +- +- Amusement +- +- +- +- +- Graphics +- kde-graphics.directory +- +- +- Graphics +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- Graphics +- X-KDE-More +- +- +- +- +- +- Internet +- kde-internet.directory +- +- +- Network +- X-KDE-More +- +- +- +- Terminal +- kde-internet-terminal.directory +- +- +- More +- kde-more.directory +- +- +- Network +- X-KDE-More +- +- +- +- +- +- Multimedia +- kde-multimedia.directory +- +- +- AudioVideo +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- AudioVideo +- X-KDE-More +- +- +- +- +- +- Office +- kde-office.directory +- +- +- kde-koshell.desktop +- kde-Kontact.desktop +- +- kde-kword.desktop +- kde-kspread.desktop +- kde-kpresenter.desktop +- +- +- More +- +- +- +- Office +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- Office +- X-KDE-More +- +- +- +- +- +- Settingsmenu +- kde-settingsmenu.directory +- +- Settings +- +- +- +- System +- kde-system.directory +- +- +- System +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- System +- X-KDE-More +- +- +- +- +- ScreenSavers +- kde-system-screensavers.directory +- +- +- Terminal +- kde-system-terminal.directory +- +- +- +- Utilities +- kde-utilities.directory +- +- +- Utility +- Accessibility +- X-KDE-Utilities-Desktop +- X-KDE-Utilities-File +- X-KDE-Utilities-Peripherals +- X-KDE-Utilities-PIM +- X-KDE-More +- +- +- +- Accessibility +- kde-utilities-accessibility.directory +- +- +- Utility +- Accessibility +- +- +- +- +- Desktop +- kde-utilities-desktop.directory +- +- +- Utility +- X-KDE-Utilities-Desktop +- +- +- +- +- Editors +- kde-editors.directory +- +- TextEditor +- +- +- +- File +- kde-utilities-file.directory +- +- +- Utility +- X-KDE-Utilities-File +- +- +- +- +- Peripherals +- kde-utilities-peripherals.directory +- +- +- Utility +- X-KDE-Utilities-Peripherals +- +- +- +- +- PIM +- kde-utilities-pim.directory +- +- +- Utility +- X-KDE-Utilities-PIM +- +- +- +- +- XUtilities +- kde-utilities-xutils.directory +- +- +- More +- kde-more.directory +- +- +- Utility +- X-KDE-More +- +- +- +- +- +- +- KDE +- Core +- +- +- +- applications-kmenuedit.menu +- +diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp +--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 +@@ -379,7 +379,7 @@ + connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), + this, SLOT(slotCreateEntry(const QString &, KService **))); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); + entry->setLayoutInfo(kdeMenu->layoutList); +diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu +--- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 +@@ -0,0 +1,469 @@ ++ ++ ++ ++ Applications ++ kde-main.directory ++ ++ ++ ++ ++ ++ ++ ++ ++ More ++ ++ ++ ++ Applications ++ ++ ++ ++ ++ Applications ++ kde-unknown.directory ++ ++ ++ ++ ++ ++ Core ++ KDE ++ ++ ++ X-SuSE-YaST ++ ++ ++ ++ ++ Development ++ kde-development.directory ++ ++ X-KDE-KDevelopIDE ++ kde-development-kdevelop.directory ++ ++ ++ Development ++ X-KDE-KDevelopIDE ++ ++ ++ ++ ++ Translation ++ kde-development-translation.directory ++ ++ ++ Development ++ Translation ++ ++ ++ ++ ++ Web Development ++ kde-development-webdevelopment.directory ++ ++ ++ Development ++ WebDevelopment ++ ++ ++ ++ ++ ++ Development ++ X-KDE-KDevelopIDE ++ Translation ++ WebDevelopment ++ ++ ++ ++ ++ Science ++ kde-science.directory ++ ++ ++ ++ Astronomy ++ Biology ++ Chemistry ++ Geology ++ MedicalSoftware ++ Physics ++ Math ++ Science ++ ++ Education ++ ++ ++ ++ ++ Edutainment ++ kde-edutainment.directory ++ ++ Languages ++ kde-edu-languages.directory ++ ++ ++ Education ++ ++ Languages ++ X-KDE-Edu-Language ++ ++ ++ ++ ++ ++ Mathematics ++ kde-edu-mathematics.directory ++ ++ ++ Education ++ Math ++ ++ ++ ++ ++ Miscellaneous ++ kde-edu-miscellaneous.directory ++ ++ ++ Education ++ ++ Languages ++ X-KDE-Edu-Language ++ Math ++ Science ++ Teaching ++ X-KDE-Edu-Teaching ++ ++ ++ ++ ++ ++ Science ++ kde-edu-science.directory ++ ++ ++ Education ++ Science ++ ++ ++ ++ ++ Tools ++ kde-edu-tools.directory ++ ++ ++ Education ++ ++ Teaching ++ X-KDE-Edu-Teaching ++ ++ ++ ++ ++ ++ ++ Games ++ kde-games.directory ++ ++ Arcade ++ kde-games-arcade.directory ++ ++ ++ Game ++ ArcadeGame ++ ++ ++ ++ ++ Board ++ kde-games-board.directory ++ ++ ++ Game ++ BoardGame ++ ++ ++ ++ ++ Card ++ kde-games-card.directory ++ ++ ++ Game ++ CardGame ++ ++ ++ ++ ++ Kidsgames ++ kde-games-kids.directory ++ ++ ++ Game ++ ++ X-KDE-KidsGame ++ KidsGame ++ ++ ++ ++ ++ ++ TacticStrategy ++ kde-games-strategy.directory ++ ++ ++ Game ++ StrategyGame ++ ++ ++ ++ ++ ++ Game ++ ++ ArcadeGame ++ BoardGame ++ CardGame ++ X-KDE-KidsGame ++ KidsGame ++ StrategyGame ++ ++ ++ ++ ++ Toys ++ kde-toys.directory ++ ++ Amusement ++ ++ ++ ++ ++ Graphics ++ kde-graphics.directory ++ ++ ++ Graphics ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Graphics ++ X-KDE-More ++ ++ ++ ++ ++ ++ Internet ++ kde-internet.directory ++ ++ ++ Network ++ X-KDE-More ++ ++ ++ ++ Terminal ++ kde-internet-terminal.directory ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Network ++ X-KDE-More ++ ++ ++ ++ ++ ++ Multimedia ++ kde-multimedia.directory ++ ++ ++ AudioVideo ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ AudioVideo ++ X-KDE-More ++ ++ ++ ++ ++ ++ Office ++ kde-office.directory ++ ++ ++ kde-koshell.desktop ++ kde-Kontact.desktop ++ ++ kde-kword.desktop ++ kde-kspread.desktop ++ kde-kpresenter.desktop ++ ++ ++ More ++ ++ ++ ++ Office ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Office ++ X-KDE-More ++ ++ ++ ++ ++ ++ Settingsmenu ++ kde-settingsmenu.directory ++ ++ Settings ++ ++ ++ ++ System ++ kde-system.directory ++ ++ ++ System ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ System ++ X-KDE-More ++ ++ ++ ++ ++ ScreenSavers ++ kde-system-screensavers.directory ++ ++ ++ Terminal ++ kde-system-terminal.directory ++ ++ ++ ++ Utilities ++ kde-utilities.directory ++ ++ ++ Utility ++ Accessibility ++ X-KDE-Utilities-Desktop ++ X-KDE-Utilities-File ++ X-KDE-Utilities-Peripherals ++ X-KDE-Utilities-PIM ++ X-KDE-More ++ ++ ++ ++ Accessibility ++ kde-utilities-accessibility.directory ++ ++ ++ Utility ++ Accessibility ++ ++ ++ ++ ++ Desktop ++ kde-utilities-desktop.directory ++ ++ ++ Utility ++ X-KDE-Utilities-Desktop ++ ++ ++ ++ ++ Editors ++ kde-editors.directory ++ ++ TextEditor ++ ++ ++ ++ File ++ kde-utilities-file.directory ++ ++ ++ Utility ++ X-KDE-Utilities-File ++ ++ ++ ++ ++ Peripherals ++ kde-utilities-peripherals.directory ++ ++ ++ Utility ++ X-KDE-Utilities-Peripherals ++ ++ ++ ++ ++ PIM ++ kde-utilities-pim.directory ++ ++ ++ Utility ++ X-KDE-Utilities-PIM ++ ++ ++ ++ ++ XUtilities ++ kde-utilities-xutils.directory ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Utility ++ X-KDE-More ++ ++ ++ ++ ++ ++ ++ KDE ++ Core ++ ++ ++ ++ applications-kmenuedit.menu ++ -- cgit v1.2.3-54-g00ecf