fontforge: 20120731-b -> 20150612

3 files changed, 188 insertions, 35 deletions

diff --git a/fontforge/.footprint b/fontforge/.footprint
index f803adf84..365516c14 100644
--- a/fontforge/.footprint
+++ b/fontforge/.footprint
@@ -13,18 +13,22 @@ drwxr-xr-x	root/root	usr/include/fontforge/
 -rw-r--r--	root/root	usr/include/fontforge/basics.h
 -rw-r--r--	root/root	usr/include/fontforge/bezctx_ff.h
 -rw-r--r--	root/root	usr/include/fontforge/bitmapcontrol.h
+-rw-r--r--	root/root	usr/include/fontforge/carbon.h
 -rw-r--r--	root/root	usr/include/fontforge/chardata.h
 -rw-r--r--	root/root	usr/include/fontforge/charset.h
--rw-r--r--	root/root	usr/include/fontforge/config.h
 -rw-r--r--	root/root	usr/include/fontforge/configure-fontforge.h
+-rw-r--r--	root/root	usr/include/fontforge/cvruler.h
 -rw-r--r--	root/root	usr/include/fontforge/delta.h
+-rw-r--r--	root/root	usr/include/fontforge/dlist.h
 -rw-r--r--	root/root	usr/include/fontforge/dynamic.h
 -rw-r--r--	root/root	usr/include/fontforge/edgelist.h
 -rw-r--r--	root/root	usr/include/fontforge/edgelist2.h
 -rw-r--r--	root/root	usr/include/fontforge/encoding.h
 -rw-r--r--	root/root	usr/include/fontforge/fffreetype.h
+-rw-r--r--	root/root	usr/include/fontforge/ffglib.h
 -rw-r--r--	root/root	usr/include/fontforge/ffpython.h
 -rw-r--r--	root/root	usr/include/fontforge/fileutil.h
+-rw-r--r--	root/root	usr/include/fontforge/fontforge-config.h
 -rw-r--r--	root/root	usr/include/fontforge/fontforge.h
 -rw-r--r--	root/root	usr/include/fontforge/fontforgevw.h
 -rw-r--r--	root/root	usr/include/fontforge/fvmetrics.h
@@ -35,13 +39,15 @@ drwxr-xr-x	root/root	usr/include/fontforge/
 -rw-r--r--	root/root	usr/include/fontforge/gimage.h
 -rw-r--r--	root/root	usr/include/fontforge/gio.h
 -rw-r--r--	root/root	usr/include/fontforge/gkeysym.h
+-rw-r--r--	root/root	usr/include/fontforge/glif_name_hash.h
+-rw-r--r--	root/root	usr/include/fontforge/gnetwork.h
 -rw-r--r--	root/root	usr/include/fontforge/gprogress.h
 -rw-r--r--	root/root	usr/include/fontforge/gresedit.h
 -rw-r--r--	root/root	usr/include/fontforge/gresource.h
 -rw-r--r--	root/root	usr/include/fontforge/groups.h
+-rw-r--r--	root/root	usr/include/fontforge/gutils.h
 -rw-r--r--	root/root	usr/include/fontforge/gwidget.h
 -rw-r--r--	root/root	usr/include/fontforge/gwwiconv.h
--rw-r--r--	root/root	usr/include/fontforge/import.h
 -rw-r--r--	root/root	usr/include/fontforge/intl.h
 -rw-r--r--	root/root	usr/include/fontforge/libffstamp.h
 -rw-r--r--	root/root	usr/include/fontforge/lookups.h
@@ -65,35 +71,48 @@ drwxr-xr-x	root/root	usr/include/fontforge/
 -rw-r--r--	root/root	usr/include/fontforge/ttfinstrs.h
 -rw-r--r--	root/root	usr/include/fontforge/uiinterface.h
 -rw-r--r--	root/root	usr/include/fontforge/unicoderange.h
+-rw-r--r--	root/root	usr/include/fontforge/usermenu.h
 -rw-r--r--	root/root	usr/include/fontforge/ustring.h
 -rw-r--r--	root/root	usr/include/fontforge/utype.h
 drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libfontforge.a
 -rwxr-xr-x	root/root	usr/lib/libfontforge.la
-lrwxrwxrwx	root/root	usr/lib/libfontforge.so -> libfontforge.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libfontforge.so.1 -> libfontforge.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libfontforge.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libfontforge.so -> libfontforge.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libfontforge.so.2 -> libfontforge.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libfontforge.so.2.0.0
+-rw-r--r--	root/root	usr/lib/libfontforgeexe.a
+-rwxr-xr-x	root/root	usr/lib/libfontforgeexe.la
+lrwxrwxrwx	root/root	usr/lib/libfontforgeexe.so -> libfontforgeexe.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libfontforgeexe.so.2 -> libfontforgeexe.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libfontforgeexe.so.2.0.0
+-rw-r--r--	root/root	usr/lib/libgdraw.a
 -rwxr-xr-x	root/root	usr/lib/libgdraw.la
-lrwxrwxrwx	root/root	usr/lib/libgdraw.so -> libgdraw.so.4.0.10
-lrwxrwxrwx	root/root	usr/lib/libgdraw.so.4 -> libgdraw.so.4.0.10
--rwxr-xr-x	root/root	usr/lib/libgdraw.so.4.0.10
+lrwxrwxrwx	root/root	usr/lib/libgdraw.so -> libgdraw.so.5.0.0
+lrwxrwxrwx	root/root	usr/lib/libgdraw.so.5 -> libgdraw.so.5.0.0
+-rwxr-xr-x	root/root	usr/lib/libgdraw.so.5.0.0
+-rw-r--r--	root/root	usr/lib/libgioftp.a
 -rwxr-xr-x	root/root	usr/lib/libgioftp.la
-lrwxrwxrwx	root/root	usr/lib/libgioftp.so -> libgioftp.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libgioftp.so.1 -> libgioftp.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libgioftp.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libgioftp.so -> libgioftp.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libgioftp.so.2 -> libgioftp.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libgioftp.so.2.0.0
+-rw-r--r--	root/root	usr/lib/libgunicode.a
 -rwxr-xr-x	root/root	usr/lib/libgunicode.la
-lrwxrwxrwx	root/root	usr/lib/libgunicode.so -> libgunicode.so.3.0.2
-lrwxrwxrwx	root/root	usr/lib/libgunicode.so.3 -> libgunicode.so.3.0.2
--rwxr-xr-x	root/root	usr/lib/libgunicode.so.3.0.2
+lrwxrwxrwx	root/root	usr/lib/libgunicode.so -> libgunicode.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libgunicode.so.4 -> libgunicode.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libgunicode.so.4.0.0
+-rw-r--r--	root/root	usr/lib/libgutils.a
 -rwxr-xr-x	root/root	usr/lib/libgutils.la
-lrwxrwxrwx	root/root	usr/lib/libgutils.so -> libgutils.so.1.0.3
-lrwxrwxrwx	root/root	usr/lib/libgutils.so.1 -> libgutils.so.1.0.3
--rwxr-xr-x	root/root	usr/lib/libgutils.so.1.0.3
+lrwxrwxrwx	root/root	usr/lib/libgutils.so -> libgutils.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libgutils.so.2 -> libgutils.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libgutils.so.2.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/fontforge.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libfontforge.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libfontforgeexe.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/fontforge-1.0-py2.7.egg-info
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/fontforge.la
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/fontforge.so
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/psMat.la
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/psMat.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
@@ -102,8 +121,51 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/fontlint.1.gz
 -rw-r--r--	root/root	usr/man/man1/sfddiff.1.gz
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-rw-r--r--	root/root	usr/share/applications/fontforge.desktop
 drwxr-xr-x	root/root	usr/share/fontforge/
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-CNS1-5.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-CNS1-6.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-GB1-5.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-Identity-0.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-Japan1-5.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-Japan1-6.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-Japan2-0.cidmap
+-rw-r--r--	root/root	usr/share/fontforge/Adobe-Korea1-2.cidmap
+drwxr-xr-x	root/root	usr/share/fontforge/hotkeys/
+-rw-r--r--	root/root	usr/share/fontforge/hotkeys/default
+drwxr-xr-x	root/root	usr/share/fontforge/nodejs/
+drwxr-xr-x	root/root	usr/share/fontforge/nodejs/collabwebview/
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/client.html
+drwxr-xr-x	root/root	usr/share/fontforge/nodejs/collabwebview/css/
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/css/print.css
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/css/styles.css
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/index.html
+drwxr-xr-x	root/root	usr/share/fontforge/nodejs/collabwebview/js/
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/constants.js
+drwxr-xr-x	root/root	usr/share/fontforge/nodejs/collabwebview/js/contentEditable/
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/contentEditable/component.json
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/contentEditable/example.html
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/fontdrag.js
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/jquery-1.9.1.min.js
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/jquery.masonry.min.js
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/js/otfeatures.js
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/package.json
+-rw-r--r--	root/root	usr/share/fontforge/nodejs/collabwebview/server.js
 drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Cantarell-Bold.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Cantarell-BoldOblique.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Cantarell-Oblique.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Cantarell-Regular.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Inconsolata-Bold.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/Inconsolata-Regular.ttf
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/OFL.txt
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/changeweight.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/charviewicon.xbm
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/check_off.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/check_on.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooseraudio.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooserback.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooserbookmark.png
@@ -119,6 +181,7 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosermacttf.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosernobookmark.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooserobject.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosersfdir.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosertar.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosertextbdf.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/choosertextc.png
@@ -136,6 +199,7 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooserupdir.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/chooservideo.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/colorwheel.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/downarrow.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editclear.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editclearback.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editcopy.png
@@ -151,6 +215,7 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editfind.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editjoin.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editmerge.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/editmergetoline.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editpaste.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editpasteafter.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/editpasteinto.png
@@ -196,7 +261,16 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/elementtransform.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/elementvalidate.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/elementvbaselines.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/exclude.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/extendcondense.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/fflogo.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/fflogo13.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/ffsplash1.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/ffsplash2.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/ffsplash3.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/fileclose.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/fileclose2.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/filedisplay.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/fileexecute.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/fileexport.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/filegenerate.png
@@ -215,6 +289,10 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/filesave.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/filesaveall.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/filesaveas.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/findinter.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/fliphor.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/flipvert.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/fontview2.xbm
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/helpabout.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/helphelp.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/helpindex.png
@@ -227,12 +305,17 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/hintsclearvstems.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/hintsdontautohint.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/hintsreviewhints.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/inline.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/intersection.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/logo.xbm
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/menuempty.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/metricscenter.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/metricssetlbearing.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/metricssetrbearing.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/metricssetvwidth.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/metricssetwidth.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/oblique.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/outline.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/overlapexclude.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/overlapfindinter.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/overlapintersection.png
@@ -303,6 +386,7 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsmakearc.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsmakeline.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsnamecontour.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsnamepoint.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsspironext.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointsspiroprev.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/pointstangent.png
@@ -311,6 +395,23 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/ptinfohvcurve.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/ptinfotangent.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/python.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/radio_off.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/radio_on.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/resources
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/rmoverlap.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/rotate180.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/rotateccw.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/rotatecw.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectblue.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectcyan.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectdefault.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectgreen.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectmagenta.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectred.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectwhite.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/selectyellow.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/shadow.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/skew.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/styleschangeweight.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/styleschangexheight.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/stylesextendcondense.png
@@ -322,6 +423,7 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/stylessmallcaps.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/stylessubsuper.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/styleswireframe.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/text12210.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/tools3drotate.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/toolselipse.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/toolsflip.png
@@ -372,5 +474,52 @@ drwxr-xr-x	root/root	usr/share/fontforge/pixmaps/
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/viewsmallersize.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/viewzoomin.png
 -rw-r--r--	root/root	usr/share/fontforge/pixmaps/viewzoomout.png
+-rw-r--r--	root/root	usr/share/fontforge/pixmaps/wireframe.png
+-rw-r--r--	root/root	usr/share/fontforge/prefs
 drwxr-xr-x	root/root	usr/share/fontforge/python/
+drwxr-xr-x	root/root	usr/share/fontforge/python/collab/
+-rwxr-xr-x	root/root	usr/share/fontforge/python/collab/sessionjoin-and-change-c.py
+-rwxr-xr-x	root/root	usr/share/fontforge/python/collab/sessionjoin-and-save-to-out.sfd.py
+-rwxr-xr-x	root/root	usr/share/fontforge/python/collab/sessionstart.py
+-rwxr-xr-x	root/root	usr/share/fontforge/python/collab/web-test-collab.py
 -rw-r--r--	root/root	usr/share/fontforge/python/excepthook.py
+drwxr-xr-x	root/root	usr/share/fontforge/python/gdraw/
+-rw-r--r--	root/root	usr/share/fontforge/python/gdraw/README
+-rwxr-xr-x	root/root	usr/share/fontforge/python/gdraw/__init__.py
+-rwxr-xr-x	root/root	usr/share/fontforge/python/gdraw/_gdraw.py
+-rw-r--r--	root/root	usr/share/fontforge/python/gdraw/gdraw.html
+-rwxr-xr-x	root/root	usr/share/fontforge/python/gdraw/gdraw.py
+drwxr-xr-x	root/root	usr/share/fontforge/python/simple/
+-rwxr-xr-x	root/root	usr/share/fontforge/python/simple/expand-a.py
+-rwxr-xr-x	root/root	usr/share/fontforge/python/simple/load-font-and-show-name.py
+-rw-r--r--	root/root	usr/share/fontforge/python/test.sfd
+-rw-r--r--	root/root	usr/share/fontforge/python/webcollab.py
+drwxr-xr-x	root/root	usr/share/icons/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/128x128/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/128x128/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/128x128/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/16x16/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/16x16/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/22x22/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/22x22/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/24x24/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/24x24/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/24x24/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/256x256/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/256x256/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/256x256/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/32x32/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/32x32/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/48x48/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/48x48/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/64x64/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/64x64/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/64x64/apps/fontforge.png
+drwxrwxr-x	root/root	usr/share/icons/hicolor/scalable/
+drwxrwxr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-rw-r--	root/root	usr/share/icons/hicolor/scalable/apps/fontforge.svg
diff --git a/fontforge/.md5sum b/fontforge/.md5sum
index 9e3ff4d7a..1c86fed14 100644
--- a/fontforge/.md5sum
+++ b/fontforge/.md5sum
@@ -1,2 +1,2 @@
-a8a90473a97da87e45f66d11007b6e7c  fontforge_full-20120731-b.tar.bz2
-b93435488942486c8d0ca22e8f768034  freetype-2.4.11.tar.bz2
+aadde3b8b956eb87b3df4a1be8b164ba  20150612.tar.gz
+063691163e592515b31514515bb3ce8c  cidmaps.tgz
diff --git a/fontforge/Pkgfile b/fontforge/Pkgfile
index 93e355a76..e7d53cf44 100644
--- a/fontforge/Pkgfile
+++ b/fontforge/Pkgfile
@@ -2,31 +2,35 @@
 # URL: http://fontforge.sourceforge.net
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Antti Nykanen, aon at iki dot fi
-# Depends on: freetype libpng libspiro libtiff giflib libuninameslist util-linux xorg-libxi xorg-libxkbui xz
+# Depends on: giflib git libtiff pango
 
 name=fontforge
-version=20120731-b
-release=4
-source=(http://downloads.sourceforge.net/project/$name/$name-source/fontforge_full-$version.tar.bz2
-	http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2)
+version=20150612
+release=1
+source=(https://github.com/fontforge/fontforge/archive/$version.tar.gz
+	http://fontforge.org/cidmaps.tgz)
 
 build() {
 	cd $name-$version
 
-	export LDFLAGS="$LDFLAGS $(pkg-config libpng --libs)"
-
+	./bootstrap --force
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
-		--enable-type3 \
-		--enable-devicetables \
-		--enable-double \
-		--with-regular-link \
-		--enable-pyextension \
-		--with-freetype-src=$SRC/freetype-2.4.11
+		--enable-python-extension
 
 	make
 	make install DESTDIR=$PKG
 
-	rm -r $PKG/usr/share/locale
+	install -d $PKG/usr/share/fontforge
+	install -m 0644 -t $PKG/usr/share/fontforge $SRC/Adobe-*
+
+	install -d $PKG/usr/share/icons
+	cp -a desktop/icons $PKG/usr/share/icons/hicolor
+	rm -fr $PKG/usr/share/icons/hicolor/src
+
+	install -m 0644 -D desktop/fontforge.desktop \
+		$PKG/usr/share/applications/fontforge.desktop
+
+	rm -r $PKG/usr/share/{doc,locale}
 }