[arch-commits] Commit in kdebase-workspace (4 files)
Andrea Scarpino
andrea at archlinux.org
Thu Nov 25 09:40:39 UTC 2010
Date: Thursday, November 25, 2010 @ 04:40:39
Author: andrea
Revision: 100676
KDE 4.6 beta1
Added:
kdebase-workspace/kde-unstable/
kdebase-workspace/kde-unstable/PKGBUILD
(from rev 97469, kdebase-workspace/trunk/PKGBUILD)
Deleted:
kdebase-workspace/kde-unstable/PKGBUILD
kdebase-workspace/kde-unstable/fix-information-bar-size.patch
--------------------------------+
PKGBUILD | 77 ---------------------------------------
fix-information-bar-size.patch | 13 ------
kde-unstable/PKGBUILD | 71 +++++++++++++++++++++++++++++++++++
3 files changed, 71 insertions(+), 90 deletions(-)
Deleted: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2010-10-23 11:31:35 UTC (rev 96660)
+++ kde-unstable/PKGBUILD 2010-11-25 09:40:39 UTC (rev 100676)
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-pkgver=4.5.2
-pkgrel=2
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('polkit-kde' 'kdepimlibs' 'kdepim-runtime' 'kdebase-runtime' 'qimageblitz'
- 'libxcomposite' 'lm_sensors' 'libxklavier' 'libxdamage'
- 'xorg-utils' 'libxrandr' 'libraw1394' 'libqalculate')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 'kdebindings-python' 'docbook-xsl' 'boost')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
- 'etc/pam.d/kde'
- 'etc/pam.d/kde-np'
- 'etc/pam.d/kscreensaver')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch'
- 'fix-information-bar-size.patch')
-sha1sums=('0a2ef4f3391e94371481226374c609fb52587243'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
- '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- 'f7b38af38549242a240f1a90ab9964ca8a366129'
- '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'f81831251a5e72f6510a2936d05bd4d74c0feacd')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
- patch -p0 -i ${srcdir}/fixpath.patch
- patch -p0 -i ${srcdir}/terminate-server.patch
-
- # Already fixed in 4.5.3
- patch -Np5 -i ${srcdir}/fix-information-bar-size.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_QEdje=OFF \
- -DWITH_PolkitQt=OFF
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-
- install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
- install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
- install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
- install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
- install -d -m755 ${pkgdir}/etc/X11/sessions/
- ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/
- install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
-
- install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
-}
Copied: kdebase-workspace/kde-unstable/PKGBUILD (from rev 97469, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- kde-unstable/PKGBUILD (rev 0)
+++ kde-unstable/PKGBUILD 2010-11-25 09:40:39 UTC (rev 100676)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+pkgver=4.5.80
+pkgrel=1
+pkgdesc="KDE Base Workspace"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate'
+ 'consolekit' 'xorg-utils' 'libxdamage' 'libxkbfile' 'libdmtx')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez'
+ 'docbook-xsl')
+replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
+conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter')
+install="${pkgname}.install"
+backup=('usr/share/config/kdm/kdmrc'
+ 'etc/pam.d/kde'
+ 'etc/pam.d/kde-np'
+ 'etc/pam.d/kscreensaver')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'fixpath.patch' 'terminate-server.patch')
+sha1sums=('488a1c06bbc386ba96a9edabcd59635c953325d7'
+ '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
+ '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
+ 'f7b38af38549242a240f1a90ab9964ca8a366129'
+ '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
+ patch -p0 -i ${srcdir}/fixpath.patch
+ patch -p0 -i ${srcdir}/terminate-server.patch
+
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Xmms=OFF \
+ -DWITH_Googlegadgets=OFF \
+ -DWITH_PolkitQt=OFF
+ make
+}
+
+package() {
+ cd $srcdir/build
+ make DESTDIR=$pkgdir install
+
+ install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
+ install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
+ install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
+ install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver
+ install -d -m755 ${pkgdir}/etc/X11/sessions/
+ ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop ${pkgdir}/etc/X11/sessions/
+ install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
+
+ install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm
+}
Property changes on: kdebase-workspace/kde-unstable/PKGBUILD
___________________________________________________________________
Added: svn:keywords
+ Id
Deleted: kde-unstable/fix-information-bar-size.patch
===================================================================
--- trunk/fix-information-bar-size.patch 2010-10-23 11:31:35 UTC (rev 96660)
+++ kde-unstable/fix-information-bar-size.patch 2010-11-25 09:40:39 UTC (rev 100676)
@@ -1,13 +0,0 @@
---- branches/KDE/4.5/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp 2010/10/02 17:21:35 1181905
-+++ branches/KDE/4.5/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp 2010/10/02 17:23:29 1181906
-@@ -1450,7 +1450,9 @@
- case ProgressBar::BusyIndicator:
- {
-
-- if( r.width() < 4 || r.height() < 4 ) return true;
-+ if( orientation == Qt::Horizontal && r.width() < 4 ) return true;
-+ else if( orientation == Qt::Vertical && r.height() < 4 ) return true;
-+
- QPixmap pixmap( _helper.progressBarIndicator( pal, rect ) );
- p->drawPixmap( rect.adjusted(-1, -2, 0, 0).topLeft(), pixmap );
- return true;
More information about the arch-commits
mailing list