rpms/kdebase/F-9 kdebase-4.2.0-avoid_kde3_services.patch, NONE, 1.1 kdebase-4.2.0-dolphin-qt45.patch, NONE, 1.1 kdebase-4.2.0-home-icon.patch, 1.1, 1.2 kdebase.spec, 1.344, 1.345
Rex Dieter
rdieter at fedoraproject.org
Fri Feb 13 20:27:32 UTC 2009
- Previous message (by thread): rpms/kernel/F-10 patch-2.6.29-rc4-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.982, 1.983 config-x86_64-generic, 1.58, 1.59 kernel.spec, 1.1258, 1.1259 sources, 1.944, 1.945 upstream, 1.855, 1.856 linux-2.6-net-sch-drr-fix-u32-type.patch, 1.1, NONE patch-2.6.29-rc4-git6.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/lmarbles/devel lmarbles.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155
Modified Files:
kdebase-4.2.0-home-icon.patch kdebase.spec
Added Files:
kdebase-4.2.0-avoid_kde3_services.patch
kdebase-4.2.0-dolphin-qt45.patch
Log Message:
* Thu Feb 12 2009 Rex Dieter <rdieter at fedorparoject.org> - 4.2.0-5
- avoid_kde3_services patch
- fix home-icon patch
kdebase-4.2.0-avoid_kde3_services.patch:
--- NEW FILE kdebase-4.2.0-avoid_kde3_services.patch ---
--- branches/KDE/4.2/kdebase/apps/konqueror/src/konqmainwindow.cpp 2009/01/19 14:02:58 913542
+++ branches/KDE/4.2/kdebase/apps/konqueror/src/konqmainwindow.cpp 2009/02/11 22:50:44 924926
@@ -1777,7 +1777,7 @@
"bookmarks"};
for (uint i=0;i<sizeof(toplevelModules)/sizeof(char*);++i)
if (KAuthorized::authorizeControlModule(toplevelModules[i]))
- m_configureDialog->addModule(KCModuleInfo(toplevelModules[i]));
+ m_configureDialog->addModule(KCModuleInfo(QString(toplevelModules[i])+".desktop"));
if (KAuthorized::authorizeControlModule("filebehavior") )
@@ -1790,7 +1790,7 @@
"kcmtrash"};
for (uint i=0;i<sizeof(fmModules)/sizeof(char*);++i)
if (KAuthorized::authorizeControlModule(fmModules[i]))
- m_configureDialog->addModule(KCModuleInfo(fmModules[i]),fileManagementGroup);
+ m_configureDialog->addModule(KCModuleInfo(QString(fmModules[i])+".desktop"),fileManagementGroup);
}
if (KAuthorized::authorizeControlModule("khtml_behavior"))
@@ -1812,7 +1812,7 @@
"khtml_plugins"};
for (uint i=0;i<sizeof(webModules)/sizeof(char*);++i)
if (KAuthorized::authorizeControlModule(webModules[i]))
- m_configureDialog->addModule(KCModuleInfo(webModules[i]),webGroup);
+ m_configureDialog->addModule(KCModuleInfo(QString(webModules[i])+".desktop"),webGroup);
}
//END SYNC with initActions()
kdebase-4.2.0-dolphin-qt45.patch:
--- NEW FILE kdebase-4.2.0-dolphin-qt45.patch ---
--- kdebase/apps/dolphin/src/dolphiniconsview.cpp 2009/01/06 17:13:38 906699
+++ kdebase/apps/dolphin/src/dolphiniconsview.cpp 2009/02/11 17:27:50 924814
@@ -402,12 +402,20 @@
Q_ASSERT(additionalInfoCount >= 0);
itemHeight += additionalInfoCount * m_font.pointSize() * 2;
- // optimize the item size of the grid in a way to prevent large gaps on the
- // right border (= row arrangement) or the bottom border (= column arrangement)
+ // Optimize the item size of the grid in a way to prevent large gaps on the
+ // right border (= row arrangement) or the bottom border (= column arrangement).
+ // There is no public API in QListView to find out the used width of the viewport
+ // for the layout. The following calculation of 'contentWidth'/'contentHeight'
+ // is based on QListViewPrivate::prepareItemsLayout() (Copyright (C) 2009 Nokia Corporation).
+ int frameAroundContents = 0;
+ if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+ frameAroundContents = style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
+ }
const int spacing = settings->gridSpacing();
if (settings->arrangement() == QListView::TopToBottom) {
- const int contentWidth = viewport()->width() - 1 -
- style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
+ const int contentWidth = viewport()->width() - 1
+ - frameAroundContents
+ - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
const int gridWidth = itemWidth + spacing * 2;
const int horizItemCount = contentWidth / gridWidth;
if (horizItemCount > 0) {
@@ -420,8 +428,9 @@
m_decorationSize = QSize(itemWidth, size);
setIconSize(QSize(itemWidth, size));
} else {
- const int contentHeight = viewport()->height() - 1 -
- style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
+ const int contentHeight = viewport()->height() - 1
+ - frameAroundContents
+ - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
const int gridHeight = itemHeight + spacing;
const int vertItemCount = contentHeight / gridHeight;
if (vertItemCount > 0) {
kdebase-4.2.0-home-icon.patch:
Index: kdebase-4.2.0-home-icon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase-4.2.0-home-icon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-4.2.0-home-icon.patch 12 Feb 2009 12:18:35 -0000 1.1
+++ kdebase-4.2.0-home-icon.patch 13 Feb 2009 20:27:31 -0000 1.2
@@ -1,7 +1,8 @@
Index: apps/konqueror/Home.desktop
===================================================================
---- apps/konqueror/Home.desktop (revision 924661)
-+++ apps/konqueror/Home.desktop (working copy)
+diff -up kdebase-4.2.0/apps/konqueror/Home.desktop.home-icon kdebase-4.2.0/apps/konqueror/Home.desktop
+--- kdebase-4.2.0/apps/konqueror/Home.desktop.home-icon 2009-01-17 04:59:32.000000000 -0600
++++ kdebase-4.2.0/apps/konqueror/Home.desktop 2009-02-12 10:20:43.000000000 -0600
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
@@ -10,11 +11,10 @@
Icon=user-home
Terminal=false
-@@ -85,89 +85,5 @@
- Name[xh]=Ikhaya
+@@ -85,87 +85,5 @@ Name[xh]=Ikhaya
Name[zh_CN]=主æ件夹
Name[zh_TW]=家ç®é
--
+
-GenericName=Personal Files
-GenericName[af]=Persoonlike Lêers
-GenericName[ar]=اÙÙ
ÙÙات اÙشخصÙØ©
@@ -45,7 +45,6 @@
-GenericName[gu]=àª
àªàªàª¤ ફાàªàª²à«
-GenericName[he]=ק×צ×× ××ש×××
-GenericName[hi]=निà¤à¥ फ़ाà¤à¤²à¥à¤
--GenericName[hne]=निà¤à¥ फाà¤à¤² मन ल
-GenericName[hr]=Osobne datoteke
-GenericName[hsb]=Wosobinske dataje
-GenericName[hu]=Személyes fájlok
@@ -74,7 +73,7 @@
-GenericName[pa]=ਨਿੱà¨à© ਫਾà¨à¨²à¨¾à¨
-GenericName[pl]=Pliki osobiste
-GenericName[pt]=Ficheiros Pessoais
--GenericName[pt_BR]=Arquivos pessoais
+-GenericName[pt_BR]=Arquivos Ppessoais
-GenericName[ro]=FiÈiere personale
-GenericName[ru]=ÐиÑнÑе ÑайлÑ
-GenericName[se]=Iežat fiillat
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- kdebase.spec 12 Feb 2009 12:18:35 -0000 1.344
+++ kdebase.spec 13 Feb 2009 20:27:31 -0000 1.345
@@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Core Files
Version: 4.2.0
-Release: 3%{?dist}
+Release: 5%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -32,8 +32,11 @@
## upstream patches
# bugs.kde.org/162729
Patch100: kdebase-4.2.0-konsole_kdeinit.patch
+Patch101: kdebase-4.2.0-dolphin-qt45.patch
+# http://websvn.kde.org/?view=rev&revision=924926
+Patch102: kdebase-4.2.0-avoid_kde3_services.patch
-## Fedora custom patches
+#Â Fedora custom patches
Patch200: kdebase-4.2.0-home-icon.patch
%ifnarch s390 s390x
@@ -131,8 +134,12 @@
%patch1 -p1 -b .konsole-session
%patch100 -p1 -b .konsole_kdeinit
+%if 0%{?fedora} > 10
+%patch101 -p1 -b .dolphin-qt45
+%endif
+%patch102 -p4 -b .avoid_kde3_services
-%patch200 -p0 -b .home-icon
+%patch200 -p1 -b .home-icon
# fix incorrect assumption that we're building in a combined kdebase tree
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -144,7 +151,7 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -314,9 +321,16 @@
%changelog
-* Thu Feb 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.0-3
+* Thu Feb 12 2009 Rex Dieter <rdieter at fedorparoject.org> - 4.2.0-5
+- avoid_kde3_services patch
+- fix home-icon patch
+
+* Thu Feb 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.0-4
- add Home icon to the Applications menu by default (#457756)
+* Wed Feb 11 2009 Than Ngo <than at redhat.com> - 4.2.0-3
+- apply patch to make dolphin working well with 4.5
+
* Wed Jan 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- KDEInit could not launch '/usr/bin/konsole' (kdebug#162729)
- Previous message (by thread): rpms/kernel/F-10 patch-2.6.29-rc4-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.982, 1.983 config-x86_64-generic, 1.58, 1.59 kernel.spec, 1.1258, 1.1259 sources, 1.944, 1.945 upstream, 1.855, 1.856 linux-2.6-net-sch-drr-fix-u32-type.patch, 1.1, NONE patch-2.6.29-rc4-git6.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/lmarbles/devel lmarbles.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list