summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorBill Kirkpatrick <bkirkp@gmail.com>2012-09-10 12:11:41 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-10 16:35:37 -0500
commit8e3960c6a5087be89f30837c18e1b9ece321bd20 (patch)
treec805835e56c1798228016f6c4770db68cd488c6d /system
parentae0f6203538eedae12f1d0d5fcf67796d32e6487 (diff)
downloadslackbuilds-8e3960c6a5087be89f30837c18e1b9ece321bd20.tar.gz
system/krusader: Added a patch for gcc.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/krusader/krusader-2.4.0_beta1-gcc47.patch20
-rw-r--r--system/krusader/krusader.SlackBuild4
2 files changed, 23 insertions, 1 deletions
diff --git a/system/krusader/krusader-2.4.0_beta1-gcc47.patch b/system/krusader/krusader-2.4.0_beta1-gcc47.patch
new file mode 100644
index 0000000000..1ad24adf9d
--- /dev/null
+++ b/system/krusader/krusader-2.4.0_beta1-gcc47.patch
@@ -0,0 +1,20 @@
+--- a/krusader/UserAction/tstring.h
++++ b/krusader/UserAction/tstring.h
+@@ -125,7 +125,7 @@ TagString_t<T>& TagString_t<T>::operator
+ str += s.str;
+ const unsigned disp = length();
+ for (typename taglist::const_iterator it = s.tags.begin(), end = s.tags.end();it != end;++it) {
+- tags.push_back(make_pair((*it).first + disp, (*it).second));
++ tags.push_back(std::make_pair((*it).first + disp, (*it).second));
+ }
+ return *this;
+ }
+@@ -134,7 +134,7 @@ template <class T>
+ void TagString_t<T>::insertTag(uint pos, const T& t)
+ {
+ assert(pos <= length());
+- tags.push_back(make_pair(pos, t));
++ tags.push_back(std::make_pair(pos, t));
+ }
+
+ #endif
diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild
index a0aa75a22d..301c30b22f 100644
--- a/system/krusader/krusader.SlackBuild
+++ b/system/krusader/krusader.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=krusader
VERSION=${VERSION:-2.3.0_beta1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCVER="$(printf $VERSION | tr _ -)"
@@ -77,6 +77,8 @@ find . \
# add xz archive support
# https://bugs.kde.org/show_bug.cgi?id=254615
patch -p1 -i $CWD/krusader-xz.patch
+# add gcc-4.7 patch
+patch -p1 -i $CWD/krusader-2.4.0_beta1-gcc47.patch
mkdir -p build
cd build