OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2005 21:15:21
Branch: OPENPKG_2_5_SOLID Handle: 2005101420152100
Added files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/giftcurs giftcurs.patch
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/giftcurs giftcurs.spec
Log:
MFC: fix building under FreeBSD/amd64 and similar different platforms
Summary:
Revision Changes Path
1.1.2.1 +42 -0 openpkg-src/giftcurs/giftcurs.patch
1.6.4.2 +3 -1 openpkg-src/giftcurs/giftcurs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/giftcurs/giftcurs.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 giftcurs.patch
--- /dev/null 2005-10-14 21:15:21 +0200
+++ giftcurs.patch 2005-10-14 21:15:21 +0200
@@ -0,0 +1,42 @@
+Index: src/ui_draw.c
+--- src/ui_draw.c.orig 2003-11-16 17:15:36 +0100
++++ src/ui_draw.c 2005-10-14 21:12:03 +0200
+@@ -83,7 +83,7 @@
+ g_free(s);
+ }
+
+-G_INLINE_FUNC int selection_color(int selected, int color)
++static int selection_color(int selected, int color)
+ {
+ if (INVERT_SEL)
+ return selected ? COLOR_PAIR(color) | A_REVERSE :
COLOR_PAIR(color);
+@@ -91,7 +91,7 @@
+ return selected ? COLOR_PAIR(COLOR_SELECTION) | A_BOLD :
COLOR_PAIR(color);
+ }
+
+-G_INLINE_FUNC int selection_color_special(int selected, int color)
++static int selection_color_special(int selected, int color)
+ {
+ if (INVERT_SEL)
+ return selected ? COLOR_PAIR(color) | A_REVERSE :
COLOR_PAIR(color);
+Index: src/xcommon.c
+--- src/xcommon.c.orig 2003-06-30 14:31:03 +0200
++++ src/xcommon.c 2005-10-14 21:12:33 +0200
+@@ -38,7 +38,7 @@
+
+ #include "xcommon.h"
+
+-G_INLINE_FUNC int xconnect_unix(const char *hostname, const char *path)
++static int xconnect_unix(const char *hostname, const char *path)
+ {
+ #ifdef AF_UNIX
+ int sock;
+@@ -64,7 +64,7 @@
+ #endif
+ }
+
+-G_INLINE_FUNC int xconnect_ip(const char *hostname, const char *port)
++static int xconnect_ip(const char *hostname, const char *port)
+ {
+ int sock;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/giftcurs/giftcurs.spec
============================================================================
$ cvs diff -u -r1.6.4.1 -r1.6.4.2 giftcurs.spec
--- openpkg-src/giftcurs/giftcurs.spec 11 Oct 2005 12:50:07 -0000
1.6.4.1
+++ openpkg-src/giftcurs/giftcurs.spec 14 Oct 2005 19:15:21 -0000
1.6.4.2
@@ -37,6 +37,7 @@
# list of sources
Source0:
http://savannah.nongnu.org/download/giftcurs/giFTcurs-%{version}.tar.gz
+Patch0: giftcurs.patch
# build information
Prefix: %{l_prefix}
@@ -62,11 +63,12 @@
%prep
%setup -q -n giFTcurs-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags ncurses}" \
+ CPPFLAGS="%{l_cppflags ncurses .}" \
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
