Inkscape

Merge lp:~tghs/inkscape/0.92.x_mac_packaging into lp:inkscape/0.92.x

  1. 0.92.x_mac_packaging
  2. Merge into 0.92.x-bzr
Proposed by Tim Sheridan
Status: Merged
Merged at revision: 15405
Proposed branch: lp:~tghs/inkscape/0.92.x_mac_packaging
Merge into: lp:inkscape/0.92.x
Diff against target: 939 lines (+397/-135)
27 files modified
CMakeLists.txt (+3/-0)
Info.plist.in (+2/-2)
packaging/macosx/README.txt (+7/-3)
packaging/macosx/Resources/bin/inkscape (+5/-1)
packaging/macosx/Resources/etc/fonts/fonts.conf (+0/-66)
packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh (+1/-1)
packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch (+31/-0)
packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch (+22/-0)
packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch (+35/-0)
packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch (+36/-0)
packaging/macosx/dmg_background.svg (+4/-4)
packaging/macosx/osx-app.sh (+34/-11)
packaging/macosx/osx-build.sh (+67/-37)
packaging/macosx/osx-dmg.sh (+2/-0)
packaging/macosx/ports/devel/inkscape-packaging/Portfile (+3/-3)
packaging/macosx/ports/python/py-scour/Portfile (+56/-0)
packaging/macosx/ports/python/py-scour/files/scour26 (+1/-0)
packaging/macosx/ports/python/py-scour/files/scour27 (+1/-0)
packaging/macosx/ports/python/py-scour/files/scour34 (+1/-0)
packaging/macosx/ports/python/py-scour/files/scour35 (+1/-0)
packaging/macosx/ports/python/py-sk1libs/Portfile (+3/-3)
packaging/macosx/ports/python/py-uniconvertor/Portfile (+4/-4)
packaging/macosx/ports/python/scour_select/Portfile (+35/-0)
packaging/macosx/ports/python/scour_select/files/base (+1/-0)
packaging/macosx/ports/python/scour_select/files/none (+1/-0)
packaging/macosx/ports/textproc/help2man/Portfile (+39/-0)
src/menus-skeleton.h (+2/-0)
To merge this branch: bzr merge lp:~tghs/inkscape/0.92.x_mac_packaging
Reviewer Review Type Date Requested Status
su_v (community) Approve
Review via email: mp+318170@code.launchpad.net

Description of the change

This branch contains the main work for getting the macOS packaging ready for an official 0.92.2 release.

Changes have mostly been reviewed by su_v as I've been committing them. Adding su_v for review in case there's anything added recently that hasn't been looked at. I've tested su_v's patches that are included in this branch.

The following are the only changes made outside of the packaging/macosx tree:
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15367
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15369
* http://bazaar.launchpad.net/~tghs/inkscape/0.92.x_mac_packaging/revision/15372

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

For landing on 0.92.x, pending suv's approval:

Acked-by: Bryce Harrington <email address hidden>

Revision history for this message
su_v (suv-lp) :
review: Approve
Revision history for this message
su_v (suv-lp) wrote :

@Tim - would you mind applying for membership in the Inkscape dev team at launchpad to get commit access, and merge this yourself?
https://launchpad.net/~inkscape.dev
https://launchpad.net/~inkscape.dev/+join

@inkscape.dev: apart from updates for the en_GB translation, patches contributed by Tim (tghs) had been committed in r15395, r15446, r15487.

Revision history for this message
Tim Sheridan (tghs) wrote :

su_v: Sure, I've applied to the group. I'll merge this when I'm added.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-02-16 20:37:27 +0000
3+++ CMakeLists.txt 2017-02-24 00:27:32 +0000
4@@ -135,9 +135,12 @@
5 add_custom_target(dist
6 COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake
7 && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake
8+ && sed -i "/VER_BZRREV=/d" src/Makefile.am
9+ && sed -i "s/..VER_BZRREV/ r${INKSCAPE_REVISION}/" src/Makefile.am
10 && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX}
11 "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2"
12 && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake
13+ && bzr revert ${CMAKE_SOURCE_DIR}/src/Makefile.am
14 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
15
16 # -----------------------------------------------------------------------------
17
18=== modified file 'Info.plist.in'
19--- Info.plist.in 2014-12-31 14:59:16 +0000
20+++ Info.plist.in 2017-02-24 00:27:32 +0000
21@@ -7,7 +7,7 @@
22 <key>CFBundleExecutable</key>
23 <string>Inkscape</string>
24 <key>CFBundleGetInfoString</key>
25- <string>@VERSION@, Copyright 2003-2014 Inkscape Developers</string>
26+ <string>@VERSION@, Copyright 2003-2017 Inkscape Developers</string>
27 <key>CFBundleIconFile</key>
28 <string>Inkscape.icns</string>
29 <key>CFBundleIdentifier</key>
30@@ -550,6 +550,6 @@
31 <key>LSMinimumSystemVersion</key>
32 <string>10.5</string>
33 <key>NSHumanReadableCopyright</key>
34- <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string>
35+ <string>Copyright 2003-2017 Inkscape Developers, GNU General Public License.</string>
36 </dict>
37 </plist>
38
39=== modified file 'packaging/macosx/README.txt'
40--- packaging/macosx/README.txt 2015-01-29 00:13:59 +0000
41+++ packaging/macosx/README.txt 2017-02-24 00:27:32 +0000
42@@ -20,12 +20,16 @@
43
44 $ sudo sed -e '$a\'$'\n''+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' -i "" "$MP_PREFIX/etc/macports/variants.conf"
45
46-6) install required dependencies:
47+6) optional: to force an i386 build on x86_64 machine:
48+
49+$ sudo sed -e '/^#build_arch/i\'$'\nbuild_arch i386' -i "" "$MP_PREFIX/etc/macports/macports.conf"
50+
51+7) install required dependencies:
52
53 $ sudo port install inkscape-packaging
54
55-7) compile inkscape, create app bundle and DMG:
56+8) compile inkscape, create app bundle and DMG (if building for i386 on x86_64 machine, add at the beginning ARCH="i386"):
57
58 $ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d
59
60-8) upload the DMG.
61+9) upload the DMG.
62
63=== modified file 'packaging/macosx/Resources/bin/inkscape'
64--- packaging/macosx/Resources/bin/inkscape 2015-11-02 10:14:45 +0000
65+++ packaging/macosx/Resources/bin/inkscape 2017-02-24 00:27:32 +0000
66@@ -95,6 +95,10 @@
67 export ASPELL_CONF="prefix $TOP;"
68 export POPPLER_DATADIR="$TOP/share/poppler"
69
70+# Using fontconfig backend for slightly crisper UI text rendering
71+export PANGOCAIRO_BACKEND="fontconfig"
72+#export PANGOCAIRO_BACKEND="coretext"
73+
74 # no DBUS for now
75 unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
76 unset DBUS_SESSION_BUS_ADDRESS
77@@ -140,7 +144,7 @@
78 export LANG="en_US.UTF-8"
79 else
80 tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
81- tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
82+ tail -n1 | awk '{print $2}' | sed 's/\./ /' | awk '{print $1}'`"
83 if [ "x$tmpLANG" == "x" ]
84 then
85 # override broken script
86
87=== modified file 'packaging/macosx/Resources/etc/fonts/fonts.conf'
88--- packaging/macosx/Resources/etc/fonts/fonts.conf 2014-08-20 01:29:43 +0000
89+++ packaging/macosx/Resources/etc/fonts/fonts.conf 2017-02-24 00:27:32 +0000
90@@ -83,72 +83,6 @@
91
92 <config>
93 <!--
94- These are the default Unicode chars that are expected to be blank
95- in fonts. All other blank chars are assumed to be broken and
96- won't appear in the resulting charsets
97- -->
98- <blank>
99- <int>0x0020</int> <!-- SPACE -->
100- <int>0x00A0</int> <!-- NO-BREAK SPACE -->
101- <int>0x00AD</int> <!-- SOFT HYPHEN -->
102- <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
103- <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
104- <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
105- <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
106- <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
107- <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
108- <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
109- <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
110- <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
111- <int>0x1680</int> <!-- OGHAM SPACE MARK -->
112- <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
113- <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
114- <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
115- <int>0x2000</int> <!-- EN QUAD -->
116- <int>0x2001</int> <!-- EM QUAD -->
117- <int>0x2002</int> <!-- EN SPACE -->
118- <int>0x2003</int> <!-- EM SPACE -->
119- <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
120- <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
121- <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
122- <int>0x2007</int> <!-- FIGURE SPACE -->
123- <int>0x2008</int> <!-- PUNCTUATION SPACE -->
124- <int>0x2009</int> <!-- THIN SPACE -->
125- <int>0x200A</int> <!-- HAIR SPACE -->
126- <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
127- <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
128- <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
129- <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
130- <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
131- <int>0x2028</int> <!-- LINE SEPARATOR -->
132- <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
133- <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
134- <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
135- <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
136- <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
137- <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
138- <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
139- <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
140- <int>0x2060</int> <!-- WORD JOINER -->
141- <int>0x2061</int> <!-- FUNCTION APPLICATION -->
142- <int>0x2062</int> <!-- INVISIBLE TIMES -->
143- <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
144- <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
145- <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
146- <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
147- <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
148- <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
149- <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
150- <int>0x2800</int> <!-- BRAILLE PATTERN BLANK -->
151- <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
152- <int>0x3164</int> <!-- HANGUL FILLER -->
153- <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
154- <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
155- <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
156- <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
157- <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
158- </blank>
159-<!--
160 Rescan configuration every 30 seconds when FcFontSetList is called
161 -->
162 <rescan>
163
164=== modified file 'packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh'
165--- packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh 2015-01-10 16:06:20 +0000
166+++ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh 2017-02-24 00:27:32 +0000
167@@ -143,7 +143,7 @@
168 export LANG="en_US.UTF-8"
169 else
170 tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
171- tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
172+ tail -n1 | awk '{print $2}' | sed 's/\./ /' | awk '{print $1}'`"
173 if [ "x$tmpLANG" == "x" ]
174 then
175 # override broken script
176
177=== added directory 'packaging/macosx/app_patches'
178=== added file 'packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch'
179--- packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch 1970-01-01 00:00:00 +0000
180+++ packaging/macosx/app_patches/fix-GIMP-sliders-in-Inkscape-app-v3.patch 2017-02-24 00:27:32 +0000
181@@ -0,0 +1,31 @@
182+--- Contents/Resources/etc/gtk-2.0/gtkrc-orig 2017-02-08 07:33:39.000000000 +0100
183++++ Contents/Resources/etc/gtk-2.0/gtkrc 2017-02-08 21:44:57.000000000 +0100
184+@@ -16,8 +16,4 @@
185+ # use OS X default PDF viewer for print preview
186+ gtk-print-preview-command="open -a /Applications/Preview.app %f"
187+
188+-# fix Adwaita theme for Inkscape's GimpSpinScale widgets
189+-style "spinbutton" {}
190+-widget_class "*GimpSpinScale*" style "spinbutton"
191+-
192+ # eof
193+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/apps-orig.rc 2017-02-07 13:40:44.000000000 +0100
194++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/apps.rc 2017-02-08 21:45:08.000000000 +0100
195+@@ -5,6 +5,7 @@
196+ # the theme or stuff that is supposed to look different, like panels.
197+
198+ # TODO: This could really look nicer
199++# TODO: fix for Inkscape
200+ style "gimp_spin_scale" {
201+
202+ # Spin background
203+@@ -93,7 +94,8 @@
204+ }
205+
206+ # Disable spin button assets for GimpSpinScale
207+-class "GimpSpinScale" style "gimp_spin_scale"
208++# TODO: fix for Inkscape
209++#class "GimpSpinScale" style "gimp_spin_scale"
210+
211+ # Chromium lets us define some colours and settings for better integration
212+ class "ChromeGtkFrame" style "chrome_gtk_frame"
213
214=== added file 'packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch'
215--- packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch 1970-01-01 00:00:00 +0000
216+++ packaging/macosx/app_patches/fix-URL-links-in-Inkscape-app-v1.patch 2017-02-24 00:27:32 +0000
217@@ -0,0 +1,22 @@
218+diff -u -N Contents/Resources/share/applications.orig/mimeapps.list Contents/Resources/share/applications/mimeapps.list
219+--- Contents/Resources/share/applications.orig/mimeapps.list 1970-01-01 01:00:00.000000000 +0100
220++++ Contents/Resources/share/applications/mimeapps.list 2017-02-14 08:46:35.000000000 +0100
221+@@ -0,0 +1,3 @@
222++[Default Applications]
223++x-scheme-handler/http=open.desktop
224++x-scheme-handler/https=open.desktop
225+diff -u -N Contents/Resources/share/applications.orig/open.desktop Contents/Resources/share/applications/open.desktop
226+--- Contents/Resources/share/applications.orig/open.desktop 1970-01-01 01:00:00.000000000 +0100
227++++ Contents/Resources/share/applications/open.desktop 2017-02-14 08:46:40.000000000 +0100
228+@@ -0,0 +1,11 @@
229++[Desktop Entry]
230++Version=1.0
231++Name=Open
232++GenericName=Open
233++Comment=Open wih registered native application
234++Exec=open %u
235++Icon=None
236++StartupNotify=false
237++Terminal=false
238++Type=Application
239++Categories=Utility;
240
241=== added file 'packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch'
242--- packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch 1970-01-01 00:00:00 +0000
243+++ packaging/macosx/app_patches/fix-borderless-menus-in-Inkscape-app-v1.patch 2017-02-24 00:27:32 +0000
244@@ -0,0 +1,35 @@
245+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/main.rc.orig 2017-02-07 13:40:44.000000000 +0100
246++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/main.rc 2017-02-10 15:50:57.000000000 +0100
247+@@ -1533,6 +1533,24 @@
248+
249+ }
250+
251++style "menu_framed_box" {
252++
253++ bg[NORMAL] = @base_color
254++ bg[INSENSITIVE] = @base_color
255++ bg[PRELIGHT] = @base_color
256++
257++ engine "pixmap"
258++ {
259++ image
260++ {
261++ function = BOX
262++ file = "assets/menu-border.png"
263++ border = { 1, 1, 1, 1 }
264++ stretch = TRUE
265++ }
266++ }
267++ }
268++
269+ style "menu_item" {
270+
271+ xthickness = 3
272+@@ -2502,6 +2520,7 @@
273+ class "GtkTextView" style "textview"
274+
275+ # Menu and menubar items
276++widget_class "*<GtkMenu>" style "menu_framed_box"
277+ widget_class "*<GtkMenuItem>*" style "menu_item"
278+ widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
279+ widget_class "*<GtkSeparatorMenuItem>*" style "separator_menu_item"
280
281=== added file 'packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch'
282--- packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch 1970-01-01 00:00:00 +0000
283+++ packaging/macosx/app_patches/fix-cropped-button-images-in-Inkscape-app-v1.patch 2017-02-24 00:27:32 +0000
284@@ -0,0 +1,36 @@
285+--- Contents/Resources/share/themes/Adwaita/gtk-2.0/hacks.rc.orig 2017-02-16 00:04:50.000000000 +0100
286++++ Contents/Resources/share/themes/Adwaita/gtk-2.0/hacks.rc 2017-02-16 19:17:47.000000000 +0100
287+@@ -20,6 +20,18 @@
288+ bg[ACTIVE] = @insensitive_bg_color
289+ }
290+
291++style "inkscape_toolbox_button" {
292++ xthickness = 3
293++ ythickness = 3
294++ GtkButton::inner-border = {0, 0, 0, 0}
295++}
296++
297++style "inkscape_canvas_button" {
298++ xthickness = 0
299++ ythickness = 0
300++ GtkButton::inner-border = {0, 0, 0, 0}
301++}
302++
303+ # Vim puts an eventbox between the tab and the label and colours it,
304+ # we need to handle that
305+ widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
306+@@ -34,3 +46,14 @@
307+
308+ # Hack to be able to match widgets in LibreOffice
309+ class "GtkWindow" style "toplevel_hack"
310++
311++# Inkscape toolbox buttons have cropped icons.
312++# Use zero inner border and increased padding to avoid cropping
313++widget "*.SPDesktopWidget.*.ToolToolbar.Tool*.SPButton" style "inkscape_toolbox_button"
314++
315++# Inkscape buttons in canvas corners have cropped icons.
316++# use zero inner border and zero padding to avoid cropping
317++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.GtkVBox.StickyZoom" style "inkscape_canvas_button"
318++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.CMS_Adjust" style "inkscape_canvas_button"
319++# Button to lock/unlock guides has no widget name
320++widget "*.SPDesktopWidget.GtkVBox.GtkHBox.GtkTable.gtkmm__GtkHPaned.GtkTable.SPButton" style "inkscape_canvas_button"
321
322=== modified file 'packaging/macosx/dmg_background.png'
323Binary files packaging/macosx/dmg_background.png 2014-11-08 03:30:57 +0000 and packaging/macosx/dmg_background.png 2017-02-24 00:27:32 +0000 differ
324=== modified file 'packaging/macosx/dmg_background.svg'
325--- packaging/macosx/dmg_background.svg 2014-11-08 03:30:57 +0000
326+++ packaging/macosx/dmg_background.svg 2017-02-24 00:27:32 +0000
327@@ -994,7 +994,7 @@
328 sodipodi:role="line"
329 id="tspan4806"
330 x="459"
331- y="141.78999">Inkscape 0.91+devel</tspan></text>
332+ y="141.78999">Inkscape 0.92</tspan></text>
333 <path
334 sodipodi:nodetypes="cccccccc"
335 style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8258427;fill:url(#linearGradient3762);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
336@@ -1223,7 +1223,7 @@
337 id="text4431"
338 y="56.595001"
339 x="113.27875"
340- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33.75px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
341+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:34px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
342 xml:space="preserve"><tspan
343 y="56.595001"
344 x="113.27875"
345@@ -1233,8 +1233,8 @@
346 sodipodi:linespacing="125%"
347 id="text4443"
348 y="84.804001"
349- x="144.53799"
350- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
351+ x="134.53799"
352+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:125%;font-family:EuphoriaScript;-inkscape-font-specification:EuphoriaScript;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
353 xml:space="preserve"><tspan
354 y="84.804001"
355 x="144.53799"
356
357=== modified file 'packaging/macosx/osx-app.sh'
358--- packaging/macosx/osx-app.sh 2017-02-22 17:57:56 +0000
359+++ packaging/macosx/osx-app.sh 2017-02-24 00:27:32 +0000
360@@ -286,20 +286,25 @@
361 OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)"
362 OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)"
363 OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)"
364-ARCH="$(uname -a | awk '{print $NF;}')"
365+HOSTARCH="$(uname -a | awk '{print $NF;}')"
366
367-# guess default build_arch (MacPorts)
368-if [ "$OSXMINORNO" -ge "6" ]; then
369- if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
370- _build_arch="x86_64"
371- else
372- _build_arch="i386"
373- fi
374+if [ "$ARCH" != "" ]; then
375+ # explicit build_arch
376+ _build_arch="$ARCH"
377 else
378- if [ $ARCH = "powerpc" ]; then
379- _build_arch="ppc"
380+ # guess default build_arch (MacPorts)
381+ if [ "$OSXMINORNO" -ge "6" ]; then
382+ if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
383+ _build_arch="x86_64"
384+ else
385+ _build_arch="i386"
386+ fi
387 else
388- _build_arch="i386"
389+ if [ $HOSTARCH = "powerpc" ]; then
390+ _build_arch="ppc"
391+ else
392+ _build_arch="i386"
393+ fi
394 fi
395 fi
396
397@@ -424,6 +429,7 @@
398 if [ $_backend = "quartz" ]; then
399 /usr/libexec/PlistBuddy -x -c "Set :CGDisableCoalescedUpdates 1" "${package}/Contents/Info.plist"
400 fi
401+/usr/libexec/PlistBuddy -x -c "Set :LSMinimumSystemVersion $OSXMINORVER" "${package}/Contents/Info.plist"
402
403 # Share files
404 $rsync_cmd "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name"
405@@ -493,6 +499,9 @@
406 $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython"
407 # pySerial for HPGL plotting
408 $cp_cmd -RL "$packages_path/serial" "$pkgpython"
409+ # scour and its dependency six
410+ $cp_cmd -RL "$packages_path/scour" "$pkgpython"
411+ $cp_cmd -RL "$packages_path/six.py" "$pkgpython"
412 # PyGTK (optional)
413 $cp_cmd -RL "$packages_path/cairo" "$pkgpython"
414 $cp_cmd -RL "$packages_path/glib" "$pkgpython"
415@@ -856,6 +865,20 @@
416
417 fi
418
419+# Patch files in app bundle
420+#----------------------------------------------------------
421+
422+PATCH_FILE_DIR="app_patches"
423+
424+if [ -d "$PATCH_FILE_DIR" ]; then
425+ echo "Applying patches in '$PATCH_FILE_DIR'"
426+ for PATCH in ${PATCH_FILE_DIR}/*.patch; do
427+ patch -d ${package} -p0 < $PATCH || {
428+ echo "Patch failed!"
429+ exit 1
430+ }
431+ done
432+fi
433
434 # All done.
435 #----------------------------------------------------------
436
437=== modified file 'packaging/macosx/osx-build.sh'
438--- packaging/macosx/osx-build.sh 2017-02-22 17:57:56 +0000
439+++ packaging/macosx/osx-build.sh 2017-02-24 00:27:32 +0000
440@@ -10,11 +10,12 @@
441 # Jean-Olivier Irisson <jo.irisson@gmail.com>
442 # Liam P. White <inkscapebrony@gmail.com>
443 # ~suv <suv-sf@users.sourceforge.net>
444+# Tim Sheridan <tghs@tghs.net>
445 # with information from
446 # Kees Cook
447 # Michael Wybrow
448 #
449-# Copyright (C) 2006-2014
450+# Copyright (C) 2006-2017
451 # Released under GNU GPL, read the file 'COPYING' for more information
452 #
453
454@@ -171,23 +172,28 @@
455 OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)"
456 OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)"
457 OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)"
458-ARCH="$(uname -a | awk '{print $NF;}')"
459+HOSTARCH="$(uname -a | awk '{print $NF;}')"
460
461 # MacPorts for dependencies
462 [[ -x $LIBPREFIX/bin/port && -d $LIBPREFIX/etc/macports ]] && export use_port="t"
463
464-# guess default build_arch (MacPorts)
465-if [ "$OSXMINORNO" -ge "6" ]; then
466- if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
467- _build_arch="x86_64"
468- else
469- _build_arch="i386"
470- fi
471+if [ "$ARCH" != "" ]; then
472+ # explicit build_arch
473+ _build_arch="$ARCH"
474 else
475- if [ $ARCH = "powerpc" ]; then
476- _build_arch="ppc"
477+ # guess default build_arch (MacPorts)
478+ if [ "$OSXMINORNO" -ge "6" ]; then
479+ if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then
480+ _build_arch="x86_64"
481+ else
482+ _build_arch="i386"
483+ fi
484 else
485- _build_arch="i386"
486+ if [ $HOSTARCH = "powerpc" ]; then
487+ _build_arch="ppc"
488+ else
489+ _build_arch="i386"
490+ fi
491 fi
492 fi
493
494@@ -221,60 +227,89 @@
495 TARGETVERSION="10.5"
496 export CC="/usr/bin/gcc-4.2"
497 export CXX="/usr/bin/g++-4.2"
498- #export CLAGS="$CFLAGS -arch $_build_arch"
499+ export CFLAGS="$CFLAGS -arch $_build_arch"
500 export CXXFLAGS="$CFLAGS"
501 CONFFLAGS="--disable-openmp $CONFFLAGS"
502+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
503 elif [ "$OSXMINORNO" -eq "6" ]; then
504 ## Apple's LLVM-GCC 4.2.1 on Snow Leopard
505 TARGETNAME="SNOW LEOPARD"
506 TARGETVERSION="10.6"
507 export CC="/usr/bin/llvm-gcc-4.2"
508 export CXX="/usr/bin/llvm-g++-4.2"
509- #export CLAGS="$CFLAGS -arch $_build_arch"
510+ export CFLAGS="$CFLAGS -arch $_build_arch"
511 export CXXFLAGS="$CFLAGS"
512 CONFFLAGS="--disable-openmp $CONFFLAGS"
513+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
514 elif [ "$OSXMINORNO" -eq "7" ]; then
515 ## Apple's clang on Lion and later
516 TARGETNAME="LION"
517 TARGETVERSION="10.7"
518 export CC="/usr/bin/clang"
519 export CXX="/usr/bin/clang++"
520- #export CLAGS="$CFLAGS -arch $_build_arch"
521+ export CFLAGS="$CFLAGS -arch $_build_arch"
522 export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11
523+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
524 elif [ "$OSXMINORNO" -eq "8" ]; then
525 ## Apple's clang on Mountain Lion
526 TARGETNAME="MOUNTAIN LION"
527 TARGETVERSION="10.8"
528 export CC="/usr/bin/clang"
529 export CXX="/usr/bin/clang++"
530- #export CLAGS="$CFLAGS -arch $_build_arch"
531+ export CFLAGS="$CFLAGS -arch $_build_arch"
532 export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++"
533+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
534 elif [ "$OSXMINORNO" -eq "9" ]; then
535 ## Apple's clang on Mavericks
536 TARGETNAME="MAVERICKS"
537 TARGETVERSION="10.9"
538 export CC="/usr/bin/clang"
539 export CXX="/usr/bin/clang++"
540- #export CLAGS="$CFLAGS -arch $_build_arch"
541- export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
542+ export CFLAGS="$CFLAGS -arch $_build_arch"
543+ export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
544+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
545 elif [ "$OSXMINORNO" -eq "10" ]; then
546 ## Apple's clang on Yosemite
547 TARGETNAME="YOSEMITE"
548 TARGETVERSION="10.10"
549 export CC="/usr/bin/clang"
550 export CXX="/usr/bin/clang++"
551- #export CLAGS="$CFLAGS -arch $_build_arch"
552- export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
553- echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
554- echo " Inkscape packaging has not been tested on ${TARGETNAME}."
555-else # if [ "$OSXMINORNO" -ge "11" ]; then
556- ## Apple's clang after Yosemite?
557+ export CFLAGS="$CFLAGS -arch $_build_arch"
558+ export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
559+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
560+ echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
561+ echo " Inkscape packaging has not been tested on ${TARGETNAME}."
562+elif [ "$OSXMINORNO" -eq "11" ]; then
563+ ## Apple's clang on El Capitan
564+ TARGETNAME="EL_CAPITAN"
565+ TARGETVERSION="10.11"
566+ export CC="/usr/bin/clang"
567+ export CXX="/usr/bin/clang++"
568+ export CFLAGS="$CFLAGS -arch $_build_arch"
569+ export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
570+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
571+ echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
572+ echo " Inkscape packaging has not been tested on ${TARGETNAME}."
573+elif [ "$OSXMINORNO" -eq "12" ]; then
574+ ## Apple's clang on Sierra
575+ TARGETNAME="SIERRA"
576+ TARGETVERSION="10.12"
577+ export CC="/usr/bin/clang"
578+ export CXX="/usr/bin/clang++"
579+ export CFLAGS="$CFLAGS -arch $_build_arch"
580+ export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
581+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
582+ echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
583+ echo " Inkscape packaging has not been tested on ${TARGETNAME}."
584+else # if [ "$OSXMINORNO" -ge "13" ]; then
585+ ## Apple's clang after Sierra?
586 TARGETNAME="UNKNOWN"
587 TARGETVERSION="10.XX"
588 export CC="/usr/bin/clang"
589 export CXX="/usr/bin/clang++"
590- #export CLAGS="$CFLAGS -arch $_build_arch"
591- export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
592+ export CFLAGS="$CFLAGS -arch $_build_arch"
593+ export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++"
594+ CONFFLAGS="--disable-strict-build $CONFFLAGS" # Workaround for https://bugs.launchpad.net/inkscape/+bug/1606018
595 echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION"
596 echo " Inkscape packaging has not been tested on this unknown version of OS X (${OSXVERSION})."
597 fi
598@@ -391,26 +426,21 @@
599 Libexif $(checkversion libexif libexif)
600 JPEG $(checkversion jpeg jpeg)
601 Icu $(checkversion icu-uc icu)
602- LibWPD $(checkversion libwpd-0.9 libwpd)
603- LibWPG $(checkversion libwpg-0.2 libwpg)
604- Libcdr $(checkversion libcdr-0.0 libcdr)
605- Libvisio $(checkversion libvisio-0.0 libvisio)
606+ LibRevenge $(checkversion librevenge-0.0 librevenge)
607+ LibWPD $(checkversion libwpd-0.10 libwpd-0.10)
608+ LibWPG $(checkversion libwpg-0.3 libwpg-0.3)
609+ Libcdr $(checkversion libcdr-0.1 libcdr-0.1)
610+ Libvisio $(checkversion libvisio-0.1 libvisio-0.1)
611 Potrace $(checkversion potrace potrace)
612 Included python modules:
613 lxml $(checkversion py27-lxml py27-lxml)
614 numpy $(checkversion py27-numpy py27-numpy)
615+ scour $(checkversion py27-scour py27-scour)
616 sk1libs $(checkversion py27-sk1libs py27-sk1libs)
617 UniConvertor $(checkversion py27-uniconvertor py27-uniconvertor)
618 Pillow $(checkversion py27-Pillow py27-Pillow)
619 " > $INFOFILE
620
621- ## TODO: Pending merge adds support for:
622- #LibRevenge $(checkversion librevenge-0.0 librevenge-devel)
623- #LibWPD $(checkversion libwpd-0.10 libwpd-10.0)
624- #LibWPG $(checkversion libwpg-0.3 libwpg-0.3)
625- #Libcdr $(checkversion libcdr-0.1 libcdr-0.1)
626- #Libvisio $(checkversion libvisio-0.1 libvisio-0.1)
627-
628 ## TODO: add support for gtk-mac-integration (see osxmenu branch)
629 #Gtk-mac-integration $(checkversion gtk-mac-integration gtk-osx-application)
630
631
632=== modified file 'packaging/macosx/osx-dmg.sh'
633--- packaging/macosx/osx-dmg.sh 2014-08-19 22:04:43 +0000
634+++ packaging/macosx/osx-dmg.sh 2017-02-24 00:27:32 +0000
635@@ -22,6 +22,8 @@
636 # Modify the 'dmg_background.svg' file and generate a new
637 # 'dmg_background.png' file.
638 #
639+# inkscape -z dmg_background.svg -i dmg_background -w 600 -h 400 -e dmg_background.png
640+#
641 # Update the AppleScript file 'dmg_set_style.scpt'.
642 #
643 # Run this script with the '-s' option. It will apply the
644
645=== modified file 'packaging/macosx/ports/devel/inkscape-packaging/Portfile'
646--- packaging/macosx/ports/devel/inkscape-packaging/Portfile 2017-02-22 17:57:56 +0000
647+++ packaging/macosx/ports/devel/inkscape-packaging/Portfile 2017-02-24 00:27:32 +0000
648@@ -55,9 +55,7 @@
649 port:potrace
650
651 # ports for Inkscape.app
652-depends_build-append port:gnome-icon-theme \
653- port:gnome-icon-theme-symbolic \
654- port:icon-naming-utils \
655+depends_build-append port:icon-naming-utils \
656 port:gnome-themes-standard \
657 port:gtk-engines2 \
658 port:gtk2-murrine
659@@ -65,6 +63,7 @@
660 # ports for python extensions
661 depends_build-append port:py27-lxml \
662 port:py27-numpy \
663+ port:py27-scour \
664 port:py27-Pillow \
665 port:py27-uniconvertor \
666 port:py27-serial \
667@@ -74,6 +73,7 @@
668 # ports for python extensions on Snow Leopard and Leopard
669 depends_build-append port:py26-lxml \
670 port:py26-numpy \
671+ port:py26-scour \
672 port:py26-Pillow \
673 port:py26-uniconvertor
674 }
675
676=== added directory 'packaging/macosx/ports/python/py-scour'
677=== added file 'packaging/macosx/ports/python/py-scour/Portfile'
678--- packaging/macosx/ports/python/py-scour/Portfile 1970-01-01 00:00:00 +0000
679+++ packaging/macosx/ports/python/py-scour/Portfile 2017-02-24 00:27:32 +0000
680@@ -0,0 +1,56 @@
681+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim: fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
682+# $Id$
683+
684+PortSystem 1.0
685+PortGroup python 1.0
686+PortGroup select 1.0
687+
688+set realname scour
689+
690+name py-scour
691+version 0.35
692+revision 100
693+categories-append graphics
694+license Apache-2
695+platforms darwin
696+supported_archs noarch
697+
698+maintainers nomaintainer
699+
700+description Scour SVG Optimizer
701+long_description Scour is a SVG optimizer/sanitizer that can be used to \
702+ produce SVGs for Web deployment.
703+
704+homepage http://pypi.python.org/pypi/${realname}/
705+master_sites pypi:s/${realname}/
706+
707+distname scour-${version}
708+
709+checksums rmd160 fcb8c54d89cf0b015f7f081e7d4640a85226c85a \
710+ sha256 7b33a0fc7ed578e7d1fcf4f68eb4c38cd080c243ea57537840062d37cd0d3c8e
711+
712+python.versions 27 34 35
713+
714+if {${name} ne ${subport}} {
715+
716+ depends_build-append port:py${python.version}-setuptools
717+
718+ depends_lib-append port:py${python.version}-six
719+
720+ depends_run-append port:${realname}_select
721+
722+ select.group ${realname}
723+ select.file ${filespath}/${realname}${python.version}
724+ notes "
725+To make the Python ${python.branch} version of scour the one that is run\
726+when you execute the commands without a version suffix, e.g. 'scour', run:
727+
728+port select --set ${select.group} [file tail ${select.file}]
729+"
730+
731+ livecheck.type none
732+} else {
733+ livecheck.type regex
734+ livecheck.url https://pypi.python.org/pypi/${realname}/json
735+ livecheck.regex "${realname}-(\\d+(\\.\\d+)+)\\${extract.suffix}"
736+}
737
738=== added directory 'packaging/macosx/ports/python/py-scour/files'
739=== added file 'packaging/macosx/ports/python/py-scour/files/scour26'
740--- packaging/macosx/ports/python/py-scour/files/scour26 1970-01-01 00:00:00 +0000
741+++ packaging/macosx/ports/python/py-scour/files/scour26 2017-02-24 00:27:32 +0000
742@@ -0,0 +1,1 @@
743+bin/scour-2.6
744
745=== added file 'packaging/macosx/ports/python/py-scour/files/scour27'
746--- packaging/macosx/ports/python/py-scour/files/scour27 1970-01-01 00:00:00 +0000
747+++ packaging/macosx/ports/python/py-scour/files/scour27 2017-02-24 00:27:32 +0000
748@@ -0,0 +1,1 @@
749+bin/scour-2.7
750
751=== added file 'packaging/macosx/ports/python/py-scour/files/scour34'
752--- packaging/macosx/ports/python/py-scour/files/scour34 1970-01-01 00:00:00 +0000
753+++ packaging/macosx/ports/python/py-scour/files/scour34 2017-02-24 00:27:32 +0000
754@@ -0,0 +1,1 @@
755+bin/scour-3.4
756
757=== added file 'packaging/macosx/ports/python/py-scour/files/scour35'
758--- packaging/macosx/ports/python/py-scour/files/scour35 1970-01-01 00:00:00 +0000
759+++ packaging/macosx/ports/python/py-scour/files/scour35 2017-02-24 00:27:32 +0000
760@@ -0,0 +1,1 @@
761+bin/scour-3.5
762
763=== modified file 'packaging/macosx/ports/python/py-sk1libs/Portfile'
764--- packaging/macosx/ports/python/py-sk1libs/Portfile 2014-09-09 23:24:58 +0000
765+++ packaging/macosx/ports/python/py-sk1libs/Portfile 2017-02-24 00:27:32 +0000
766@@ -6,12 +6,12 @@
767
768 name py-sk1libs
769 version 0.9.1
770-revision 101
771+revision 102
772 license LGPL-2
773 maintainers nomaintainer
774 categories python graphics
775 platforms darwin
776-homepage http://sk1project.org/
777+homepage http://sk1project.net/
778
779 description Set of python non-GUI extensions for sK1 Project
780
781@@ -23,7 +23,7 @@
782 distname sk1libs-${version}
783 # MacPorts does not properly support URLs with a get parameter.
784 # Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams
785-master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy=
786+master_sites http://sk1project.net/dc.php?target=${distfiles}&dummy=
787
788 checksums md5 e18088bbc8a105e7535a96f40b80f284 \
789 sha1 dd948558128bb6547b1f277087bf3066104912da \
790
791=== modified file 'packaging/macosx/ports/python/py-uniconvertor/Portfile'
792--- packaging/macosx/ports/python/py-uniconvertor/Portfile 2014-08-21 13:44:13 +0000
793+++ packaging/macosx/ports/python/py-uniconvertor/Portfile 2017-02-24 00:27:32 +0000
794@@ -6,12 +6,12 @@
795
796 name py-uniconvertor
797 version 1.1.5
798-revision 100
799+revision 101
800 license LGPL-2 GPL-2
801 maintainers nomaintainer
802 categories python graphics
803 platforms darwin
804-homepage http://sk1project.org/modules.php?name=Products&product=uniconvertor
805+homepage http://sk1project.net/modules.php?name=Products&product=uniconvertor
806
807 description universal vector graphics translator.
808
809@@ -26,7 +26,7 @@
810 distname uniconvertor-${version}
811 # MacPorts does not properly support URLs with a get parameter.
812 # Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams
813-master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy=
814+master_sites http://sk1project.net/dc.php?target=${distfiles}&dummy=
815
816 checksums md5 d1272315a58304ece2ff588834e23f72 \
817 sha1 51ec7c4487048c3357ed95cdb4ab3524018a2c9e \
818@@ -42,5 +42,5 @@
819 }
820
821 livecheck.type regex
822-livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download
823+livecheck.url http://sk1project.net/modules.php?name=Products&product=uniconvertor&op=download
824 livecheck.regex "uniconvertor-(\\d+(?:\\.\\d+)*)${extract.suffix}"
825
826=== added directory 'packaging/macosx/ports/python/scour_select'
827=== added file 'packaging/macosx/ports/python/scour_select/Portfile'
828--- packaging/macosx/ports/python/scour_select/Portfile 1970-01-01 00:00:00 +0000
829+++ packaging/macosx/ports/python/scour_select/Portfile 2017-02-24 00:27:32 +0000
830@@ -0,0 +1,35 @@
831+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
832+# $Id$
833+
834+PortSystem 1.0
835+PortGroup select 1.0
836+
837+name scour_select
838+version 0.1
839+revision 0
840+categories python
841+license BSD
842+platforms darwin
843+supported_archs noarch
844+
845+maintainers nomaintainer
846+
847+description common files for selecting default scour version
848+long_description \
849+ This port installs files that allow 'port select' to be used to \
850+ create links to the preferred default version of scour.
851+
852+homepage http://www.macports.org/
853+
854+distfiles
855+
856+use_configure no
857+
858+build {}
859+
860+destroot {
861+ select::install scour ${filespath}/base
862+ select::install scour ${filespath}/none
863+}
864+
865+livecheck.type none
866
867=== added directory 'packaging/macosx/ports/python/scour_select/files'
868=== added file 'packaging/macosx/ports/python/scour_select/files/base'
869--- packaging/macosx/ports/python/scour_select/files/base 1970-01-01 00:00:00 +0000
870+++ packaging/macosx/ports/python/scour_select/files/base 2017-02-24 00:27:32 +0000
871@@ -0,0 +1,1 @@
872+bin/scour
873
874=== added file 'packaging/macosx/ports/python/scour_select/files/none'
875--- packaging/macosx/ports/python/scour_select/files/none 1970-01-01 00:00:00 +0000
876+++ packaging/macosx/ports/python/scour_select/files/none 2017-02-24 00:27:32 +0000
877@@ -0,0 +1,1 @@
878+-
879
880=== added directory 'packaging/macosx/ports/textproc'
881=== added directory 'packaging/macosx/ports/textproc/help2man'
882=== added file 'packaging/macosx/ports/textproc/help2man/Portfile'
883--- packaging/macosx/ports/textproc/help2man/Portfile 1970-01-01 00:00:00 +0000
884+++ packaging/macosx/ports/textproc/help2man/Portfile 2017-02-24 00:27:32 +0000
885@@ -0,0 +1,39 @@
886+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
887+# $Id: $
888+
889+PortSystem 1.0
890+
891+name help2man
892+version 1.0
893+revision 1
894+
895+categories textproc
896+platforms darwin
897+license GPL-2
898+supported_archs noarch
899+
900+maintainers nomaintainer
901+
902+description Satisfy help2man dependency
903+long_description ${description}
904+
905+homepage http://inkscape.org
906+
907+# this is a metaport - no fetch, configure and build phases
908+master_sites
909+distfiles
910+use_configure no
911+build {}
912+destroot {
913+ # Create a dummy file so the port can be successfully activated
914+ xinstall -d ${destroot}${prefix}/share/doc/${name}
915+ set docfile [open ${destroot}${prefix}/share/doc/${name}/README.txt "w"]
916+ puts $docfile "Dummy help2man package installation.\n"
917+ close $docfile
918+}
919+
920+# variants
921+universal_variant no
922+
923+# livecheck
924+livecheck.type none
925
926=== modified file 'src/menus-skeleton.h'
927--- src/menus-skeleton.h 2016-04-15 14:39:49 +0000
928+++ src/menus-skeleton.h 2017-02-24 00:27:32 +0000
929@@ -27,8 +27,10 @@
930 " <separator/>\n"
931 " <verb verb-id=\"FileImport\" />\n"
932 " <verb verb-id=\"DialogExport\" />\n"
933+#if !defined(ENABLE_OSX_APP_LOCATIONS)
934 " <verb verb-id=\"FileImportFromOCAL\" />\n"
935 //" <verb verb-id=\"FileExportToOCAL\" />\n"
936+#endif
937 " <separator/>\n"
938 " <verb verb-id=\"FilePrint\" />\n"
939 " <separator/>\n"

Subscribers

People subscribed via source and target branches