#4370 inkscape-0.48.4-9 to fix libc++ build

open
Daniel Macks
None
5
2013-11-19
2013-11-17
Jack Howarth
No

The attached packaging for inkscape-0.48.4-9 uses the MacPorts approach of patching up to revision 9985 from the inkscape 0.48.x branch. This patch, patch-thru-r9985.diff, replaces part of the inkscape.patch and all the other previous patches. An additional hunk is added to the inkscape.patch for…

--- inkscape-0.48.4/src/extension/system.cpp.orig       2013-11-17 17:15:40.000000000 -0500
+++ inkscape-0.48.4/src/extension/system.cpp    2013-11-17 17:15:59.000000000 -0500
@@ -20,6 +20,7 @@

 #include <interface.h>

+#include <unistd.h>
 #include "system.h"
 #include "preferences.h"
 #include "extension.h"

The changes to the inkscape.info file are…

--- /sw/fink/10.7/stable/main/finkinfo/graphics/inkscape.info   2013-11-17 16:58:40.000000000 -0500
+++ inkscape.info   2013-11-17 17:21:02.000000000 -0500
@@ -1,6 +1,6 @@
 Package: inkscape
 Version: 0.48.4
-Revision: 8
+Revision: 9
 GCC: 4.0
 Maintainer: Daniel Macks <dmacks@netspace.org>
 Depends: <<
@@ -87,29 +87,14 @@
 SetCPPFLAGS: -Wno-error=format-security
 ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking --with-gnome-vfs --enable-lcms
 PatchFile: %n.patch
-PatchFile-MD5: cd6f5c4833fc7e425953d8121b0c19d9
+PatchFile-MD5: 0126cb8c5d95cf22d319b55dbcc843e1
+
+PatchFile2: patch-thru-r9985.diff
+PatchFile2-MD5: c0271fed8e4664e95092799cb39fcafe

-# 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}
+   patch -p1 < %{PatchFile}
+   patch -p0 < %{PatchFile2}

    # fink doesn't have gtk >= 2.22 yet, make sure
    # we get consistent build results when it does
@@ -120,6 +105,9 @@
 CompileScript: <<
 #!/bin/sh -ev

+   if [[ $(sw_vers -productVersion | cut -d. -f1-2) > 10.8 ]]; then
+     export CXXFLAGS="$CXXFLAGS -std=c++11"
+   fi
    autoreconf -vfi
    ./configure %c
    make V=1

Tested with 'fink -m' on 10.8 and 10.9.

Discussion

  • Jack Howarth
    Jack Howarth
    2013-11-17

    Info file for inkscape-0.48.4-9.

     
    Attachments
  • Jack Howarth
    Jack Howarth
    2013-11-17

    Patch file for inkscape-0.48.4-9.

     
    Attachments
  • Jack Howarth
    Jack Howarth
    2013-11-17

    Cumulative patch from inkscape 4.84.x branch.

     
    Attachments
  • The attached changes also work on 10.7.

    One note: please rename patch-thru-r9985.diff to inkscape_patch-thru-r9985.diff (and change it in the .info as well). The renamed file doesn't have to be uploaded if no further changes are needed before committing to CVS.

     
    • Description has changed:

    Diff:

    --- old
    +++ new
    @@ -1,5 +1,6 @@
     The attached packaging for inkscape-0.48.4-9 uses the MacPorts approach of patching up to revision 9985 from the inkscape 0.48.x branch. This patch, patch-thru-r9985.diff, replaces part of the inkscape.patch and all the other previous patches. An additional hunk is added to the inkscape.patch for…
    
    +~~~~
     --- inkscape-0.48.4/src/extension/system.cpp.orig       2013-11-17 17:15:40.000000000 -0500
     +++ inkscape-0.48.4/src/extension/system.cpp    2013-11-17 17:15:59.000000000 -0500
     @@ -20,6 +20,7 @@
    @@ -10,9 +11,11 @@
      #include "system.h"
      #include "preferences.h"
      #include "extension.h"
    +~~~~
    
     The changes to the inkscape.info file are…
    
    +~~~~
     --- /sw/fink/10.7/stable/main/finkinfo/graphics/inkscape.info  2013-11-17 16:58:40.000000000 -0500
     +++ inkscape.info  2013-11-17 17:21:02.000000000 -0500
     @@ -1,6 +1,6 @@
    @@ -69,5 +72,6 @@
        autoreconf -vfi
        ./configure %c
        make V=1
    +~~~~
    
     Tested with 'fink -m' on 10.8 and 10.9.
    
     
  • ps. If you type in 4 ~ characters before and after a code section, it gets wrapped into an easier to read block.

     
  • Jack Howarth
    Jack Howarth
    2013-11-19

    Analysis of the missing unistd.h include during the compilation of src/extension/system.cpp on fink shows that it occurs because of our ancient glib2. On MacPorts, the unistd.h include comes in from /opt/local/include/glib-2.0/gio/gcredentials.h. Notified upstream that older glib2 need the patch proposed at…..

    https://bugs.launchpad.net/inkscape/+bug/1245722/comments/10

     
    Last edit: Jack Howarth 2013-11-19