[arch-commits] Commit in kdelibs/repos (5 files)
Pierre Schmitz
pierre at archlinux.org
Mon Aug 3 21:09:13 UTC 2009
Date: Monday, August 3, 2009 @ 17:09:13
Author: pierre
Revision: 48794
Merged revisions 48004,48085 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/kdelibs/trunk
........
r48004 | pierre | 2009-07-30 13:06:37 +0200 (Do, 30 Jul 2009) | 1 line
update to KDE 4.3.0 (try #1)
........
r48085 | pierre | 2009-07-30 13:25:56 +0200 (Do, 30 Jul 2009) | 1 line
update patches
........
Modified:
kdelibs/repos/testing-i686/ (properties)
kdelibs/repos/testing-i686/PKGBUILD
kdelibs/repos/testing-i686/abs-syntax-highlight.patch
kdelibs/repos/testing-i686/archlinux-menu.patch
kdelibs/repos/testing-i686/kde-applications-menu.patch
-----------------------------+
PKGBUILD | 16 ++++++++--------
abs-syntax-highlight.patch | 5 +++--
archlinux-menu.patch | 17 +++++++++--------
kde-applications-menu.patch | 32 +++++++++++++++-----------------
4 files changed, 35 insertions(+), 35 deletions(-)
Property changes on: kdelibs/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /kdelibs/trunk:1-47508
+ /kdelibs/trunk:1-48793
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-08-03 21:04:59 UTC (rev 48793)
+++ testing-i686/PKGBUILD 2009-08-03 21:09:13 UTC (rev 48794)
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=kdelibs
-pkgver=4.2.98
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -14,12 +14,12 @@
makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell' 'libxslt')
replaces=('arts')
install='kdelibs.install'
-source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
-md5sums=('57d29dbd24afb72c03545ba583c8347f'
- 'e94450ba5430ea9c1e33bad9ae38ca2d'
- 'a6b31e1e5812340f010ef4cdd77e356c'
- 'a471b0c4642028917f4e17025eaa6505')
+md5sums=('ea54f71bcbb0cf96bb6d94c019de8bb5'
+ '280f34ee159845f8902c31bd499254fc'
+ '9b55dbd3de058fe066e20e9d63661a18'
+ '18ea42696a7f41332a092d6ead7efc6a')
build() {
cd $srcdir/${pkgname}-${pkgver}
@@ -29,7 +29,7 @@
# add Archlinux menu entry
patch -p1 -i $srcdir/archlinux-menu.patch
# add syntax highlightning for PKGBUILD and .install files
- patch -p0 -i $srcdir/abs-syntax-highlight.patch
+ patch -p1 -i $srcdir/abs-syntax-highlight.patch
cd ..
mkdir build
cd build
Modified: testing-i686/abs-syntax-highlight.patch
===================================================================
--- testing-i686/abs-syntax-highlight.patch 2009-08-03 21:04:59 UTC (rev 48793)
+++ testing-i686/abs-syntax-highlight.patch 2009-08-03 21:09:13 UTC (rev 48794)
@@ -1,5 +1,6 @@
---- kate/syntax/data/bash.xml_2009-06-15T08:10+0200 2009-06-15 08:10:40.000000000 +0200
-+++ kate/syntax/data/bash.xml 2009-06-15 08:13:50.000000000 +0200
+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 .%*?+-]|\\ )"> <!-- valid character in a file name -->
Modified: testing-i686/archlinux-menu.patch
===================================================================
--- testing-i686/archlinux-menu.patch 2009-08-03 21:04:59 UTC (rev 48793)
+++ testing-i686/archlinux-menu.patch 2009-08-03 21:09:13 UTC (rev 48794)
@@ -1,9 +1,10 @@
---- kdelibs-4.2.85/kded/applications.menu~ 2009-05-21 11:04:15.000000000 +0200
-+++ kdelibs-4.2.85/kded/applications.menu 2009-05-21 11:05:30.000000000 +0200
+diff -Nura kdelibs-4.3.0.orig/kded/applications.menu kdelibs-4.3.0/kded/applications.menu
+--- kdelibs-4.3.0.orig/kded/applications.menu 2009-07-29 13:09:44.000000000 +0200
++++ kdelibs-4.3.0/kded/applications.menu 2009-07-30 13:18:36.000000000 +0200
@@ -30,6 +30,14 @@
- </Layout>
-
- <Menu>
+ <And>
+ <Category>Core</Category>
+ <Not><Category>KDE</Category></Not>
+ <Name>Archlinux</Name>
+ <Directory>Archlinux.directory</Directory>
+ <Include>
@@ -12,6 +13,6 @@
+ </Menu>
+
+ <Menu>
- <Name>LostFound</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
+ </And>
+ <!-- Don't list SUSE's YaST in here -->
+ <Category>X-SuSE-YaST</Category>
Modified: testing-i686/kde-applications-menu.patch
===================================================================
--- testing-i686/kde-applications-menu.patch 2009-08-03 21:04:59 UTC (rev 48793)
+++ testing-i686/kde-applications-menu.patch 2009-08-03 21:09:13 UTC (rev 48794)
@@ -1,20 +1,6 @@
-Index: b/kded/kbuildsycoca.cpp
-===================================================================
---- a/kded/kbuildsycoca.cpp
-+++ b/kded/kbuildsycoca.cpp
-@@ -307,7 +307,7 @@
- connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
- this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
-
-- 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);
-Index: b/kded/CMakeLists.txt
-===================================================================
---- a/kded/CMakeLists.txt
-+++ b/kded/CMakeLists.txt
+diff -Nura kdelibs-4.3.0.orig/kded/CMakeLists.txt kdelibs-4.3.0/kded/CMakeLists.txt
+--- kdelibs-4.3.0.orig/kded/CMakeLists.txt 2008-12-10 17:12:28.000000000 +0100
++++ kdelibs-4.3.0/kded/CMakeLists.txt 2009-07-30 13:22:06.000000000 +0200
@@ -69,7 +69,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
@@ -24,3 +10,15 @@
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+diff -Nura kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp kdelibs-4.3.0/kded/kbuildsycoca.cpp
+--- kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp 2009-03-10 13:26:04.000000000 +0100
++++ kdelibs-4.3.0/kded/kbuildsycoca.cpp 2009-07-30 13:22:06.000000000 +0200
+@@ -306,7 +306,7 @@
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
+ this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
+
+- 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);
More information about the arch-commits
mailing list