Date: Saturday, July 15, 2017 @ 08:46:33 Author: arojas Revision: 245187
archrelease: copy trunk to community-i686, community-x86_64 Added: wvstreams/repos/community-i686/PKGBUILD (from rev 245186, wvstreams/trunk/PKGBUILD) wvstreams/repos/community-i686/gcc-6.patch (from rev 245186, wvstreams/trunk/gcc-6.patch) wvstreams/repos/community-i686/openssl-buildfix.patch (from rev 245186, wvstreams/trunk/openssl-buildfix.patch) wvstreams/repos/community-i686/wvstreams-4.6.1-gcc47.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch) wvstreams/repos/community-i686/wvstreams-4.6.1-glibc212.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch) wvstreams/repos/community-x86_64/PKGBUILD (from rev 245186, wvstreams/trunk/PKGBUILD) wvstreams/repos/community-x86_64/gcc-6.patch (from rev 245186, wvstreams/trunk/gcc-6.patch) wvstreams/repos/community-x86_64/openssl-buildfix.patch (from rev 245186, wvstreams/trunk/openssl-buildfix.patch) wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch) wvstreams/repos/community-x86_64/wvstreams-4.6.1-glibc212.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch) Deleted: wvstreams/repos/community-i686/PKGBUILD wvstreams/repos/community-i686/gcc-6.patch wvstreams/repos/community-i686/openssl-buildfix.patch wvstreams/repos/community-i686/wvstreams-4.6.1-gcc47.patch wvstreams/repos/community-i686/wvstreams-4.6.1-glibc212.patch wvstreams/repos/community-x86_64/PKGBUILD wvstreams/repos/community-x86_64/gcc-6.patch wvstreams/repos/community-x86_64/openssl-buildfix.patch wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch wvstreams/repos/community-x86_64/wvstreams-4.6.1-glibc212.patch -------------------------------------------------+ /PKGBUILD | 122 ++++++++++++++++++++++ /gcc-6.patch | 84 +++++++++++++++ /openssl-buildfix.patch | 28 +++++ /wvstreams-4.6.1-gcc47.patch | 100 ++++++++++++++++++ /wvstreams-4.6.1-glibc212.patch | 48 ++++++++ community-i686/PKGBUILD | 61 ----------- community-i686/gcc-6.patch | 42 ------- community-i686/openssl-buildfix.patch | 14 -- community-i686/wvstreams-4.6.1-gcc47.patch | 50 --------- community-i686/wvstreams-4.6.1-glibc212.patch | 24 ---- community-x86_64/PKGBUILD | 61 ----------- community-x86_64/gcc-6.patch | 42 ------- community-x86_64/openssl-buildfix.patch | 14 -- community-x86_64/wvstreams-4.6.1-gcc47.patch | 50 --------- community-x86_64/wvstreams-4.6.1-glibc212.patch | 24 ---- 15 files changed, 382 insertions(+), 382 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-07-15 08:46:00 UTC (rev 245186) +++ community-i686/PKGBUILD 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=wvstreams -pkgver=4.6.1 -pkgrel=13 -pkgdesc="A network programming library written in C++" -arch=('i686' 'x86_64') -url="http://alumnit.ca/wiki/?page=WvStreams" -license=('LGPL') -depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline') -source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz - wvstreams-4.6.1-glibc212.patch - wvstreams-4.6.1-gcc47.patch - openssl-buildfix.patch - gcc-6.patch) -md5sums=('2760dac31a43d452a19a3147bfde571c' - '5f6e24864209055239cb4e7c9bbd4a41' - '217e5dedd7f1d50588a5a67d637fc8a1' - 'df423c68134a09439b3961c34635e0b4' - 'bc728af9421e04d0c1f358415b6c1421') -options=('!makeflags') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" - patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" - patch -p1 -i "$srcdir/openssl-buildfix.patch" - patch -p1 -i "$srcdir/gcc-6.patch" -} - -build() { - cd ${pkgname}-${pkgver} - - CPPFLAGS=-I/usr/include/openssl-1.0 \ - LDFLAGS=-L/usr/lib/openssl-1.0 \ - ./configure --prefix=/usr \ - --sbin=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --without-dbus \ - --with-pam \ - --with-openssl \ - --without-tcl \ - --without-qt - make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - # FS#15974 - # --without-dbus still installs the pkg-config file - rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" - # --without-qt still installs the pkg-config file - rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" -} Copied: wvstreams/repos/community-i686/PKGBUILD (from rev 245186, wvstreams/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=wvstreams +pkgver=4.6.1 +pkgrel=14 +pkgdesc="A network programming library written in C++" +arch=('i686' 'x86_64') +url="http://alumnit.ca/wiki/?page=WvStreams" +license=('LGPL') +depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline') +source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz + wvstreams-4.6.1-glibc212.patch + wvstreams-4.6.1-gcc47.patch + openssl-buildfix.patch + gcc-6.patch) +md5sums=('2760dac31a43d452a19a3147bfde571c' + '5f6e24864209055239cb4e7c9bbd4a41' + '217e5dedd7f1d50588a5a67d637fc8a1' + 'df423c68134a09439b3961c34635e0b4' + 'bc728af9421e04d0c1f358415b6c1421') +options=('!makeflags') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" + patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" + patch -p1 -i "$srcdir/openssl-buildfix.patch" + patch -p1 -i "$srcdir/gcc-6.patch" +} + +build() { + cd ${pkgname}-${pkgver} + + CPPFLAGS=-I/usr/include/openssl-1.0 \ + LDFLAGS=-L/usr/lib/openssl-1.0 \ + ./configure --prefix=/usr \ + --sbin=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --without-dbus \ + --with-pam \ + --with-openssl \ + --without-tcl \ + --without-qt + make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # FS#15974 + # --without-dbus still installs the pkg-config file + rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" + # --without-qt still installs the pkg-config file + rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" +} Deleted: community-i686/gcc-6.patch =================================================================== --- community-i686/gcc-6.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-i686/gcc-6.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,42 +0,0 @@ -Description: Fix compilation with gcc-6 -Author: Gert Wollny <gw.foss...@gmail.com> -Last-Updated: 2016-07-26 -Forwarded: No -Bug-Debian: https://bugs.debian.org/811659 -Bug-Debian: https://bugs.debian.org/831146 - ---- a/streams/wvstream.cc -+++ b/streams/wvstream.cc -@@ -907,9 +907,9 @@ - - if (forceable) - { -- si.wants.readable = readcb; -- si.wants.writable = writecb; -- si.wants.isexception = exceptcb; -+ si.wants.readable = static_cast<bool>(readcb); -+ si.wants.writable = static_cast<bool>(writecb); -+ si.wants.isexception = static_cast<bool>(exceptcb); - } - else - { -@@ -1019,7 +1019,8 @@ - - IWvStream::SelectRequest WvStream::get_select_request() - { -- return IWvStream::SelectRequest(readcb, writecb, exceptcb); -+ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), -+ static_cast<bool>(exceptcb)); - } - - -@@ -1107,7 +1108,8 @@ - // inefficient, because if the alarm was expired then pre_select() - // returned true anyway and short-circuited the previous select(). - TRACE("hello-%p\n", this); -- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); -+ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), -+ static_cast<bool>(writecb), static_cast<bool>(exceptcb)); - } - - Copied: wvstreams/repos/community-i686/gcc-6.patch (from rev 245186, wvstreams/trunk/gcc-6.patch) =================================================================== --- community-i686/gcc-6.patch (rev 0) +++ community-i686/gcc-6.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,42 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny <gw.foss...@gmail.com> +Last-Updated: 2016-07-26 +Forwarded: No +Bug-Debian: https://bugs.debian.org/811659 +Bug-Debian: https://bugs.debian.org/831146 + +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast<bool>(readcb); ++ si.wants.writable = static_cast<bool>(writecb); ++ si.wants.isexception = static_cast<bool>(exceptcb); + } + else + { +@@ -1019,7 +1019,8 @@ + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), ++ static_cast<bool>(exceptcb)); + } + + +@@ -1107,7 +1108,8 @@ + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), ++ static_cast<bool>(writecb), static_cast<bool>(exceptcb)); + } + + Deleted: community-i686/openssl-buildfix.patch =================================================================== --- community-i686/openssl-buildfix.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-i686/openssl-buildfix.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,14 +0,0 @@ ---- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 -+++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 -@@ -1157,7 +1157,11 @@ - - if (ext) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+#else - X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+#endif - if (!method) - { - WvDynBuf buf; \ No newline at end of file Copied: wvstreams/repos/community-i686/openssl-buildfix.patch (from rev 245186, wvstreams/trunk/openssl-buildfix.patch) =================================================================== --- community-i686/openssl-buildfix.patch (rev 0) +++ community-i686/openssl-buildfix.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,14 @@ +--- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 ++++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 +@@ -1157,7 +1157,11 @@ + + if (ext) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#else + X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#endif + if (!method) + { + WvDynBuf buf; \ No newline at end of file Deleted: community-i686/wvstreams-4.6.1-gcc47.patch =================================================================== --- community-i686/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-i686/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,50 +0,0 @@ -http://bugs.gentoo.org/419563 -http://bugs.gentoo.org/419971 - -See -gcc47-patch and -magic.patch in Fedora git: - -http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree - ---- include/wvtask.h -+++ include/wvtask.h -@@ -45,7 +45,8 @@ - typedef void TaskFunc(void *userdata); - - static int taskcount, numtasks, numrunning; -- int magic_number, *stack_magic; -+ int volatile magic_number; -+ int *stack_magic; - WvString name; - int tid; - -@@ -84,7 +85,7 @@ - static WvTaskMan *singleton; - static int links; - -- static int magic_number; -+ static int volatile magic_number; - static WvTaskList all_tasks, free_tasks; - - static void get_stack(WvTask &task, size_t size); ---- include/wvuid.h -+++ include/wvuid.h -@@ -7,6 +7,7 @@ - #ifndef __WVUID_H - #define __WVUID_H - -+#include <unistd.h> - #include "wvstring.h" - - #if WIN32 ---- utils/wvtask.cc -+++ utils/wvtask.cc -@@ -58,7 +58,8 @@ - int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; - - WvTaskMan *WvTaskMan::singleton; --int WvTaskMan::links, WvTaskMan::magic_number; -+int WvTaskMan::links; -+int volatile WvTaskMan::magic_number; - WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; - ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, - WvTaskMan::toplevel; Copied: wvstreams/repos/community-i686/wvstreams-4.6.1-gcc47.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch) =================================================================== --- community-i686/wvstreams-4.6.1-gcc47.patch (rev 0) +++ community-i686/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,50 @@ +http://bugs.gentoo.org/419563 +http://bugs.gentoo.org/419971 + +See -gcc47-patch and -magic.patch in Fedora git: + +http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree + +--- include/wvtask.h ++++ include/wvtask.h +@@ -45,7 +45,8 @@ + typedef void TaskFunc(void *userdata); + + static int taskcount, numtasks, numrunning; +- int magic_number, *stack_magic; ++ int volatile magic_number; ++ int *stack_magic; + WvString name; + int tid; + +@@ -84,7 +85,7 @@ + static WvTaskMan *singleton; + static int links; + +- static int magic_number; ++ static int volatile magic_number; + static WvTaskList all_tasks, free_tasks; + + static void get_stack(WvTask &task, size_t size); +--- include/wvuid.h ++++ include/wvuid.h +@@ -7,6 +7,7 @@ + #ifndef __WVUID_H + #define __WVUID_H + ++#include <unistd.h> + #include "wvstring.h" + + #if WIN32 +--- utils/wvtask.cc ++++ utils/wvtask.cc +@@ -58,7 +58,8 @@ + int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; + + WvTaskMan *WvTaskMan::singleton; +-int WvTaskMan::links, WvTaskMan::magic_number; ++int WvTaskMan::links; ++int volatile WvTaskMan::magic_number; + WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; + ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, + WvTaskMan::toplevel; Deleted: community-i686/wvstreams-4.6.1-glibc212.patch =================================================================== --- community-i686/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-i686/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/333301 -https://bugs.archlinux.org/task/27188 - ---- ipstreams/wvunixdgsocket.cc -+++ ipstreams/wvunixdgsocket.cc -@@ -1,5 +1,5 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS -+#if defined(MACOS) || defined(__GNUC__) - #include <sys/types.h> - #include <sys/stat.h> - #endif ---- streams/wvatomicfile.cc -+++ streams/wvatomicfile.cc -@@ -11,7 +11,8 @@ - #include "wvfileutils.h" - #include "wvstrutils.h" - --#ifdef MACOS -+#if defined(MACOS) || defined(__GNUC__) -+#include <sys/types.h> - #include <sys/stat.h> - #endif - Copied: wvstreams/repos/community-i686/wvstreams-4.6.1-glibc212.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch) =================================================================== --- community-i686/wvstreams-4.6.1-glibc212.patch (rev 0) +++ community-i686/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/333301 +https://bugs.archlinux.org/task/27188 + +--- ipstreams/wvunixdgsocket.cc ++++ ipstreams/wvunixdgsocket.cc +@@ -1,5 +1,5 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) + #include <sys/types.h> + #include <sys/stat.h> + #endif +--- streams/wvatomicfile.cc ++++ streams/wvatomicfile.cc +@@ -11,7 +11,8 @@ + #include "wvfileutils.h" + #include "wvstrutils.h" + +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) ++#include <sys/types.h> + #include <sys/stat.h> + #endif + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-07-15 08:46:00 UTC (rev 245186) +++ community-x86_64/PKGBUILD 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=wvstreams -pkgver=4.6.1 -pkgrel=13 -pkgdesc="A network programming library written in C++" -arch=('i686' 'x86_64') -url="http://alumnit.ca/wiki/?page=WvStreams" -license=('LGPL') -depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline') -source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz - wvstreams-4.6.1-glibc212.patch - wvstreams-4.6.1-gcc47.patch - openssl-buildfix.patch - gcc-6.patch) -md5sums=('2760dac31a43d452a19a3147bfde571c' - '5f6e24864209055239cb4e7c9bbd4a41' - '217e5dedd7f1d50588a5a67d637fc8a1' - 'df423c68134a09439b3961c34635e0b4' - 'bc728af9421e04d0c1f358415b6c1421') -options=('!makeflags') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" - patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" - patch -p1 -i "$srcdir/openssl-buildfix.patch" - patch -p1 -i "$srcdir/gcc-6.patch" -} - -build() { - cd ${pkgname}-${pkgver} - - CPPFLAGS=-I/usr/include/openssl-1.0 \ - LDFLAGS=-L/usr/lib/openssl-1.0 \ - ./configure --prefix=/usr \ - --sbin=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --without-dbus \ - --with-pam \ - --with-openssl \ - --without-tcl \ - --without-qt - make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - # FS#15974 - # --without-dbus still installs the pkg-config file - rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" - # --without-qt still installs the pkg-config file - rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" -} Copied: wvstreams/repos/community-x86_64/PKGBUILD (from rev 245186, wvstreams/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=wvstreams +pkgver=4.6.1 +pkgrel=14 +pkgdesc="A network programming library written in C++" +arch=('i686' 'x86_64') +url="http://alumnit.ca/wiki/?page=WvStreams" +license=('LGPL') +depends=('zlib' 'pam' 'xplc' 'openssl-1.0' 'readline') +source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-$pkgver.tar.gz + wvstreams-4.6.1-glibc212.patch + wvstreams-4.6.1-gcc47.patch + openssl-buildfix.patch + gcc-6.patch) +md5sums=('2760dac31a43d452a19a3147bfde571c' + '5f6e24864209055239cb4e7c9bbd4a41' + '217e5dedd7f1d50588a5a67d637fc8a1' + 'df423c68134a09439b3961c34635e0b4' + 'bc728af9421e04d0c1f358415b6c1421') +options=('!makeflags') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" + patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" + patch -p1 -i "$srcdir/openssl-buildfix.patch" + patch -p1 -i "$srcdir/gcc-6.patch" +} + +build() { + cd ${pkgname}-${pkgver} + + CPPFLAGS=-I/usr/include/openssl-1.0 \ + LDFLAGS=-L/usr/lib/openssl-1.0 \ + ./configure --prefix=/usr \ + --sbin=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --without-dbus \ + --with-pam \ + --with-openssl \ + --without-tcl \ + --without-qt + make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # FS#15974 + # --without-dbus still installs the pkg-config file + rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" + # --without-qt still installs the pkg-config file + rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" +} Deleted: community-x86_64/gcc-6.patch =================================================================== --- community-x86_64/gcc-6.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-x86_64/gcc-6.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,42 +0,0 @@ -Description: Fix compilation with gcc-6 -Author: Gert Wollny <gw.foss...@gmail.com> -Last-Updated: 2016-07-26 -Forwarded: No -Bug-Debian: https://bugs.debian.org/811659 -Bug-Debian: https://bugs.debian.org/831146 - ---- a/streams/wvstream.cc -+++ b/streams/wvstream.cc -@@ -907,9 +907,9 @@ - - if (forceable) - { -- si.wants.readable = readcb; -- si.wants.writable = writecb; -- si.wants.isexception = exceptcb; -+ si.wants.readable = static_cast<bool>(readcb); -+ si.wants.writable = static_cast<bool>(writecb); -+ si.wants.isexception = static_cast<bool>(exceptcb); - } - else - { -@@ -1019,7 +1019,8 @@ - - IWvStream::SelectRequest WvStream::get_select_request() - { -- return IWvStream::SelectRequest(readcb, writecb, exceptcb); -+ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), -+ static_cast<bool>(exceptcb)); - } - - -@@ -1107,7 +1108,8 @@ - // inefficient, because if the alarm was expired then pre_select() - // returned true anyway and short-circuited the previous select(). - TRACE("hello-%p\n", this); -- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); -+ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), -+ static_cast<bool>(writecb), static_cast<bool>(exceptcb)); - } - - Copied: wvstreams/repos/community-x86_64/gcc-6.patch (from rev 245186, wvstreams/trunk/gcc-6.patch) =================================================================== --- community-x86_64/gcc-6.patch (rev 0) +++ community-x86_64/gcc-6.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,42 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny <gw.foss...@gmail.com> +Last-Updated: 2016-07-26 +Forwarded: No +Bug-Debian: https://bugs.debian.org/811659 +Bug-Debian: https://bugs.debian.org/831146 + +--- a/streams/wvstream.cc ++++ b/streams/wvstream.cc +@@ -907,9 +907,9 @@ + + if (forceable) + { +- si.wants.readable = readcb; +- si.wants.writable = writecb; +- si.wants.isexception = exceptcb; ++ si.wants.readable = static_cast<bool>(readcb); ++ si.wants.writable = static_cast<bool>(writecb); ++ si.wants.isexception = static_cast<bool>(exceptcb); + } + else + { +@@ -1019,7 +1019,8 @@ + + IWvStream::SelectRequest WvStream::get_select_request() + { +- return IWvStream::SelectRequest(readcb, writecb, exceptcb); ++ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), ++ static_cast<bool>(exceptcb)); + } + + +@@ -1107,7 +1108,8 @@ + // inefficient, because if the alarm was expired then pre_select() + // returned true anyway and short-circuited the previous select(). + TRACE("hello-%p\n", this); +- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb); ++ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), ++ static_cast<bool>(writecb), static_cast<bool>(exceptcb)); + } + + Deleted: community-x86_64/openssl-buildfix.patch =================================================================== --- community-x86_64/openssl-buildfix.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-x86_64/openssl-buildfix.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,14 +0,0 @@ ---- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 -+++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 -@@ -1157,7 +1157,11 @@ - - if (ext) - { -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+#else - X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+#endif - if (!method) - { - WvDynBuf buf; \ No newline at end of file Copied: wvstreams/repos/community-x86_64/openssl-buildfix.patch (from rev 245186, wvstreams/trunk/openssl-buildfix.patch) =================================================================== --- community-x86_64/openssl-buildfix.patch (rev 0) +++ community-x86_64/openssl-buildfix.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,14 @@ +--- wvstreams-4.6.1/crypto/wvx509.cc 2008-10-23 22:23:49.000000000 +0200 ++++ wvstreams-4.6.1-1/crypto/wvx509.cc 2010-01-27 11:09:06.000000000 +0100 +@@ -1157,7 +1157,11 @@ + + if (ext) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#else + X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#endif + if (!method) + { + WvDynBuf buf; \ No newline at end of file Deleted: community-x86_64/wvstreams-4.6.1-gcc47.patch =================================================================== --- community-x86_64/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-x86_64/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,50 +0,0 @@ -http://bugs.gentoo.org/419563 -http://bugs.gentoo.org/419971 - -See -gcc47-patch and -magic.patch in Fedora git: - -http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree - ---- include/wvtask.h -+++ include/wvtask.h -@@ -45,7 +45,8 @@ - typedef void TaskFunc(void *userdata); - - static int taskcount, numtasks, numrunning; -- int magic_number, *stack_magic; -+ int volatile magic_number; -+ int *stack_magic; - WvString name; - int tid; - -@@ -84,7 +85,7 @@ - static WvTaskMan *singleton; - static int links; - -- static int magic_number; -+ static int volatile magic_number; - static WvTaskList all_tasks, free_tasks; - - static void get_stack(WvTask &task, size_t size); ---- include/wvuid.h -+++ include/wvuid.h -@@ -7,6 +7,7 @@ - #ifndef __WVUID_H - #define __WVUID_H - -+#include <unistd.h> - #include "wvstring.h" - - #if WIN32 ---- utils/wvtask.cc -+++ utils/wvtask.cc -@@ -58,7 +58,8 @@ - int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; - - WvTaskMan *WvTaskMan::singleton; --int WvTaskMan::links, WvTaskMan::magic_number; -+int WvTaskMan::links; -+int volatile WvTaskMan::magic_number; - WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; - ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, - WvTaskMan::toplevel; Copied: wvstreams/repos/community-x86_64/wvstreams-4.6.1-gcc47.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-gcc47.patch) =================================================================== --- community-x86_64/wvstreams-4.6.1-gcc47.patch (rev 0) +++ community-x86_64/wvstreams-4.6.1-gcc47.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,50 @@ +http://bugs.gentoo.org/419563 +http://bugs.gentoo.org/419971 + +See -gcc47-patch and -magic.patch in Fedora git: + +http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree + +--- include/wvtask.h ++++ include/wvtask.h +@@ -45,7 +45,8 @@ + typedef void TaskFunc(void *userdata); + + static int taskcount, numtasks, numrunning; +- int magic_number, *stack_magic; ++ int volatile magic_number; ++ int *stack_magic; + WvString name; + int tid; + +@@ -84,7 +85,7 @@ + static WvTaskMan *singleton; + static int links; + +- static int magic_number; ++ static int volatile magic_number; + static WvTaskList all_tasks, free_tasks; + + static void get_stack(WvTask &task, size_t size); +--- include/wvuid.h ++++ include/wvuid.h +@@ -7,6 +7,7 @@ + #ifndef __WVUID_H + #define __WVUID_H + ++#include <unistd.h> + #include "wvstring.h" + + #if WIN32 +--- utils/wvtask.cc ++++ utils/wvtask.cc +@@ -58,7 +58,8 @@ + int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; + + WvTaskMan *WvTaskMan::singleton; +-int WvTaskMan::links, WvTaskMan::magic_number; ++int WvTaskMan::links; ++int volatile WvTaskMan::magic_number; + WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; + ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, + WvTaskMan::toplevel; Deleted: community-x86_64/wvstreams-4.6.1-glibc212.patch =================================================================== --- community-x86_64/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:00 UTC (rev 245186) +++ community-x86_64/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/333301 -https://bugs.archlinux.org/task/27188 - ---- ipstreams/wvunixdgsocket.cc -+++ ipstreams/wvunixdgsocket.cc -@@ -1,5 +1,5 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS -+#if defined(MACOS) || defined(__GNUC__) - #include <sys/types.h> - #include <sys/stat.h> - #endif ---- streams/wvatomicfile.cc -+++ streams/wvatomicfile.cc -@@ -11,7 +11,8 @@ - #include "wvfileutils.h" - #include "wvstrutils.h" - --#ifdef MACOS -+#if defined(MACOS) || defined(__GNUC__) -+#include <sys/types.h> - #include <sys/stat.h> - #endif - Copied: wvstreams/repos/community-x86_64/wvstreams-4.6.1-glibc212.patch (from rev 245186, wvstreams/trunk/wvstreams-4.6.1-glibc212.patch) =================================================================== --- community-x86_64/wvstreams-4.6.1-glibc212.patch (rev 0) +++ community-x86_64/wvstreams-4.6.1-glibc212.patch 2017-07-15 08:46:33 UTC (rev 245187) @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/333301 +https://bugs.archlinux.org/task/27188 + +--- ipstreams/wvunixdgsocket.cc ++++ ipstreams/wvunixdgsocket.cc +@@ -1,5 +1,5 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) + #include <sys/types.h> + #include <sys/stat.h> + #endif +--- streams/wvatomicfile.cc ++++ streams/wvatomicfile.cc +@@ -11,7 +11,8 @@ + #include "wvfileutils.h" + #include "wvstrutils.h" + +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) ++#include <sys/types.h> + #include <sys/stat.h> + #endif +