[Frugalware-git] kdetesting2: kdelibs-4.6.0-1-i686 * added custom patch * added libqtdeclarative and polkit-qt in makedepends

[Devil505]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting2.git;a=commitdiff;h=56a67ba8307633a25e6bcb043d0d507de935d8c3

commit 56a67ba8307633a25e6bcb043d0d507de935d8c3
Author: Devil505 <devil505linux at gmail.com>
Date:   Fri Jan 28 21:46:29 2011 +0100

kdelibs-4.6.0-1-i686
* added custom patch
* added libqtdeclarative and polkit-qt in makedepends

diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 3a7d246..58f843b 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -11,8 +11,17 @@ _F_kde_subpkgs_custom_path=1
Finclude kde
depends=()
## for now
-makedepends=("${makedepends[@]}" "krb5" "libqttest>=$_F_kde_qtver" "docbook-xsl" "shared-desktop-ontologies>=0.5" "libdbusmenu-qt")
-sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc')
+makedepends=("${makedepends[@]}" "krb5" "libqttest>=$_F_kde_qtver" \
+	"docbook-xsl" "shared-desktop-ontologies>=0.5" \
+	"libdbusmenu-qt>=0.7.0" "polkit-qt>=0.99.0" "libqtdeclarative>=_F_kde_qtver")
+source=($source \
+	frugalware-menu.patch \
+	FrugalBuild-syntax-highlight.patch \
+	kde-applications-menu.patch)
+sha1sums=('6ea3fc69f98fa91c5159ccd743d4d548e801c7bc' \
+          'c657c474875c155197dde1c846f1791e744febc2' \
+          'd68e789167fb028a9da7d4d5393a363ad56b0c6f' \
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7')

## conflicts kdebase-workspace<=4.3.5

diff --git a/source/kde/kdelibs/FrugalBuild-syntax-highlight.patch b/source/kde/kdelibs/FrugalBuild-syntax-highlight.patch
new file mode 100644
index 0000000..22c64e0
--- /dev/null
+++ b/source/kde/kdelibs/FrugalBuild-syntax-highlight.patch
@@ -0,0 +1,12 @@
+diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
+--- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml	2009-04-15 12:26:37.000000000 +0200
++++ kdelibs-4.3.0/kate/syntax/data/bash.xml	2009-07-30 13:24:01.000000000 +0200
+@@ -8,7 +8,7 @@
+         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
+         <!ENTITY pathpart "([\w_ at .&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+ ]>
+-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;FrugalBuild;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
+
+ <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
+     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)
diff --git a/source/kde/kdelibs/frugalware-menu.patch b/source/kde/kdelibs/frugalware-menu.patch
new file mode 100644
index 0000000..1d0bd74
--- /dev/null
+++ b/source/kde/kdelibs/frugalware-menu.patch
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ 	</DefaultLayout>
+ 	<Layout>
+ 		<Merge type="menus"/>
++		<Menuname>Frugalware</Menuname>
+ 		<Menuname>Applications</Menuname>
+ 		<Merge type="files"/>
+ 	</Layout>
+
+ 	<Menu>
++		<Name>Frugalware</Name>
++		<Directory>Frugalware.directory</Directory>
++		<Include>
++			<Category>Frugalware</Category>
++		</Include>
++	</Menu>
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>
diff --git a/source/kde/kdelibs/kde-applications-menu.patch b/source/kde/kdelibs/kde-applications-menu.patch
new file mode 100644
index 0000000..4b51329
--- /dev/null
+++ b/source/kde/kdelibs/kde-applications-menu.patch
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);