Date: Sunday, July 24, 2011 @ 20:11:50
Author: andrea
Revision: 132565
move pkgbuilds to trunk; cleanup
Added:
kdelibs/trunk/PKGBUILD
(from rev 132557, kdelibs/kde-unstable/PKGBUILD)
kdelibs/trunk/archlinux-menu.patch
(from rev 132557, kdelibs/kde-unstable/archlinux-menu.patch)
kdelibs/trunk/kde-applications-menu.patch
(from rev 132557, kdelibs/kde-unstable/kde-applications-menu.patch)
kdelibs/trunk/kdelibs.install
(from rev 132557, kdelibs/kde-unstable/kdelibs.install)
Deleted:
kdelibs/trunk/PKGBUILD
kdelibs/trunk/abs-syntax-highlight.patch
kdelibs/trunk/archlinux-menu.patch
kdelibs/trunk/fix-lineedit-clear-button.patch
kdelibs/trunk/fix-lineedit-completion-tab.patch
kdelibs/trunk/kde-applications-menu.patch
kdelibs/trunk/kdelibs.install
-----------------------------------+
PKGBUILD | 129 ++++++++++++++++--------------------
abs-syntax-highlight.patch | 12 ---
archlinux-menu.patch | 44 ++++++------
fix-lineedit-clear-button.patch | 30 --------
fix-lineedit-completion-tab.patch | 56 ---------------
kde-applications-menu.patch | 44 ++++++------
kdelibs.install | 25 +++---
7 files changed, 115 insertions(+), 225 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-24 23:53:44 UTC (rev 132564)
+++ PKGBUILD 2011-07-25 00:11:50 UTC (rev 132565)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <[email protected]
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgname=kdelibs
-pkgver=4.6.5
-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=('arts' 'kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
- 'kde-applications-menu.patch' 'archlinux-menu.patch'
- 'abs-syntax-highlight.patch'
- 'fix-lineedit-clear-button.patch'
- 'fix-lineedit-completion-tab.patch')
-sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb'
- '3deae3fc6733624759ad8bf5a1560d9a2f792d73'
- 'a5f223b61499fa03043def0b3a45b1712cc72d70')
-
-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
- # add syntax highlightning for PKGBUILD and .install files
- patch -p1 -i $srcdir/abs-syntax-highlight.patch
-
- # Already fixed upstream
- patch -p1 -i "${srcdir}"/fix-lineedit-clear-button.patch
- patch -p1 -i "${srcdir}"/fix-lineedit-completion-tab.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 \
- -DKAUTH_BACKEND=PolkitQt-1
- 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/trunk/PKGBUILD (from rev 132557, kdelibs/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-07-25 00:11:50 UTC (rev 132565)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <[email protected]
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgname=kdelibs
+pkgver=4.7.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' '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=('2a7a59ac78a161c7c2393db89179449b495dd2db'
+ '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
+}
Deleted: abs-syntax-highlight.patch
===================================================================
--- abs-syntax-highlight.patch 2011-07-24 23:53:44 UTC (rev 132564)
+++ abs-syntax-highlight.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml
kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15
12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000
+0200
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or
- following -->
- <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character
in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts"
extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile"
mimetype="application/x-shellscript" casesensitive="1" author="Wilbert
Berendsen ([email protected])" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts"
extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install"
mimetype="application/x-shellscript" casesensitive="1" author="Wilbert
Berendsen ([email protected])" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen ([email protected])
- Changes by Matthew Woehlke ([email protected])
Deleted: archlinux-menu.patch
===================================================================
--- archlinux-menu.patch 2011-07-24 23:53:44 UTC (rev 132564)
+++ archlinux-menu.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -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/trunk/archlinux-menu.patch (from rev 132557,
kdelibs/kde-unstable/archlinux-menu.patch)
===================================================================
--- archlinux-menu.patch (rev 0)
+++ archlinux-menu.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -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: fix-lineedit-clear-button.patch
===================================================================
--- fix-lineedit-clear-button.patch 2011-07-24 23:53:44 UTC (rev 132564)
+++ fix-lineedit-clear-button.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -1,30 +0,0 @@
-commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
-Author: Andrea Iacovitti <[email protected]>
-Date: Sat Jul 9 19:51:40 2011 +0200
-
- Fix regression about input text clearButton stopping to work on khtml forms
- BUG: 246513
- FIXED-IN: 4.7.0
-
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
-index 7382806..8f1c8a4 100644
---- a/kdeui/widgets/klineedit.cpp
-+++ b/kdeui/widgets/klineedit.cpp
-@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- if ( (e->button() == Qt::LeftButton ||
- e->button() == Qt::MidButton ) &&
- d->clearButton ) {
-- d->clickInClear = d->clearButton == childAt( e->pos() );
-+ d->clickInClear = ( d->clearButton == childAt(e->pos()) ||
d->clearButton->underMouse() );
-
- if ( d->clickInClear ) {
- d->possibleTripleClick = false;
-@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
- {
- if ( d->clickInClear ) {
-- if ( d->clearButton == childAt( e->pos() ) ) {
-+ if ( d->clearButton == childAt(e->pos()) ||
d->clearButton->underMouse() ) {
- QString newText;
- if ( e->button() == Qt::MidButton ) {
- newText = QApplication::clipboard()->text(
QClipboard::Selection );
Deleted: fix-lineedit-completion-tab.patch
===================================================================
--- fix-lineedit-completion-tab.patch 2011-07-24 23:53:44 UTC (rev 132564)
+++ fix-lineedit-completion-tab.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -1,56 +0,0 @@
---- kdelibs/khtml/rendering/render_form.cpp
-+++ kdelibs/khtml/rendering/render_form.cpp
-@@ -1012,11 +1012,11 @@
- //
-----------------------------------------------------------------------------
-
- RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
-- : RenderFormElement(element)
-+ : RenderFormElement(element), m_blockElementUpdates(false)
- {
- LineEditWidget *edit = new LineEditWidget(element, view(),
view()->widget());
- connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
--
connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
-+
connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
-
- if(element->inputType() == HTMLInputElementImpl::PASSWORD)
- edit->setEchoMode( QLineEdit::Password );
-@@ -1142,17 +1142,21 @@
- }
-
- if (element()->value().string() != widget()->text()) {
-+ m_blockElementUpdates = true;
- int pos = widget()->cursorPosition();
- widget()->setText(element()->value().string());
- widget()->setCursorPosition(pos);
-+ m_blockElementUpdates = false;
- }
- widget()->setReadOnly(element()->readOnly());
-
- RenderFormElement::updateFromElement();
- }
-
--void RenderLineEdit::slotTextEdited(const QString &string)
-+void RenderLineEdit::slotTextChanged(const QString &string)
- {
-+ if (m_blockElementUpdates) return;
-+
- // don't use setValue here!
- element()->m_value = string;
- element()->m_unsubmittedFormChange = true;
---- kdelibs/khtml/rendering/render_form.h
-+++ kdelibs/khtml/rendering/render_form.h
-@@ -282,12 +282,13 @@
- void setSelectionRange(long start, long end);
- public Q_SLOTS:
- void slotReturnPressed();
-- void slotTextEdited(const QString &string);
-+ void slotTextChanged(const QString &string);
- protected:
-
- private:
- virtual bool isEditable() const { return true; }
- virtual bool canHaveBorder() const { return true; }
-+ bool m_blockElementUpdates;
- };
-
- // -------------------------------------------------------------------------
Deleted: kde-applications-menu.patch
===================================================================
--- kde-applications-menu.patch 2011-07-24 23:53:44 UTC (rev 132564)
+++ kde-applications-menu.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -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/trunk/kde-applications-menu.patch (from rev 132557,
kdelibs/kde-unstable/kde-applications-menu.patch)
===================================================================
--- kde-applications-menu.patch (rev 0)
+++ kde-applications-menu.patch 2011-07-25 00:11:50 UTC (rev 132565)
@@ -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: kdelibs.install
===================================================================
--- kdelibs.install 2011-07-24 23:53:44 UTC (rev 132564)
+++ kdelibs.install 2011-07-25 00:11:50 UTC (rev 132565)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
\ No newline at end of file
Copied: kdelibs/trunk/kdelibs.install (from rev 132557,
kdelibs/kde-unstable/kdelibs.install)
===================================================================
--- kdelibs.install (rev 0)
+++ kdelibs.install 2011-07-25 00:11:50 UTC (rev 132565)
@@ -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
+}
