Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53fcb0b6dac69b124f03a7828c749028b4b893fe
commit 53fcb0b6dac69b124f03a7828c749028b4b893fe Author: voroskoi <[EMAIL PROTECTED]> Date: Sat Nov 3 10:37:24 2007 +0100 fbpager-0.1.4-4-x86_64 rebuilt with gcc4 added a pach to fix build errors fixed makedepends(), rodepends() and depends() fixed up2date new m8r diff --git a/source/x11-extra/fbpager/FrugalBuild b/source/x11-extra/fbpager/FrugalBuild index a96a292..1c1c0ac 100644 --- a/source/x11-extra/fbpager/FrugalBuild +++ b/source/x11-extra/fbpager/FrugalBuild @@ -1,16 +1,21 @@ # Compiling Time: 0.13 SBU -# Maintainer: Shrift <[EMAIL PROTECTED]> +# Contributor: Shrift <[EMAIL PROTECTED]> +# Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=fbpager pkgver=0.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="FBpager is a pager application for fluxbox" url="http://www.fluxbox.org/fbpager/"; -depends=('fluxbox') +makedepends=('mesa') +depends=('libsm' 'libxrender' 'libstdc++') +rodepends=('fluxbox') groups=('x11-extra') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://www.fluxbox.org/download/?M=D'|grep fbpager|grep tar.gz$|sed -ne 's/.*r-\(.*\)\.t.*/\1/;1 p'" -source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz) -sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2') +up2date="lynx -dump ${url} |grep tar.gz$ |sed 's/.*-\(.*\).t.*/\1/'" +source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz g++-4.1_namespace.patch) +sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2' \ + '0182937480fd7c0511217736c3e43ab129eaa01d') +unset MAKEFLAGS -# optimalization OK +# optimization OK diff --git a/source/x11-extra/fbpager/g++-4.1_namespace.patch b/source/x11-extra/fbpager/g++-4.1_namespace.patch new file mode 100644 index 0000000..85f6d82 --- /dev/null +++ b/source/x11-extra/fbpager/g++-4.1_namespace.patch @@ -0,0 +1,83 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_g++-4.1_namespace.dpatch by <[EMAIL PROTECTED]> +## +## DP: FTBFS fixes for g++-4.1 and above + [EMAIL PROTECTED]@ +diff -urNad --exclude=CVS --exclude=.svn ./src/Resources.hh /home/sean/tmp/dpep-work.kCLHyF/fbpager-0.1.4/src/Resources.hh +--- ./src/Resources.hh 2004-03-02 17:49:51.000000000 +0100 ++++ /home/sean/tmp/dpep-work.kCLHyF/fbpager-0.1.4/src/Resources.hh 2006-05-29 22:05:44.000000000 +0200 +@@ -8,8 +8,10 @@ + #include <cstdio> + #include <cstring> + ++namespace FbTk { ++ + template<> +-void FbTk::Resource<bool>:: ++void Resource<bool>:: + setFromString(char const *strval) { + if (strcasecmp(strval, "true") == 0 || + strcasecmp(strval, "yes") == 0) +@@ -19,38 +21,37 @@ + } + + template<> +-std::string FbTk::Resource<bool>:: ++std::string Resource<bool>:: + getString() { + return std::string(**this == true ? "true" : "false"); + } + + template <> +-void FbTk::Resource<std::string>::setFromString(const char *str) { ++void Resource<std::string>::setFromString(const char *str) { + *(*this) = (str ? str : ""); + } + + template <> +-std::string FbTk::Resource<std::string>::getString() { ++std::string Resource<std::string>::getString() { + return *(*this); + } + + template <> +-void FbTk::Resource<int>::setFromString(const char *str) { ++void Resource<int>::setFromString(const char *str) { + if (str == 0) + return; + sscanf(str, "%d", &(*(*this))); + } + + template <> +-std::string FbTk::Resource<int>::getString() { ++std::string Resource<int>::getString() { + char buff[16]; + sprintf(buff, "%d", (*(*this))); + return std::string(buff); + } + +-namespace FbPager { + template <> +-void FbTk::Resource<FbPager::Alignment>::setFromString(const char *str) { ++void Resource<FbPager::FbPager::Alignment>::setFromString(const char *str) { + if (strcmp("TopToBottom", str) == 0) + *(*this) = FbPager::FbPager::TOP_TO_BOTTOM; + else +@@ -58,7 +59,7 @@ + } + + template <> +-std::string FbTk::Resource<FbPager::Alignment>::getString() { ++std::string Resource<FbPager::FbPager::Alignment>::getString() { + switch (*(*this)) { + case FbPager::FbPager::LEFT_TO_RIGHT: + return "LeftToRight"; +@@ -67,6 +68,6 @@ + } + } + +-} // end namespace FbPager ++} // end namespace FbTk + + #endif // RESOURCES _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
