pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/kdevelop-base Update kdevelop to 3.4.1 (part of ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/723920ad922c
branches:  trunk
changeset: 529071:723920ad922c
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed May 23 13:52:58 2007 +0000

description:
Update kdevelop to 3.4.1 (part of KDE 3.5.7)

diffstat:

 devel/kdevelop-base/Makefile         |    10 +-
 devel/kdevelop-base/PLIST            |    21 +-
 devel/kdevelop-base/distinfo         |    28 +-
 devel/kdevelop-base/options.mk       |    17 +
 devel/kdevelop-base/patches/patch-aj |    43 +
 devel/kdevelop-base/patches/patch-ak |    19 +
 devel/kdevelop-base/patches/patch-ba |    78 -
 devel/kdevelop-base/patches/patch-bb |    13 -
 devel/kdevelop-base/patches/patch-bc |   150 -
 devel/kdevelop-base/patches/patch-bd |    36 -
 devel/kdevelop-base/patches/patch-be |   147 -
 devel/kdevelop-base/patches/patch-bf |    94 -
 devel/kdevelop-base/patches/patch-bg |    49 -
 devel/kdevelop-base/patches/patch-bh |  1561 -------------------
 devel/kdevelop-base/patches/patch-bi |    50 -
 devel/kdevelop-base/patches/patch-bj |  2763 ----------------------------------
 devel/kdevelop-base/patches/patch-bk |   108 -
 devel/kdevelop-base/patches/patch-bl |   426 -----
 devel/kdevelop-base/patches/patch-bm |   101 -
 devel/kdevelop-base/patches/patch-bn |   134 -
 devel/kdevelop-base/patches/patch-bo |    13 -
 devel/kdevelop-base/patches/patch-bp |   225 --
 devel/kdevelop-base/patches/patch-bq |    50 -
 devel/kdevelop-base/patches/patch-br |   210 --
 24 files changed, 107 insertions(+), 6239 deletions(-)

diffs (truncated from 6531 to 300 lines):

diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/Makefile
--- a/devel/kdevelop-base/Makefile      Wed May 23 13:45:05 2007 +0000
+++ b/devel/kdevelop-base/Makefile      Wed May 23 13:52:58 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.62 2007/03/24 14:01:26 markd Exp $
+# $NetBSD: Makefile,v 1.63 2007/05/23 13:52:58 markd Exp $
 
-DISTNAME=      kdevelop-3.4.0
-PKGNAME=       kdevelop-base-3.4.0
+DISTNAME=      kdevelop-3.4.1
+PKGNAME=       kdevelop-base-3.4.1
 CATEGORIES=    devel kde
 
 HOMEPAGE=      http://www.kdevelop.org/
 COMMENT=       Base modules for IDE for Unix/X11/KDE
-MASTER_SITES=  ${MASTER_SITE_KDE:=kdevelop-3.4.0/src/}
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
@@ -22,6 +21,7 @@
 CONFLICTS+=    kdevelop<=1.3
 
 USE_TOOLS+=    msgfmt perl:run
+USE_LANGUAGES+=        fortran
 
 REPLACE_PERL+= \
        kdevprj2kdevelop \
@@ -51,6 +51,8 @@
        --with-qtdoc-dir=${QT3DIR}/qt3/doc/html \
        --with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs
 
+.include "options.mk"
+
 .include "../../meta-pkgs/kde3/kde3.mk"
 
 .include "../../databases/db4/buildlink3.mk"
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/PLIST
--- a/devel/kdevelop-base/PLIST Wed May 23 13:45:05 2007 +0000
+++ b/devel/kdevelop-base/PLIST Wed May 23 13:52:58 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/03/24 14:01:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2007/05/23 13:52:58 markd Exp $
 bin/kdevassistant
 bin/kdevdesigner
 bin/kdevelop
@@ -143,8 +143,10 @@
 include/kdevelop/widgets/resizablecombo.h
 include/kinterfacedesigner/designer.h
 lib/kconf_update_bin/kdev-gen-settings-kconf_update
+${HAVE_SVN}lib/kde3/kded_kdevsvnd.la
 lib/kde3/kio_chm.la
 lib/kde3/kio_csharpdoc.la
+${HAVE_SVN}lib/kde3/kio_kdevsvn.la
 lib/kde3/kio_perldoc.la
 lib/kde3/kio_pydoc.la
 lib/kde3/libclearcaseintegrator.la
@@ -217,7 +219,7 @@
 lib/kde3/libkdevscriptproject.la
 lib/kde3/libkdevsnippet.la
 lib/kde3/libkdevsqlsupport.la
-lib/kde3/libkdevsubversion.la
+${HAVE_SVN}lib/kde3/libkdevsubversion.la
 lib/kde3/libkdevtexttools.la
 lib/kde3/libkdevtipofday.la
 lib/kde3/libkdevtools.la
@@ -226,7 +228,7 @@
 lib/kde3/libkdevvalgrind.la
 lib/kde3/libkdevvcsmanager.la
 lib/kde3/libperforceintegrator.la
-lib/kde3/libsubversionintegrator.la
+${HAVE_SVN}lib/kde3/libsubversionintegrator.la
 lib/libd.la
 lib/libdesignerintegration.la
 lib/libdocumentation_interfaces.la
@@ -1240,6 +1242,7 @@
 share/kde/apps/kdevrubysupport/pics/ruby_run.png
 share/kde/apps/kdevscripting/kdevscripting.rc
 share/kde/apps/kdevscriptproject/kdevscriptproject.rc
+share/kde/apps/kdevsnippet/kdevpart_snippet.rc
 share/kde/apps/kdevsqlsupport/kdevsqlsupport.rc
 share/kde/apps/kdevtipofday/kdevpart_tipofday.rc
 share/kde/apps/kdevtipofday/tips
@@ -1260,6 +1263,7 @@
 share/kde/services/dockdevtocplugin.desktop
 share/kde/services/docqtplugin.desktop
 share/kde/services/kchmpart.desktop
+${HAVE_SVN}share/kde/services/kded/kdevsvnd.desktop
 share/kde/services/kdevabbrev.desktop
 share/kde/services/kdevadaproject.desktop
 share/kde/services/kdevadasupport.desktop
@@ -1329,8 +1333,13 @@
 share/kde/services/kdevscriptproject.desktop
 share/kde/services/kdevsnippet.desktop
 share/kde/services/kdevsqlsupport.desktop
-share/kde/services/kdevsubversion.desktop
-share/kde/services/kdevsubversionintegrator.desktop
+${HAVE_SVN}share/kde/services/kdevsubversion.desktop
+${HAVE_SVN}share/kde/services/kdevsubversionintegrator.desktop
+${HAVE_SVN}share/kde/services/kdevsvn+file.protocol
+${HAVE_SVN}share/kde/services/kdevsvn+http.protocol
+${HAVE_SVN}share/kde/services/kdevsvn+https.protocol
+${HAVE_SVN}share/kde/services/kdevsvn+ssh.protocol
+${HAVE_SVN}share/kde/services/kdevsvn+svn.protocol
 share/kde/services/kdevtexttools.desktop
 share/kde/services/kdevtipofday.desktop
 share/kde/services/kdevtmakeproject.desktop
@@ -1356,6 +1365,7 @@
 share/kde/servicetypes/kdevelopvcsintegrator.desktop
 share/kde/servicetypes/kdevelopversioncontrol.desktop
 @comment in kde: @dirrm share/kde/servicetypes
+@comment in kde: @dirrm share/kde/services/kded
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/text
 @comment in kde: @dirrm share/kde/mimelnk/application
@@ -1368,6 +1378,7 @@
 @dirrm share/kde/apps/kdevtools
 @dirrm share/kde/apps/kdevtipofday
 @dirrm share/kde/apps/kdevsqlsupport
+@dirrm share/kde/apps/kdevsnippet
 @dirrm share/kde/apps/kdevscriptproject
 @dirrm share/kde/apps/kdevscripting
 @dirrm share/kde/apps/kdevrubysupport/pics
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/distinfo
--- a/devel/kdevelop-base/distinfo      Wed May 23 13:45:05 2007 +0000
+++ b/devel/kdevelop-base/distinfo      Wed May 23 13:52:58 2007 +0000
@@ -1,28 +1,12 @@
-$NetBSD: distinfo,v 1.31 2007/04/07 02:41:20 wiz Exp $
+$NetBSD: distinfo,v 1.32 2007/05/23 13:52:58 markd Exp $
 
-SHA1 (kdevelop-3.4.0.tar.bz2) = d72f01ae6a0d3200339345d3557ada5c5f99112d
-RMD160 (kdevelop-3.4.0.tar.bz2) = 7a3fb362e456965f5c35f2a8a3293178d596c845
-Size (kdevelop-3.4.0.tar.bz2) = 9158370 bytes
+SHA1 (kdevelop-3.4.1.tar.bz2) = 5862f03aa4111b1288fc3c1cc926bc7aa582179c
+RMD160 (kdevelop-3.4.1.tar.bz2) = c24ee5a999334345c521ddd70f51b8d2e4aa38d6
+Size (kdevelop-3.4.1.tar.bz2) = 9368912 bytes
 SHA1 (patch-aa) = ea4ceb43d826297610b19c1cd2c538fa486b2b22
 SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
 SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
 SHA1 (patch-ai) = fa0b9b7bc82c9cf2e8ac32e873e7efd06bb75599
-SHA1 (patch-ba) = bbe66f1f163d7f6f90e38caba2689abf7b9830a6
-SHA1 (patch-bb) = dc7507bd324f12b8854c55270d4dd65273d5828b
-SHA1 (patch-bc) = 17215f7346ab82993b10ea6d6341693ffa5fbe10
-SHA1 (patch-bd) = ae24ff52158d29e50ef93dc94e009bb3f12a928e
-SHA1 (patch-be) = cc2d17c9f31907fd38e56f9718b7ac593ca0f247
-SHA1 (patch-bf) = 1fc4b3f79e30ad9cc38c985bb1255ed35b004193
-SHA1 (patch-bg) = 7b76658d4dc9e2d9b2099dc3f68045c85b802d90
-SHA1 (patch-bh) = 5af1b3c7477c5d45a1af59e8d5aa51829d431fa8
-SHA1 (patch-bi) = fa46b78ac1ef6fbe216642b56720e17ab60cdaa5
-SHA1 (patch-bj) = df480cd6fb831a71fa9e0d53ead5cd9d0d13d4cc
-SHA1 (patch-bk) = bfca9d1879643d28faae6cd55c88e91561063d02
-SHA1 (patch-bl) = 344003b4d9d400cb3e6a513d052f78ba2ef44488
-SHA1 (patch-bm) = c57e5af762edf4212bf1bae31033635ca81f1dea
-SHA1 (patch-bn) = a0eb654833e7dbe8c5143d99abf79a1ce533235a
-SHA1 (patch-bo) = 669a4f76dab36f9902534dc44d8a871739a1446d
-SHA1 (patch-bp) = 0ec5808b91906d16d9ca528867ce4ff5f9d7fa8c
-SHA1 (patch-bq) = 060e02bd33f4db75300f0b9c3eb416924ec35cc1
-SHA1 (patch-br) = 01866aacb2700e1b6af644dd5a29f97eb04b7d77
+SHA1 (patch-aj) = 649ea2804c81e177c8c7d1fa52120c803d9068f3
+SHA1 (patch-ak) = 5c9e8c75b294218ecfd8ffc745784a2d54077a9b
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdevelop-base/options.mk    Wed May 23 13:52:58 2007 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2007/05/23 13:52:58 markd Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.kdesdk
+PKG_SUPPORTED_OPTIONS= svn
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msvn)
+.include "../../devel/subversion-base/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-apr-config=${BUILDLINK_PREFIX.apr}/bin/apr-config
+CONFIGURE_ARGS+=       --with-apu-config=${BUILDLINK_PREFIX.apr}/bin/apu-config
+CONFIGURE_ARGS+=       --with-svn-include=${BUILDLINK_PREFIX.subversion-base}/include/subversion-1
+CONFIGURE_ARGS+=       --with-svn-lib=${BUILDLINK_PREFIX.subversion-base}/lib
+PLIST_SUBST+=          HAVE_SVN=""
+.else
+CONFIGURE_ARGS+=       --disable-subversion
+PLIST_SUBST+=          HAVE_SVN="@comment "
+.endif
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdevelop-base/patches/patch-aj      Wed May 23 13:52:58 2007 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-aj,v 1.1 2007/05/23 13:52:58 markd Exp $
+
+Fix from svn.
+
+diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp kdevelop-svn/languages/cpp/cppsupportpart.cpp
+--- kdevelop-3.4.1/languages/cpp/cppsupportpart.cpp    2007-05-16 16:36:20.000000000 +0200
++++ languages/cpp/cppsupportpart.cpp   2007-05-16 00:25:57.000000000 +0200
+@@ -3130,11 +3130,11 @@
+         return QString::null;
+ }
+ 
+-UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ) {
++UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : QThread(), m_parent( parent ), m_stop(false) {
+ }
+       
+ void UIBlockTester::UIBlockTesterThread::run() {
+-  while(1) {
++  while(!m_stop) {
+         msleep( m_parent.m_msecs / 10 );
+         m_parent.m_timeMutex.lock();
+         QDateTime t = QDateTime::currentDateTime();
+@@ -3146,7 +3146,11 @@
+         m_parent.m_timeMutex.unlock();
+   }
+ }
+-      
++
++void UIBlockTester::UIBlockTesterThread::stop() {
++      m_stop = true;
++}
++
+ UIBlockTester::UIBlockTester( uint milliseconds ) : m_thread( *this ), m_msecs( milliseconds ) {
+       m_timer = new QTimer( this );
+       m_timer->start( milliseconds/10 );
+@@ -3155,7 +3159,7 @@
+       m_thread.start();
+ }
+ UIBlockTester::~UIBlockTester() {
+-  m_thread.terminate();
++  m_thread.stop();
+   m_thread.wait();
+ }
+       
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdevelop-base/patches/patch-ak      Wed May 23 13:52:58 2007 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2007/05/23 13:52:58 markd Exp $
+
+Fix from SVN
+
+diff -u -u kdevelop-3.4.1/languages/cpp/cppsupportpart.h kdevelop-svn/languages/cpp/cppsupportpart.h
+--- kdevelop-3.4.1/languages/cpp/cppsupportpart.h      2007-05-16 16:36:20.000000000 +0200
++++ languages/cpp/cppsupportpart.h     2007-05-16 00:25:57.000000000 +0200
+@@ -43,9 +43,10 @@
+     public:
+       UIBlockTesterThread( UIBlockTester& parent );
+       void run();
+-      
++      void stop();
+     private:
+       UIBlockTester& m_parent;
++      bool m_stop;
+     };
+   friend class UIBlockTesterThread;
+ public:
diff -r 0f47cb8a3fe6 -r 723920ad922c devel/kdevelop-base/patches/patch-ba
--- a/devel/kdevelop-base/patches/patch-ba      Wed May 23 13:45:05 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/03/24 14:01:29 markd Exp $
-
---- buildtools/lib/parsers/qmake/tests/runner.cpp.orig 2007-01-26 04:42:02.000000000 +1300
-+++ buildtools/lib/parsers/qmake/tests/runner.cpp
-@@ -17,10 +17,26 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-  ***************************************************************************/
--#include <qmakeast.h>
--#include <qmakeastvisitor.h>
--#include <qmakedriver.h>
-+
-+#include <cstdlib>
-+#include <iostream>
-+#include <stdio.h>
-+#include "qmakedriver.h"
-+#include "qmakeastvisitor.h"
-+
-+#include <qstring.h>
-+
- #include <kdebug.h>
-+#include <kcmdlineargs.h>
-+#include <kurl.h>
-+
-+static const KCmdLineOptions options[] =
-+{
-+    {"silent", "Enable Parser debug output", 0},
-+    {"!debug", "Disable output of the generated AST", 0},
-+    {"!+files", "QMake project files", 0}
-+};
-+
- 
- class PrintAST : QMake::ASTVisitor
- {
-@@ -120,14 +136,30 @@ private:
- };
- int main(int argc, char *argv[])
- {
--    QMake::ProjectAST *projectAST;
--    int ret;
--    if (argc > 1)
-+  KCmdLineArgs::init( argc, argv, "QMake Parser", "qmake-parser", "Parse QMake project files", "1.0.0");
-+    KCmdLineArgs::addCmdLineOptions(options);
-+
-+    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();



Home | Main Index | Thread Index | Old Index