Merge a patch from usptream.

Use our libtool.
Still BROKEN.
This commit is contained in:
ajacoutot 2014-03-30 14:31:56 +00:00
parent c3aa4f62e3
commit f61e483286
2 changed files with 19 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2013/12/08 15:06:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2014/03/30 14:31:56 ajacoutot Exp $
BROKEN= runtime issue (threads related?)
@ -43,10 +43,7 @@ LIB_DEPENDS= devel/libgtop2 \
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_TOOLS= yelp
MODGNOME_LDFLAGS= -Wl,-rpath,${TRUEPREFIX}/lib/nemiver
# XXX our libtool(1) does not like to link against unversioned SOLIBS
USE_LIBTOOL= gnu
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_ARGS= --disable-static \

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_common_nmv-ustring_cc,v 1.1 2014/03/30 14:31:56 ajacoutot Exp $
From 6b0d5a76ee2060e233edf1e2a49cdc5269b34ddc Mon Sep 17 00:00:00 2001
From: Fabien Parent <parent.f@gmail.com>
Date: Mon, 28 Oct 2013 14:57:00 +0000
Subject: 710828 Fix a condition in UString::is_integer
--- src/common/nmv-ustring.cc.orig Mon Jan 21 13:05:35 2013
+++ src/common/nmv-ustring.cc Sun Mar 30 10:43:55 2014
@@ -136,7 +136,7 @@ UString::is_integer () const
for (UString::size_type i = 0; i < size (); ++i) {
c = (*this)[i];
- if (c < '0' && c > '9') {
+ if (c < '0' || c > '9') {
return false;
}
}