diff -Nurd -x'*~' inkscape-0.48.3.1.orig/configure inkscape-0.48.3.1/configure
--- inkscape-0.48.3.1.orig/configure	2012-02-18 20:43:51.000000000 -0500
+++ inkscape-0.48.3.1/configure	2012-02-21 21:44:53.000000000 -0500
@@ -7349,7 +7349,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
 $as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
   ink_svd_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="-Werror=format-security $CPPFLAGS"
+  if [ `uname -r | cut -f1 -d.` -gt 9 ] ; then CPPFLAGS="-Werror=format-security $CPPFLAGS" ; fi
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8439,6 +8439,11 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+/* To make the test function on Mac OS X – Simon Urbanek */
+/* http://stackoverflow.com/questions/8983038/linker-errors-after-enabling-openmp-on-mac */
+#include <pthread.h>
+pthread_attr_t gomp_thread_attr;
+
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
@@ -10966,7 +10966,8 @@
 
 # Add X11 library if needed
 if test "x$gtk_backend_target" = "xx11"; then
-  INKSCAPE_LIBS="$INKSCAPE_LIBS -lX11"
+  INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -I/usr/X11R6/include"
+  INKSCAPE_LIBS="$INKSCAPE_LIBS -L/usr/X11R6/lib -lX11"
 fi
 
 # Check for Apple Mac OS X Carbon framework
diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/Makefile.in inkscape-0.48.3.1/src/Makefile.in
--- inkscape-0.48.3.1.orig/src/Makefile.in	2012-02-18 20:43:50.000000000 -0500
+++ inkscape-0.48.3.1/src/Makefile.in	2012-02-21 21:44:53.000000000 -0500
@@ -2447,6 +2447,9 @@
 # Add Inkview-only sources here.
 inkview_SOURCES = inkview.cpp $(win32_sources)
 INCLUDES = \
+	-I$(top_srcdir)/cxxtest \
+	-I$(srcdir)/bind/javainc \
+	-I$(srcdir)/bind/javainc/linux \
 	$(PERL_CFLAGS) $(PYTHON_CFLAGS)	\
 	$(FREETYPE_CFLAGS)	\
 	$(GNOME_PRINT_CFLAGS)	\
@@ -2460,10 +2463,7 @@
 	$(POPPLER_GLIB_CFLAGS)	\
 	-DPOTRACE=\"potrace\"	\
 	$(INKSCAPE_CFLAGS) \
-	-I$(top_srcdir)/cxxtest \
 	$(WIN32_CFLAGS) \
-	-I$(srcdir)/bind/javainc \
-	-I$(srcdir)/bind/javainc/linux \
 	$(AM_CPPFLAGS)
 
 CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/ui/widget/registered-widget.h inkscape-0.48.3.1/src/ui/widget/registered-widget.h
--- inkscape-0.48.3.1.orig/src/ui/widget/registered-widget.h	2011-07-08 14:25:09.000000000 -0400
+++ inkscape-0.48.3.1/src/ui/widget/registered-widget.h	2012-02-21 21:44:53.000000000 -0500
@@ -61,9 +61,6 @@
 
     bool is_updating() {if (_wr) return _wr->isUpdating(); else return false;}
 
-    // provide automatic 'upcast' for ease of use. (do it 'dynamic_cast' instead of 'static' because who knows what W is)
-    operator const Gtk::Widget () { return dynamic_cast<Gtk::Widget*>(this); }
-
 protected:
     RegisteredWidget() : W() { construct(); }
     template< typename A >
diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/widgets/desktop-widget.h inkscape-0.48.3.1/src/widgets/desktop-widget.h
--- inkscape-0.48.3.1.orig/src/widgets/desktop-widget.h	2011-07-08 14:25:09.000000000 -0400
+++ inkscape-0.48.3.1/src/widgets/desktop-widget.h	2012-02-21 21:44:53.000000000 -0500
@@ -239,7 +239,7 @@
 private:
     GtkWidget *tool_toolbox;
     GtkWidget *aux_toolbox;
-    GtkWidget *commands_toolbox,;
+    GtkWidget *commands_toolbox;
     GtkWidget *snap_toolbox;
 
     static void init(SPDesktopWidget *widget);
diff -u inkscape-0.48.3.1-1l/inkscape-0.48.3.1/configure.orig  inkscape-0.48.3.1-1l/inkscape-0.48.3.1/configure