Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Mar 2020 06:41:25 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528687 - in head/devel/dee: . files
Message-ID:  <202003190641.02J6fP5W060654@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Thu Mar 19 06:41:25 2020
New Revision: 528687
URL: https://svnweb.freebsd.org/changeset/ports/528687

Log:
  Add an upstream patch to fix build with Clang 10.0.
  
  Note PORTREVISION is bumped because the patch actually fixes a bug.
  
  https://bugs.launchpad.net/dee/+bug/1579529
  https://bazaar.launchpad.net/~unity-team/dee/trunk/revision/439

Added:
  head/devel/dee/files/patch-src_dee-serializable-model.c   (contents, props changed)
  head/devel/dee/files/patch-src_dee-transaction.c
     - copied, changed from r528686, head/devel/dee/files/patch-src__dee-transaction.c
Deleted:
  head/devel/dee/files/patch-src__dee-transaction.c
Modified:
  head/devel/dee/Makefile

Modified: head/devel/dee/Makefile
==============================================================================
--- head/devel/dee/Makefile	Thu Mar 19 06:26:57 2020	(r528686)
+++ head/devel/dee/Makefile	Thu Mar 19 06:41:25 2020	(r528687)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dee
 PORTVERSION=	1.2.7
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/

Added: head/devel/dee/files/patch-src_dee-serializable-model.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/dee/files/patch-src_dee-serializable-model.c	Thu Mar 19 06:41:25 2020	(r528687)
@@ -0,0 +1,15 @@
+--- src/dee-serializable-model.c.orig	2013-09-16 18:21:20 UTC
++++ src/dee-serializable-model.c
+@@ -1327,8 +1327,10 @@ dee_serializable_model_get_position (DeeModel     *sel
+   pos = 0;
+   _iter = dee_model_get_first_iter (self);
+   while (!dee_model_is_last (self, iter) && iter != _iter)
+-    _iter = dee_model_next (self, _iter);
+-    pos++;
++    {
++      _iter = dee_model_next (self, _iter);
++      pos++;
++    }
+ 
+   if (iter == _iter)
+     return pos;

Copied and modified: head/devel/dee/files/patch-src_dee-transaction.c (from r528686, head/devel/dee/files/patch-src__dee-transaction.c)
==============================================================================
--- head/devel/dee/files/patch-src__dee-transaction.c	Thu Mar 19 06:26:57 2020	(r528686, copy source)
+++ head/devel/dee/files/patch-src_dee-transaction.c	Thu Mar 19 06:41:25 2020	(r528687)
@@ -1,5 +1,5 @@
---- src/dee-transaction.c.orig	2012-11-28 09:46:41.000000000 +0100
-+++ src/dee-transaction.c	2016-01-17 15:50:39.997965000 +0100
+--- src/dee-transaction.c.orig	2012-11-28 08:46:41 UTC
++++ src/dee-transaction.c
 @@ -233,7 +233,7 @@ journal_iter_free (JournalIter *jiter)
    g_slice_free (JournalIter, jiter);
  }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003190641.02J6fP5W060654>