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

update to birdfont-0.36

Browse Source 
ok bcallah@ (MAINTAINER) who had a similar diff
This commit is contained in:
jasper 2014-03-26 12:57:18 +00:00
parent 30e7383413
commit fb906c7413
8 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/birdfont/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2014/03/26 09:23:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2014/03/26 12:57:18 jasper Exp $
COMMENT = free font editor for TTF, EOT, and SVG fonts
DISTNAME = birdfont-0.31
DISTNAME = birdfont-0.36
CATEGORIES = graphics print
SHARED_LIBS += birdfont 0.0 # 0.0
@ -28,7 +28,7 @@ MODULES = devel/gettext \
MODPY_ADJ_FILES = configure install.py
BUILD_DEPENDS = devel/py-doit \
BUILD_DEPENDS = devel/py-doit>=0.24 \
lang/vala
LIB_DEPENDS = devel/libgee \
@ -50,6 +50,6 @@ do-build:
cd ${WRKSRC} && ${LOCALBASE}/bin/doit
do-install:
cd ${WRKSRC} && ./install.py
cd ${WRKSRC} && ./install.py --nogzip=1
.include <bsd.port.mk>

4
graphics/birdfont/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (birdfont-0.31.tar.gz) = 8sceoJLKwK2MQhkKlNyA5OFo1BYIyMmKlDIUqmPnG84=
SIZE (birdfont-0.31.tar.gz) = 314764
SHA256 (birdfont-0.36.tar.gz) = PCH+kS7kDxGHhP/mE2DR5rq9mV6YSk7IQTQPWMYRrLk=
SIZE (birdfont-0.36.tar.gz) = 448690

8
graphics/birdfont/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2013/09/13 07:09:36 bcallah Exp $
--- configure.orig Thu Sep 12 22:27:17 2013
+++ configure Thu Sep 12 22:27:36 2013
@@ -82,7 +82,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com
$OpenBSD: patch-configure,v 1.3 2014/03/26 12:57:18 jasper Exp $
--- configure.orig Sat Mar 22 16:52:01 2014
+++ configure Wed Mar 26 10:36:29 2014
@@ -92,7 +92,7 @@ parser.add_option("-c", "--cc", dest="cc", help="C com
(options, args) = parser.parse_args()
if not options.prefix:

19
graphics/birdfont/patches/patch-dodo_py
View File

@ -1,19 +1,10 @@
$OpenBSD: patch-dodo_py,v 1.2 2014/03/26 09:23:33 ajacoutot Exp $
$OpenBSD: patch-dodo_py,v 1.3 2014/03/26 12:57:18 jasper Exp $
glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from nullable reference denied
--- dodo.py.orig Thu Sep 12 15:33:31 2013
+++ dodo.py Wed Mar 26 10:19:22 2014
@@ -45,7 +45,7 @@ LIBS = [
'cairo',
'gdk-pixbuf-2.0',
'webkit-1.0',
- 'gee-1.0'
+ 'gee-0.8'
]
def task_build ():
@@ -73,12 +73,11 @@ def task_pkg_flags():
--- dodo.py.orig Sat Mar 22 16:52:01 2014
+++ dodo.py Wed Mar 26 10:36:57 2014
@@ -74,12 +74,11 @@ def task_pkg_flags():
valac_options = [
@ -23,7 +14,7 @@ glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from null
'--define=LINUX'
]
-libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version=version.SO_VERSION, pkg_libs=LIBS)
+libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version=${LIBbirdfont_VERSION}, pkg_libs=LIBS)
+libbird = Vala(src='libbirdfont', build='build', library='birdfont', so_version='${LIBbirdfont_VERSION}', pkg_libs=LIBS)
def task_libbirdfont():
yield libbird.gen_c(valac_options)
yield libbird.gen_o(['-fPIC', """-D 'GETTEXT_PACKAGE="birdfont"'"""])

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

@ -1,15 +1,16 @@
$OpenBSD: patch-install_py,v 1.1 2013/09/13 07:09:36 bcallah Exp $
--- install.py.orig Thu Sep 12 22:17:47 2013
+++ install.py Thu Sep 12 22:19:52 2013
@@ -67,9 +67,8 @@ install ('build/bin/birdfont-export', '/bin')
if os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):
install ('build/bin/libbirdfont.so.' + version.SO_VERSION, '/lib')
install ('build/bin/libbirdfont.so', '/lib')
$OpenBSD: patch-install_py,v 1.2 2014/03/26 12:57:18 jasper Exp $
--- install.py.orig Sat Mar 22 16:52:02 2014
+++ install.py Wed Mar 26 10:37:26 2014
@@ -112,10 +112,8 @@ if os.path.isfile ('build/bin/libbirdfont.so.' + versi
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, '/lib')
- install ('build/libbirdfont.so', '/lib')
- 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')
+ 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', '/lib')
install ('build/bin/libbirdfont.dylib', '/lib')
install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 644)
link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib.' + version.SO_VERSION_MAJOR)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_bavala_py,v 1.2 2013/09/13 07:09:37 bcallah Exp $
--- scripts/bavala.py.orig Sat Aug 24 16:18:42 2013
+++ scripts/bavala.py Sun Aug 25 15:30:09 2013
$OpenBSD: patch-scripts_bavala_py,v 1.3 2014/03/26 12:57:18 jasper Exp $
--- scripts/bavala.py.orig Sat Mar 22 16:52:02 2014
+++ scripts/bavala.py Wed Mar 26 10:36:29 2014
@@ -81,7 +81,7 @@ class Vala(object):
if library:
self.header = join(build, library) + '.h'
@ -10,9 +10,9 @@ $OpenBSD: patch-scripts_bavala_py,v 1.2 2013/09/13 07:09:37 bcallah Exp $
self.so_link = join(build, src) + '.so'
self.so_link_name = src + '.so'
self.so_version = so_version
@@ -163,7 +163,7 @@ class Vala(object):
@@ -167,7 +167,7 @@ class Vala(object):
def gen_ln(self):
"""generate a symbilic link to the generated ".so" file"""
"""generate a symbolic link to the generated ".so" file"""
so_file = self.so.rsplit('/')[-1]
- create_link = "ln -s -T " + so_file + " " + self.so_link_name + " "
+ create_link = "ln -s " + so_file + " " + self.so_link_name + " "

14
graphics/birdfont/patches/patch-scripts_build_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-scripts_build_py,v 1.1 2014/03/26 09:23:33 ajacoutot Exp $
$OpenBSD: patch-scripts_build_py,v 1.2 2014/03/26 12:57:18 jasper Exp $
glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from nullable reference denied
--- scripts/build.py.orig Wed Mar 26 10:19:55 2014
+++ scripts/build.py Wed Mar 26 10:20:02 2014
@@ -31,7 +31,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, va
--- scripts/build.py.orig Sat Mar 22 16:52:02 2014
+++ scripts/build.py Wed Mar 26 10:36:29 2014
@@ -32,7 +32,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, va
-C \
""" + valaflags + """ \
--basedir build/libbirdfont/ \
@ -12,7 +12,7 @@ glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from null
--enable-experimental \
--library libbirdfont \
-H build/libbirdfont/birdfont.h \
@@ -89,7 +88,6 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac
@@ -106,7 +105,6 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac
run(valac + """ \
-C \
@ -20,11 +20,11 @@ glib-2.0.vapi:967.53-967.68: error: Access to instance member `length' from null
--enable-experimental \
--define=MAC birdfont-export/* \
--vapidir=./ \
@@ -135,7 +133,6 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, v
@@ -161,7 +159,6 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, v
run(valac + " " + valaflags + """\
-C \
birdfont/* \
- --enable-experimental-non-null \
--enable-experimental \
--vapidir=./ \
--pkg gee-1.0 \
--pkg """ + config.GEE + """ \

18
graphics/birdfont/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2013/09/13 07:09:37 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.3 2014/03/26 12:57:18 jasper Exp $
@bin bin/birdfont
@bin bin/birdfont-export
@lib lib/libbirdfont.so.${LIBbirdfont_VERSION}
@ -25,6 +25,7 @@ share/birdfont/icons/create_line.png
share/birdfont/icons/cubic_points.png
share/birdfont/icons/custom_character_set.png
share/birdfont/icons/cut_background.png
share/birdfont/icons/delay_circle.png
share/birdfont/icons/delete_menu_item.png
share/birdfont/icons/delete_selected_glyph.png
share/birdfont/icons/double_points.png
@ -41,6 +42,7 @@ share/birdfont/icons/info_icon.png
share/birdfont/icons/insert_background.png
share/birdfont/icons/insert_point_on_path.png
share/birdfont/icons/kerning_class.png
share/birdfont/icons/kerning_text_input.png
share/birdfont/icons/move.png
share/birdfont/icons/move_background.png
share/birdfont/icons/move_layer.png
@ -53,6 +55,7 @@ share/birdfont/icons/next.png
share/birdfont/icons/next_tab.png
share/birdfont/icons/no_icon.png
share/birdfont/icons/pen_tool.png
share/birdfont/icons/point_tool.png
share/birdfont/icons/prev.png
share/birdfont/icons/previous_tab.png
share/birdfont/icons/quadratic_points.png
@ -84,7 +87,7 @@ share/birdfont/icons/tool_button_deselected.png
share/birdfont/icons/tool_button_deselected_active.png
share/birdfont/icons/tool_button_selected.png
share/birdfont/icons/tool_button_selected_active.png
share/birdfont/icons/toolbox_background.png
share/birdfont/icons/track.png
share/birdfont/icons/ttf_units.png
share/birdfont/icons/union_paths.png
share/birdfont/icons/utf_8.png
@ -93,19 +96,19 @@ share/birdfont/icons/view_result.png
share/birdfont/icons/window_icon.png
share/birdfont/icons/zoom_1_1.png
share/birdfont/icons/zoom_background_image.png
share/birdfont/icons/zoom_boundries.png
share/birdfont/icons/zoom_boundaries.png
share/birdfont/icons/zoom_in.png
share/birdfont/icons/zoom_out.png
share/birdfont/icons/zoom_tool.png
share/birdfont/layout/
share/birdfont/layout/birdfont.rc
share/birdfont/layout/delete_backup.png
share/birdfont/layout/index.html
share/birdfont/layout/style.css
share/birdfont/layout/supplement.js
share/icons/hicolor/128x128/apps/birdfont.png
share/icons/hicolor/48x48/apps/birdfont.png
share/locale/de/LC_MESSAGES/birdfont.mo
share/locale/el/LC_MESSAGES/birdfont.mo
share/locale/fa/LC_MESSAGES/birdfont.mo
share/locale/fr/LC_MESSAGES/birdfont.mo
share/locale/he/LC_MESSAGES/birdfont.mo
share/locale/it/LC_MESSAGES/birdfont.mo
share/locale/ja/LC_MESSAGES/birdfont.mo
share/locale/nl/LC_MESSAGES/birdfont.mo
@ -113,6 +116,7 @@ share/locale/oc/LC_MESSAGES/birdfont.mo
share/locale/pt/LC_MESSAGES/birdfont.mo
share/locale/pt_BR/LC_MESSAGES/birdfont.mo
share/locale/ru/LC_MESSAGES/birdfont.mo
share/locale/sr/LC_MESSAGES/birdfont.mo
share/locale/sv/LC_MESSAGES/birdfont.mo
share/locale/tr/LC_MESSAGES/birdfont.mo
share/locale/zh_CN/LC_MESSAGES/birdfont.mo