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

Andrea Scarpino andrea at archlinux.org
Tue Sep 6 20:14:57 UTC 2011


    Date: Tuesday, September 6, 2011 @ 16:14:57
  Author: andrea
Revision: 137224

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  kdelibs/repos/staging-i686/
  kdelibs/repos/staging-i686/PKGBUILD
    (from rev 137222, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/staging-i686/archlinux-menu.patch
    (from rev 137222, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/staging-i686/kde-applications-menu.patch
    (from rev 137222, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/staging-i686/kdelibs.install
    (from rev 137223, kdelibs/trunk/kdelibs.install)
  kdelibs/repos/staging-x86_64/
  kdelibs/repos/staging-x86_64/PKGBUILD
    (from rev 137223, kdelibs/trunk/PKGBUILD)
  kdelibs/repos/staging-x86_64/archlinux-menu.patch
    (from rev 137223, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/staging-x86_64/kde-applications-menu.patch
    (from rev 137223, kdelibs/trunk/kde-applications-menu.patch)
  kdelibs/repos/staging-x86_64/kdelibs.install
    (from rev 137223, kdelibs/trunk/kdelibs.install)

--------------------------------------------+
 staging-i686/PKGBUILD                      |   58 +++++++++++++++++++++++++++
 staging-i686/archlinux-menu.patch          |   22 ++++++++++
 staging-i686/kde-applications-menu.patch   |   22 ++++++++++
 staging-i686/kdelibs.install               |   13 ++++++
 staging-x86_64/PKGBUILD                    |   58 +++++++++++++++++++++++++++
 staging-x86_64/archlinux-menu.patch        |   22 ++++++++++
 staging-x86_64/kde-applications-menu.patch |   22 ++++++++++
 staging-x86_64/kdelibs.install             |   13 ++++++
 8 files changed, 230 insertions(+)

Copied: kdelibs/repos/staging-i686/PKGBUILD (from rev 137222, kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2011-09-06 20:14:57 UTC (rev 137224)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.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' '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=('661cc56f199b7250bd825cc0e85ff442b85171e2'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+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
+
+       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/staging-i686/archlinux-menu.patch (from rev 137222, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-i686/archlinux-menu.patch	                        (rev 0)
+++ staging-i686/archlinux-menu.patch	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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/>

Copied: kdelibs/repos/staging-i686/kde-applications-menu.patch (from rev 137222, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-i686/kde-applications-menu.patch	                        (rev 0)
+++ staging-i686/kde-applications-menu.patch	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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);

Copied: kdelibs/repos/staging-i686/kdelibs.install (from rev 137223, kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-i686/kdelibs.install	                        (rev 0)
+++ staging-i686/kdelibs.install	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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
+}

Copied: kdelibs/repos/staging-x86_64/PKGBUILD (from rev 137223, kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2011-09-06 20:14:57 UTC (rev 137224)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.7.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' '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=('661cc56f199b7250bd825cc0e85ff442b85171e2'
+          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+
+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
+
+       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/staging-x86_64/archlinux-menu.patch (from rev 137223, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-x86_64/archlinux-menu.patch	                        (rev 0)
+++ staging-x86_64/archlinux-menu.patch	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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/>

Copied: kdelibs/repos/staging-x86_64/kde-applications-menu.patch (from rev 137223, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-x86_64/kde-applications-menu.patch	                        (rev 0)
+++ staging-x86_64/kde-applications-menu.patch	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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);

Copied: kdelibs/repos/staging-x86_64/kdelibs.install (from rev 137223, kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-x86_64/kdelibs.install	                        (rev 0)
+++ staging-x86_64/kdelibs.install	2011-09-06 20:14:57 UTC (rev 137224)
@@ -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