Date: Saturday, January 28, 2012 @ 05:32:01
Author: andrea
Revision: 147758
db-move: moved kdelibs from [testing] to [extra] (i686)
Added:
kdelibs/repos/extra-i686/PKGBUILD
(from rev 147757, kdelibs/repos/testing-i686/PKGBUILD)
kdelibs/repos/extra-i686/archlinux-menu.patch
(from rev 147757, kdelibs/repos/testing-i686/archlinux-menu.patch)
kdelibs/repos/extra-i686/fix-knotify-filepath.patch
(from rev 147757, kdelibs/repos/testing-i686/fix-knotify-filepath.patch)
kdelibs/repos/extra-i686/kde-applications-menu.patch
(from rev 147757, kdelibs/repos/testing-i686/kde-applications-menu.patch)
kdelibs/repos/extra-i686/kdelibs.install
(from rev 147757, kdelibs/repos/testing-i686/kdelibs.install)
Deleted:
kdelibs/repos/extra-i686/PKGBUILD
kdelibs/repos/extra-i686/archlinux-menu.patch
kdelibs/repos/extra-i686/fix-knotify-filepath.patch
kdelibs/repos/extra-i686/kde-applications-menu.patch
kdelibs/repos/extra-i686/kdelibs-4.7.4-xinelib12x.patch
kdelibs/repos/extra-i686/kdelibs.install
kdelibs/repos/testing-i686/
--------------------------------+
PKGBUILD | 126 ++++++++++++++++++---------------------
archlinux-menu.patch | 44 ++++++-------
fix-knotify-filepath.patch | 26 ++++----
kde-applications-menu.patch | 44 ++++++-------
kdelibs-4.7.4-xinelib12x.patch | 32 ---------
kdelibs.install | 26 ++++----
6 files changed, 131 insertions(+), 167 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-01-28 10:27:06 UTC (rev 147757)
+++ extra-i686/PKGBUILD 2012-01-28 10:32:01 UTC (rev 147758)
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
-# Maintainer: Andrea Scarpino <and...@archlinux.org
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.4
-pkgrel=5
-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' 'qtwebkit')
-makedepends=('pkgconfig' 'cmake' 'automoc4' '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-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
-sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
- '9cb83cb7f6394549354c6837977f9e9529127041')
-
-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
-
- # https://bugs.kde.org/show_bug.cgi?id=285028
- patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
- patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.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 147757,
kdelibs/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-28 10:32:01 UTC (rev 147758)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.8.0
+pkgrel=1
+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/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+ 'kde-applications-menu.patch' 'archlinux-menu.patch'
+ 'fix-knotify-filepath.patch')
+sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
+
+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
+
+ # https://bugs.kde.org/show_bug.cgi?id=285028
+ patch -p1 -i "${srcdir}"/fix-knotify-filepath.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 2012-01-28 10:27:06 UTC (rev 147757)
+++ extra-i686/archlinux-menu.patch 2012-01-28 10:32:01 UTC (rev 147758)
@@ -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 147757,
kdelibs/repos/testing-i686/archlinux-menu.patch)
===================================================================
--- extra-i686/archlinux-menu.patch (rev 0)
+++ extra-i686/archlinux-menu.patch 2012-01-28 10:32:01 UTC (rev 147758)
@@ -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-knotify-filepath.patch
===================================================================
--- extra-i686/fix-knotify-filepath.patch 2012-01-28 10:27:06 UTC (rev
147757)
+++ extra-i686/fix-knotify-filepath.patch 2012-01-28 10:32:01 UTC (rev
147758)
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp
b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
---- a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( )
- KUrl soundURL = m_ui.Sound_select->url();
- if ( soundURL.isRelative() )
- {
-- QString soundString = soundURL.toLocalFile();
-+ QString soundString = m_ui.Sound_select->text();
- // we need a way to get the application name in order to ba
able to do this :
- /*QString search =
QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
- search = KGlobal::mainComponent().dirs()->findResource("data",
search);
Copied: kdelibs/repos/extra-i686/fix-knotify-filepath.patch (from rev 147757,
kdelibs/repos/testing-i686/fix-knotify-filepath.patch)
===================================================================
--- extra-i686/fix-knotify-filepath.patch (rev 0)
+++ extra-i686/fix-knotify-filepath.patch 2012-01-28 10:32:01 UTC (rev
147758)
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp
b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( )
+ KUrl soundURL = m_ui.Sound_select->url();
+ if ( soundURL.isRelative() )
+ {
+- QString soundString = soundURL.toLocalFile();
++ QString soundString = m_ui.Sound_select->text();
+ // we need a way to get the application name in order to ba
able to do this :
+ /*QString search =
QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ search = KGlobal::mainComponent().dirs()->findResource("data",
search);
Deleted: extra-i686/kde-applications-menu.patch
===================================================================
--- extra-i686/kde-applications-menu.patch 2012-01-28 10:27:06 UTC (rev
147757)
+++ extra-i686/kde-applications-menu.patch 2012-01-28 10:32:01 UTC (rev
147758)
@@ -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 147757,
kdelibs/repos/testing-i686/kde-applications-menu.patch)
===================================================================
--- extra-i686/kde-applications-menu.patch (rev 0)
+++ extra-i686/kde-applications-menu.patch 2012-01-28 10:32:01 UTC (rev
147758)
@@ -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-4.7.4-xinelib12x.patch
===================================================================
--- extra-i686/kdelibs-4.7.4-xinelib12x.patch 2012-01-28 10:27:06 UTC (rev
147757)
+++ extra-i686/kdelibs-4.7.4-xinelib12x.patch 2012-01-28 10:32:01 UTC (rev
147758)
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <j...@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
- ${PC_LIBXINE_LIBRARY_DIRS}
- )
-
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
- HINTS
- ${PC_LIBXINE_PREFIX}/bin
- )
-
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
-- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine
RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
- if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER)
is new since cmake 2.6.2
- set(XINE_VERSION_OK TRUE)
- string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION
${XINE_VERSION})
---
-1.7.8.2
-
Deleted: extra-i686/kdelibs.install
===================================================================
--- extra-i686/kdelibs.install 2012-01-28 10:27:06 UTC (rev 147757)
+++ extra-i686/kdelibs.install 2012-01-28 10:32:01 UTC (rev 147758)
@@ -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 147757,
kdelibs/repos/testing-i686/kdelibs.install)
===================================================================
--- extra-i686/kdelibs.install (rev 0)
+++ extra-i686/kdelibs.install 2012-01-28 10:32:01 UTC (rev 147758)
@@ -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
+}
