Bug 169623 - Vendor update net-im/kmess-kde4
Summary: Vendor update net-im/kmess-kde4
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Scheidell
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-03 07:20 UTC by Axel Gonzalez
Modified: 2012-07-30 20:00 UTC (History)
0 users

See Also:


Attachments
file.diff (3.45 KB, patch)
2012-07-03 07:20 UTC, Axel Gonzalez
no flags Details | Diff
patch-src--model--contactlistmodelitem.cpp (405 bytes, text/x-c++src)
2012-07-28 20:23 UTC, Axel Gonzalez
no flags Details
kmess-kde4.txt (2.56 KB, text/plain)
2012-07-28 20:23 UTC, Axel Gonzalez
no flags Details
patch.txt (6.50 KB, text/plain)
2012-07-30 19:31 UTC, Michael Scheidell
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Axel Gonzalez 2012-07-03 07:20:01 UTC
Update -> 2.0.6.2

Fix: Remove files/patch-soap (fixed upstream)

Apply the attached patch.

In the plist I changed some dirrm -> dirrmtry to not show error on shared directories.

Patch attached with submission follows:
How-To-Repeat: -
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-07-03 07:20:56 UTC
Maintainer of net-im/kmess-kde4,

Please note that PR ports/169623 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169623

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-07-03 07:20:57 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Michael Scheidell freebsd_committer freebsd_triage 2012-07-26 12:38:54 UTC
Responsible Changed
From-To: freebsd-ports-bugs->scheidell

I'll take it.
Comment 4 Michael Scheidell freebsd_committer freebsd_triage 2012-07-27 08:31:39 UTC
State Changed
From-To: feedback->open

Maintainer feedback timeout.
Comment 5 Michael Scheidell freebsd_committer freebsd_triage 2012-07-27 13:48:02 UTC
State Changed
From-To: open->feedback

===> Building package for kmess-2.0.6.2 
2471 	Deleting kmess-2.0.6.2 
2472 	================================================================ 
2473 	 
2474 	=== Checking filesystem state 
2475 	list of files present before this port was installed but missing after it was deinstalled) 
2476 	./usr/local/kde4/share/emoticons missing 
2477 	./usr/local/kde4/share/sounds missing 
2478 	Deleting qt4-uic-4.8.2 
2479 	Deleting qt4-rcc-4.8.2 
2480 	Deleting qt4-qmake-4.8.2_3 
2481 	Deleting qca-ossl-2.0.0.b3_4 
2482 	Deleting kde-baseapps-4.8.4 
2483 	pkg_delete: unable to completely remove directory '/usr/local/kde4/share/apps/konqueror/pics' 
2484 	pkg_delete: couldn't entirely delete package (perhaps the packing list is 
2485 	incorrectly specified?)
Comment 6 Axel Gonzalez 2012-07-28 20:23:04 UTC
2476 	./usr/local/kde4/share/emoticons missing
2477 	./usr/local/kde4/share/sounds missing

Ok removed those dirs, and also removed the other dirs installed by
kdehier

2483 	pkg_delete: unable to completely remove directory
'/usr/local/kde4/share/apps/konqueror/pics'

This is not installed by this port, my guess is kde-baseapps-4.8.4

The new patch is attached


I'd also like to add a new patch, that fixes a crash with qt 4.8
and disconnect or loss of network.

The patch is attached, goes in files/

The error, and the patch is from here:
http://kmess.org/board/viewtopic.php?f=4&t=22533

Sorry for the late patch, but I discovered it after I sent the PR.


Thanks!
Comment 7 Michael Scheidell freebsd_committer freebsd_triage 2012-07-30 18:31:03 UTC
Ok, see your new patch, testing in tinderbox.

as a request always run 'portlint -abmt' and fix what you can.

as an example:

portlint -abmt
WARN: /dumpster/home/scheidell/ports/ports/net-im/kmess-kde4/pkg-plist: 
[2]: installing shared libraries, please define USE_LDCONFIG as appropriate

this means that someone who adds a package or installs this, can't use 
this library patch (ldconfig) without running service ldconfig start.

(use_ldconfig will fix this)

(some of the docsafe stuff is up to you to decide if you want to fix it, 
and the dirrmtry, stuff is normally just noise)

I will add to makefile and test in tinderbox.


-- 
Michael Scheidell, CTO
 >*| * SECNAP Network Security Corporation
d: +1.561.948.2259
w: http://people.freebsd.org/~scheidell
Comment 8 Michael Scheidell freebsd_committer freebsd_triage 2012-07-30 19:31:00 UTC
syncer@gmail.com (maintainer), please approve.
Builds fine in tinderbox, 7.4 i386, 9.0, amd64.
-- 
Michael Scheidell, CTO
SECNAP Network Security Corporation
http://people.freebsd.org/~scheidell

______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.spammertrap.com/
______________________________________________________________________  
  
Comment 9 Mina R Waheeb 2012-07-30 19:50:39 UTC
Sorry for delay. But I'm traveling and there no machine to test. If it pass
tinder build please commit there is nothing major.

Thank you,
Mina R. Waheeb

On Jul 30, 2012, at 8:31 PM, Michael Scheidell <scheidell@freebsd.org>
wrote:

syncer@gmail.com (maintainer), please approve.
Builds fine in tinderbox, 7.4 i386, 9.0, amd64.
-- 
Michael Scheidell, CTO
SECNAP Network Security Corporation
http://people.freebsd.org/~scheidell

______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r).
For Information please see http://www.spammertrap.com/
______________________________________________________________________

<patch.txt>
Comment 10 dfilter service freebsd_committer freebsd_triage 2012-07-30 19:54:37 UTC
Author: scheidell
Date: Mon Jul 30 18:54:25 2012
New Revision: 301738
URL: http://svn.freebsd.org/changeset/ports/301738

Log:
  - Update to 2.0.6.2
  - Remove files/patch-soap (fixed upstream)
  
  PR:		ports/169623
  Submitted by:	Axel Gonzalez <loox@e-shell.net>
  Approved by:	Mina R Waheeb <syncer@gmail.com> (maintainer)

Added:
  head/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp   (contents, props changed)
Deleted:
  head/net-im/kmess-kde4/files/patch-soap
Modified:
  head/net-im/kmess-kde4/Makefile   (contents, props changed)
  head/net-im/kmess-kde4/distinfo   (contents, props changed)
  head/net-im/kmess-kde4/pkg-plist   (contents, props changed)

Modified: head/net-im/kmess-kde4/Makefile
==============================================================================
--- head/net-im/kmess-kde4/Makefile	Mon Jul 30 18:45:28 2012	(r301737)
+++ head/net-im/kmess-kde4/Makefile	Mon Jul 30 18:54:25 2012	(r301738)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	2.0.6.1
-PORTREVISION=	3
+PORTVERSION=	2.0.6.2
 CATEGORIES=	net-im kde
 MASTER_SITES=	SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
 
@@ -18,6 +17,7 @@ LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
 BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
+USE_LDCONFIG=	${PREFIX}/lib/kde4
 LATEST_LINK=	${PORTNAME}-kde4
 MAKE_JOBS_SAFE=	yes
 

Modified: head/net-im/kmess-kde4/distinfo
==============================================================================
--- head/net-im/kmess-kde4/distinfo	Mon Jul 30 18:45:28 2012	(r301737)
+++ head/net-im/kmess-kde4/distinfo	Mon Jul 30 18:54:25 2012	(r301738)
@@ -1,2 +1,2 @@
-SHA256 (kmess-2.0.6.1.tar.bz2) = f41b09fb0a2fbbd3b3748267bed7e95e6fbd6f1391f603345f4de76a020dfaa4
-SIZE (kmess-2.0.6.1.tar.bz2) = 3187173
+SHA256 (kmess-2.0.6.2.tar.bz2) = d6af80d2144d3b859b46bc3aa18eaecb1329f1782bf165bda5617a92ec8a6a8e
+SIZE (kmess-2.0.6.2.tar.bz2) = 3170329

Added: head/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp	Mon Jul 30 18:54:25 2012	(r301738)
@@ -0,0 +1,12 @@
+--- src/model/contactlistmodelitem.cpp.orig	2012-07-03 01:35:16.000000000 -0500
++++ src/model/contactlistmodelitem.cpp	2012-07-03 01:35:50.000000000 -0500
+@@ -79,7 +79,8 @@
+  */
+ ContactListModelItem::~ContactListModelItem()
+ {
+-  qDeleteAll( childItems_ );
++  while( !childItems_.isEmpty() )
++    delete childItems_.takeFirst();
+   childItems_.clear();
+ 
+   // Delete this item from the parent's children

Modified: head/net-im/kmess-kde4/pkg-plist
==============================================================================
--- head/net-im/kmess-kde4/pkg-plist	Mon Jul 30 18:45:28 2012	(r301737)
+++ head/net-im/kmess-kde4/pkg-plist	Mon Jul 30 18:54:25 2012	(r301738)
@@ -216,21 +216,21 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@dirrm share/emoticons/KMess-new/
-@dirrm share/doc/HTML/en/kmess/
-@dirrm share/apps/kmess/styles/Pure/
-@dirrm share/apps/kmess/styles/Fresh/
-@dirrm share/apps/kmess/styles/Fresh-dark/
-@dirrm share/apps/kmess/styles/Efficient/
-@dirrm share/apps/kmess/styles/Dim/
-@dirrm share/apps/kmess/styles/Colourful-Enclosed/
-@dirrm share/apps/kmess/styles/Classic/
-@dirrm share/apps/kmess/styles/Classic-compact/
-@dirrm share/apps/kmess/styles/
-@dirrm share/apps/kmess/pics/
-@dirrm share/apps/kmess/icons/hicolor/16x16/apps/
-@dirrm share/apps/kmess/icons/hicolor/16x16/actions/
-@dirrm share/apps/kmess/icons/hicolor/16x16/
-@dirrm share/apps/kmess/icons/hicolor/
-@dirrm share/apps/kmess/icons/
-@dirrm share/apps/kmess/
+@dirrm share/emoticons/KMess-new
+@dirrm share/doc/HTML/en/kmess
+@dirrm share/apps/kmess/styles/Pure
+@dirrm share/apps/kmess/styles/Fresh-dark
+@dirrm share/apps/kmess/styles/Fresh
+@dirrm share/apps/kmess/styles/Efficient
+@dirrm share/apps/kmess/styles/Dim
+@dirrm share/apps/kmess/styles/Colourful-Enclosed
+@dirrm share/apps/kmess/styles/Classic-compact
+@dirrm share/apps/kmess/styles/Classic
+@dirrm share/apps/kmess/styles
+@dirrm share/apps/kmess/pics
+@dirrm share/apps/kmess/icons/hicolor/16x16/apps
+@dirrm share/apps/kmess/icons/hicolor/16x16/actions
+@dirrm share/apps/kmess/icons/hicolor/16x16
+@dirrm share/apps/kmess/icons/hicolor
+@dirrm share/apps/kmess/icons
+@dirrm share/apps/kmess
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 11 Michael Scheidell freebsd_committer freebsd_triage 2012-07-30 19:54:41 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!