[92845] trunk/dports/graphics/darktable

jmr at macports.org jmr at macports.org
Tue May 8 21:48:50 PDT 2012 

Revision: 92845
          https://trac.macports.org/changeset/92845
Author:   jmr at macports.org
Date:     2012-05-08 21:48:49 -0700 (Tue, 08 May 2012)
Log Message:
-----------
darktable: remove use of -Werror

Modified Paths:
--------------
    trunk/dports/graphics/darktable/Portfile
    trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff

Added Paths:
-----------
    trunk/dports/graphics/darktable/files/patch-Werror.diff

Modified: trunk/dports/graphics/darktable/Portfile
===================================================================
--- trunk/dports/graphics/darktable/Portfile	2012-05-09 04:27:37 UTC (rev 92844)
+++ trunk/dports/graphics/darktable/Portfile	2012-05-09 04:48:49 UTC (rev 92845)
@@ -45,7 +45,8 @@
                     port:sqlite3 \
                     port:tiff
 
-patchfiles          patch-src-common-exif.cc.diff patch-darktablerc.diff patch-src-iop-lens.c.diff
+patchfiles          patch-src-common-exif.cc.diff patch-darktablerc.diff \
+                    patch-src-iop-lens.c.diff patch-Werror.diff
 
 configure.args-append   --disable-gconf --disable-gkeyring
 

Added: trunk/dports/graphics/darktable/files/patch-Werror.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-Werror.diff	                        (rev 0)
+++ trunk/dports/graphics/darktable/files/patch-Werror.diff	2012-05-09 04:48:49 UTC (rev 92845)
@@ -0,0 +1,84 @@
+--- src/imageio/format/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/imageio/format/Makefile.in	2012-05-09 14:35:49.000000000 +1000
+@@ -161,7 +161,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
+ 	-g -rdynamic
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+@@ -171,7 +171,7 @@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@ $(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) \
+-	-I$(srcdir)/../.. -Werror -g -rdynamic
++	-I$(srcdir)/../.. -g -rdynamic
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+--- src/imageio/storage/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/imageio/storage/Makefile.in	2012-05-09 14:36:04.000000000 +1000
+@@ -133,7 +133,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
+ 	-g -rdynamic
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+--- src/iop/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/iop/Makefile.in	2012-05-09 14:36:18.000000000 +1000
+@@ -286,7 +286,7 @@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. \
+-	-I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
++	-I$(srcdir)/dtgtk -g $(RSVG_CFLAGS)
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CURL_CFLAGS = @CURL_CFLAGS@
+@@ -295,7 +295,7 @@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@ $(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. \
+-	-I$(srcdir)/dtgtk -Werror -g
++	-I$(srcdir)/dtgtk -g
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
+--- src/libs/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/libs/Makefile.in	2012-05-09 14:36:30.000000000 +1000
+@@ -159,7 +159,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
+ 	-rdynamic
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+--- src/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/Makefile.in	2012-05-09 14:36:46.000000000 +1000
+@@ -404,7 +404,7 @@
+ 	$(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) \
+ 	-fno-strict-aliasing -Wall -std=c99 -I$(srcdir)/LibRaw -fPIC \
+ 	-DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\" \
+-	-Werror -rdynamic -Wno-deprecated-declarations
++	-rdynamic -Wno-deprecated-declarations
+ AM_CXXFLAGS = $(GNOME_KEYRING_CFLAGS) $(GPHOTO2_CFLAGS) $(GEGL_CFLAGS) $(DBUSGLIB_CFLAGS) $(EXIV2_CFLAGS) $(CAIRO_CFLAGS) $(GLADE_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) -fno-strict-aliasing -Wall -I$(srcdir)/LibRaw -fPIC -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\"
+ AM_CPPFLAGS = $(OPENEXR_CFLAGS)
+ libdarktable_LTLIBRARIES = libdarktable.la
+--- src/views/Makefile.in.orig	2010-12-07 23:18:55.000000000 +1100
++++ src/views/Makefile.in	2012-05-09 14:36:58.000000000 +1000
+@@ -138,7 +138,7 @@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
+ 	-rdynamic
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@

Modified: trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff	2012-05-09 04:27:37 UTC (rev 92844)
+++ trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff	2012-05-09 04:48:49 UTC (rev 92845)
@@ -28,8 +28,8 @@
  	$(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) \
  	-fno-strict-aliasing -Wall -std=c99 -I$(srcdir)/LibRaw -fPIC \
  	-DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\" \
--	-Werror -rdynamic -Wno-deprecated-declarations
-+	-Werror -Wno-deprecated-declarations  -Wno-error=unused-but-set-variable
+-	-rdynamic -Wno-deprecated-declarations
++	-Wno-deprecated-declarations  -Wno-error=unused-but-set-variable
  AM_CXXFLAGS = $(GNOME_KEYRING_CFLAGS) $(GPHOTO2_CFLAGS) $(GEGL_CFLAGS) $(DBUSGLIB_CFLAGS) $(EXIV2_CFLAGS) $(CAIRO_CFLAGS) $(GLADE_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) -fno-strict-aliasing -Wall -I$(srcdir)/LibRaw -fPIC -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\"
  AM_CPPFLAGS = $(OPENEXR_CFLAGS)
  libdarktable_LTLIBRARIES = libdarktable.la
@@ -52,7 +52,7 @@
 @@ -162,7 +162,7 @@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
+ CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
 -	-g -rdynamic
 +	-Wno-error=unused-but-set-variable -g
  CPP = @CPP@
@@ -62,8 +62,8 @@
  CXXCPP = @CXXCPP@
  CXXDEPMODE = @CXXDEPMODE@
  CXXFLAGS = @CXXFLAGS@ $(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) \
--	-I$(srcdir)/../.. -Werror -g -rdynamic
-+	-I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
+-	-I$(srcdir)/../.. -g -rdynamic
++	-I$(srcdir)/../.. -Wno-error=unused-but-set-variable -g
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
@@ -84,7 +84,7 @@
 @@ -134,7 +134,7 @@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
+ CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
 -	-g -rdynamic
 +	-Wno-error=unused-but-set-variable -g
  CPP = @CPP@
@@ -110,8 +110,8 @@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. \
--	-I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
-+	-I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
+-	-I$(srcdir)/dtgtk -g $(RSVG_CFLAGS)
++	-I$(srcdir)/dtgtk -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CURL_CFLAGS = @CURL_CFLAGS@
@@ -119,8 +119,8 @@
  CXXCPP = @CXXCPP@
  CXXDEPMODE = @CXXDEPMODE@
  CXXFLAGS = @CXXFLAGS@ $(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. \
--	-I$(srcdir)/dtgtk -Werror -g
-+	-I$(srcdir)/dtgtk -Werror -Wno-error=unused-but-set-variable -g
+-	-I$(srcdir)/dtgtk -g
++	-I$(srcdir)/dtgtk -Wno-error=unused-but-set-variable -g
  CYGPATH_W = @CYGPATH_W@
  DATADIRNAME = @DATADIRNAME@
  DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
@@ -142,9 +142,9 @@
  CATOBJEXT = @CATOBJEXT@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
 -	-rdynamic
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g -Wno-error=unused-but-set-variable
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CURL_CFLAGS = @CURL_CFLAGS@
@@ -166,9 +166,9 @@
  CATOBJEXT = @CATOBJEXT@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
+-CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
 -	-rdynamic
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
++CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g -Wno-error=unused-but-set-variable
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CURL_CFLAGS = @CURL_CFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120508/4c84d42b/attachment.html>

More information about the macports-changes mailing list