[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge/kde-4.8] portage/testing/calligra: add 2.3.92 (2.4.0-rc2) release and update dependencies
From: Patrick Spendrin <ps_ml () gmx ! de>
Date: 2012-03-21 14:49:42
Message-ID: 20120321144942.C7399A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 4da7a8ad3228300a9434b5cddfcffb23c1843121 by Patrick Spendrin.
Committed on 21/03/2012 at 15:46.
Pushed by sengels into branch 'kde-4.8'.
add 2.3.92 (2.4.0-rc2) release and update dependencies
A +24 -0 portage/testing/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
A +33 -0 portage/testing/calligra/0001-make-it-possible-to-find-openjpeg-on-windows.patch
A +94 -0 portage/testing/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch
M +22 -11 portage/testing/calligra/calligra-20101207.py
http://commits.kde.org/emerge/4da7a8ad3228300a9434b5cddfcffb23c1843121
diff --git a/portage/testing/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch \
b/portage/testing/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
new file mode 100644
index 0000000..e94843a
--- /dev/null
+++ b/portage/testing/calligra/0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch
@@ -0,0 +1,24 @@
+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/testing/calligra/0001-make-it-possible-to-find-openjpeg-on-windows.patch \
b/portage/testing/calligra/0001-make-it-possible-to-find-openjpeg-on-windows.patch \
new file mode 100644 index 0000000..fe80cc7
--- /dev/null
+++ b/portage/testing/calligra/0001-make-it-possible-to-find-openjpeg-on-windows.patch
@@ -0,0 +1,33 @@
+From 21e0125fe16e5958c10a7c8141114e17d0ffec4b Mon Sep 17 00:00:00 2001
+From: Patrick Spendrin <ps_ml@gmx.de>
+Date: Wed, 21 Mar 2012 00:04:57 +0100
+Subject: [PATCH] make it possible to find openjpeg on windows
+
+---
+ cmake/modules/FindOpenJPEG.cmake | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/FindOpenJPEG.cmake b/cmake/modules/FindOpenJPEG.cmake
+index 949384e..d88a1bc 100644
+--- a/cmake/modules/FindOpenJPEG.cmake
++++ b/cmake/modules/FindOpenJPEG.cmake
+@@ -10,10 +10,12 @@
+ # OPENJPEG_LIBRARY, where to find the OpenJPEG library.
+
+ FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
+-/usr/local/include/openjpeg
+-/usr/local/include
+-/usr/include/openjpeg
+-/usr/include
++PATHS
++ /usr/local/include/openjpeg
++ /usr/local/include
++ /usr/include/openjpeg
++ /usr/include
++PATH_SUFFIXES openjpeg
+ )
+
+ SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
+--
+1.7.4.msysgit.0
+
diff --git a/portage/testing/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch \
b/portage/testing/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch
new file mode 100644
index 0000000..2157dd5
--- /dev/null
+++ b/portage/testing/calligra/0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch
@@ -0,0 +1,94 @@
+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
+
diff --git a/portage/testing/calligra/calligra-20101207.py \
b/portage/testing/calligra/calligra-20101207.py index f061c03..0c67954 100644
--- a/portage/testing/calligra/calligra-20101207.py
+++ b/portage/testing/calligra/calligra-20101207.py
@@ -3,20 +3,31 @@ import info
class subinfo( info.infoclass ):
def setTargets( self ):
self.svnTargets['gitHEAD'] = "[git]kde:calligra"
+ self.svnTargets['gitStable'] = "[git]kde:calligra|calligra/2.4|"
+ for ver in ['2.3.92']:
+ self.targets[ver] = 'ftp://ftp.kde.org/pub/kde/unstable/calligra-' + ver \
+ '/calligra-' + ver + '.tar.bz2' + self.targetInstSrc[ver] = 'calligra-' \
+ ver + self.targetDigests['2.3.92'] = \
'460d01bbb454140e851f7ea251d3ac8e143215e5' + self.patchToApply['2.3.92'] = [ \
("0001-INCLUDE-CheckFunctionExists-before-using-check_funct.patch", 1), + \
("0001-make-it-possible-to-find-openjpeg-on-windows.patch", 1), + \
("0002-For-pure-C-programs-MSVC-requires-that-variables-mus.patch", 1) + \
] self.defaultTarget = 'gitHEAD'
def setDependencies( self ):
- self.hardDependencies['win32libs-bin/lcms2'] = 'default'
- self.hardDependencies['win32libs-bin/libwpd'] = 'default'
- self.hardDependencies['win32libs-bin/libwpg'] = 'default'
- self.hardDependencies['win32libs-bin/openjpeg'] = 'default'
- self.hardDependencies['win32libs-bin/libfftw'] = 'default'
- self.hardDependencies['virtual/kdepimlibs'] = 'default'
- self.hardDependencies['virtual/kde-runtime'] = 'default'
- self.hardDependencies['kdesupport/eigen2'] = 'default'
- self.hardDependencies['kdesupport/poppler'] = 'default'
- self.softDependencies['kdesupport/qca'] = 'default'
- self.softDependencies['testing/gsl'] = 'default'
+ self.dependencies['win32libs-bin/lcms2'] = 'default'
+ self.dependencies['win32libs-bin/libwpd'] = 'default'
+ self.dependencies['win32libs-bin/libwpg'] = 'default'
+ self.dependencies['win32libs-bin/openjpeg'] = 'default'
+ self.dependencies['win32libs-bin/libfftw'] = 'default'
+ self.dependencies['win32libs-bin/glew'] = 'default'
+ self.dependencies['virtual/kdepimlibs'] = 'default'
+ self.dependencies['virtual/kde-runtime'] = 'default'
+ self.dependencies['kdesupport/eigen2'] = 'default'
+ self.dependencies['kdesupport/poppler'] = 'default'
+ self.dependencies['kde/okular'] = 'default'
+ self.dependencies['kde/libkdcraw'] = 'default'
+ self.dependencies['testing/gsl'] = 'default'
from Package.CMakePackageBase import *
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic