Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15118
Modified Files: inkscape.info inkscape.patch Added Files: inkscape_bug707205-export-dynamic.patch inkscape_compiler_check.patch inkscape_rev10062-preferences.patch inkscape_rev10399.patch inkscape_rev12202.patch Log Message: inkscape now builds with clang maintainer approved --- NEW FILE: inkscape_bug707205-export-dynamic.patch --- === modified file 'configure.ac' --- a/configure.ac 2011-07-02 20:43:05 +0000 +++ b/configure.ac 2011-07-10 17:54:41 +0000 @@ -323,7 +323,6 @@ platform_osx=no fi AC_MSG_RESULT([$platform_osx]) -AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes") AC_MSG_CHECKING([for Solaris platform]) case "$host" in === modified file 'src/Makefile.am' --- a/src/Makefile.am 2011-07-05 20:22:31 +0000 +++ b/src/Makefile.am 2011-07-10 17:54:41 +0000 @@ -205,11 +205,7 @@ inkscape_SOURCES += main.cpp $(win32_sources) inkscape_LDADD = $(all_libs) -if PLATFORM_OSX -inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) -else -inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows) -endif +inkscape_LDFLAGS = $(kdeldflags) $(mwindows) inkview_SOURCES += inkview.cpp $(win32_sources) inkview_LDADD = $(all_libs) --- NEW FILE: inkscape_rev12202.patch --- === modified file 'src/2geom/basic-intersection.cpp' --- a/src/2geom/basic-intersection.cpp 2011-02-02 21:24:36 +0000 +++ b/src/2geom/basic-intersection.cpp 2013-03-13 21:44:30 +0000 @@ -64,7 +64,12 @@ void split(vector<Point> const &p, double t, vector<Point> &left, vector<Point> &right) { const unsigned sz = p.size(); - Geom::Point Vtemp[sz][sz]; + + Geom::Point **Vtemp = new Geom::Point* [sz]; + + for (unsigned int i = 0; i < sz; ++i) { + Vtemp[i] = new Geom::Point[sz]; + } /* Copy control points */ std::copy(p.begin(), p.end(), Vtemp[0]); @@ -82,6 +87,11 @@ left[j] = Vtemp[j][0]; for (unsigned j = 0; j < sz; j++) right[j] = Vtemp[sz-1-j][j]; + + for (unsigned int i = 0; i < sz; ++i) + delete[] Vtemp[i]; + + delete[] Vtemp; } === modified file 'src/2geom/solve-bezier-parametric.cpp' --- a/src/2geom/solve-bezier-parametric.cpp 2011-07-24 23:24:28 +0000 +++ b/src/2geom/solve-bezier-parametric.cpp 2013-03-13 21:44:30 +0000 @@ -68,13 +68,20 @@ break; } - // Otherwise, solve recursively after subdividing control polygon - std::vector<Geom::Point> Left(degree + 1); // New left and right - std::vector<Geom::Point> Right(degree + 1); // control polygons + /* + * Otherwise, solve recursively after subdividing control polygon + * New left and right control polygons + */ + Geom::Point *Left = new Geom::Point[degree+1]; + Geom::Point *Right = new Geom::Point[degree+1]; + Bezier(w, degree, 0.5, &Left[0], &Right[0]); total_subs ++; find_parametric_bezier_roots(&Left[0], degree, solutions, depth + 1); find_parametric_bezier_roots(&Right[0], degree, solutions, depth + 1); + + delete[] Left; + delete[] Right; } @@ -191,7 +198,10 @@ Geom::Point *Left, /* RETURN left half ctl pts */ Geom::Point *Right) /* RETURN right half ctl pts */ { - Geom::Point Vtemp[degree+1][degree+1]; + Geom::Point **Vtemp = new Geom::Point* [degree+1]; + + for (unsigned int i = 0; i < degree+1; ++i) + Vtemp[i] = new Geom::Point[degree+1]; /* Copy control points */ std::copy(V, V+degree+1, Vtemp[0]); @@ -208,7 +218,14 @@ for (unsigned j = 0; j <= degree; j++) Right[j] = Vtemp[degree-j][j]; - return (Vtemp[degree][0]); + Geom::Point return_value = Vtemp[degree][0]; + + for (unsigned int i = 0; i < degree+1; ++i) + delete[] Vtemp[i]; + + delete[] Vtemp; + + return return_value; } }; === modified file 'src/color-profile.cpp' --- a/src/color-profile.cpp 2013-01-05 14:16:58 +0000 +++ b/src/color-profile.cpp 2013-03-13 21:44:30 +0000 @@ -103,6 +103,8 @@ static SPObjectClass *cprof_parent_class; +namespace Inkscape { + class ColorProfileImpl { public: #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) @@ -129,10 +131,6 @@ #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) }; - - -namespace Inkscape { - #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) cmsColorSpaceSignature asICColorSpaceSig(ColorSpaceSig const & sig) { --- NEW FILE: inkscape_rev10399.patch --- --- a/src/display/nr-filter-gaussian.cpp 2012-02-13 22:22:17.000000000 -0500 +++ a/src/display/nr-filter-gaussian.cpp 2013-06-20 15:11:33.000000000 -0400 @@ -708,7 +708,7 @@ }; } else if ( scr_len_x > 0 ) { // !use_IIR_x // Filter kernel for x direction - FIRValue kernel[scr_len_x+1]; + std::vector<FIRValue> kernel(scr_len_x+1); _make_kernel(&kernel[0], deviation_x); // Filter (x) @@ -770,7 +770,7 @@ }; } else if ( scr_len_y > 0 ) { // !use_IIR_y // Filter kernel for y direction - FIRValue kernel[scr_len_y+1]; + std::vector<FIRValue> kernel(scr_len_y+1); _make_kernel(&kernel[0], deviation_y); // Filter (y) Index: inkscape.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/inkscape.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- inkscape.info 20 Jun 2013 19:28:52 -0000 1.7 +++ inkscape.info 21 Jun 2013 02:49:28 -0000 1.8 @@ -1,6 +1,6 @@ Package: inkscape Version: 0.48.4 -Revision: 4 +Revision: 5 GCC: 4.0 Maintainer: Daniel Macks <dma...@netspace.org> Depends: << @@ -41,9 +41,12 @@ BuildDepends: << aspell-dev (>= 0.60.5-1002), atk1 (>= 1.32.0-1), + autoconf2.6, + automake1.13, boost1.46.1.cmake, cairo (>= 1.8.8-3), cairomm1 (>= 1.8.2-3), + fink (>= 0.30.0), fink-package-precedence, fontconfig2-dev (>= 2.10.0-1), freetype219 (>= 2.4.11-1), @@ -64,7 +67,6 @@ lcms (>= 1.13-1), libgettext8-dev, libiconv-dev, - llvm-gcc, libpng15, libsigc++2 (>= 2.0.17-1001), libwpd-0.9-dev, @@ -80,20 +82,35 @@ popt, x11-dev << -Suggests: default-icon-theme Source: mirror:sourceforge:%n/%n-%v.tar.bz2 Source-MD5: 47bd8546e42ba396624eef9eb66b9b6c +SetCPPFLAGS: -Wno-error=format-security ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking --with-gnome-vfs --enable-lcms PatchFile: %n.patch -PatchFile-MD5: 0a0f5ae5e93874a978c5e3221d1a9257 +PatchFile-MD5: cd6f5c4833fc7e425953d8121b0c19d9 + +# http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/12203 +PatchFile2: inkscape_compiler_check.patch +PatchFile2-MD5: 3725c87e175fa758326c22ffb4b47a45 + +# modified from http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/12202 +PatchFile3: inkscape_rev12202.patch +PatchFile3-MD5: 7a870be193ae34fe0c7dd5402bee6b70 + +# http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10399 +PatchFile4: inkscape_rev10399.patch +PatchFile4-MD5: 34c3e1d8208127d524e806298a0be3bf + +# modified from http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10062 +PatchFile5: inkscape_rev10062-preferences.patch +PatchFile5-MD5: 0a40f13cd8adfd1eac3d8e06bc25891a + +# https://bugs.launchpad.net/inkscape/+bug/707205/comments/28 +PatchFile6: inkscape_bug707205-export-dynamic.patch +PatchFile6-MD5: 55d97d3fd35286031d2cf8f346982740 PatchScript: << %{default_script} - # configure.ac needs token to find version in 'gcc -v' output - # should rewrite as AC_TRY_RUN with .c comparison of macros: - # __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ -# perl -pi -e 's/gcc version/clang version/' configure - # fink doesn't have gtk >= 2.22 yet, make sure # we get consistent build results when it does perl -pi -e 's/(gtkmm-2.4 >=) 2\.22/${1} >= 99999.FORCE.NONDETECT/g' configure @@ -103,17 +120,7 @@ CompileScript: << #!/bin/sh -ev - # Lots of the source isn't compatible with clang, so we drop - # back to legacy compiler if fink (or a new xcode suite from - # apple?) is mapping g++ -> clang++ (cannot simply do this - # everywhere, since may not have the legacy-name available if - # there's no newer one and/or may not have it wrapped for fink - # single-arch) - if g++ -v 2>&1 | grep -q clang; then - export CC=llvm-gcc-4.2 - export CXX=llvm-g++-4.2 - fi - + autoreconf -vfi ./configure %c make V=1 fink-package-precedence . @@ -129,7 +136,33 @@ Cherry-pick clang-support patches from upstream bzr repo: bad type-conversion (registered-widget.h) + http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10360 + stray comma (desktop-widget.h) + http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10359 + + Compiler version check + http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/12203 + + Clang fixes: + Modified from http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/12202 + and http://bazaar.launchpad.net/~inkscape.dev/inkscape/RELEASE_0_48_BRANCH/revision/9864 + basic-intersection.cpp + solve-bezier-parametric.cpp + color-profile.cpp + + box3d-context.h: + Add "-Wno-error=format-security" + "not string literal" clang failure + https://bugs.launchpad.net/inkscape/+bug/1193025 + + nr-filter-gaussian.cpp + variable-length array of non-POD element + Modified from http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10399 + + inkscape-preferences.cpp + variable length array of non-POD element type 'Glib::ustring' + Modified from http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10062 << DescPackaging: << Formerly maintained by Michael Wybrow @@ -144,8 +177,6 @@ Could convert to use external libgdl? See: https://bugs.launchpad.net/inkscape/+bug/792115 - Giving up on clang because there is too much incompatible. - Uptream claims lcms2 2.2 and 2.3 are buggy on OS X, so staying with older lcms lib for now. << --- NEW FILE: inkscape_compiler_check.patch --- --- a/configure.ac 2012-12-15 11:50:19.000000000 -0500 +++ b/configure.ac 2013-06-18 11:43:40.000000000 -0400 @@ -106,31 +106,6 @@ dnl Honor aclocal flags ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -dnl Verify our GCC version -if test "x$GXX" = "xyes"; then - AC_MSG_CHECKING([GNU compiler version]) - - # Don't pass CXXFLAGS to the following CXX command as some - # of them can't be specified along with '-v'. - cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\ - sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"] - - AC_MSG_RESULT([$cc_version]) - - # Some version numbers - cc_vers_major=`echo $cc_version | cut -f1 -d.` - cc_vers_minor=`echo $cc_version | cut -f2 -d.` - cc_vers_patch=`echo $cc_version | cut -f3 -d.` - test -n "$cc_vers_major" || cc_vers_major=0 - test -n "$cc_vers_minor" || cc_vers_minor=0 - test -n "$cc_vers_patch" || cc_vers_patch=0 - cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch` - - if test $cc_vers_major -lt 3; then - AC_MSG_ERROR([gcc >= 3.0 is needed to compile inkscape]) - fi -fi - # Detect a working version of unordered containers. AC_MSG_CHECKING([TR1 unordered_set usability]) AC_COMPILE_IFELSE([ Index: inkscape.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/inkscape.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- inkscape.patch 20 Dec 2012 07:29:57 -0000 1.3 +++ inkscape.patch 21 Jun 2013 02:49:28 -0000 1.4 @@ -1,7 +1,7 @@ -diff -Nurd -x'*~' inkscape-0.48.4.orig/configure inkscape-0.48.4/configure ---- inkscape-0.48.4.orig/configure 2012-12-15 11:56:08.000000000 -0500 -+++ inkscape-0.48.4/configure 2012-12-20 00:00:10.000000000 -0500 -@@ -11070,7 +11070,8 @@ +diff -Nurd -x'*~' inkscape-0.48.4.orig/configure.ac inkscape-0.48.4/configure.ac +--- inkscape-0.48.4.orig/configure.ac 2012-12-15 11:56:08.000000000 -0500 ++++ inkscape-0.48.4/configure.ac 2012-12-20 00:00:10.000000000 -0500 +@@ -728,7 +728,8 @@ # Add X11 library if needed if test "x$gtk_backend_target" = "xx11"; then @@ -11,20 +11,20 @@ fi # Check for Apple Mac OS X Carbon framework -diff -Nurd -x'*~' inkscape-0.48.4.orig/src/Makefile.in inkscape-0.48.4/src/Makefile.in ---- inkscape-0.48.4.orig/src/Makefile.in 2012-12-15 11:56:07.000000000 -0500 -+++ inkscape-0.48.4/src/Makefile.in 2012-12-20 00:00:43.000000000 -0500 -@@ -2471,6 +2471,9 @@ - # Add Inkview-only sources here. - inkview_SOURCES = inkview.cpp $(win32_sources) - INCLUDES = \ +diff -Nurd -x'*~' inkscape-0.48.4.orig/src/Makefile.am inkscape-0.48.4/src/Makefile.am +--- inkscape-0.48.4.orig/src/Makefile.am 2012-12-15 11:56:07.000000000 -0500 ++++ inkscape-0.48.4/src/Makefile.am 2013-06-20 16:55:13.000000000 -0400 +@@ -55,6 +55,9 @@ + inkview_SOURCES = + + INCLUDES = \ + -I$(top_srcdir)/cxxtest \ + -I$(srcdir)/bind/javainc \ + -I$(srcdir)/bind/javainc/linux \ $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(GNOME_PRINT_CFLAGS) \ -@@ -2484,10 +2487,7 @@ +@@ -68,10 +71,7 @@ $(POPPLER_GLIB_CFLAGS) \ -DPOTRACE=\"potrace\" \ $(INKSCAPE_CFLAGS) \ --- NEW FILE: inkscape_rev10062-preferences.patch --- === modified file 'src/preferences-skeleton.h' --- a/src/preferences-skeleton.h 2010-11-17 02:12:56 +0000 +++ b/src/preferences-skeleton.h 2011-02-21 19:17:17 +0000 @@ -277,7 +277,7 @@ " <group id=\"autoscrolldistance\" value=\"-10\"/>\n" " <group id=\"simplifythreshold\" value=\"0.002\"/>\n" " <group id=\"bitmapoversample\" value=\"1\"/>\n" -" <group id=\"bitmapeditor\" value=\"0\" choices=\"gimp,krita,gpaint,kolourpaint,mtpaint,cinepaint\"/>\n" +" <group id=\"bitmapeditor\" value=\"gimp\"/>\n" " <group id=\"bitmapautoreload\" value=\"1\"/>\n" " <group id=\"dialogtype\" value=\"1\"/>\n" " <group id=\"dock\" " === modified file 'src/ui/context-menu.cpp' --- a/src/ui/context-menu.cpp 2011-02-21 07:59:34 +0000 +++ b/src/ui/context-menu.cpp 2011-02-21 19:17:17 +0000 @@ -436,17 +436,10 @@ static gchar* getImageEditorName() { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); [...1035 lines suppressed...] void onRelatedButtonClickedCallback(); }; +class PrefEntryFileButtonHBox : public Gtk::HBox +{ +public: + void init(Glib::ustring const &prefs_path, + bool mask); +protected: + Glib::ustring _prefs_path; + Gtk::Button *relatedButton; + Gtk::Entry *relatedEntry; + void onRelatedEntryChangedCallback(); + void onRelatedButtonClickedCallback(); +}; + class PrefFileButton : public Gtk::FileChooserButton { public: ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs