Date: Wednesday, October 5, 2011 @ 15:09:03 Author: andrea Revision: 139892
db-move: moved kdelibs from [staging] to [extra] (i686) Added: kdelibs/repos/extra-i686/PKGBUILD (from rev 139891, kdelibs/repos/staging-i686/PKGBUILD) kdelibs/repos/extra-i686/archlinux-menu.patch (from rev 139891, kdelibs/repos/staging-i686/archlinux-menu.patch) kdelibs/repos/extra-i686/kde-applications-menu.patch (from rev 139891, kdelibs/repos/staging-i686/kde-applications-menu.patch) kdelibs/repos/extra-i686/kdelibs.install (from rev 139891, kdelibs/repos/staging-i686/kdelibs.install) Deleted: kdelibs/repos/extra-i686/PKGBUILD kdelibs/repos/extra-i686/archlinux-menu.patch kdelibs/repos/extra-i686/fix-kdirwatch-with-linux3.patch kdelibs/repos/extra-i686/kde-applications-menu.patch kdelibs/repos/extra-i686/kdelibs.install kdelibs/repos/staging-i686/ ---------------------------------+ PKGBUILD | 121 ++++++++++++++++++-------------------- archlinux-menu.patch | 44 ++++++------- fix-kdirwatch-with-linux3.patch | 56 ----------------- kde-applications-menu.patch | 44 ++++++------- kdelibs.install | 26 ++++---- 5 files changed, 115 insertions(+), 176 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-05 19:06:59 UTC (rev 139891) +++ extra-i686/PKGBUILD 2011-10-05 19:09:03 UTC (rev 139892) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=kdelibs -pkgver=4.7.1 -pkgrel=2 -pkgdesc="KDE Core Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' - 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' - 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' - 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' - 'docbook-xsl') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' - 'hspell') -replaces=('kdelibs-experimental') -install='kdelibs.install' -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-kdirwatch-with-linux3.patch') -sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '54e6cbd7a8c4f9df947f18692512ca618c824c43') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # avoid file conflict with gnome-menu - patch -p1 -i "${srcdir}"/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i "${srcdir}"/archlinux-menu.patch - - # Already fixed upstream - patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.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/extra-i686/PKGBUILD (from rev 139891, kdelibs/repos/staging-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-05 19:09:03 UTC (rev 139892) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdelibs +pkgver=4.7.2 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' + 'hspell') +replaces=('kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch') +sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' + '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: extra-i686/archlinux-menu.patch =================================================================== --- extra-i686/archlinux-menu.patch 2011-10-05 19:06:59 UTC (rev 139891) +++ extra-i686/archlinux-menu.patch 2011-10-05 19:09:03 UTC (rev 139892) @@ -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/extra-i686/archlinux-menu.patch (from rev 139891, kdelibs/repos/staging-i686/archlinux-menu.patch) =================================================================== --- extra-i686/archlinux-menu.patch (rev 0) +++ extra-i686/archlinux-menu.patch 2011-10-05 19:09:03 UTC (rev 139892) @@ -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: extra-i686/fix-kdirwatch-with-linux3.patch =================================================================== --- extra-i686/fix-kdirwatch-with-linux3.patch 2011-10-05 19:06:59 UTC (rev 139891) +++ extra-i686/fix-kdirwatch-with-linux3.patch 2011-10-05 19:09:03 UTC (rev 139892) @@ -1,56 +0,0 @@ -From: Alex Fiestas <afies...@kde.org> -Date: Fri, 09 Sep 2011 16:54:23 +0000 -Subject: Fix KDirWatch when using Kernel 3.0 -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=7df5a79fb9f09e4a4a80cd541cc478b5fa6df00f ---- -Fix KDirWatch when using Kernel 3.0 - -To know INotify is available in the kernel we are checking for a -kernel newer than 2.6.14, that's all allright but the problem is -that the Kernel version format has changed and now we can't be sure -that it is going to be formed by 3 numbers. -Basically we where checking for: - -%d.%d.%d and now it can be %d.%d as it is with 3.0 - -This patch what does is check if the kernel is 2.6, if it is then -it proceed with the version checking. - -CCMAIL: dfa...@kde.org ---- - - ---- a/kdecore/io/kdirwatch.cpp -+++ b/kdecore/io/kdirwatch.cpp -@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate() - { - struct utsname uts; - int major, minor, patch; -- if (uname(&uts) < 0) -- supports_inotify = false; // *shrug* -- else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) -- supports_inotify = false; // *shrug* -- else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14 -- kDebug(7001) << "Can't use INotify, Linux kernel too old"; -+ if (uname(&uts) < 0) { - supports_inotify = false; -+ kDebug(7001) << "Unable to get uname"; -+ } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { -+ supports_inotify = false; -+ kDebug(7001) << "The version is malformed: " << uts.release; -+ } else if(major == 2 && minor == 6) { // If it is 2.6 check further... -+ if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) { -+ supports_inotify = false; -+ kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release; -+ } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){ -+ supports_inotify = false; -+ kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release; -+ } - } - } - -+ kDebug() << "INotify available: " << supports_inotify; - if ( supports_inotify ) { - availableMethods << "INotify"; - fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); - Deleted: extra-i686/kde-applications-menu.patch =================================================================== --- extra-i686/kde-applications-menu.patch 2011-10-05 19:06:59 UTC (rev 139891) +++ extra-i686/kde-applications-menu.patch 2011-10-05 19:09:03 UTC (rev 139892) @@ -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/extra-i686/kde-applications-menu.patch (from rev 139891, kdelibs/repos/staging-i686/kde-applications-menu.patch) =================================================================== --- extra-i686/kde-applications-menu.patch (rev 0) +++ extra-i686/kde-applications-menu.patch 2011-10-05 19:09:03 UTC (rev 139892) @@ -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: extra-i686/kdelibs.install =================================================================== --- extra-i686/kdelibs.install 2011-10-05 19:06:59 UTC (rev 139891) +++ extra-i686/kdelibs.install 2011-10-05 19:09:03 UTC (rev 139892) @@ -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/extra-i686/kdelibs.install (from rev 139891, kdelibs/repos/staging-i686/kdelibs.install) =================================================================== --- extra-i686/kdelibs.install (rev 0) +++ extra-i686/kdelibs.install 2011-10-05 19:09:03 UTC (rev 139892) @@ -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 +}