cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build after libiconv 1.12 update; ok ajacoutot@

Browse Source
This commit is contained in:
naddy 2008-05-28 20:05:14 +00:00
parent 909d90be37
commit d0768598fe
8 changed files with 20 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/abiword/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.66 2008/02/20 01:17:53 merdely Exp $
# $OpenBSD: Makefile,v 1.67 2008/05/28 20:05:14 naddy Exp $
COMMENT= free cross-platform WYSIWYG word processor
VERSION= 2.4.6
MAJORVER= ${VERSION:C/..$//}
DISTNAME= abiword-${VERSION}
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= editors
HOMEPAGE= http://www.abisource.com/

12
editors/abiword/patches/patch-abi_src_af_util_xp_ut_iconv_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abi_src_af_util_xp_ut_iconv_cpp,v 1.4 2008/05/28 20:05:14 naddy Exp $
--- abi/src/af/util/xp/ut_iconv.cpp.orig Mon May 26 16:01:29 2008
+++ abi/src/af/util/xp/ut_iconv.cpp Mon May 26 16:02:07 2008
@@ -67,7 +67,7 @@ extern "C" {
#if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \
(defined (__MACH__) && defined (__APPLE__)) || \
(defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
-defined (__AIX__) || defined(__OpenBSD__) || \
+defined (__AIX__) || \
(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
#define ICONV_CONST const

4
games/pokerth/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2008/05/26 10:39:49 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2008/05/28 20:05:14 naddy Exp $
COMMENT= Qt4 poker game with online capabilities
V= 0.6.2
DISTNAME= PokerTH-${V}-src
PKGNAME= pokerth-${V}
PKGNAME= pokerth-${V}p0
CATEGORIES= games x11
HOMEPAGE= http://www.pokerth.net/

25
games/pokerth/patches/patch-src_core_linux_convhelper_cpp
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_core_linux_convhelper_cpp,v 1.1.1.1 2008/04/08 09:51:15 ajacoutot Exp $
--- src/core/linux/convhelper.cpp.orig Wed Mar 12 10:37:20 2008
+++ src/core/linux/convhelper.cpp Mon Apr 7 19:37:43 2008
@@ -37,8 +37,8 @@ ConvHelper::NativeToUtf8(const std::string &inStr)
{
string retStr(inStr);
size_t insize = inStr.length();
-#ifdef __APPLE__
- const char *inbuf = inStr.data();
+#if defined(__APPLE__) || defined(__OpenBSD__)
+ const char* inbuf = (char*)inStr.data();
#else
char *inbuf = const_cast<char *>(inStr.data());
#endif
@@ -72,8 +72,8 @@ ConvHelper::Utf8ToNative(const std::string &inStr)
{
string retStr(inStr);
size_t insize = inStr.length();
-#ifdef __APPLE__
- const char *inbuf = inStr.data();
+#if defined(__APPLE__) || defined(__OpenBSD__)
+ const char* inbuf = (char*)inStr.data();
#else
char *inbuf = const_cast<char *>(inStr.data());
#endif

3
multimedia/k3b/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
# $OpenBSD: Makefile,v 1.2 2008/05/28 20:05:14 naddy Exp $
SHARED_ONLY = Yes
COMMENT = CD/DVD creator
DISTNAME = k3b-1.0.4
PKGNAME = ${DISTNAME}p0
SHARED_LIBS = k3b 0.0 # 3.0
SHARED_LIBS += k3bdevice 0.0 # 5.0

21
multimedia/k3b/patches/patch-src_projects_k3bencodingconverter_cpp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_projects_k3bencodingconverter_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
--- src/projects/k3bencodingconverter.cpp.orig Thu Jan 17 17:43:00 2008
+++ src/projects/k3bencodingconverter.cpp Thu Jan 17 17:45:16 2008
@@ -62,7 +62,7 @@ bool K3bEncodingConverter::encodedLocally( const QCStr
{
#ifdef HAVE_ICONV_H
QCString utf8Encoded( s.length()*2 );
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
const char* in = s.data();
#else
char* in = s.data();
@@ -111,7 +111,7 @@ bool K3bEncodingConverter::convert( const QCString& s,
iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() );
result.resize( s.length() * 2 );
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
const char* in = s.data();
#else
char* in = s.data();

4
x11/icewm/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2008/04/14 14:18:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.34 2008/05/28 20:05:14 naddy Exp $
COMMENT= small, fast window manager
DISTNAME= icewm-1.2.35
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://www.icewm.org/

13
x11/icewm/patches/patch-src_ylocale_cc
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_ylocale_cc,v 1.1 2008/04/09 10:15:36 ajacoutot Exp $
--- src/ylocale.cc.orig Wed Apr 9 12:02:08 2008
+++ src/ylocale.cc Wed Apr 9 12:02:44 2008
@@ -149,7 +149,8 @@ YUChar *YLocale::unicodeString(const YLChar *lStr, siz
return NULL;
YUChar * uStr(new YUChar[lLen + 1]);
- char * inbuf((char *) lStr), * outbuf((char *) uStr);
+ const char * inbuf((char *) lStr);
+ char * outbuf((char *) uStr);
size_t inlen(lLen), outlen(4 * lLen);
if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))