Date: Monday, December 26, 2011 @ 06:58:35
Author: andrea
Revision: 145655
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64
Added:
kdelibs/repos/kde-unstable-i686/PKGBUILD
(from rev 145654, kdelibs/trunk/PKGBUILD)
kdelibs/repos/kde-unstable-i686/archlinux-menu.patch
(from rev 145654, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch
(from rev 145654, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/kde-unstable-i686/kdelibs.install
(from rev 145654, kdelibs/trunk/kdelibs.install)
kdelibs/repos/kde-unstable-x86_64/PKGBUILD
(from rev 145654, kdelibs/trunk/PKGBUILD)
kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch
(from rev 145654, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch
(from rev 145654, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/kde-unstable-x86_64/kdelibs.install
(from rev 145654, kdelibs/trunk/kdelibs.install)
Deleted:
kdelibs/repos/kde-unstable-i686/PKGBUILD
kdelibs/repos/kde-unstable-i686/archlinux-menu.patch
kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch
kdelibs/repos/kde-unstable-i686/kdelibs.install
kdelibs/repos/kde-unstable-x86_64/PKGBUILD
kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch
kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch
kdelibs/repos/kde-unstable-x86_64/kdelibs.install
-------------------------------------------------+
kde-unstable-i686/PKGBUILD | 112 +++++++++++-----------
kde-unstable-i686/archlinux-menu.patch | 44 ++++----
kde-unstable-i686/kde-applications-menu.patch | 44 ++++----
kde-unstable-i686/kdelibs.install | 26 ++---
kde-unstable-x86_64/PKGBUILD | 112 +++++++++++-----------
kde-unstable-x86_64/archlinux-menu.patch | 44 ++++----
kde-unstable-x86_64/kde-applications-menu.patch | 44 ++++----
kde-unstable-x86_64/kdelibs.install | 26 ++---
8 files changed, 226 insertions(+), 226 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2011-12-26 11:57:58 UTC (rev 145654)
+++ kde-unstable-i686/PKGBUILD 2011-12-26 11:58:35 UTC (rev 145655)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.95
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
- 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
- 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
Copied: kdelibs/repos/kde-unstable-i686/PKGBUILD (from rev 145654,
kdelibs/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2011-12-26 11:58:35 UTC (rev 145655)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.95
+pkgrel=3
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+ 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
+ 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+replaces=('kdelibs-experimental')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+ 'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Deleted: kde-unstable-i686/archlinux-menu.patch
===================================================================
--- kde-unstable-i686/archlinux-menu.patch 2011-12-26 11:57:58 UTC (rev
145654)
+++ kde-unstable-i686/archlinux-menu.patch 2011-12-26 11:58:35 UTC (rev
145655)
@@ -1,22 +0,0 @@
---- 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>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
Copied: kdelibs/repos/kde-unstable-i686/archlinux-menu.patch (from rev 145654,
kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- kde-unstable-i686/archlinux-menu.patch (rev 0)
+++ kde-unstable-i686/archlinux-menu.patch 2011-12-26 11:58:35 UTC (rev
145655)
@@ -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>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Deleted: kde-unstable-i686/kde-applications-menu.patch
===================================================================
--- kde-unstable-i686/kde-applications-menu.patch 2011-12-26 11:57:58 UTC
(rev 145654)
+++ kde-unstable-i686/kde-applications-menu.patch 2011-12-26 11:58:35 UTC
(rev 145655)
@@ -1,22 +0,0 @@
---- 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);
Copied: kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch (from rev
145654, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- kde-unstable-i686/kde-applications-menu.patch
(rev 0)
+++ kde-unstable-i686/kde-applications-menu.patch 2011-12-26 11:58:35 UTC
(rev 145655)
@@ -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);
Deleted: kde-unstable-i686/kdelibs.install
===================================================================
--- kde-unstable-i686/kdelibs.install 2011-12-26 11:57:58 UTC (rev 145654)
+++ kde-unstable-i686/kdelibs.install 2011-12-26 11:58:35 UTC (rev 145655)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdelibs/repos/kde-unstable-i686/kdelibs.install (from rev 145654,
kdelibs/trunk/kdelibs.install)
===================================================================
--- kde-unstable-i686/kdelibs.install (rev 0)
+++ kde-unstable-i686/kdelibs.install 2011-12-26 11:58:35 UTC (rev 145655)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2011-12-26 11:57:58 UTC (rev 145654)
+++ kde-unstable-x86_64/PKGBUILD 2011-12-26 11:58:35 UTC (rev 145655)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.95
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
- 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
- 'kde-applications-menu.patch' 'archlinux-menu.patch')
-sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
Copied: kdelibs/repos/kde-unstable-x86_64/PKGBUILD (from rev 145654,
kdelibs/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2011-12-26 11:58:35 UTC (rev 145655)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.95
+pkgrel=3
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee'
+ 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl'
+ 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
+replaces=('kdelibs-experimental')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+ 'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
"${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Deleted: kde-unstable-x86_64/archlinux-menu.patch
===================================================================
--- kde-unstable-x86_64/archlinux-menu.patch 2011-12-26 11:57:58 UTC (rev
145654)
+++ kde-unstable-x86_64/archlinux-menu.patch 2011-12-26 11:58:35 UTC (rev
145655)
@@ -1,22 +0,0 @@
---- 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>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
Copied: kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch (from rev
145654, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- kde-unstable-x86_64/archlinux-menu.patch (rev 0)
+++ kde-unstable-x86_64/archlinux-menu.patch 2011-12-26 11:58:35 UTC (rev
145655)
@@ -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>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Deleted: kde-unstable-x86_64/kde-applications-menu.patch
===================================================================
--- kde-unstable-x86_64/kde-applications-menu.patch 2011-12-26 11:57:58 UTC
(rev 145654)
+++ kde-unstable-x86_64/kde-applications-menu.patch 2011-12-26 11:58:35 UTC
(rev 145655)
@@ -1,22 +0,0 @@
---- 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);
Copied: kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch (from rev
145654, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- kde-unstable-x86_64/kde-applications-menu.patch
(rev 0)
+++ kde-unstable-x86_64/kde-applications-menu.patch 2011-12-26 11:58:35 UTC
(rev 145655)
@@ -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);
Deleted: kde-unstable-x86_64/kdelibs.install
===================================================================
--- kde-unstable-x86_64/kdelibs.install 2011-12-26 11:57:58 UTC (rev 145654)
+++ kde-unstable-x86_64/kdelibs.install 2011-12-26 11:58:35 UTC (rev 145655)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdelibs/repos/kde-unstable-x86_64/kdelibs.install (from rev 145654,
kdelibs/trunk/kdelibs.install)
===================================================================
--- kde-unstable-x86_64/kdelibs.install (rev 0)
+++ kde-unstable-x86_64/kdelibs.install 2011-12-26 11:58:35 UTC (rev 145655)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
