summaryrefslogtreecommitdiff
path: root/extra/kdebindings-smokegen
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
commit2699a201e0f70a2e1c2f7a0cab8725321649893d (patch)
treeb9f1b7eaa65592b658bb922714a975725e244d3c /extra/kdebindings-smokegen
parent8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff)
parent359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bacula/PKGBUILD community/clementine/PKGBUILD community/dbus-sharp-glib/PKGBUILD community/dockmanager/PKGBUILD community/docky/PKGBUILD community/flightgear-atlas/PKGBUILD community/libdesktop-agnostic/PKGBUILD community/openmovieeditor/PKGBUILD community/perl-crypt-openssl-bignum/PKGBUILD community/perl-crypt-openssl-random/PKGBUILD community/perl-crypt-openssl-rsa/PKGBUILD community/tucan/PKGBUILD core/btrfs-progs-unstable/PKGBUILD core/module-init-tools/PKGBUILD core/sqlite3/PKGBUILD.mips64el extra/bogofilter/PKGBUILD extra/dirmngr/PKGBUILD extra/gluezilla/PKGBUILD extra/gnupg/PKGBUILD extra/gnupg2/PKGBUILD extra/gpgme/PKGBUILD extra/kdeaccessibility/PKGBUILD extra/kdelibs/PKGBUILD extra/kdeutils/PKGBUILD extra/libassuan/PKGBUILD extra/libksba/PKGBUILD extra/oxygen-gtk/PKGBUILD extra/pinentry/PKGBUILD extra/pth/PKGBUILD extra/smplayer-themes/PKGBUILD libre/kdeutils-libre/PKGBUILD libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'extra/kdebindings-smokegen')
-rw-r--r--extra/kdebindings-smokegen/fix-crash.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/extra/kdebindings-smokegen/fix-crash.patch b/extra/kdebindings-smokegen/fix-crash.patch
deleted file mode 100644
index 5864da3f3..000000000
--- a/extra/kdebindings-smokegen/fix-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp
-diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp
---- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200
-+++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200
-@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
-
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
-+ if ( ! m_session->token_stream ) return;
-+ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
- if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
- QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
- pointerDepth.append(cv.first);