Update to yelp-3.6.0.

This commit is contained in:
ajacoutot 2012-09-27 11:04:02 +00:00
parent ee373c6040
commit c9b57fb066
4 changed files with 15 additions and 43 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.84 2012/09/06 08:28:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.85 2012/09/27 11:04:02 ajacoutot Exp $
COMMENT= GNOME help browser
GNOME_PROJECT= yelp
GNOME_VERSION= 3.4.2
REVISION= 1
GNOME_VERSION= 3.6.0
SHARED_LIBS += yelp 0.0 # 0.0
@ -27,15 +26,16 @@ WANTLIB += gstvideo-0.10 gthread-2.0 gtk-3 icudata icui18n icuuc
WANTLIB += javascriptcoregtk-3.0 jpeg lzma m orc-0.4 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs soup-2.4 sqlite3 stdc++ webkitgtk-3.0
WANTLIB += atk-bridge-2.0 atspi harfbuzz icule
WANTLIB += xcb xcb-render xcb-shm xml2 xslt z
MODULES= devel/gettext \
x11/gnome \
devel/dconf
BUILD_DEPENDS= x11/gnome/yelp-xsl>=3.2.0 \
BUILD_DEPENDS= x11/gnome/yelp-xsl>=3.6.0 \
textproc/itstool
RUN_DEPENDS= x11/gnome/yelp-xsl>=3.2.0
RUN_DEPENDS= x11/gnome/yelp-xsl>=3.6.0
LIB_DEPENDS= archivers/xz \
www/webkit,gtk3

View File

@ -1,2 +1,2 @@
SHA256 (gnome/yelp-3.4.2.tar.xz) = M/Vz2k0Ldmq6fr+rFEcGlOMkXf+ytjFT80v4JAsTw6M=
SIZE (gnome/yelp-3.4.2.tar.xz) = 846168
SHA256 (gnome/yelp-3.6.0.tar.xz) = lmpRNCBnTEiLGN8P/PUfi0aHzboEsdHV521ZwEhKwEg=
SIZE (gnome/yelp-3.6.0.tar.xz) = 855084

View File

@ -1,43 +1,16 @@
$OpenBSD: patch-configure,v 1.7 2012/09/10 07:42:33 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=627126
$OpenBSD: patch-configure,v 1.8 2012/09/27 11:04:02 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Sep 10 09:10:25 2012
+++ configure Mon Sep 10 09:10:26 2012
@@ -11372,22 +11372,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
-gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(gsettings__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
- done
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
@@ -12302,6 +12290,9 @@ else
DATADIRNAME=lib
--- configure.orig Mon Sep 24 22:38:48 2012
+++ configure Thu Sep 27 12:58:03 2012
@@ -12961,6 +12961,9 @@ else
fi
+ ;;
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
;;
+ ;;
*)
DATADIRNAME=lib
;;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.29 2012/03/29 06:41:05 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.30 2012/09/27 11:04:02 ajacoutot Exp $
%%SHARED%%
bin/gnome-help
@bin bin/yelp
@ -38,7 +38,6 @@ share/gtk-doc/html/libyelp/index.html
share/gtk-doc/html/libyelp/index.sgml
share/gtk-doc/html/libyelp/left.png
share/gtk-doc/html/libyelp/libyelp-yelp-error.html
share/gtk-doc/html/libyelp/libyelp.devhelp
share/gtk-doc/html/libyelp/libyelp.devhelp2
share/gtk-doc/html/libyelp/object-tree.html
share/gtk-doc/html/libyelp/right.png