Revision: 15034
http://gar.svn.sourceforge.net/gar/?rev=15034&view=rev
Author: dmichelsen
Date: 2011-07-10 11:12:47 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
libgadu: Intermediate update, tests failing
Modified Paths:
--------------
csw/mgar/pkg/libgadu/trunk/Makefile
csw/mgar/pkg/libgadu/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch
csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch
Removed Paths:
-------------
csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend
csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec
csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype
Property Changed:
----------------
csw/mgar/pkg/libgadu/trunk/
Property changes on: csw/mgar/pkg/libgadu/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/libgadu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-10 10:47:40 UTC (rev 15033)
+++ csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-10 11:12:47 UTC (rev 15034)
@@ -1,28 +1,49 @@
+# TBD:
+# - There are tests failing, this is serious as some fields seem to have the
wrong size:
+#
+# File: script/00-login.scr, Line: 45
+# Invalid data length 150 vs expected 147
+#
+# 0000: 31 00 00 00 8e 00 00 00 56 34 12 00 70 6c 01 09 1.......V4..pl..
+# 0010: ad 7d 58 00 00 00 00 00 00 00 00 00 00 00 00 00 .}X.............
+# 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+# 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+# 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+# 0050: 16 00 00 00 44 33 22 11 37 27 00 00 00 00 00 00 ....D3".7'......
+# 0060: 00 00 00 00 00 00 00 00 00 00 ff 64 1e 00 00 00 ...........d....
+# 0070: 47 61 64 75 2d 47 61 64 75 20 43 6c 69 65 6e 74 Gadu-Gadu Client
+# 0080: 20 42 75 69 6c 64 20 31 2e 32 2e 33 2e 34 04 00 Build 1.2.3.4..
+# 0090: 00 00 54 65 73 74 ..Test
+#
+# expect data (
+# 31 00 00 00, auto, 56 34 12 00, "pl", 01, 09 -> OK
+# ad 7d 58 00*60, -> too long by 1
+# 16 00 00 00, 44 33 22 11, 37 27 00 00, 00 00 00 00, -> OK
+# 00 00, 00 00 00 00, 00 00, ff, 64, 1e 00 00 00, -> too long by 2
+# "Gadu-Gadu", 20, "Client", -> OK
+# 20, "Build", 20, "1.2.3.4", 04 00 -> OK
+# 00 00, "Test") -> OK
+#
+
NAME = libgadu
-VERSION = 1.8.2
-GARTYPE = v1
+#
+VERSION = 1.11.0
+GARTYPE = v2
CATEGORIES = lib
-SPKG_SOURCEURL = http://toxygen.net/libgadu
-#Need to use either gcc or studio 12 with -features=extensions
-GARCOMPILER = GNU
-
DESCRIPTION = Gadu-Gadu protocol implementation library
MASTER_SITES = http://toxygen.net/libgadu/files/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWlibgadu,depend prototype)
+DISTFILES = $(DISTNAME).tar.gz
-#No tests
-TEST_SCRIPTS =
+PATCHFILES += 0001-Use-127.0.0.1-for-localhost-or-fail.patch
+PATCHFILES += 0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch
-# We define upstream file regex so we can be notifed of new upstream software
release
-UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://toxygen.net/libgadu
-# If the url used to check for software update is different of MASTER_SITES,
then
-# uncomment the next line. Otherwise it is set by default to the value of
MASTER_SITES
-# UPSTREAM_MASTER_SITES =
+# There are zero-sized structs
+EXTRA_CFLAGS += -features=extensions
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
include gar/category.mk
Modified: csw/mgar/pkg/libgadu/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgadu/trunk/checksums 2011-07-10 10:47:40 UTC (rev
15033)
+++ csw/mgar/pkg/libgadu/trunk/checksums 2011-07-10 11:12:47 UTC (rev
15034)
@@ -1,4 +1 @@
-f64d4d0222c7adf37aed7a8ef98059a7 download/CSWlibgadu.depend
-c5145da14173d6e111f8b45ef8510f3a download/CSWlibgadu.gspec
-dff83971a51fe7177617fb3dbc749757 download/CSWlibgadu.prototype
-1090f82f8a1bb99e9cdf5853188f625f download/libgadu-1.8.2.tar.gz
+c779891298ce5d081c1e871e1e5b256d libgadu-1.11.0.tar.gz
Added:
csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch
===================================================================
---
csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch
(rev 0)
+++
csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch
2011-07-10 11:12:47 UTC (rev 15034)
@@ -0,0 +1,25 @@
+From 800a93c29e829ad9b715880d51506544a6dc90c6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Sun, 10 Jul 2011 12:25:25 +0200
+Subject: [PATCH 1/2] Use 127.0.0.1 for localhost or fail
+
+---
+ test/automatic/protocol.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/automatic/protocol.c b/test/automatic/protocol.c
+index d04219e..6eaa081 100644
+--- a/test/automatic/protocol.c
++++ b/test/automatic/protocol.c
+@@ -17,7 +17,7 @@
+
+ #include "script.h"
+
+-#define LOCALHOST "127.0.67.67"
++#define LOCALHOST "127.0.0.1"
+ #define LOCALPORT 17219
+
+ #define debug(msg...) \
+--
+1.7.6
+
Added:
csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch
===================================================================
---
csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch
(rev 0)
+++
csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch
2011-07-10 11:12:47 UTC (rev 15034)
@@ -0,0 +1,39 @@
+From 2962c7258aa0128a478b4814449f75b75b5d6d7f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Sun, 10 Jul 2011 12:27:02 +0200
+Subject: [PATCH 2/2] Do not forcefully set CFLAGS to gcc-specific stuff
+
+---
+ test/automatic/Makefile.am | 2 --
+ test/automatic/Makefile.in | 2 +-
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/test/automatic/Makefile.am b/test/automatic/Makefile.am
+index a032342..8d4be7c 100644
+--- a/test/automatic/Makefile.am
++++ b/test/automatic/Makefile.am
+@@ -2,8 +2,6 @@ TESTS = convert message2 message1 $(OPTIONAL_TESTS_GLIBC)
$(OPTIONAL_TESTS_PERL)
+ check_PROGRAMS = convert message2 message1 $(OPTIONAL_TESTS_GLIBC)
$(OPTIONAL_TESTS_PERL)
+ EXTRA_PROGRAMS = convert message2 message1 connect packet resolver protocol
+
+-CFLAGS = -Wall -ggdb -DGG_IGNORE_DEPRECATED
+-
+ protocol_SOURCES = protocol.c
+ nodist_protocol_SOURCES = script/script.c
+ protocol_CFLAGS = -Iscript
+diff --git a/test/automatic/Makefile.in b/test/automatic/Makefile.in
+index 1185a8f..b1bf94e 100644
+--- a/test/automatic/Makefile.in
++++ b/test/automatic/Makefile.in
+@@ -169,7 +169,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -Wall -ggdb -DGG_IGNORE_DEPRECATED
++CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+--
+1.7.6
+
Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend
===================================================================
--- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2011-07-10 10:47:40 UTC
(rev 15033)
+++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2011-07-10 11:12:47 UTC
(rev 15034)
@@ -1,2 +0,0 @@
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWgcc3corert gcc3corert - GNU C Compiler Run Time
Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec
===================================================================
--- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2011-07-10 10:47:40 UTC
(rev 15033)
+++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2011-07-10 11:12:47 UTC
(rev 15034)
@@ -1,4 +0,0 @@
-%var bitname libgadu
-%var pkgname CSWlibgadu
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype
===================================================================
--- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2011-07-10
10:47:40 UTC (rev 15033)
+++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2011-07-10
11:12:47 UTC (rev 15034)
@@ -1,8 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/libgadu.pc 0644 root bin
-s none /opt/csw/lib/libgadu.so.3=libgadu.so.3.9.0
-f none /opt/csw/lib/libgadu.so.3.9.0 0755 root bin
-s none /opt/csw/lib/libgadu.so=libgadu.so.3.9.0
-d none /opt/csw/include 0755 root bin
-f none /opt/csw/include/libgadu.h 0644 root bin
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
