[arch-commits] Commit in kdelibs/repos (10 files)

Andrea Scarpino andrea at archlinux.org
Wed Mar 7 11:11:49 EST 2012


    Date: Wednesday, March 7, 2012 @ 11:11:49
  Author: andrea
Revision: 152459

db-move: moved kdelibs from [staging] to [extra] (x86_64)

Added:
  kdelibs/repos/extra-x86_64/PKGBUILD
    (from rev 152457, kdelibs/repos/staging-x86_64/PKGBUILD)
  kdelibs/repos/extra-x86_64/archlinux-menu.patch
    (from rev 152457, kdelibs/repos/staging-x86_64/archlinux-menu.patch)
  kdelibs/repos/extra-x86_64/kde-applications-menu.patch
    (from rev 152457, kdelibs/repos/staging-x86_64/kde-applications-menu.patch)
  kdelibs/repos/extra-x86_64/kdelibs.install
    (from rev 152457, kdelibs/repos/staging-x86_64/kdelibs.install)
Deleted:
  kdelibs/repos/extra-x86_64/PKGBUILD
  kdelibs/repos/extra-x86_64/archlinux-menu.patch
  kdelibs/repos/extra-x86_64/fix-knotify-filepath.patch
  kdelibs/repos/extra-x86_64/kde-applications-menu.patch
  kdelibs/repos/extra-x86_64/kdelibs.install
  kdelibs/repos/staging-x86_64/

-----------------------------+
 PKGBUILD                    |  117 ++++++++++++++++++++----------------------
 archlinux-menu.patch        |   44 +++++++--------
 fix-knotify-filepath.patch  |   13 ----
 kde-applications-menu.patch |   44 +++++++--------
 kdelibs.install             |   26 ++++-----
 5 files changed, 113 insertions(+), 131 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-03-07 16:11:47 UTC (rev 152458)
+++ extra-x86_64/PKGBUILD	2012-03-07 16:11:49 UTC (rev 152459)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.8.0
-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/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz"
-        '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
-}

Copied: kdelibs/repos/extra-x86_64/PKGBUILD (from rev 152457, kdelibs/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-03-07 16:11:49 UTC (rev 152459)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.8.1
+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/xz/${pkgname}-${pkgver}.tar.xz"
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('da4e13f63ac340619351e9a2f4211cce8ec4fdf8'
+          '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-x86_64/archlinux-menu.patch
===================================================================
--- extra-x86_64/archlinux-menu.patch	2012-03-07 16:11:47 UTC (rev 152458)
+++ extra-x86_64/archlinux-menu.patch	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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-x86_64/archlinux-menu.patch (from rev 152457, kdelibs/repos/staging-x86_64/archlinux-menu.patch)
===================================================================
--- extra-x86_64/archlinux-menu.patch	                        (rev 0)
+++ extra-x86_64/archlinux-menu.patch	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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-x86_64/fix-knotify-filepath.patch
===================================================================
--- extra-x86_64/fix-knotify-filepath.patch	2012-03-07 16:11:47 UTC (rev 152458)
+++ extra-x86_64/fix-knotify-filepath.patch	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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);

Deleted: extra-x86_64/kde-applications-menu.patch
===================================================================
--- extra-x86_64/kde-applications-menu.patch	2012-03-07 16:11:47 UTC (rev 152458)
+++ extra-x86_64/kde-applications-menu.patch	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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-x86_64/kde-applications-menu.patch (from rev 152457, kdelibs/repos/staging-x86_64/kde-applications-menu.patch)
===================================================================
--- extra-x86_64/kde-applications-menu.patch	                        (rev 0)
+++ extra-x86_64/kde-applications-menu.patch	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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-x86_64/kdelibs.install
===================================================================
--- extra-x86_64/kdelibs.install	2012-03-07 16:11:47 UTC (rev 152458)
+++ extra-x86_64/kdelibs.install	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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-x86_64/kdelibs.install (from rev 152457, kdelibs/repos/staging-x86_64/kdelibs.install)
===================================================================
--- extra-x86_64/kdelibs.install	                        (rev 0)
+++ extra-x86_64/kdelibs.install	2012-03-07 16:11:49 UTC (rev 152459)
@@ -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
+}



More information about the arch-commits mailing list