From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 22 21:10:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18CC816A4E1 for ; Sat, 22 Jul 2006 21:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A3AE43D4C for ; Sat, 22 Jul 2006 21:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6MLADCJ009152 for ; Sat, 22 Jul 2006 21:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6MLADPK009151; Sat, 22 Jul 2006 21:10:13 GMT (envelope-from gnats) Resent-Date: Sat, 22 Jul 2006 21:10:13 GMT Resent-Message-Id: <200607222110.k6MLADPK009151@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yuan Jue Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6251516A4DE for ; Sat, 22 Jul 2006 21:00:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DD0C43D45 for ; Sat, 22 Jul 2006 21:00:40 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k6ML0dH7051834 for ; Sat, 22 Jul 2006 21:00:39 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k6ML0dcS051833; Sat, 22 Jul 2006 21:00:39 GMT (envelope-from nobody) Message-Id: <200607222100.k6ML0dcS051833@www.freebsd.org> Date: Sat, 22 Jul 2006 21:00:39 GMT From: Yuan Jue To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/100730: [maintainer update] devel/kdesvn 0.8.5 -> 0.9.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jul 2006 21:10:15 -0000 >Number: 100730 >Category: ports >Synopsis: [maintainer update] devel/kdesvn 0.8.5 -> 0.9.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jul 22 21:10:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Yuan Jue >Release: FreeBSD 6.1-RELEASE >Organization: Institute of Computing Technology, CAS, China >Environment: FreeBSD maver-freebsd.net 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Sat Jul 22 22:01:08 CST 2006 maver@maver-freebsd.net:/usr/obj/usr/src/sys/MYKERNEL_6_1 i386 >Description: upgrade kdesvn port from 0.8.5 to 0.9.0 >How-To-Repeat: >Fix: diff -ruN kdesvn.orig/Makefile kdesvn/Makefile --- kdesvn.orig/Makefile Mon Jun 26 09:44:25 2006 +++ kdesvn/Makefile Sun Jul 23 03:14:18 2006 @@ -2,10 +2,10 @@ # Date created: 08 April 2006 # Whom: Yuan Jue # -# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.6 2006/06/26 01:44:25 delphij Exp $ +# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.2 2006/04/15 02:53:53 markus Exp $ PORTNAME= kdesvn -PORTVERSION= 0.8.5 +PORTVERSION= 0.9.0 CATEGORIES= devel kde MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/ \ http://www.yuanjue.net/download/ diff -ruN kdesvn.orig/distinfo kdesvn/distinfo --- kdesvn.orig/distinfo Mon Jun 26 09:44:25 2006 +++ kdesvn/distinfo Sun Jul 23 03:14:40 2006 @@ -1,3 +1,3 @@ -MD5 (kdesvn-0.8.5.tar.gz) = a76b808f38f30da31ea9b8fc11fc524b -SHA256 (kdesvn-0.8.5.tar.gz) = 45f281fb8416475444b5566f54fc51bd6b17e5ba2156275220af106b5c649062 -SIZE (kdesvn-0.8.5.tar.gz) = 1989755 +MD5 (kdesvn-0.9.0.tar.gz) = 4523ff8fca8f75832f2761f84a8ed06b +SHA256 (kdesvn-0.9.0.tar.gz) = 3571a746881a54ab0f57e34f1d5967b103583c77133b31970ee38fdfe56774f9 +SIZE (kdesvn-0.9.0.tar.gz) = 2026360 diff -ruN kdesvn.orig/files/patch-src-svnqt-dirent.cpp kdesvn/files/patch-src-svnqt-dirent.cpp --- kdesvn.orig/files/patch-src-svnqt-dirent.cpp Sat Apr 29 08:13:41 2006 +++ kdesvn/files/patch-src-svnqt-dirent.cpp Sun Jul 23 03:22:03 2006 @@ -4,8 +4,8 @@ hasProps (dirEntry->has_props != 0), createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock() { -- lastAuthor = dirEntry->last_author == 0 ? "" : QString::fromUtf8(dirEntry->last_author); -+ lastAuthor = dirEntry->last_author == 0 ? QString::fromLatin1("") : QString::fromUtf8(dirEntry->last_author); +- lastAuthor = dirEntry->last_author == 0 ? "" : QString::FROMUTF8(dirEntry->last_author); ++ lastAuthor = dirEntry->last_author == 0 ? QString::fromLatin1("") : QString::FROMUTF8(dirEntry->last_author); } Data (const DirEntry & src) diff -ruN kdesvn.orig/files/patch-src-svnqt-log_entry.cpp kdesvn/files/patch-src-svnqt-log_entry.cpp --- kdesvn.orig/files/patch-src-svnqt-log_entry.cpp Sat Apr 29 08:13:41 2006 +++ kdesvn/files/patch-src-svnqt-log_entry.cpp Sun Jul 23 03:21:54 2006 @@ -4,10 +4,10 @@ } revision = revision_; -- author = author_ == 0 ? "" : QString::fromUtf8(author_); -- message = message_ == 0 ? "" : QString::fromUtf8(message_); -+ author = author_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(author_); -+ message = message_ == 0 ? QString::fromLatin1("") : QString::fromUtf8(message_); +- author = author_ == 0 ? "" : QString::FROMUTF8(author_); +- message = message_ == 0 ? "" : QString::FROMUTF8(message_); ++ author = author_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(author_); ++ message = message_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(message_); } } diff -ruN kdesvn.orig/files/patch-src-svnqt-wc.cpp kdesvn/files/patch-src-svnqt-wc.cpp --- kdesvn.orig/files/patch-src-svnqt-wc.cpp Thu May 4 14:51:58 2006 +++ kdesvn/files/patch-src-svnqt-wc.cpp Sun Jul 23 03:53:34 2006 @@ -1,11 +1,11 @@ ---- src/svnqt/wc.cpp.orig Sat Apr 8 06:36:12 2006 -+++ src/svnqt/wc.cpp Wed May 3 19:53:42 2006 -@@ -103,7 +103,7 @@ +--- src/svnqt/wc.cpp.orig Sun Jul 23 03:30:36 2006 ++++ src/svnqt/wc.cpp Sun Jul 23 03:36:09 2006 +@@ -113,7 +113,7 @@ QString result = ""; const svn_wc_entry_t *entry; entry = getEntry( path ); -- result = entry?QString::fromUtf8(entry->url):""; -+ result = entry ? QString::fromUtf8(entry->url) : QString::fromLatin1(""); - +- result = entry?QString::FROMUTF8(entry->repos):""; ++ result = entry ? QString::FROMUTF8(entry->repos) : QString::fromLatin1(""); + return result; } diff -ruN kdesvn.orig/pkg-plist kdesvn/pkg-plist --- kdesvn.orig/pkg-plist Mon Jun 26 09:44:25 2006 +++ kdesvn/pkg-plist Sun Jul 23 04:34:37 2006 @@ -16,9 +16,13 @@ include/svnqt/log_entry.hpp include/svnqt/path.hpp include/svnqt/pool.hpp +include/svnqt/repository.hpp +include/svnqt/repositorylistener.hpp include/svnqt/revision.hpp include/svnqt/status.hpp -include/svnqt/svncpp_defines.hpp +include/svnqt/svnfilestream.hpp +include/svnqt/svnqt_defines.hpp +include/svnqt/svnstream.hpp include/svnqt/targets.hpp include/svnqt/url.hpp include/svnqt/version_check.hpp @@ -35,12 +39,11 @@ lib/libsvnqt.a lib/libsvnqt.la lib/libsvnqt.so -lib/libsvnqt.so.2 +lib/libsvnqt.so.4 share/applications/kde/kdesvn.desktop share/apps/kdesvn/kdesvnui.rc share/apps/kdesvnpart/kdesvn_part.rc share/apps/konqueror/servicemenus/kdesvn_subversion.desktop -share/apps/konqueror/servicemenus/kdesvn_subversion_toplevel.desktop share/config.kcfg/kdesvn_part.kcfg share/doc/HTML/en/kdesvn/common share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png @@ -250,6 +253,7 @@ share/locale/ca/LC_MESSAGES/kdesvn.mo share/locale/de/LC_MESSAGES/kdesvn.mo share/locale/es/LC_MESSAGES/kdesvn.mo +share/locale/fr/LC_MESSAGES/kdesvn.mo share/locale/it/LC_MESSAGES/kdesvn.mo share/locale/nl/LC_MESSAGES/kdesvn.mo share/locale/pa/LC_MESSAGES/kdesvn.mo >Release-Note: >Audit-Trail: >Unformatted: