Sure, here is the right one.
On 24/03, Tomm Gerthard wrote:
; Hi,
;
; On Sun, Mar 22, 2015 at 01:57:22PM -0300, Gonzalo L. Rodriguez wrote:
; > Hi,
; >
; > Update for Xombrero to 1.6.4 with some tweaks from Tomm Gerthard
; > (Thanks!)
; >
; > Comments? Oks?
;
; I have been running with the same diff for some time now on amd64 with
; gtk+3-3.14.8 (snapshots from March 3rd), except:
;
; > Index: patches/patch-Makefile
; > ===================================================================
; > RCS file: /cvs/ports/www/xombrero/patches/patch-Makefile,v
; > retrieving revision 1.1
; > diff -u -p -r1.1 patch-Makefile
; > --- patches/patch-Makefile 25 Sep 2013 12:26:46 -0000 1.1
; > +++ patches/patch-Makefile 22 Mar 2015 16:55:01 -0000
; > @@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile,v 1.1 2013/09/2
; >
; > Fix build with gtk+3 >= 3.10.0
; >
; > ---- Makefile.orig Wed Sep 25 13:52:42 2013
; > -+++ Makefile Wed Sep 25 13:52:56 2013
; > -@@ -11,7 +11,7 @@ SRCS+= history.c completion.c tldlist.c externaleditor
; > +--- Makefile.orig Tue Feb 17 13:11:49 2015
; > ++++ Makefile Sun Mar 22 13:23:16 2015
; > +@@ -12,7 +12,7 @@ SRCS+= history.c completion.c tldlist.c externaleditor
; > CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused -Wextra
-Wno-unused-parameter
; > CFLAGS+= -Wno-missing-field-initializers -Wno-sign-compare
; > CFLAGS+= -Wno-deprecated-declarations -Wfloat-equal ${DEBUG}
;
; Is this patch still needed? AFAIK upstream has replaced the deprecated
; calls. Build passed without this patch on my system.
;
; Regards,
; Tomm
;
--
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/xombrero/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 10 Aug 2014 09:58:07 -0000 1.13
+++ Makefile 31 Mar 2015 15:16:16 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2014/08/10 09:58:07 espie Exp $
COMMENT= vi-like minimalists web browser
-DISTNAME= xombrero-1.6.3
+DISTNAME= xombrero-1.6.4
CATEGORIES= www
-EPOCH= 1
HOMEPAGE= http://opensource.conformal.com/wiki/xombrero
@@ -18,7 +17,7 @@ MODULES += devel/gettext
WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnutls gobject-2.0
WANTLIB += gtk-3 javascriptcoregtk-3.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 soup-2.4 util webkitgtk-3.0 z
+WANTLIB += pangoft2-1.0 pthread soup-2.4 util webkitgtk-3.0 z
MASTER_SITES= http://opensource.conformal.com/snapshots/xombrero/
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/xombrero/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 14 Jul 2013 19:06:02 -0000 1.8
+++ distinfo 31 Mar 2015 15:16:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (xombrero-1.6.3.tgz) = SBARwTYgb3qjq0zfSa13+B301VhfnpogxlG/qqpTf3k=
-SIZE (xombrero-1.6.3.tgz) = 290478
+SHA256 (xombrero-1.6.4.tgz) = PYGNIvpLT9ZiVSKokB6mlbv2rnkHT07FWh7hb9xdL9k=
+SIZE (xombrero-1.6.4.tgz) = 482984
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 25 Sep 2013 12:26:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2013/09/25 12:26:46 ajacoutot Exp $
-
-Fix build with gtk+3 >= 3.10.0
-
---- Makefile.orig Wed Sep 25 13:52:42 2013
-+++ Makefile Wed Sep 25 13:52:56 2013
-@@ -11,7 +11,7 @@ SRCS+= history.c completion.c tldlist.c externaleditor
- CFLAGS+= -O2 -Wall -Wno-format-extra-args -Wunused -Wextra
-Wno-unused-parameter
- CFLAGS+= -Wno-missing-field-initializers -Wno-sign-compare
- CFLAGS+= -Wno-deprecated-declarations -Wfloat-equal ${DEBUG}
--CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
-+CFLAGS+= -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGSEAL_ENABLE
- CFLAGS+= -I. -I${.CURDIR}
- LDADD= -lutil
- GTK_VERSION ?= gtk3
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/xombrero/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 7 Jun 2012 14:18:14 -0000 1.1.1.1
+++ pkg/DESCR 31 Mar 2015 15:16:16 -0000
@@ -1,5 +1,4 @@
-Xombrero is a minimalists web browser. It strives to be vi-like for
-heavy keyboard users. Development has just begun and currently it
-is very spartan.
+Xombrero is a minimalists web browser. It strives to be vi-like for
+heavy keyboard users.
Please refer to the man page for more details.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/xombrero/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 30 Nov 2012 21:23:27 -0000 1.4
+++ pkg/PLIST 31 Mar 2015 15:16:16 -0000
@@ -9,6 +9,7 @@ share/examples/xombrero/favorites
share/examples/xombrero/playflash.sh
share/examples/xombrero/xombrero.conf
share/xombrero/
+share/xombrero/favicon.ico
share/xombrero/hsts-preload
share/xombrero/http-accept-headers
share/xombrero/style.css
@@ -17,9 +18,9 @@ share/xombrero/tordisabled.ico
share/xombrero/torenabled.ico
share/xombrero/user-agent-headers
share/xombrero/xombrero.css
-share/xombrero/xombreroicon.png
share/xombrero/xombreroicon128.png
share/xombrero/xombreroicon16.png
+share/xombrero/xombreroicon256.png
share/xombrero/xombreroicon32.png
share/xombrero/xombreroicon48.png
share/xombrero/xombreroicon64.png
