Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8d600d20459968a56b1a3256823cfcf9a8e106a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8d600d20459968a56b1a3256823cfcf9a8e106a2)
  • Date: Thu, 15 Apr 2010 04:46:06 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics/rawstudio/HISTORY | 4 ++++
graphics/rawstudio/PRE_BUILD | 1 +
graphics/rawstudio/gcc-4.4.patch | 11 +++++++++++
3 files changed, 16 insertions(+)

New commits:
commit 8d600d20459968a56b1a3256823cfcf9a8e106a2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/rawstudio: added patch so it compiles with gcc 4.4

diff --git a/graphics/rawstudio/HISTORY b/graphics/rawstudio/HISTORY
index 2488d0f..25ab5d5 100644
--- a/graphics/rawstudio/HISTORY
+++ b/graphics/rawstudio/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.4.patch: added patch to make the spell
+ compile with gcc 4.4
+
2009-08-16 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: updated spell to 1.2

diff --git a/graphics/rawstudio/PRE_BUILD b/graphics/rawstudio/PRE_BUILD
index c00f9e7..d81cd9f 100755
--- a/graphics/rawstudio/PRE_BUILD
+++ b/graphics/rawstudio/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch &&
if [[ $RAWSTUDIO_SCM == y ]]; then
NOCONFIGURE=X ./autogen.sh
fi
diff --git a/graphics/rawstudio/gcc-4.4.patch
b/graphics/rawstudio/gcc-4.4.patch
new file mode 100644
index 0000000..60818af
--- /dev/null
+++ b/graphics/rawstudio/gcc-4.4.patch
@@ -0,0 +1,11 @@
+--- rawstudio-1.2/src/dcraw.cc 2009-04-09 23:21:45.000000000 +0200
++++ rawstudio-1.2.fixed/src/dcraw.cc 2010-04-15 11:38:21.188270444 +0200
+@@ -8510,7 +8510,7 @@
+ argv[argc] = "";
+ for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+ opt = argv[arg++][1];
+- if ((cp = strchr (sp="nbrkStqmHACg", opt)))
++ if ((cp = const_cast<char *>(strchr (sp="nbrkStqmHACg", opt))))
+ for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
+ if (!isdigit(argv[arg+i][0])) {
+ dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"),
opt);



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8d600d20459968a56b1a3256823cfcf9a8e106a2), Florian Franzmann, 04/15/2010

Archive powered by MHonArc 2.6.24.

Top of Page