Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Dec 2016 17:51:10 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429805 - in head/science/gchemutils: . files
Message-ID:  <201612281751.uBSHpARd021772@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Dec 28 17:51:10 2016
New Revision: 429805
URL: https://svnweb.freebsd.org/changeset/ports/429805

Log:
  - Add LICENSE
  - Switch to USES=localbase
  - Unbreak on 11+ by backporting upstream revision 2055
  
  Approved by:	portmgr blanket

Added:
  head/science/gchemutils/files/patch-libs_gccv_text.cc   (contents, props changed)
Modified:
  head/science/gchemutils/Makefile

Modified: head/science/gchemutils/Makefile
==============================================================================
--- head/science/gchemutils/Makefile	Wed Dec 28 17:50:02 2016	(r429804)
+++ head/science/gchemutils/Makefile	Wed Dec 28 17:51:10 2016	(r429805)
@@ -10,6 +10,9 @@ DISTNAME=	gnome-chemistry-utils-${PORTVE
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	C++ classes and Gtk3 widgets related to chemistry
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:science/bodr \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
@@ -20,16 +23,12 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgcon
 
 PORTSCOUT=	limitw:1,even
 
-BROKEN_aarch64=	Fails to compile: error: call to abs is ambiguous
-
 USE_XORG=	x11
 USE_GNOME=	gnomedocutils gtk30 intlhack libgsf libxml2
-USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
-		pkgconfig shared-mime-info tar:xz
+USES=		desktop-file-utils gettext gmake libtool:keepla localbase:ldflags \
+		pathfix pkgconfig shared-mime-info tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes

Added: head/science/gchemutils/files/patch-libs_gccv_text.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/gchemutils/files/patch-libs_gccv_text.cc	Wed Dec 28 17:51:10 2016	(r429805)
@@ -0,0 +1,26 @@
+--- libs/gccv/text.cc	2016/03/26 17:11:08	2017
++++ libs/gccv/text.cc	2016/10/31 07:44:34	2055
+@@ -1213,7 +1213,10 @@
+ 	case GDK_KEY_Delete:
+ 	case GDK_KEY_KP_Delete: {
+ 		if (m_CurPos != m_StartSel) {
+-			ReplaceText (empty_st, MIN (m_CurPos, m_StartSel), abs (m_CurPos - m_StartSel));
++			if (m_CurPos > m_StartSel)
++				ReplaceText (empty_st, m_StartSel, m_CurPos - m_StartSel);
++			else 
++				ReplaceText (empty_st, m_CurPos, m_StartSel - m_CurPos);
+ 			if (client)
+ 				client->TextChanged (m_CurPos);
+ 			break;
+@@ -1233,7 +1236,10 @@
+ 		break;
+ 	case GDK_KEY_BackSpace: {
+ 		if (m_CurPos != m_StartSel) {
+-			ReplaceText (empty_st, MIN (m_CurPos, m_StartSel), abs (m_CurPos - m_StartSel));
++			if (m_CurPos > m_StartSel)
++				ReplaceText (empty_st, m_StartSel, m_CurPos - m_StartSel);
++			else 
++				ReplaceText (empty_st, m_CurPos, m_StartSel - m_CurPos);
+ 			if (client)
+ 				client->TextChanged (m_CurPos);
+ 			break;



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