[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.12] portage/kdeapps/calligra: Remove unused calligra patches.
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-12-31 23:04:12
Message-ID: E1Vy8M8-0002P4-B7 () scm ! kde ! org
[Download RAW message or body]

Git commit 6228b8e640a98ab8ca8fd1133bb7ade8efdd0fbc by Andrius da Costa Ribas.
Committed on 31/12/2013 at 22:31.
Pushed by andriusr into branch 'kde-4.12'.

Remove unused calligra patches.

D  +0    -24   portage/kdeapps/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
 D  +0    -94   portage/kdeapps/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch


http://commits.kde.org/emerge/6228b8e640a98ab8ca8fd1133bb7ade8efdd0fbc

diff --git a/portage/kdeapps/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch \
b/portage/kdeapps/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
 deleted file mode 100644
index e94843a..0000000
--- a/portage/kdeapps/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
                
+++ /dev/null
@@ -1,24 +0,0 @@
-From b22afbc35fc288f1baeab7acfe11aa5a770ad144 Mon Sep 17 00:00:00 2001
-From: Andrius da Costa Ribas <andriusmao@gmail.com>
-Date: Fri, 16 Mar 2012 00:34:49 -0300
-Subject: [PATCH 1/2] INCLUDE(CheckFunctionExists) before using check_function_exists \
                macro.
-
----
- kexi/CMakeLists.txt |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/kexi/CMakeLists.txt b/kexi/CMakeLists.txt
-index af9f3f0..a724a34 100644
---- a/kexi/CMakeLists.txt
-+++ b/kexi/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(kexi)
- 
-+INCLUDE(CheckFunctionExists)
-+
- SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- 
- option(KEXI_MOBILE "compile a mobile Kexi" OFF)
--- 
-1.7.4.msysgit.0
-
diff --git a/portage/kdeapps/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch \
b/portage/kdeapps/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch
 deleted file mode 100644
index 2157dd5..0000000
--- a/portage/kdeapps/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch
                
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6e9ac6a5009bcc29a4a8efde138613e94bcaeb6b Mon Sep 17 00:00:00 2001
-From: Andrius da Costa Ribas <andriusmao@gmail.com>
-Date: Fri, 16 Mar 2012 00:36:46 -0300
-Subject: [PATCH 2/2] For pure C programs, MSVC requires that variables must be \
                declared in the beginning of the scope.
-
----
- kexi/kexidb/drivers/sqlite/dump/shell.c |   19 ++++++++++++-------
- 1 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/kexi/kexidb/drivers/sqlite/dump/shell.c \
                b/kexi/kexidb/drivers/sqlite/dump/shell.c
-index 1052bdc..d10d436 100644
---- a/kexi/kexidb/drivers/sqlite/dump/shell.c
-+++ b/kexi/kexidb/drivers/sqlite/dump/shell.c
-@@ -1512,13 +1512,14 @@ static int booleanValue(char *zArg){
- 
- static int table_size(struct callback_data *p, const unsigned char* table)
- {
-+  int rc;
-   sqlite3_stmt *pSelect;
-   const char *sqlPref = "SELECT COUNT() FROM ";
-   char *sql = malloc(strlen(sqlPref) + 1 + strlen((const char*)table));
-   strcpy(sql, sqlPref);
-   strcat(sql, (const char*)table);
-   /*fprintf(stderr, "%s", sql);*/
--  int rc = sqlite3_prepare(p->db, sql, -1, &pSelect, 0);
-+  rc = sqlite3_prepare(p->db, sql, -1, &pSelect, 0);
-   if( rc!=SQLITE_OK || !pSelect ){
-     fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
-     return -1;
-@@ -1550,7 +1551,11 @@ static int table_size(struct callback_data *p, const unsigned \
                char* table)
- */
- static int do_meta_command(char *zLine, struct callback_data *p){
-   int i = 1;
--  UNUSED_PARAMETER(zLine);
-+  sqlite3_stmt *pSelect;
-+  int totalRecords;
-+  int prevPercent;
-+  int size;
-+  int percent;
- #if 0
-   int nArg = 0;
-   int n, c;
-@@ -1559,6 +1564,7 @@ static int do_meta_command(char *zLine, struct callback_data \
                *p){
- #if 0
-   char *azArg[50];
- #endif
-+  UNUSED_PARAMETER(zLine);
- 
- #if 0
-   /* Parse the input line into tokens.
-@@ -1662,7 +1668,6 @@ static int do_meta_command(char *zLine, struct callback_data \
                *p){
-     if( nArg==1 ){
- #endif
- 
--  sqlite3_stmt *pSelect;
-   /* get table sizes */
-   rc = sqlite3_prepare(p->db, 
-         "SELECT name FROM sqlite_master "
-@@ -1672,7 +1677,7 @@ static int do_meta_command(char *zLine, struct callback_data \
                *p){
-     return rc;
-   }
-   rc = sqlite3_step(pSelect);
--  int totalRecords = 0;
-+  totalRecords = 0;
-   for(i=0; rc==SQLITE_ROW; i++){
-     int size = table_size(p, sqlite3_column_text(pSelect, 0));
-     if (size < 0) {
-@@ -1721,7 +1726,7 @@ static int do_meta_command(char *zLine, struct callback_data \
                *p){
-     return rc;
-   }
-   rc = sqlite3_step(pSelect);
--  int prevPercent = -1;
-+  prevPercent = -1;
-   for(i=0; rc==SQLITE_ROW;){
-     zShellStatic = (const char*)sqlite3_column_text(pSelect, 0);
-     run_schema_dump_query(p,
-@@ -1735,12 +1740,12 @@ static int do_meta_command(char *zLine, struct callback_data \
                *p){
-       "  AND tbl_name LIKE shellstatic()", 0
-     );
- 
--    int size = table_size(p, sqlite3_column_text(pSelect, 0));
-+    size = table_size(p, sqlite3_column_text(pSelect, 0));
-     if (size < 0) {
-       sqlite3_finalize(pSelect);
-       return 1;
-     }
--    int percent = 100 * i / totalRecords;
-+    percent = 100 * i / totalRecords;
-     if(prevPercent < percent){
-       fprintf(stderr, "DUMP: %d%%\n", percent);
-       prevPercent = percent;
--- 
-1.7.4.msysgit.0
-


[prev in list] [next in list] [prev in thread] [next in thread]