diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-24 11:07:35 -0300 |
| commit | 8d32e471d53634b308adf93007922a6ccbd2b830 (patch) | |
| tree | 606fdcd5508936ffdfc7cf510a16b7324c2792e2 /community/btanks/gcc-4.6.patch | |
| parent | 4c9d76f582ae64854e30113e7f7dc621af3db820 (diff) | |
| parent | 1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/chmsee/PKGBUILD
community/cupsddk/PKGBUILD
community/optipng/PKGBUILD
community/pcb/PKGBUILD
community/taglib-rcc/PKGBUILD
community/wmctrl/PKGBUILD
extra/c-ares/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
Diffstat (limited to 'community/btanks/gcc-4.6.patch')
| -rw-r--r-- | community/btanks/gcc-4.6.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch new file mode 100644 index 000000000..d371abd53 --- /dev/null +++ b/community/btanks/gcc-4.6.patch @@ -0,0 +1,26 @@ +From: Ansgar Burchardt <ansgar@debian.org> +Bug-Debian: http://bugs.debian.org/624916 +Subject: Fix FTBFS with gcc-4.6 + +--- btanks-0.9.8083.orig/engine/sl08/sl08.py ++++ btanks-0.9.8083/engine/sl08/sl08.py +@@ -152,8 +152,8 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef return_type (object_type::*func_t) %s; + +- inline slotXXX () : object(NULL), func(NULL) {} +- inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slotXXX () : object(0), func(0) {} ++ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } +@@ -187,7 +187,7 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef void (object_type::*func_t) %s ; + +- inline slotXXX () : object(NULL), func(NULL) {} ++ inline slotXXX () : object(0), func(0) {} + inline slotXXX (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } |