diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
commit | 2699a201e0f70a2e1c2f7a0cab8725321649893d (patch) | |
tree | b9f1b7eaa65592b658bb922714a975725e244d3c /community/freemat/freemat-gcc-4.3.0.patch | |
parent | 8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff) | |
parent | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (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 'community/freemat/freemat-gcc-4.3.0.patch')
-rw-r--r-- | community/freemat/freemat-gcc-4.3.0.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/community/freemat/freemat-gcc-4.3.0.patch b/community/freemat/freemat-gcc-4.3.0.patch deleted file mode 100644 index 40247177c..000000000 --- a/community/freemat/freemat-gcc-4.3.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -wbBur FreeMat-3.6/libs/libFreeMat/Malloc.cpp FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp ---- FreeMat-3.6/libs/libFreeMat/Malloc.cpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp 2008-04-25 21:29:19.000000000 +0400 -@@ -21,6 +21,7 @@ - #include "Exception.hpp" - #include <stdlib.h> - #include <stdio.h> -+#include <string.h> - - - void* Malloc(int count) { -diff -wbBur FreeMat-3.6/libs/libFreeMat/Token.cpp FreeMat-3.6.my/libs/libFreeMat/Token.cpp ---- FreeMat-3.6/libs/libFreeMat/Token.cpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Token.cpp 2008-04-25 21:31:33.000000000 +0400 -@@ -2,6 +2,7 @@ - #include "Serialize.hpp" - #include <iostream> - #include <errno.h> -+#include <limits.h> - - // These must appear as sequential token numbers - string fm_reserved[22] = { -diff -wbBur FreeMat-3.6/libs/libFreeMat/Types.hpp FreeMat-3.6.my/libs/libFreeMat/Types.hpp ---- FreeMat-3.6/libs/libFreeMat/Types.hpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Types.hpp 2008-04-25 21:28:26.000000000 +0400 -@@ -20,7 +20,11 @@ - #ifndef __Types_hpp__ - #define __Types_hpp__ - -+#include <algorithm> - #include <string> -+#include <string.h> -+using namespace std; -+ - #include <QVector> - #include <QtGlobal> - #include <QList> |