[Frugalware-git] frugalware-current: wvstreams-4.4.1-1-x86_64

Christian Hamar alias krix krics at linuxforum.hu
Sat Nov 3 15:36:02 CET 2007


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a588a50c4e0321f49c9ae25fd0cea917dfd9486

commit 4a588a50c4e0321f49c9ae25fd0cea917dfd9486
Author: Christian Hamar alias krix <krics at linuxforum.hu>
Date:   Sat Nov 3 15:34:55 2007 +0100

wvstreams-4.4.1-1-x86_64
* Version bump
* Deleted old patches
* Bring fresh patches (from gentoo)
* Fixed SBU

diff --git a/source/network/wvstreams/FrugalBuild b/source/network/wvstreams/FrugalBuild
index 583eed1..da9e07c 100644
--- a/source/network/wvstreams/FrugalBuild
+++ b/source/network/wvstreams/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling Time: 0.01 SBU
+# Compiling Time: 0.85 SBU
# Maintainer: Christian Hamar alias krix <krics at linuxforum.hu>
# Contributor: Karoly CZOVEK <slinky at rei.keni.hu>

pkgname=wvstreams
-pkgver=4.2.2
+pkgver=4.4.1
pkgrel=1
pkgdesc="A network programming library in C++"
groups=('network')
@@ -13,17 +13,25 @@ makedepends=('qt' 'tcl' 'tk')
url="http://alumnit.ca/wiki/?DownloadReleases"
up2date="lynx -dump -nolist 'http://alumnit.ca/wiki/?DownloadReleases'|grep 'wvstreams-\(.*\).tar.gz'|sed 's/.*-\(.*\).tar.*$/\1/'"
source=(http://wvstreams.googlecode.com/files/$pkgname-$pkgver.tar.gz \
-	wvstreams-4.2.2-linux-serial.patch \
-	wvstreams-4.2.2-wireless-user.patch \
-	wvstreams-4.2.2-MOC-fix.patch \
wvstreams-4.2.2-tcl_8_4.patch \
-	wvstreams-4.2.2-external-xplc.patch)
-sha1sums=('a44a9ded6339fb2c53eb472d0763e4cf6b0c0534' \
-	  '4ea60c31b55f0fdbc94803a6b588af83cad5de3a' \
-	  'f1bed39371eb648bc8fb4e6d64693c59003c7d91' \
-	  'af28e60552446b408c1751713d7e8b4cebb7a4c8' \
-	  '7503c63a29fde6a87d47257cc2bd3afceda6e841' \
-	  'd3480b6cd9a11e2415a0e259a3d93a6e64f26d73')
+	wvstreams-4.4-external-xplc.patch \
+	wvstreams-4.4-linux-serial.patch \
+	wvstreams-4.4-MOC-fix.patch \
+	wvstreams-4.4-sigaction.patch \
+	wvstreams-4.4-type-punned.patch \
+	wvstreams-4.4-uniconfd-ini.patch \
+	wvstreams-4.4-wireless-user.patch \
+	wvstreams-4.4-wvconfemu.patch)
+sha1sums=('1c84bb50f1528a4014f62c1bd645815fedea713a' \
+          '7503c63a29fde6a87d47257cc2bd3afceda6e841' \
+          '2e6d36d4249679e2ffa25f6bee9f191338e8a9ca' \
+          '8852774b47f941edbf24943b5895f3497ddc18c9' \
+          '2a9ea9c18329f6494c981cbc176e09a6e7b1b3ec' \
+          '7ca737f3faf5b611596d1f114dbc199a928425b5' \
+          '2e997401fb98fa70bd26a21f084fb3ec246044ba' \
+          '0823b65f5ef5c09b4446a0ed923fca438287c122' \
+          '0d6e3a6f78f9a2829ea2225f6f09b0ee5147e2f1' \
+          '33eeb9b0288f2d0ceedcbacf11ad10c4550c36cf')

build() {
Fcd
@@ -40,10 +48,10 @@ build() {
# Another braindead thing.
touch include/wvautoconf.h.in configure || Fdie

-	Fconf --localstatedir=/var --without-pam --with-xplc --with-qt=/usr/lib/qt \
+	Fconf --localstatedir=/var/lib --without-pam --with-xplc --with-qt=/usr/lib/qt \
--disable-debug --with-tcl
make CXXOPTS="$CXXFLAGS -fPIC" COPTS="$CFLAGS -fPIC" VERBOSE="1" || Fdie
Fmakeinstall
}

-# optimalization OK
+# optimization OK
diff --git a/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch b/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch
deleted file mode 100644
index 9ab381c..0000000
--- a/source/network/wvstreams/wvstreams-4.2.2-MOC-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur wvstreams-4.2.2.orig/wvrules.mk wvstreams-4.2.2/wvrules.mk
---- wvstreams-4.2.2.orig/wvrules.mk	2005-11-24 21:46:51.000000000 +0200
-+++ wvstreams-4.2.2/wvrules.mk	2006-02-03 21:26:59.439036250 +0200
-@@ -296,7 +296,7 @@
- %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
- %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
-
--%.moc: %.h;	moc -o $@ $<
-+%.moc: %.h;	$(MOC) -o $@ $<
-
- %: %.o;		$(call wvlink,$@,$^)
- %.t: %.t.o;	$(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
diff --git a/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch b/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch
deleted file mode 100644
index 40db380..0000000
--- a/source/network/wvstreams/wvstreams-4.2.2-external-xplc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur wvstreams-4.2.2.orig/configure.ac wvstreams-4.2.2/configure.ac
---- wvstreams-4.2.2.orig/configure.ac	2006-01-12 20:31:50.000000000 +0200
-+++ wvstreams-4.2.2/configure.ac	2006-02-03 21:24:41.546418500 +0200
-@@ -542,7 +542,6 @@
-
- # xplc
- if test "$with_xplc" != "no"; then
--    if test "$with_xplc" = ""; then
- 	if pkg-config --modversion xplc-${xplc_version}; then
-             WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
- 	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
-@@ -554,15 +553,6 @@
- 	else
- 	    with_xplc='no'
- 	fi
--    else
--        WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
--	WV_APPEND(LDFLAGS, [-L$with_xplc])
--	AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
--	LIBS_save="$LIBS"
--	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
--	LIBS="$LIBS_save"
--	xplc_pc="xplc-${xplc_version}"
--    fi
-     # What if we can't find it?
-     if test "$with_xplc" = "no" && test -d xplc; then
-         WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
-@@ -570,7 +560,7 @@
-         AC_CONFIG_SUBDIRS(xplc)
-         build_xplc=yes
-         with_xplc='$(WVSTREAMS)/xplc'
--	xplc_pc='wvxplc'
-+        xplc_pc='wvxplc'
-     fi
- fi
-
diff --git a/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch b/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch
deleted file mode 100644
index f5d5215..0000000
--- a/source/network/wvstreams/wvstreams-4.2.2-linux-serial.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur wvstreams-4.2.2.orig/streams/wvmodem.cc wvstreams-4.2.2/streams/wvmodem.cc
---- wvstreams-4.2.2.orig/streams/wvmodem.cc	2005-11-24 21:46:51.000000000 +0200
-+++ wvstreams-4.2.2/streams/wvmodem.cc	2006-02-03 21:17:54.993010500 +0200
-@@ -192,22 +192,22 @@
-     drain();
-
- #if HAVE_LINUX_SERIAL_H
--    struct serial_struct old_sinfo, sinfo;
--    sinfo.reserved_char[0] = 0;
--    if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
--	log("Cannot get information for serial port.");
--    else
--    {
--	sinfo = old_sinfo;
--	// Why there are two closing wait timeouts, is beyond me
--	// but there are... apparently the second one is deprecated
--	// but why take a chance...
--	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
--	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
--
--	if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
--	    log("Cannot set information for serial port.");
--    }
-+ 	if (getuid() == 0)
-+ 	{
-+     	struct serial_struct sinfo;
-+     	if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
-+     	{
-+     		// Why there are two closing wait timeouts, is beyond me
-+     		// but there are... apparently the second one is deprecated
-+     		// but why take a chance...
-+     		sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
-+     		sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
-+
-+     		//Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...)
-+			//see http://bugs.gentoo.org/show_bug.cgi?id=85754
-+			ioctl(getrfd(), TIOCSSERIAL, &sinfo);
-+ 		}
-+ 	}
- #endif
-
-     // set up the terminal characteristics.
diff --git a/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch b/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch
deleted file mode 100644
index cbb7f2d..0000000
--- a/source/network/wvstreams/wvstreams-4.2.2-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc wvstreams-4.2.2/linuxstreams/wvinterface.cc
---- wvstreams-4.2.2.orig/linuxstreams/wvinterface.cc	2005-11-24 21:46:47.000000000 +0200
-+++ wvstreams-4.2.2/linuxstreams/wvinterface.cc	2006-02-03 21:19:32.635112750 +0200
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <linux/sockios.h>
-
-+#include <linux/compiler.h>
- #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
- #include <linux/wireless.h>
-
diff --git a/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch b/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch
new file mode 100644
index 0000000..7f835d7
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-MOC-fix.patch
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk
+--- wvstreams-4.4.orig/wvrules.mk	2007-08-17 22:45:07.000000000 +0300
++++ wvstreams-4.4/wvrules.mk	2007-08-17 22:53:05.000000000 +0300
+@@ -294,7 +294,7 @@
+ %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
+ %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
+
+-%.moc: %.h;	moc -o $@ $<
++%.moc: %.h;	$(MOC) -o $@ $<
+
+ %: %.o;		$(call wvlink,$@,$^)
+ %.t: %.t.o;	$(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
diff --git a/source/network/wvstreams/wvstreams-4.4-external-xplc.patch b/source/network/wvstreams/wvstreams-4.4-external-xplc.patch
new file mode 100644
index 0000000..744c96b
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-external-xplc.patch
@@ -0,0 +1,36 @@
+diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac
+--- wvstreams-4.4.orig/configure.ac	2007-08-17 22:43:47.000000000 +0300
++++ wvstreams-4.4/configure.ac	2007-08-17 22:52:07.000000000 +0300
+@@ -488,7 +488,6 @@
+
+ # xplc
+ if test "$with_xplc" != "no"; then
+-    if test "$with_xplc" = ""; then
+ 	if pkg-config --modversion xplc-${xplc_version}; then
+             WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
+ 	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
+@@ -500,15 +499,6 @@
+ 	else
+ 	    with_xplc='no'
+ 	fi
+-    else
+-        WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
+-	WV_APPEND(LDFLAGS, [-L$with_xplc])
+-	AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
+-	LIBS_save="$LIBS"
+-	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
+-	LIBS="$LIBS_save"
+-	xplc_pc="xplc-${xplc_version}"
+-    fi
+     # What if we can't find it?
+     if test "$with_xplc" = "no" && test -d xplc; then
+         WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
+@@ -516,7 +506,7 @@
+         AC_CONFIG_SUBDIRS(xplc)
+         build_xplc=yes
+         with_xplc='$(WVSTREAMS)/xplc'
+-	xplc_pc='wvxplc'
++        xplc_pc='wvxplc'
+     fi
+ fi
+
diff --git a/source/network/wvstreams/wvstreams-4.4-linux-serial.patch b/source/network/wvstreams/wvstreams-4.4-linux-serial.patch
new file mode 100644
index 0000000..7b8fa08
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-linux-serial.patch
@@ -0,0 +1,42 @@
+diff -Nru wvstreams-4.4.orig/streams/wvmodem.cc wvstreams-4.4/streams/wvmodem.cc
+--- wvstreams-4.4.orig/streams/wvmodem.cc	2007-07-20 00:22:57.000000000 +0300
++++ wvstreams-4.4/streams/wvmodem.cc	2007-08-17 22:36:21.000000000 +0300
+@@ -194,22 +194,22 @@
+     drain();
+
+ #if HAVE_LINUX_SERIAL_H
+-    struct serial_struct old_sinfo, sinfo;
+-    sinfo.reserved_char[0] = 0;
+-    if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
+-	log("Cannot get information for serial port.");
+-    else
+-    {
+-	sinfo = old_sinfo;
+-	// Why there are two closing wait timeouts, is beyond me
+-	// but there are... apparently the second one is deprecated
+-	// but why take a chance...
+-	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
+-	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
+-
+-	if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
+-	    log("Cannot set information for serial port.");
+-    }
++ 	if (getuid() == 0)
++ 	{
++     struct serial_struct sinfo;
++     if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
++     {
++     	// Why there are two closing wait timeouts, is beyond me
++     	// but there are... apparently the second one is deprecated
++     	// but why take a chance...
++     	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
++     	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
++
++     	//Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...)
++			//see http://bugs.gentoo.org/show_bug.cgi?id=85754
++			ioctl(getrfd(), TIOCSSERIAL, &sinfo);
++ 		}
++ 	}
+ #endif
+
+     // set up the terminal characteristics.
diff --git a/source/network/wvstreams/wvstreams-4.4-sigaction.patch b/source/network/wvstreams/wvstreams-4.4-sigaction.patch
new file mode 100644
index 0000000..3478430
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-sigaction.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.4.orig/utils/wvcrash.cc wvstreams-4.4/utils/wvcrash.cc
+--- wvstreams-4.4.orig/utils/wvcrash.cc	2007-07-20 00:22:55.000000000 +0300
++++ wvstreams-4.4/utils/wvcrash.cc	2007-08-17 22:49:50.000000000 +0300
+@@ -385,7 +385,6 @@
+     act.sa_handler = wvcrash;
+     sigfillset(&act.sa_mask);
+     act.sa_flags = SA_ONSTACK | SA_RESTART;
+-    act.sa_restorer = NULL;
+
+     if (sigaction(sig, &act, NULL))
+         fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
diff --git a/source/network/wvstreams/wvstreams-4.4-type-punned.patch b/source/network/wvstreams/wvstreams-4.4-type-punned.patch
new file mode 100644
index 0000000..f4dff0f
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-type-punned.patch
@@ -0,0 +1,17 @@
+diff -Nru wvstreams-4.4.orig/urlget/wvhttppool.cc wvstreams-4.4/urlget/wvhttppool.cc
+--- wvstreams-4.4.orig/urlget/wvhttppool.cc	2007-07-20 00:22:36.000000000 +0300
++++ wvstreams-4.4/urlget/wvhttppool.cc	2007-08-17 23:07:41.000000000 +0300
+@@ -43,7 +43,12 @@
+     {
+         WvBufUrlStream *x = new WvBufUrlStream;
+         outstream = x;
+-        x->death_notify = (WvStream **)&outstream;
++        union {
++            WvBufUrlStream** ppbufurlstream;
++            WvStream**       ppstream;
++        } s;
++        s.ppbufurlstream = &outstream;
++        x->death_notify = s.ppstream;
+         x->url = url;
+
+         putstream = content_source;
diff --git a/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch b/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch
new file mode 100644
index 0000000..e6b8c48
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-uniconfd-ini.patch
@@ -0,0 +1,14 @@
+diff -Nru wvstreams-4.4.orig/Makefile wvstreams-4.4/Makefile
+--- wvstreams-4.4.orig/Makefile	2007-07-20 19:31:03.000000000 +0300
++++ wvstreams-4.4/Makefile	2007-08-17 22:39:56.000000000 +0300
+@@ -185,8 +185,8 @@
+ 	$(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/
+-	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf
+-	touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini
++	$(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf
++	$(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8
+ 	$(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8
diff --git a/source/network/wvstreams/wvstreams-4.4-wireless-user.patch b/source/network/wvstreams/wvstreams-4.4-wireless-user.patch
new file mode 100644
index 0000000..7f3d9cb
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-wireless-user.patch
@@ -0,0 +1,11 @@
+diff -Nru wvstreams-4.4.orig/linuxstreams/wvinterface.cc wvstreams-4.4/linuxstreams/wvinterface.cc
+--- wvstreams-4.4.orig/linuxstreams/wvinterface.cc	2007-07-20 00:22:51.000000000 +0300
++++ wvstreams-4.4/linuxstreams/wvinterface.cc	2007-08-17 22:38:13.000000000 +0300
+@@ -21,6 +21,7 @@
+ #include <errno.h>
+ #include <linux/sockios.h>
+
++#include <sys/sysctl.h> /* Needed for __user definition */
+ #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
+ #include <linux/wireless.h>
+
diff --git a/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch b/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch
new file mode 100644
index 0000000..6c942c2
--- /dev/null
+++ b/source/network/wvstreams/wvstreams-4.4-wvconfemu.patch
@@ -0,0 +1,13 @@
+diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk
+--- wvstreams-4.4.orig/vars.mk	2007-08-18 00:13:15.000000000 +0300
++++ wvstreams-4.4/vars.mk	2007-08-17 23:39:09.000000000 +0300
+@@ -156,7 +156,8 @@
+ 	streams/wvfile.o \
+ 	streams/wvstreamclone.o  \
+ 	streams/wvconstream.o \
+-	utils/wvcrashbase.o
++	utils/wvcrashbase.o \
++	uniconf/wvconfemu.o
+
+ TESTOBJS = utils/wvtest.o
+


More information about the Frugalware-git mailing list