cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to birdfont-2.11.7

Browse Source 
- rework patches

joint work with upstream
This commit is contained in:
jasper 2015-09-20 12:07:35 +00:00
parent 78664c6e71
commit 6fde2eff70
5 changed files with 40 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
graphics/birdfont/Makefile
View File

@ -1,30 +1,27 @@
# $OpenBSD: Makefile,v 1.38 2015/09/19 13:37:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.39 2015/09/20 12:07:35 jasper Exp $
COMMENT = free font editor for TTF, EOT, and SVG fonts
DISTNAME = birdfont-2.11.3
EXTRACT_SUFX = .tar.xz
DISTNAME = birdfont-2.11.7
CATEGORIES = graphics print
# Both libs must have the same SO number!
# See scripts/bavala.py (or patches/patch-scripts_bavala_py)
SHARED_LIBS += birdfont 17.0 # 2.11.2
SHARED_LIBS += birdgems 17.0 # 2.11.2
SHARED_LIBS += birdfont 17.0 # 2.11.7
SHARED_LIBS += birdgems 17.0 # 2.11.7
HOMEPAGE = http://birdfont.org/
MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject dbus-1 epoxy expat fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gtk-3 harfbuzz javascriptcoregtk-3.0
WANTLIB += m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs soup-2.4 sqlite3
WANTLIB += webkitgtk-3.0 xcb xcb-render xcb-shm xml2 xmlbird z graphite2
WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-3 javascriptcoregtk-3.0 m notify pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pthread soup-2.4 sqlite3 webkitgtk-3.0
WANTLIB += xmlbird z
MASTER_SITES = http://birdfont.org/releases/
EXTRACT_SUFX = .tar.xz
MODULES = devel/gettext \
lang/python
@ -47,12 +44,13 @@ RUN_DEPENDS = devel/desktop-file-utils \
CONFIGURE_STYLE = simple
NO_TEST = Yes
SUBST_VARS += DESTDIR
pre-configure:
perl -pi -e "s,bash,sh,g" ${WRKSRC}/*.sh ${WRKSRC}/scripts/run.py
${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/install.py \
${WRKSRC}/dodo.py ${WRKSRC}/scripts/bavala.py
${WRKSRC}/dodo.py ${WRKSRC}/scripts/version.py
do-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/doit

4
graphics/birdfont/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (birdfont-2.11.3.tar.xz) = RiWKnqDUND4l2ECpoNjXfjWxRjNIl9qSiwgLNLFZc1E=
SIZE (birdfont-2.11.3.tar.xz) = 2267692
SHA256 (birdfont-2.11.7.tar.xz) = T5B8jyyAXpLpkNWQsM1L/4ktTcCbphs6mjsYa4Vs6yc=
SIZE (birdfont-2.11.7.tar.xz) = 2217636

48
graphics/birdfont/patches/patch-install_py
View File

@ -1,29 +1,29 @@
$OpenBSD: patch-install_py,v 1.10 2015/06/23 00:20:35 bcallah Exp $
--- install.py.orig Sun Jun 21 12:41:19 2015
+++ install.py Mon Jun 22 19:32:18 2015
@@ -144,10 +144,8 @@ if os.path.isfile ('build/bin/libbirdfont.so.' + versi
$OpenBSD: patch-install_py,v 1.11 2015/09/20 12:07:35 jasper Exp $
https://github.com/johanmattssonm/birdfont/pull/7
--- install.py.orig Sun Sep 20 13:49:48 2015
+++ install.py Sun Sep 20 13:50:23 2015
@@ -140,7 +140,9 @@ if not options.libdir:
else:
libdir = options.libdir
-if os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):
+if "openbsd" in sys.platform:
+ install ('build/bin/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)
+elif os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):
install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
-elif os.path.isfile ('build/libbirdfont.so.' + version.SO_VERSION):
- install ('build/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
- link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
- link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
+elif os.path.isfile ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}'):
+ install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)
elif os.path.isfile ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib'):
install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 644)
link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib.' + version.SO_VERSION_MAJOR)
@@ -163,10 +161,8 @@ elif os.path.isfile ('build/bin/libbirdgems.so.' + ver
@@ -156,9 +158,8 @@ else:
print ("Can't find libbirdfont.")
exit (1)
-if "bsd" in sys.platform:
- install ('build/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)
- install ('build/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)
+if "openbsd" in sys.platform:
+ install ('build/bin/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)
elif os.path.isfile ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
-elif os.path.isfile ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
- install ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
- link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
- link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
+elif os.path.isfile ('build/libbirdgems.so.' + '${LIBbirdgems_VERSION}'):
+ install ('build/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)
elif os.path.isfile ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib'):
install ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', libdir, 644)
link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)

15
graphics/birdfont/patches/patch-libbirdfont_OpenFontFormat_PairFormat1_vala
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libbirdfont_OpenFontFormat_PairFormat1_vala,v 1.1 2015/09/19 13:37:38 ajacoutot Exp $
http://birdfont.org/gitphp-glip/index.php?p=birdfont.git&a=commit&h=763eaf26e6ad335e94544aa977dbcf85d239f19d
--- libbirdfont/OpenFontFormat/PairFormat1.vala.orig Sat Sep 19 15:26:52 2015
+++ libbirdfont/OpenFontFormat/PairFormat1.vala Sat Sep 19 15:27:03 2015
@@ -19,7 +19,7 @@ namespace BirdFont {
* A class that stores kerning information for one letter.
*/
public class PairFormat1 : GLib.Object {
- public uint16 left = -1;
+ public uint16 left = 0;
public Gee.ArrayList<Kern> pairs = new Gee.ArrayList<Kern> ();
}

21
graphics/birdfont/patches/patch-scripts_bavala_py
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-scripts_bavala_py,v 1.7 2015/09/19 13:37:38 ajacoutot Exp $
--- scripts/bavala.py.orig Fri Aug 28 14:00:12 2015
+++ scripts/bavala.py Sat Sep 19 15:17:14 2015
@@ -102,7 +102,7 @@ class Vala(object):
self.header = join(build, library) + '.h'
self.vapi = join(build, library) + '.vapi' # generated vapi file
self.other_vapi_files = get_sources_path (src, '*.vapi') # other vapi files
- self.so = join(build, src) + '.so.' + so_version
+ self.so = join(build, src) + '.so.' + '${LIBbirdfont_VERSION}'
self.so_link = join(build, src) + '.so'
self.so_link_name = src + '.so'
self.so_version = so_version
@@ -229,6 +229,8 @@ class Vala(object):
if not "bsd" in sys.platform or "kfreebsd" in sys.platform:
create_link = "ln -s -T " + so_file + " " + self.so_link_name + " "
+ else:
+ create_link = "ln -s " + so_file + " " + self.so_link_name + " "
create_link += "&& mv " + self.so_link_name + " " + self.build + "/"
return {