[csw-devel] SF.net SVN: gar:[21356] csw/mgar/pkg/wxwidgets/trunk

[lblume at users.sourceforge.net]

Revision: 21356
          http://gar.svn.sourceforge.net/gar/?rev=21356&view=rev
Author:   lblume
Date:     2013-06-17 12:03:54 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Fix building with print support

Modified Paths:
--------------
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2013-06-17 11:29:33 UTC (rev 21355)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2013-06-17 12:03:54 UTC (rev 21356)
@@ -19,6 +19,8 @@
 MASTER_SITES = $(SF_MIRRORS)
 SF_PROJECT   = wxwindows
 
+PATCHFILES += 0006-configure-gnome-print-headers.patch
+
 PACKAGES  = CSWwxwidgets
 PACKAGES += CSWwxwidgets-dev
 PACKAGES += CSWwxwidgetsgtk2
@@ -43,6 +45,7 @@
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgnomeprintui
 
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2
@@ -70,6 +73,7 @@
 BUILD_DEP_PKGS += CSWlibiconv-dev
 BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWlibexpat-dev
+BUILD_DEP_PKGS += CSWlibgnomeprintdevel
 
 # Easier than defining each individual .so.xxx
 PKGFILES_CSWwxwidgets     = $(libdir).*libwx_base.*\.so\..*
@@ -99,8 +103,8 @@
 CONFIGURE_ARGS += --with-regex
 CONFIGURE_ARGS += --with-opengl
 CONFIGURE_ARGS += --enable-unicode
-CONFIGURE_ARGS += --enable-printarch=no
-CONFIGURE_ARGS += --with-gnomeprint=no
+CONFIGURE_ARGS += --enable-printarch=yes
+CONFIGURE_ARGS += --with-gnomeprint=yes
 
 # -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no
 # problem with it being a C++compiler parameter

Added: csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch	                        (rev 0)
+++ csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch	2013-06-17 12:03:54 UTC (rev 21356)
@@ -0,0 +1,11 @@
+--- a/configure.original	Tue Mar 22 12:59:37 2011
++++ b/configure	Mon Jun 17 12:04:00 2013
+@@ -43415,7 +43415,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
++  pkg_cv_LIBGNOMEPRINTUI_CFLAGS="`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` `$PKG_CONFIG --cflags "libgnomeprint-2.2 >= 2.8" 2>/dev/null`"
+ else
+   pkg_failed=yes
+ fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.