WIP on unbreaking kazehakase:
- update to 0.5.8 - backport upstream svn r3871 to let it build with latest gtk+2 - switch to xulrunner 1.9.x (breaks gecko backend while here) - don't try to create a dbus server socket in a non-existent dir It is still badly broken, as upstream doesn't seem to care about shipping working stuff... but at least it builds and packages.
This commit is contained in:
parent
37a5731d41
commit
cb27d75f62
@ -1,19 +1,19 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2010/04/03 00:42:39 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2010/05/06 19:25:51 landry Exp $
|
||||
|
||||
COMMENT-main= common files for kazehakase
|
||||
COMMENT-gecko= lightweight gecko-based web browser
|
||||
COMMENT-webkit= kazehakase webkit backend
|
||||
CATEGORIES= www
|
||||
|
||||
SHARED_LIBS= kazehakase 0.0 #.1.0
|
||||
SHARED_LIBS= kazehakase 1.0 #.1.0
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
VERSION= 0.5.6
|
||||
VERSION= 0.5.8
|
||||
DISTNAME= kazehakase-${VERSION}
|
||||
PKGNAME-main= kazehakase-common-${VERSION}p4
|
||||
PKGNAME-gecko= ${DISTNAME}p6
|
||||
PKGNAME-webkit= kazehakase-webkit-${VERSION}p5
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/33533/}
|
||||
PKGNAME-main= kazehakase-common-${VERSION}
|
||||
PKGNAME-gecko= ${DISTNAME}
|
||||
PKGNAME-webkit= kazehakase-webkit-${VERSION}
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
|
||||
|
||||
HOMEPAGE= http://kazehakase.sourceforge.jp/
|
||||
|
||||
@ -36,16 +36,19 @@ MODULES= devel/gettext \
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_ARGS = --with-gecko-engine=xulrunner \
|
||||
--disable-hyper-estraier \
|
||||
--disable-heyper-estraier \
|
||||
--disable-shave \
|
||||
--without-ruby \
|
||||
--without-rgettext
|
||||
|
||||
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib/xulrunner"
|
||||
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/xulrunner1.9" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
USE_LIBTOOL = Yes
|
||||
USE_GMAKE = Yes
|
||||
|
||||
FAKE_FLAGS = sysconfdir=${TRUEPREFIX}/share/examples
|
||||
|
||||
BUILD_DEPENDS = :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel
|
||||
BUILD_DEPENDS = :xulrunner-devel->=1.9.1:devel/xulrunner/1.9,-devel
|
||||
|
||||
RUN_DEPENDS-main = ${RUN_DEPENDS} \
|
||||
::devel/desktop-file-utils
|
||||
@ -57,11 +60,12 @@ RUN_DEPENDS-gecko = ${RUN_DEPENDS} \
|
||||
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
|
||||
|
||||
LIB_DEPENDS-main = ${LIB_DEPENDS} \
|
||||
dbus-glib-1::x11/dbus-glib \
|
||||
gnutls::security/gnutls
|
||||
|
||||
LIB_DEPENDS-gecko = ${LIB_DEPENDS-main} \
|
||||
lib/kazehakase/kazehakase::www/kazehakase,-main \
|
||||
xulrunner/xpcom:xulrunner->=1.8,<1.9:devel/xulrunner/1.8
|
||||
xulrunner1.9/xpcom:xulrunner->=1.9.1:devel/xulrunner/1.9
|
||||
|
||||
LIB_DEPENDS-webkit = ${LIB_DEPENDS} \
|
||||
webkit-1.0::www/webkit
|
||||
@ -71,12 +75,14 @@ WANTLIB = ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
|
||||
freetype m z png cairo iconv intl atk-1.0 gio-2.0 glib-2.0 \
|
||||
gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \
|
||||
pangocairo-1.0 pangoft2-1.0 glitz pcre pixman-1 tasn1 \
|
||||
pthread-stubs xcb
|
||||
pthread-stubs xcb xcb-render xcb-render-util dbus-1
|
||||
|
||||
WANTLIB-main = ${WANTLIB} c gcrypt gpg-error pthread
|
||||
WANTLIB-gecko = ${WANTLIB} nspr4 plc4 plds4 gcrypt gpg-error
|
||||
WANTLIB-webkit = ${WANTLIB} Xt enchant gailutil gcrypt gnutls gpg-error \
|
||||
icudata icui18n icuuc jpeg soup-2.4 sqlite3 stdc++ xml2 xslt \
|
||||
gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10
|
||||
gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 \
|
||||
gstapp-0.10
|
||||
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (kazehakase-0.5.6.tar.gz) = uIJXqhDdU/1dOcYn+PlYkA==
|
||||
RMD160 (kazehakase-0.5.6.tar.gz) = SExuIIi20UkbBS6EVYS4IORHOYM=
|
||||
SHA1 (kazehakase-0.5.6.tar.gz) = oR4T0FliiE9vTpTrghXoXEhHlgw=
|
||||
SHA256 (kazehakase-0.5.6.tar.gz) = +3QHlS7lAxpmMY38fpxO5r/+JbaCQ1TOAqj7VAzL+So=
|
||||
SIZE (kazehakase-0.5.6.tar.gz) = 1405935
|
||||
MD5 (kazehakase-0.5.8.tar.gz) = ItgxmC6+AQM4kHOByu6P3w==
|
||||
RMD160 (kazehakase-0.5.8.tar.gz) = Uqbh2FpD1fI1D8WBZmdcMZAbV5Q=
|
||||
SHA1 (kazehakase-0.5.8.tar.gz) = pk/fobdyI5riNtOY47hAV3zycUg=
|
||||
SHA256 (kazehakase-0.5.8.tar.gz) = HUYcVrPfhlRNEj0qFUhKFWpgU8T+KITXc6mH1FBAaUM=
|
||||
SIZE (kazehakase-0.5.8.tar.gz) = 1433099
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2008/03/18 19:25:55 landry Exp $
|
||||
--- Makefile.in.orig Fri Feb 29 14:49:47 2008
|
||||
+++ Makefile.in Sat Mar 15 14:07:27 2008
|
||||
@@ -286,7 +286,7 @@ target_alias = @target_alias@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I macros
|
||||
-SUBDIRS = po src module ext etc data doc
|
||||
+SUBDIRS = src module ext etc data doc
|
||||
EXTRA_DIST = autogen.sh \
|
||||
README.ja \
|
||||
TODO.ja \
|
@ -1,25 +1,24 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2008/10/30 22:38:10 landry Exp $
|
||||
--- configure.orig Tue Oct 28 16:09:40 2008
|
||||
+++ configure Thu Oct 30 22:43:13 2008
|
||||
@@ -29071,78 +29071,6 @@ fi
|
||||
|
||||
$OpenBSD: patch-configure,v 1.5 2010/05/06 19:25:51 landry Exp $
|
||||
--- configure.orig Mon May 3 21:56:13 2010
|
||||
+++ configure Mon May 3 21:56:48 2010
|
||||
@@ -20796,77 +20796,6 @@ fi
|
||||
|
||||
anthy_exists=no
|
||||
-
|
||||
|
||||
-pkg_failed=no
|
||||
-{ echo "$as_me:$LINENO: checking for ANTHY" >&5
|
||||
-echo $ECHO_N "checking for ANTHY... $ECHO_C" >&6; }
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANTHY" >&5
|
||||
-$as_echo_n "checking for ANTHY... " >&6; }
|
||||
-
|
||||
-if test -n "$PKG_CONFIG"; then
|
||||
- if test -n "$ANTHY_CFLAGS"; then
|
||||
- pkg_cv_ANTHY_CFLAGS="$ANTHY_CFLAGS"
|
||||
- else
|
||||
- if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"anthy\"") >&5
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "anthy") 2>&5
|
||||
- ac_status=$?
|
||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
- (exit $ac_status); }; then
|
||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
- test $ac_status = 0; }; then
|
||||
- pkg_cv_ANTHY_CFLAGS=`$PKG_CONFIG --cflags "anthy" 2>/dev/null`
|
||||
-else
|
||||
- pkg_failed=yes
|
||||
@ -33,11 +32,11 @@ $OpenBSD: patch-configure,v 1.4 2008/10/30 22:38:10 landry Exp $
|
||||
- pkg_cv_ANTHY_LIBS="$ANTHY_LIBS"
|
||||
- else
|
||||
- if test -n "$PKG_CONFIG" && \
|
||||
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"anthy\"") >&5
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "anthy") 2>&5
|
||||
- ac_status=$?
|
||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
- (exit $ac_status); }; then
|
||||
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
- test $ac_status = 0; }; then
|
||||
- pkg_cv_ANTHY_LIBS=`$PKG_CONFIG --libs "anthy" 2>/dev/null`
|
||||
-else
|
||||
- pkg_failed=yes
|
||||
@ -64,34 +63,19 @@ $OpenBSD: patch-configure,v 1.4 2008/10/30 22:38:10 landry Exp $
|
||||
- # Put the nasty error message in config.log where it belongs
|
||||
- echo "$ANTHY_PKG_ERRORS" >&5
|
||||
-
|
||||
- { echo "$as_me:$LINENO: result: no" >&5
|
||||
-echo "${ECHO_T}no" >&6; }
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
-$as_echo "no" >&6; }
|
||||
- anthy_exists=no
|
||||
-elif test $pkg_failed = untried; then
|
||||
- anthy_exists=no
|
||||
-else
|
||||
- ANTHY_CFLAGS=$pkg_cv_ANTHY_CFLAGS
|
||||
- ANTHY_LIBS=$pkg_cv_ANTHY_LIBS
|
||||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||||
-echo "${ECHO_T}yes" >&6; }
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
-$as_echo "yes" >&6; }
|
||||
- anthy_exists=yes
|
||||
-fi
|
||||
-
|
||||
# Extract the first word of "mecab-config", so it can be a program name with args.
|
||||
set dummy mecab-config; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
@@ -31100,13 +31028,7 @@ done
|
||||
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
|
||||
esac ;;
|
||||
"rgettext":C)
|
||||
-sed \
|
||||
- -i'' \
|
||||
- -e "s/EXTRA_DISTFILES = /EXTRA_DISTFILES = rgettext.mk.in /
|
||||
- s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /
|
||||
- / \$(GENPOT)/r po/rgettext.mk
|
||||
- " \
|
||||
- po/Makefile
|
||||
+perl -i -pe 's/^itlocaledir = /itlocaledir = \$\(datadir\)\/locale\n#itlocaledir = /' po/Makefile
|
||||
;;
|
||||
"po/stamp-it":C)
|
||||
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
|
11
www/kazehakase/patches/patch-module_embed_gecko_Makefile_in
Normal file
11
www/kazehakase/patches/patch-module_embed_gecko_Makefile_in
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-module_embed_gecko_Makefile_in,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- module/embed/gecko/Makefile.in.orig Mon May 3 22:46:46 2010
|
||||
+++ module/embed/gecko/Makefile.in Mon May 3 22:47:00 2010
|
||||
@@ -440,6 +440,7 @@ INCLUDES = \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/find \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/gfx \
|
||||
+ -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/intl \
|
||||
-I$(MOZILLA_INCLUDE_ROOT)/imglib2 \
|
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-module_embed_per-process_kz-dbus-module_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
sure, let's create dbus socket in a non-existent dir..
|
||||
--- module/embed/per-process/kz-dbus-module.c.orig Thu May 6 20:32:57 2010
|
||||
+++ module/embed/per-process/kz-dbus-module.c Thu May 6 20:33:14 2010
|
||||
@@ -63,7 +63,7 @@ setup_dbus (void)
|
||||
DBusError error;
|
||||
|
||||
dbus_error_init(&error);
|
||||
- server = dbus_server_listen("unix:tmpdir=/tmp/kazehakase/dbus-server", &error);
|
||||
+ server = dbus_server_listen("unix:tmpdir=/tmp", &error);
|
||||
if (!server) {
|
||||
g_print("%s\n", error.message);
|
||||
dbus_error_free(&error);
|
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-src_actions_kz-smart-bookmark-action_c,v 1.1 2009/10/11 20:33:00 landry Exp $
|
||||
--- src/actions/kz-smart-bookmark-action.c.orig Sun Oct 11 22:10:25 2009
|
||||
+++ src/actions/kz-smart-bookmark-action.c Sun Oct 11 22:12:03 2009
|
||||
@@ -884,21 +884,21 @@ update_icon_and_bgtext(KzSmartBookmarkAction *action)
|
||||
title);
|
||||
kz_entry_set_arrow(KZ_ENTRY(entry),
|
||||
is_folder);
|
||||
-
|
||||
- if (favicon)
|
||||
- {
|
||||
- kz_entry_set_icon_from_pixbuf(KZ_ENTRY(entry),
|
||||
- favicon);
|
||||
- g_object_unref(favicon);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- kz_entry_set_icon_from_stock(KZ_ENTRY(entry),
|
||||
- stock_id,
|
||||
- GTK_ICON_SIZE_MENU);
|
||||
- }
|
||||
- gtk_widget_queue_resize(GTK_WIDGET(entry));
|
||||
}
|
||||
+ if (favicon)
|
||||
+ {
|
||||
+ gtk_entry_set_icon_from_pixbuf(entry,
|
||||
+ GTK_ENTRY_ICON_PRIMARY,
|
||||
+ favicon);
|
||||
+ g_object_unref(favicon);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ gtk_entry_set_icon_from_stock(entry,
|
||||
+ GTK_ENTRY_ICON_PRIMARY,
|
||||
+ stock_id);
|
||||
+ }
|
||||
+ gtk_widget_queue_resize(GTK_WIDGET(entry));
|
||||
}
|
||||
}
|
||||
|
30
www/kazehakase/patches/patch-src_actions_kz-zoom-action_c
Normal file
30
www/kazehakase/patches/patch-src_actions_kz-zoom-action_c
Normal file
@ -0,0 +1,30 @@
|
||||
$OpenBSD: patch-src_actions_kz-zoom-action_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/actions/kz-zoom-action.c.orig Mon May 3 22:08:21 2010
|
||||
+++ src/actions/kz-zoom-action.c Mon May 3 22:08:50 2010
|
||||
@@ -205,7 +205,7 @@ cb_spin_value_changed (GtkSpinButton *spin, KzZoomActi
|
||||
KzWeb *web;
|
||||
KzZoomActionPrivate *priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
|
||||
|
||||
- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
|
||||
+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
|
||||
return;
|
||||
|
||||
web = KZ_WINDOW_CURRENT_WEB(priv->kz);
|
||||
@@ -228,7 +228,7 @@ kz_zoom_action_set_ratio (KzZoomAction *action,
|
||||
|
||||
priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
|
||||
|
||||
- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
|
||||
+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
|
||||
return;
|
||||
|
||||
spin = priv->spin;
|
||||
@@ -249,7 +249,7 @@ kz_zoom_action_get_ratio (KzZoomAction *action)
|
||||
|
||||
priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
|
||||
|
||||
- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
|
||||
+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
|
||||
return 1.0;
|
||||
ratio = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->spin)) / 100;
|
||||
|
39
www/kazehakase/patches/patch-src_dialogs_kz-about-dialog_c
Normal file
39
www/kazehakase/patches/patch-src_dialogs_kz-about-dialog_c
Normal file
@ -0,0 +1,39 @@
|
||||
$OpenBSD: patch-src_dialogs_kz-about-dialog_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/dialogs/kz-about-dialog.c.orig Mon May 3 22:09:12 2010
|
||||
+++ src/dialogs/kz-about-dialog.c Mon May 3 22:09:30 2010
|
||||
@@ -78,7 +78,7 @@ cb_expose_event(GtkWidget *widget, GdkEventExpose *eve
|
||||
|
||||
/* Draw background image */
|
||||
gdk_draw_pixbuf(widget->window,
|
||||
- widget->style->bg_gc[GTK_WIDGET_STATE(widget)],
|
||||
+ widget->style->bg_gc[gtk_widget_get_state(widget)],
|
||||
image,
|
||||
0, 0,
|
||||
0, 0,
|
||||
@@ -87,7 +87,7 @@ cb_expose_event(GtkWidget *widget, GdkEventExpose *eve
|
||||
0, 0);
|
||||
/* Draw logo at top right */
|
||||
gdk_draw_pixbuf(widget->window,
|
||||
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
|
||||
+ widget->style->fg_gc[gtk_widget_get_state(widget)],
|
||||
logo,
|
||||
0, 0,
|
||||
bg_width - logo_width, 0,
|
||||
@@ -113,7 +113,7 @@ cb_expose_event(GtkWidget *widget, GdkEventExpose *eve
|
||||
pango_layout_set_alignment(info_layout, PANGO_ALIGN_RIGHT);
|
||||
pango_layout_get_pixel_extents(info_layout, &link, &logical);
|
||||
gdk_draw_layout(widget->window,
|
||||
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
|
||||
+ widget->style->fg_gc[gtk_widget_get_state(widget)],
|
||||
bg_width - logical.width, logo_height,
|
||||
info_layout);
|
||||
g_free (version);
|
||||
@@ -127,7 +127,7 @@ cb_expose_event(GtkWidget *widget, GdkEventExpose *eve
|
||||
pango_layout_set_width(copyright_layout, -1);
|
||||
pango_layout_get_pixel_extents(copyright_layout, &link, &logical);
|
||||
gdk_draw_layout(widget->window,
|
||||
- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
|
||||
+ widget->style->fg_gc[gtk_widget_get_state(widget)],
|
||||
bg_width - logical.width, bg_height - logical.height,
|
||||
copyright_layout);
|
||||
|
12
www/kazehakase/patches/patch-src_kz-download-box_c
Normal file
12
www/kazehakase/patches/patch-src_kz-download-box_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_kz-download-box_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/kz-download-box.c.orig Mon May 3 22:09:39 2010
|
||||
+++ src/kz-download-box.c Mon May 3 22:09:52 2010
|
||||
@@ -344,7 +344,7 @@ cb_add_item (KzDownloaderGroup *dlgrp,
|
||||
icon_set,
|
||||
icon->image->style,
|
||||
gtk_widget_get_direction(icon->image),
|
||||
- GTK_WIDGET_STATE(icon->image),
|
||||
+ gtk_widget_get_state(icon->image),
|
||||
GTK_ICON_SIZE_MENU,
|
||||
icon->image,
|
||||
"download icon");
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-src_kz-statusbar_c,v 1.1 2009/10/11 20:33:00 landry Exp $
|
||||
--- src/kz-statusbar.c.orig Sun Oct 11 22:16:38 2009
|
||||
+++ src/kz-statusbar.c Sun Oct 11 22:17:26 2009
|
||||
@@ -144,7 +144,8 @@ kz_statusbar_init (KzStatusbar *bar)
|
||||
gtk_widget_set_tooltip_text(toggle, _("Find direction"));
|
||||
|
||||
/* find entry */
|
||||
- priv->find_area = kz_entry_new_with_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
|
||||
+ priv->find_area = kz_entry_new();
|
||||
+ gtk_entry_set_icon_from_stock(GTK_ENTRY(priv->find_area), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(bar), priv->find_area,
|
||||
FALSE, FALSE, 0);
|
21
www/kazehakase/patches/patch-src_kz-tab-label_c
Normal file
21
www/kazehakase/patches/patch-src_kz-tab-label_c
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-src_kz-tab-label_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/kz-tab-label.c.orig Mon May 3 22:10:21 2010
|
||||
+++ src/kz-tab-label.c Mon May 3 22:11:12 2010
|
||||
@@ -519,7 +519,7 @@ kz_tab_label_set_state (KzTabLabel *kztab,
|
||||
|
||||
g_return_if_fail(KZ_IS_TAB_LABEL(kztab));
|
||||
|
||||
- if (!GTK_WIDGET_REALIZED(kztab)) return;
|
||||
+ if (!gtk_widget_get_realized(kztab)) return;
|
||||
|
||||
priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
|
||||
if (priv->create_thumbnail &&
|
||||
@@ -965,7 +965,7 @@ cb_progress (KzWeb *web, gdouble ratio, KzTabLabel *kz
|
||||
|
||||
widget = GTK_WIDGET(kztab);
|
||||
|
||||
- if(GTK_WIDGET_REALIZED(widget))
|
||||
+ if(gtk_widget_get_realized(widget))
|
||||
{
|
||||
GdkBitmap *mask;
|
||||
KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE(kztab);
|
26
www/kazehakase/patches/patch-src_kz-web_c
Normal file
26
www/kazehakase/patches/patch-src_kz-web_c
Normal file
@ -0,0 +1,26 @@
|
||||
$OpenBSD: patch-src_kz-web_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/kz-web.c.orig Mon May 3 22:11:46 2010
|
||||
+++ src/kz-web.c Mon May 3 22:12:27 2010
|
||||
@@ -656,7 +656,7 @@ size_request (GtkWidget *widget, GtkRequisition *requi
|
||||
|
||||
requisition->height = GTK_CONTAINER(widget)->border_width;
|
||||
|
||||
- if (child && GTK_WIDGET_VISIBLE(child)) {
|
||||
+ if (child && gtk_widget_get_visible(child)) {
|
||||
gtk_widget_size_request(child, &child_requisition);
|
||||
requisition->width += child_requisition.width;
|
||||
requisition->height += child_requisition.height;
|
||||
@@ -669,11 +669,11 @@ size_allocate (GtkWidget *widget, GtkAllocation *alloc
|
||||
GtkWidget *child;
|
||||
GtkAllocation child_allocation;
|
||||
|
||||
- if (!GTK_WIDGET_REALIZED(widget))
|
||||
+ if (!gtk_widget_get_realized(widget))
|
||||
return;
|
||||
widget->allocation = *allocation;
|
||||
|
||||
- if (GTK_WIDGET_NO_WINDOW(widget)) {
|
||||
+ if (!gtk_widget_get_has_window(widget)) {
|
||||
child_allocation.x = allocation->x + GTK_CONTAINER(widget)->border_width;
|
||||
child_allocation.y = allocation->y + GTK_CONTAINER(widget)->border_width;
|
||||
} else {
|
12
www/kazehakase/patches/patch-src_kz-window_c
Normal file
12
www/kazehakase/patches/patch-src_kz-window_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_kz-window_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/kz-window.c.orig Mon May 3 22:12:38 2010
|
||||
+++ src/kz-window.c Mon May 3 22:12:46 2010
|
||||
@@ -615,7 +615,7 @@ kz_window_remove_tab (KzWindow *kz, GtkWidget *widget)
|
||||
|
||||
g_return_if_fail(KZ_IS_WINDOW(kz));
|
||||
|
||||
- if (!GTK_WIDGET_REALIZED(kz)) return;
|
||||
+ if (!gtk_widget_get_realized(kz)) return;
|
||||
|
||||
web = KZ_WINDOW_CURRENT_WEB(kz);
|
||||
kz_actions_set_sensitive(kz, web);
|
11
www/kazehakase/patches/patch-src_net_kz-http_c
Normal file
11
www/kazehakase/patches/patch-src_net_kz-http_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-src_net_kz-http_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/net/kz-http.c.orig Mon May 3 22:01:54 2010
|
||||
+++ src/net/kz-http.c Mon May 3 22:02:01 2010
|
||||
@@ -25,7 +25,6 @@
|
||||
# include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
-#include <features.h>
|
||||
#define __USE_XOPEN
|
||||
#include <time.h>
|
||||
#include "gnet.h"
|
File diff suppressed because it is too large
Load Diff
@ -1,78 +0,0 @@
|
||||
$OpenBSD: patch-src_widget_kz-entry_h,v 1.1 2009/10/11 20:33:00 landry Exp $
|
||||
--- src/widget/kz-entry.h.orig Tue Oct 28 16:09:13 2008
|
||||
+++ src/widget/kz-entry.h Sun Oct 11 21:34:08 2009
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
||||
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
|
||||
/*
|
||||
* Copyright (C) 2004 Hiroyuki Ikezoe
|
||||
@@ -35,56 +35,32 @@ G_BEGIN_DECLS
|
||||
typedef struct _KzEntry KzEntry;
|
||||
typedef struct _KzEntryClass KzEntryClass;
|
||||
|
||||
-typedef enum
|
||||
-{
|
||||
- KZ_ENTRY_ICON_EMPTY,
|
||||
- KZ_ENTRY_ICON_PIXBUF,
|
||||
- KZ_ENTRY_ICON_STOCK
|
||||
-} KzEntryIconType;
|
||||
-
|
||||
-
|
||||
struct _KzEntry
|
||||
{
|
||||
- GtkEntry parent;
|
||||
- gchar *backtext;
|
||||
-
|
||||
- KzEntryIconType icon_type;
|
||||
-
|
||||
- GdkWindow *icon_area;
|
||||
- GdkPixbuf *pixbuf;
|
||||
+ GtkEntry parent;
|
||||
+ gchar *background_text;
|
||||
|
||||
- gchar *stock_id;
|
||||
- GtkIconSize icon_size;
|
||||
-
|
||||
- gint icon_width;
|
||||
- gint icon_height;
|
||||
-
|
||||
- gboolean with_arrow;
|
||||
- gboolean from_outside;
|
||||
+ gboolean with_arrow;
|
||||
};
|
||||
|
||||
struct _KzEntryClass
|
||||
{
|
||||
- GtkEntryClass parent_class;
|
||||
- /* signals */
|
||||
- void (*icon_pressed) (KzEntry *entry, GdkEventButton *event);
|
||||
+ GtkEntryClass parent_class;
|
||||
};
|
||||
|
||||
GType kz_entry_get_type (void) G_GNUC_CONST;
|
||||
GtkWidget *kz_entry_new (void);
|
||||
-GtkWidget *kz_entry_new_with_stock (const gchar *stock_id, GtkIconSize size);
|
||||
|
||||
void kz_entry_set_arrow (KzEntry *entry,
|
||||
- gboolean arrow);
|
||||
-void kz_entry_set_backtext (KzEntry *entry,
|
||||
- const gchar *text);
|
||||
-void kz_entry_set_icon_from_stock (KzEntry *entry,
|
||||
- const gchar *stock_id,
|
||||
- GtkIconSize size);
|
||||
-void kz_entry_set_icon_from_pixbuf (KzEntry *entry,
|
||||
- GdkPixbuf *icon);
|
||||
-G_CONST_RETURN gchar* kz_entry_get_backtext (KzEntry *entry);
|
||||
+ gboolean arrow);
|
||||
+void kz_entry_set_backtext (KzEntry *entry,
|
||||
+ const gchar *text);
|
||||
+G_CONST_RETURN gchar* kz_entry_get_backtext
|
||||
+ (KzEntry *entry);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __KZ_ENTRY_H__ */
|
||||
+/*
|
||||
+vi:ts=4:nowrap:ai:expandtab:sw=4
|
||||
+*/
|
14
www/kazehakase/patches/patch-src_widget_kz-paned_c
Normal file
14
www/kazehakase/patches/patch-src_widget_kz-paned_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-src_widget_kz-paned_c,v 1.1 2010/05/06 19:25:51 landry Exp $
|
||||
--- src/widget/kz-paned.c.orig Mon May 3 22:13:50 2010
|
||||
+++ src/widget/kz-paned.c Mon May 3 22:14:03 2010
|
||||
@@ -154,8 +154,8 @@ kz_paned_is_showing_all_children (KzPaned *kzpaned)
|
||||
|
||||
paned = GTK_PANED(kzpaned);
|
||||
|
||||
- return paned->child1 && GTK_WIDGET_VISIBLE(paned->child1) &&
|
||||
- paned->child2 && GTK_WIDGET_VISIBLE(paned->child2);
|
||||
+ return paned->child1 && gtk_widget_get_visible(paned->child1) &&
|
||||
+ paned->child2 && gtk_widget_get_visible(paned->child2);
|
||||
}
|
||||
|
||||
void
|
@ -1,4 +1,3 @@
|
||||
@comment $OpenBSD: PLIST-gecko,v 1.2 2009/06/18 20:10:07 landry Exp $
|
||||
@comment $OpenBSD: PLIST-gecko,v 1.3 2010/05/06 19:25:51 landry Exp $
|
||||
lib/kazehakase/embed/gecko.a
|
||||
lib/kazehakase/embed/gecko.la
|
||||
lib/kazehakase/embed/gecko.so
|
||||
|
@ -1,8 +1,12 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2009/12/22 13:02:12 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2010/05/06 19:25:51 landry Exp $
|
||||
@conflict kazehakase-<=0.5.4
|
||||
@bin bin/kazehakase
|
||||
@bin bin/kz-embed-process
|
||||
lib/kazehakase/
|
||||
lib/kazehakase/embed/
|
||||
lib/kazehakase/embed/per_process.a
|
||||
lib/kazehakase/embed/per_process.la
|
||||
lib/kazehakase/embed/per_process.so
|
||||
lib/kazehakase/libkazehakase.a
|
||||
lib/kazehakase/libkazehakase.la
|
||||
@lib lib/kazehakase/libkazehakase.so.${LIBkazehakase_VERSION}
|
||||
@ -80,6 +84,12 @@ share/kazehakase/icons/kz-yellow.png
|
||||
share/kazehakase/kz-no-thumbnail.png
|
||||
share/kazehakase/search-result.css
|
||||
share/kazehakase/search-result.js
|
||||
share/locale/cs/LC_MESSAGES/kazehakase.mo
|
||||
share/locale/de/LC_MESSAGES/kazehakase.mo
|
||||
share/locale/fr/LC_MESSAGES/kazehakase.mo
|
||||
share/locale/ja/LC_MESSAGES/kazehakase.mo
|
||||
share/locale/nl/LC_MESSAGES/kazehakase.mo
|
||||
share/locale/ru/LC_MESSAGES/kazehakase.mo
|
||||
share/pixmaps/
|
||||
share/pixmaps/kazehakase-icon.png
|
||||
@exec %D/bin/update-desktop-database
|
||||
|
Loading…
Reference in New Issue
Block a user