packages: gnet/gnet.spec, gnet/gnet-move_define.patch (NEW) - 'move_define'...

[jajcus]

Author: jajcus                       Date: Fri May  6 08:37:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 'move_define' patch from Debian, fixing build when check-devel is installed

---- Files affected:
packages/gnet:
   gnet.spec (1.53 -> 1.54) , gnet-move_define.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnet/gnet.spec
diff -u packages/gnet/gnet.spec:1.53 packages/gnet/gnet.spec:1.54
--- packages/gnet/gnet.spec:1.53	Sat Jan 29 01:06:33 2011
+++ packages/gnet/gnet.spec	Fri May  6 10:36:56 2011
@@ -9,6 +9,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	93327d2fca333d7e54ba2cf54e071165
 Patch0:		%{name}-nolibs.patch
+Patch1:		%{name}-move_define.patch
 URL:		http://gnetlibrary.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -72,6 +73,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # don't BR glib-devel
 echo -e 'AC_DEFUN([AM_PATH_GLIB], [$3\n:])' >> acinclude.m4
@@ -127,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2011/05/06 08:36:56  jajcus
+- 'move_define' patch from Debian, fixing build when check-devel is installed
+
 Revision 1.53  2011/01/29 00:06:33  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/gnet/gnet-move_define.patch
diff -u /dev/null packages/gnet/gnet-move_define.patch:1.1
--- /dev/null	Fri May  6 10:37:02 2011
+++ packages/gnet/gnet-move_define.patch	Fri May  6 10:36:56 2011
@@ -0,0 +1,26 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569378
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Move the define before using it to fix a build failure.
+
+diff -ruNp gnet-2.0.8/tests/check/gnetcheck.h gnet-2.0.8.new/tests/check/gnetcheck.h
+--- gnet-2.0.8/tests/check/gnetcheck.h	2008-02-03 13:04:41.000000000 +0100
++++ gnet-2.0.8.new/tests/check/gnetcheck.h	2010-03-06 19:23:28.000000000 +0100
+@@ -310,6 +310,8 @@ int main (int argc, char **argv)				\
+ 
+ gboolean _gnet_check_run_test_func (const gchar * func_name);
+ 
++#define _tcase_add_test  __gnet_tcase_add_test
++
+ static inline void
+ __gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
+     int sig, int start, int end)
+@@ -319,8 +321,6 @@ __gnet_tcase_add_test (TCase * tc, TFun
+   }
+ }
+ 
+-#define _tcase_add_test  __gnet_tcase_add_test
+-
+ G_END_DECLS
+ 
+ #endif /* __GNET_CHECK_H__ */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnet/gnet.spec?r1=1.53&r2=1.54&f=u