[arch-commits] CVS update of extra/kde/kdepim (PKGBUILD post-3.5.9.patch)
Tobias Powalowski
tpowa at archlinux.org
Mon Mar 3 19:03:33 UTC 2008
Date: Monday, March 3, 2008 @ 14:03:33
Author: tpowa
Path: /home/cvs-extra/extra/kde/kdepim
Added: post-3.5.9.patch (1.1)
Modified: PKGBUILD (1.56 -> 1.57)
upgppkg: update to new version
------------------+
PKGBUILD | 23 +++++++++-------
post-3.5.9.patch | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 10 deletions(-)
Index: extra/kde/kdepim/PKGBUILD
diff -u extra/kde/kdepim/PKGBUILD:1.56 extra/kde/kdepim/PKGBUILD:1.57
--- extra/kde/kdepim/PKGBUILD:1.56 Fri Dec 7 10:14:06 2007
+++ extra/kde/kdepim/PKGBUILD Mon Mar 3 14:03:32 2008
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD,v 1.56 2007/12/07 15:14:06 tpowa Exp $
+# $Id: PKGBUILD,v 1.57 2008/03/03 19:03:32 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=kdepim
-pkgver=3.5.8
-kdever=3.5.8
-pkgrel=2
+pkgver=3.5.9
+kdever=3.5.9
+pkgrel=1
pkgdesc="KDE PIM Utilities."
arch=(i686 x86_64)
url="http://www.kde.org"
license=('GPL')
groups=('kde')
-depends=('kdelibs>=3.5.8' 'kdebase>=3.5.8' 'gpgme' 'gnokii>=0.6.14' 'libmal>=0.42' 'cyrus-sasl-plugins' 'libxss' 'libopensync>=0.34')
+depends=('kdelibs>=3.5.9' 'kdebase>=3.5.9' 'gpgme' 'gnokii>=0.6.14' 'libmal>=0.42' 'cyrus-sasl-plugins' 'libxss' 'libopensync>=0.36')
#makedepends=('pilot-link' 'gnokii' 'libmal')
# for easier build, just uncomment the mirror you want to use
@@ -21,22 +21,25 @@
# latest opensync support
# svn co svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API kitchensync
source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2 \
- ftp://ftp.archlinux.org/other/kdepim/kitchensync-update.tar.bz2)
-
+ ftp://ftp.archlinux.org/other/kdepim/kitchensync-update.tar.bz2
+ post-3.5.9.patch)
build() {
# Source the QT and KDE profile
- [ -z "${QTDIR}" ] && source /etc/profile.d/qt.sh
+ [ -z "${QTDIR}" ] && source /etc/profile.d/qt3.sh
[ -z "${KDEDIR}" ] && source /etc/profile.d/kde.sh
# start building
cd $startdir/src/$pkgname-$pkgver
cp -rf ../kitchensync ./ || return 1
make -f admin/Makefile.common || return 1
+ # fix compiling
+ patch -Np4 -i ../post-3.5.9.patch || return 1
./configure --prefix=/opt/kde --disable-debug --disable-dependency-tracking \
--enable-gcc-hidden-visibility --enable-final
# --enable-final # remove this if you build with < 512mb ram.
make || return 1
make DESTDIR=$startdir/pkg install || return 1
}
-md5sums=('a1ffff553f1d6739c7791891028b176b'
- '3d634c3996bf398715aab107501539a8')
+md5sums=('ba27b06599556c572a26f03608471ee2'
+ '3d634c3996bf398715aab107501539a8'
+ '6e85b1aa4083104281aa50bb0257d4ba')
Index: extra/kde/kdepim/post-3.5.9.patch
diff -u /dev/null extra/kde/kdepim/post-3.5.9.patch:1.1
--- /dev/null Mon Mar 3 14:03:33 2008
+++ extra/kde/kdepim/post-3.5.9.patch Mon Mar 3 14:03:32 2008
@@ -0,0 +1,75 @@
+--- branches/KDE/3.5/kdepim/certmanager/lib/cryptplug.h 2005/07/26 18:54:59 438982
++++ branches/KDE/3.5/kdepim/certmanager/lib/cryptplug.h 2008/02/21 19:15:38 777849
+@@ -408,7 +408,7 @@
+ \note This function <b>must</b> be implemented by each plug-in using
+ this API specification.
+ */
+-bool hasFeature( Feature );
++bool hasFeature( ::Feature );
+
+ /*! \ingroup groupSignCryptAct
+ \brief Information record returned by signing and by encrypting
+--- branches/KDE/3.5/kdepim/certmanager/lib/cryptplugwrapper.h 2008/01/25 17:28:51 766368
++++ branches/KDE/3.5/kdepim/certmanager/lib/cryptplugwrapper.h 2008/02/21 19:15:38 777849
+@@ -718,7 +718,7 @@
+
+ \return whether the relative feature is implemented or not
+ */
+- bool hasFeature( Feature );
++ bool hasFeature( ::Feature );
+
+
+ /* \ingroup groupSignAct
+
+--- branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp 2006/06/09 16:31:27 549733
++++ branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp 2008/02/24 14:14:09 778744
+@@ -54,6 +54,7 @@
+ #include <qcursor.h>
+ #include <kpopupmenu.h>
+ #include <X11/Xlib.h>
++#undef FocusIn
+ #undef KeyPress
+ #undef None
+ #undef Status
+--- branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h 2005/07/26 18:54:59 438982
++++ branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h 2008/02/24 13:32:04 778732
+@@ -60,8 +60,10 @@
+ void setStartTime( const QDateTime& start );
+ void setEndTime( const QDateTime& end );
+
+-private:
++protected:
+ void showItem( bool show = true, int coordY = 0 );
++
++private:
+ void initItem();
+ void hideMe();
+ QBrush myBrush, undefinedBrush;
+--- branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp 2008/02/23 16:28:17 778447
++++ branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp 2008/02/23 16:32:02 778448
+@@ -119,13 +119,13 @@
+ y = coordY;
+ else
+ y = getCoordY();
+- int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
+- int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
++ int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
++ int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
+
+ const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
+ if ( !mLeft || mw != mMarkerWidth ) {
+ if ( !mLeft ) {
+- mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++ mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+ mLeft->setBrush( Qt::black );
+ }
+ QPointArray a = QPointArray( 4 );
+@@ -137,7 +137,7 @@
+ }
+ if ( !mRight || mw != mMarkerWidth ) {
+ if ( !mRight ) {
+- mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
++ mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
+ mRight->setBrush( Qt::black );
+ }
+ QPointArray a = QPointArray( 4 );
More information about the arch-commits
mailing list