Skip to content

Instantly share code, notes, and snippets.

@przhu
Created July 18, 2012 19:13
Show Gist options
  • Save przhu/3138181 to your computer and use it in GitHub Desktop.
Save przhu/3138181 to your computer and use it in GitHub Desktop.
diff -r -u calligra-2.4.3.orig/filters/karbon/wpg/CMakeLists.txt calligra-2.4.3/filters/karbon/wpg/CMakeLists.txt
--- calligra-2.4.3.orig/filters/karbon/wpg/CMakeLists.txt 2012-06-26 12:18:00.000000000 +0800
+++ calligra-2.4.3/filters/karbon/wpg/CMakeLists.txt 2012-07-16 18:51:31.000000000 +0800
@@ -5,7 +5,7 @@
kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARY} ${WPD_LIBRARIES})
install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -r -u calligra-2.4.3.orig/filters/sheets/excel/sidewinder/excel.h calligra-2.4.3/filters/sheets/excel/sidewinder/excel.h
--- calligra-2.4.3.orig/filters/sheets/excel/sidewinder/excel.h 2012-06-26 12:18:00.000000000 +0800
+++ calligra-2.4.3/filters/sheets/excel/sidewinder/excel.h 2012-07-16 19:24:19.000000000 +0800
@@ -38,7 +38,7 @@
#include "ODrawToOdf.h"
#include "pictures.h"
-class QTextDocument;
+#include <QTextDocument>
namespace Swinder
{
diff -r -u calligra-2.4.3.orig/kexi/kexiutils/utils.h calligra-2.4.3/kexi/kexiutils/utils.h
--- calligra-2.4.3.orig/kexi/kexiutils/utils.h 2012-06-26 12:21:31.000000000 +0800
+++ calligra-2.4.3/kexi/kexiutils/utils.h 2012-07-16 16:34:08.000000000 +0800
@@ -537,7 +537,7 @@
typename QHash<Key, T>::iterator insertMulti(const Key& key, const T& value) {
return QHash<Key, T>::insertMulti(key.toLower(), value);
}
- const Key key(const T& value, const Key& defaultKey) const {
+ const Key key(const T& value, const Key& key) const {
return QHash<Key, T>::key(value, key.toLower());
}
int remove(const Key& key) {
diff -r -u calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/fitness.c calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/fitness.c
--- calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/fitness.c 2012-06-26 12:18:01.000000000 +0800
+++ calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/fitness.c 2012-07-16 16:24:38.000000000 +0800
@@ -1,5 +1,5 @@
#include <assert.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <stdio.h>
#include "fitness.h"
diff -r -u calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/initial.c calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/initial.c
--- calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/initial.c 2012-06-26 12:18:01.000000000 +0800
+++ calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/initial.c 2012-07-16 16:23:40.000000000 +0800
@@ -1,4 +1,4 @@
-#include <malloc.h>
+//#include <malloc.h>
#include <stdlib.h>
#include <assert.h>
diff -r -u calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/librcps.c calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/librcps.c
--- calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/librcps.c 2012-06-26 12:18:01.000000000 +0800
+++ calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/librcps.c 2012-07-16 16:24:56.000000000 +0800
@@ -1,4 +1,4 @@
-#include <malloc.h>
+//#include <malloc.h>
#include <string.h>
#include <stdlib.h>
#include <time.h>
diff -r -u calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/repair.c calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/repair.c
--- calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/repair.c 2012-06-26 12:18:01.000000000 +0800
+++ calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/repair.c 2012-07-16 16:24:21.000000000 +0800
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
#include <assert.h>
#include "repair.h"
diff -r -u calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/slist.c calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/slist.c
--- calligra-2.4.3.orig/plan/plugins/schedulers/rcps/libs/src/slist.c 2012-06-26 12:18:01.000000000 +0800
+++ calligra-2.4.3/plan/plugins/schedulers/rcps/libs/src/slist.c 2012-07-16 16:25:14.000000000 +0800
@@ -1,6 +1,6 @@
#include <assert.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <string.h>
#include "slist.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment