Author: shadzik Date: Wed Jan 5 18:13:08 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- changed text
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-aboutPLD.patch (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.15
packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.16
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.15 Tue Jan 4
17:57:28 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch Wed Jan 5 19:13:03 2011
@@ -1,6 +1,17 @@
-diff -ru kdelibs-4.4.3/CreateKDELibsDependenciesFile.cmake
kdelibs-4.4.3-bs/CreateKDELibsDependenciesFile.cmake
---- kdelibs-4.4.3/CreateKDELibsDependenciesFile.cmake 2010-03-26
18:24:35.000000000 +0100
-+++ kdelibs-4.4.3-bs/CreateKDELibsDependenciesFile.cmake 2010-05-05
15:09:16.247343933 +0200
+diff -Nru kdelibs-4.5.5/CMakeLists.txt kdelibs-4.5.5.new//CMakeLists.txt
+--- kdelibs-4.5.5/CMakeLists.txt 2011-01-04 14:45:04.000000000 +0100
++++ kdelibs-4.5.5.new//CMakeLists.txt 2011-01-05 17:43:47.775500003 +0100
+@@ -14,6 +14,7 @@
+ set (KDE_VERSION_RELEASE 5)
+ set (KDE_VERSION
"${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
+ set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.5.5)")
++exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE
PLD_VERSION_STRING)
+
+ set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the
distribution in bug reports" )
+
+diff -Nru kdelibs-4.5.5/CreateKDELibsDependenciesFile.cmake
kdelibs-4.5.5.new//CreateKDELibsDependenciesFile.cmake
+--- kdelibs-4.5.5/CreateKDELibsDependenciesFile.cmake 2010-02-20
12:32:37.000000000 +0100
++++ kdelibs-4.5.5.new//CreateKDELibsDependenciesFile.cmake 2011-01-05
17:43:47.698500004 +0100
@@ -12,6 +12,7 @@
set(KDE_VERSION_RELEASE ${KDE_VERSION_RELEASE})
set(KDE_VERSION \"${KDE_VERSION}\")
@@ -9,9 +20,9 @@
set(KDE_DEFAULT_HOME \"${KDE_DEFAULT_HOME}\")
")
-diff -ru kdelibs-4.4.3/kdecore/util/kdeversion.h.cmake
kdelibs-4.4.3-bs/kdecore/util/kdeversion.h.cmake
---- kdelibs-4.4.3/kdecore/util/kdeversion.h.cmake 2008-12-04
09:35:58.000000000 +0100
-+++ kdelibs-4.4.3-bs/kdecore/util/kdeversion.h.cmake 2010-05-05
15:09:16.455263079 +0200
+diff -Nru kdelibs-4.5.5/kdecore/util/kdeversion.h.cmake
kdelibs-4.5.5.new//kdecore/util/kdeversion.h.cmake
+--- kdelibs-4.5.5/kdecore/util/kdeversion.h.cmake 2008-12-04
09:35:58.000000000 +0100
++++ kdelibs-4.5.5.new//kdecore/util/kdeversion.h.cmake 2011-01-05
17:43:47.698500004 +0100
@@ -45,6 +45,7 @@
* (Fictional) example: "4.0.90 (>=20070101)"
*/
@@ -20,9 +31,9 @@
/**
* @def KDE_VERSION_MAJOR
-diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction.cpp
kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.cpp
---- kdelibs-4.4.3/kdeui/actions/kstandardaction.cpp 2009-08-20
04:43:45.000000000 +0200
-+++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.cpp 2010-05-05
15:09:16.556253671 +0200
+diff -Nru kdelibs-4.5.5/kdeui/actions/kstandardaction.cpp
kdelibs-4.5.5.new//kdeui/actions/kstandardaction.cpp
+--- kdelibs-4.5.5/kdeui/actions/kstandardaction.cpp 2009-08-20
04:43:45.000000000 +0200
++++ kdelibs-4.5.5.new//kdeui/actions/kstandardaction.cpp 2011-01-05
17:43:47.699000004 +0100
@@ -627,5 +627,10 @@
return KStandardAction::create( AboutKDE, recvr, slot, parent );
}
@@ -34,9 +45,9 @@
+
}
-diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction.h
kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.h
---- kdelibs-4.4.3/kdeui/actions/kstandardaction.h 2008-11-28
16:40:11.000000000 +0100
-+++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction.h 2010-05-05
22:03:14.724018651 +0200
+diff -Nru kdelibs-4.5.5/kdeui/actions/kstandardaction.h
kdelibs-4.5.5.new//kdeui/actions/kstandardaction.h
+--- kdelibs-4.5.5/kdeui/actions/kstandardaction.h 2010-03-30
10:28:42.000000000 +0200
++++ kdelibs-4.5.5.new//kdeui/actions/kstandardaction.h 2011-01-05
17:43:47.772000001 +0100
@@ -152,7 +152,7 @@
Preferences, ConfigureToolbars,
@@ -46,7 +57,7 @@
TipofDay,
// Other standard actions
-@@ -578,6 +578,7 @@
+@@ -590,6 +590,7 @@
* Display the About KDE dialog.
*/
KDEUI_EXPORT KAction *aboutKDE(const QObject *recvr, const char *slot,
QObject *parent);
@@ -54,9 +65,9 @@
}
#endif // KSTDACTION_H
-diff -ru kdelibs-4.4.3/kdeui/actions/kstandardaction_p.h
kdelibs-4.4.3-bs/kdeui/actions/kstandardaction_p.h
---- kdelibs-4.4.3/kdeui/actions/kstandardaction_p.h 2009-07-28
21:44:10.000000000 +0200
-+++ kdelibs-4.4.3-bs/kdeui/actions/kstandardaction_p.h 2010-05-05
15:09:16.555253800 +0200
+diff -Nru kdelibs-4.5.5/kdeui/actions/kstandardaction_p.h
kdelibs-4.5.5.new//kdeui/actions/kstandardaction_p.h
+--- kdelibs-4.5.5/kdeui/actions/kstandardaction_p.h 2010-01-20
17:26:55.000000000 +0100
++++ kdelibs-4.5.5.new//kdeui/actions/kstandardaction_p.h 2011-01-05
17:43:47.772500002 +0100
@@ -115,6 +115,7 @@
{ SwitchApplicationLanguage, KStandardShortcut::SwitchApplicationLanguage,
"switch_application_language", I18N_NOOP("Switch Application &Language..."), 0,
"preferences-desktop-locale" },
{ AboutApp, KStandardShortcut::AccelNone, "help_about_app",
I18N_NOOP("&About %1"), 0, 0 },
@@ -65,10 +76,10 @@
{ ActionNone, KStandardShortcut::AccelNone, 0, 0, 0, 0 }
};
-diff -ru kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.cpp
kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.cpp
---- kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-11-13
11:59:17.000000000 +0100
-+++ kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.cpp 2010-05-05
23:26:14.340239898 +0200
-@@ -146,6 +146,64 @@
+diff -Nru kdelibs-4.5.5/kdeui/dialogs/kaboutkdedialog_p.cpp
kdelibs-4.5.5.new//kdeui/dialogs/kaboutkdedialog_p.cpp
+--- kdelibs-4.5.5/kdeui/dialogs/kaboutkdedialog_p.cpp 2010-05-27
19:26:17.000000000 +0200
++++ kdelibs-4.5.5.new//kdeui/dialogs/kaboutkdedialog_p.cpp 2011-01-05
18:49:55.871250031 +0100
+@@ -154,6 +154,62 @@
setMainWidget(mainWidget);
}
@@ -91,10 +102,8 @@
+ about->setOpenExternalLinks(true);
+ about->setTextInteractionFlags(Qt::TextBrowserInteraction);
+ about->setText(i18n("<html>"
-+ "<p>Unlike other big distributions, there is no commercial support
behind PLD Linux. "
-+ "The developer community consists of various enthusiasts who wish to
donate their time "
-+ "and knowledge for the common good of PLD Linux. There is no specific
ideology behind PLD Linux, "
-+ "we just want to have a fast, stable and flexible environment to work
in.<br/>"
++ "<p>PLD is a free, RPM-based Linux distribution, aimed at the more
advanced users and administrators, "
++ "who accept the tradeoffs of using a system, that might require manual
tweaking in exchange for much flexibility.<br/>"
+ "<a href=\"http://www.pld-linux.org\";>Read more on the official
website...</a></p></html>"));
+
+ QLabel *report = new QLabel;
@@ -133,9 +142,9 @@
}
#include "kaboutkdedialog_p.moc"
-diff -ru kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.h
kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.h
---- kdelibs-4.4.3/kdeui/dialogs/kaboutkdedialog_p.h 2008-05-21
13:08:22.000000000 +0200
-+++ kdelibs-4.4.3-bs/kdeui/dialogs/kaboutkdedialog_p.h 2010-05-05
15:09:15.708512159 +0200
+diff -Nru kdelibs-4.5.5/kdeui/dialogs/kaboutkdedialog_p.h
kdelibs-4.5.5.new//kdeui/dialogs/kaboutkdedialog_p.h
+--- kdelibs-4.5.5/kdeui/dialogs/kaboutkdedialog_p.h 2008-05-21
13:08:22.000000000 +0200
++++ kdelibs-4.5.5.new//kdeui/dialogs/kaboutkdedialog_p.h 2011-01-05
17:43:47.773500003 +0100
@@ -61,6 +61,20 @@
Q_DISABLE_COPY( KAboutKdeDialog )
};
@@ -157,9 +166,9 @@
}
#endif
-diff -ru kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.cpp
kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.cpp
---- kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.cpp 2009-11-21
10:45:18.000000000 +0100
-+++ kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.cpp 2010-05-05
15:09:16.553338149 +0200
+diff -Nru kdelibs-4.5.5/kdeui/shortcuts/kstandardshortcut.cpp
kdelibs-4.5.5.new//kdeui/shortcuts/kstandardshortcut.cpp
+--- kdelibs-4.5.5/kdeui/shortcuts/kstandardshortcut.cpp 2009-11-21
10:45:18.000000000 +0100
++++ kdelibs-4.5.5.new//kdeui/shortcuts/kstandardshortcut.cpp 2011-01-05
17:43:47.773500003 +0100
@@ -177,6 +177,7 @@
{ SwitchApplicationLanguage, "SwitchApplicationLanguage",
I18N_NOOP2("@action", "Switch Application Language"), 0 , 0,
KShortcut(), false },
{ AboutApp , "AboutApp" ,
I18N_NOOP2("@action", "About Application") , 0 , 0,
KShortcut(), false },
@@ -168,9 +177,9 @@
//dummy entry to catch simple off-by-one errors. Insert new entries
before this line.
{ AccelNone , 0 , 0
, 0 , 0, 0, KShortcut(), false }
-diff -ru kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.h
kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.h
---- kdelibs-4.4.3/kdeui/shortcuts/kstandardshortcut.h 2009-02-04
19:21:03.000000000 +0100
-+++ kdelibs-4.4.3-bs/kdeui/shortcuts/kstandardshortcut.h 2010-05-05
15:09:16.553338149 +0200
+diff -Nru kdelibs-4.5.5/kdeui/shortcuts/kstandardshortcut.h
kdelibs-4.5.5.new//kdeui/shortcuts/kstandardshortcut.h
+--- kdelibs-4.5.5/kdeui/shortcuts/kstandardshortcut.h 2009-02-04
19:21:03.000000000 +0100
++++ kdelibs-4.5.5.new//kdeui/shortcuts/kstandardshortcut.h 2011-01-05
17:43:47.774000003 +0100
@@ -112,6 +112,7 @@
SwitchApplicationLanguage,
AboutApp,
@@ -179,9 +188,9 @@
// Insert new items here!
-diff -ru kdelibs-4.4.3/kdeui/widgets/khelpmenu.cpp
kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.cpp
---- kdelibs-4.4.3/kdeui/widgets/khelpmenu.cpp 2008-12-04 09:36:05.000000000
+0100
-+++ kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.cpp 2010-05-05
22:59:05.491267064 +0200
+diff -Nru kdelibs-4.5.5/kdeui/widgets/khelpmenu.cpp
kdelibs-4.5.5.new//kdeui/widgets/khelpmenu.cpp
+--- kdelibs-4.5.5/kdeui/widgets/khelpmenu.cpp 2010-05-27 19:26:19.000000000
+0200
++++ kdelibs-4.5.5.new//kdeui/widgets/khelpmenu.cpp 2011-01-05
19:04:40.580138842 +0100
@@ -66,18 +66,21 @@
mMenu = 0;
mAboutApp = 0;
@@ -252,7 +261,7 @@
}
return 0;
-@@ -297,6 +311,16 @@
+@@ -296,6 +310,16 @@
d->mAboutKDE->show();
}
@@ -269,7 +278,7 @@
void KHelpMenu::reportBug()
{
-@@ -332,6 +356,11 @@
+@@ -331,6 +355,11 @@
{
delete d->mAboutKDE; d->mAboutKDE = 0;
}
@@ -281,9 +290,9 @@
if( d->mBugReport && !d->mBugReport->isVisible() )
{
-diff -ru kdelibs-4.4.3/kdeui/widgets/khelpmenu.h
kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.h
---- kdelibs-4.4.3/kdeui/widgets/khelpmenu.h 2009-07-28 21:44:12.000000000
+0200
-+++ kdelibs-4.4.3-bs/kdeui/widgets/khelpmenu.h 2010-05-05 15:09:16.555253800
+0200
+diff -Nru kdelibs-4.5.5/kdeui/widgets/khelpmenu.h
kdelibs-4.5.5.new//kdeui/widgets/khelpmenu.h
+--- kdelibs-4.5.5/kdeui/widgets/khelpmenu.h 2009-07-28 21:44:12.000000000
+0200
++++ kdelibs-4.5.5.new//kdeui/widgets/khelpmenu.h 2011-01-05
17:43:47.775000003 +0100
@@ -172,7 +172,8 @@
menuAboutApp = 2,
menuAboutKDE = 3,
@@ -302,9 +311,9 @@
/**
* Opens the standard "Report Bugs" dialog box.
-diff -ru kdelibs-4.4.3/kdeui/xmlgui/ui_standards.rc
kdelibs-4.4.3-bs/kdeui/xmlgui/ui_standards.rc
---- kdelibs-4.4.3/kdeui/xmlgui/ui_standards.rc 2009-10-02 16:55:18.000000000
+0200
-+++ kdelibs-4.4.3-bs/kdeui/xmlgui/ui_standards.rc 2010-05-05
15:09:16.554264615 +0200
+diff -Nru kdelibs-4.5.5/kdeui/xmlgui/ui_standards.rc
kdelibs-4.5.5.new//kdeui/xmlgui/ui_standards.rc
+--- kdelibs-4.5.5/kdeui/xmlgui/ui_standards.rc 2009-10-02 16:55:18.000000000
+0200
++++ kdelibs-4.5.5.new//kdeui/xmlgui/ui_standards.rc 2011-01-05
17:43:47.775000003 +0100
@@ -189,6 +189,7 @@
<MergeLocal name="about_merge"/>
<Action name="help_about_app"/>
@@ -313,13 +322,3 @@
</Menu>
</MenuBar>
<ToolBar name="mainToolBar"><text>Main Toolbar</text>
---- kdelibs-4.4.80/CMakeLists.txt.orig 2010-05-20 13:40:53.000000000 +0200
-+++ kdelibs-4.4.80/CMakeLists.txt 2010-05-26 21:51:02.063537981 +0200
-@@ -13,6 +13,7 @@
- set (KDE_VERSION_RELEASE 80)
- set (KDE_VERSION
"${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.5.5)")
-+exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE
PLD_VERSION_STRING)
-
- set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the
distribution in bug reports" )
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
