Date: Thu, 5 May 2016 21:44:53 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414668 - in head/www/xombrero: . files Message-ID: <201605052144.u45LirKL081535@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Thu May 5 21:44:53 2016 New Revision: 414668 URL: https://svnweb.freebsd.org/changeset/ports/414668 Log: www/xombrero: unbreak; update to 1.6.4 This patch is cherry-picked from 4 different PRs and one upstream bug report [1] Changes are: - fix build and runtime (based on [1]). I also tried patches and solutions from PR's, but they didn't worked for some reason - update to 1.6.4 - convert to options helpers and add other simplifications to Makefile - sync installed files with Makefile, bundled into distribution - add upstream patch to fix some GTK3 warnings This was tested both at build and runtime with both GTK versions. Also HTML5 video playback was tested - there was a report that it doesn't work. [1] https://github.com/conformal/xombrero/issues/131 PR: 192779 203939 205646 209301 Submitted by: various persons Added: head/www/xombrero/files/patch-xombrero.css (contents, props changed) Modified: head/www/xombrero/Makefile head/www/xombrero/distinfo head/www/xombrero/files/patch-freebsd__Makefile head/www/xombrero/pkg-descr head/www/xombrero/pkg-plist Modified: head/www/xombrero/Makefile ============================================================================== --- head/www/xombrero/Makefile Thu May 5 21:31:36 2016 (r414667) +++ head/www/xombrero/Makefile Thu May 5 21:44:53 2016 (r414668) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xombrero -PORTVERSION= 1.6.3 -PORTREVISION= 3 +PORTVERSION= 1.6.4 CATEGORIES= www MASTER_SITES= https://opensource.conformal.com/snapshots/xombrero/ @@ -12,34 +11,28 @@ COMMENT= Minimalists vi-like web browser LICENSE= ISCL -BROKEN= Does not build - LIB_DEPENDS= libgnutls.so:security/gnutls \ libsoup-2.4.so:devel/libsoup -USES= pkgconfig perl5 tar:tgz +USES= desktop-file-utils pkgconfig perl5 tar:tgz USE_PERL5= build INSTALLS_ICONS= yes BUILD_WRKSRC= ${WRKSRC}/freebsd -OPTIONS_SINGLE= GTK -OPTIONS_SINGLE_GTK=GTK2 GTK3 -OPTIONS_DEFAULT=GTK3 +OPTIONS_SINGLE= GTK +OPTIONS_SINGLE_GTK= GTK2 GTK3 +OPTIONS_DEFAULT= GTK3 + +GTK2_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 +GTK2_USE= GNOME=gtk20 +GTK2_MAKE_ENV= GTK_VERSION="gtk2" +GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 +GTK3_USE= GNOME=gtk30 +GTK3_MAKE_ENV= GTK_VERSION="gtk3" SUB_FILES= xombrero - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME= gtk20 -LIB_DEPENDS+= libwebkitgtk-1.0.so:www/webkit-gtk2 -MAKE_ENV+= GTK_VERSION="gtk2" -.else # GTK3 -USE_GNOME= gtk30 -LIB_DEPENDS+= libwebkitgtk-3.0.so:www/webkit-gtk3 -MAKE_ENV+= GTK_VERSION="gtk3" -.endif +PORTEXAMPLES= * post-patch: @cd ${WRKSRC}; ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -50,15 +43,15 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/xombrero ${STAGEDIR}${PREFIX}/bin/xombrero-bin ${INSTALL_MAN} ${WRKSRC}/xombrero.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.for i in 16 32 48 64 128 +.for i in 16 32 48 64 128 256 ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps - ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps + ${INSTALL_DATA} ${WRKSRC}/xombreroicon${i}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps .endfor ${MKDIR} ${STAGEDIR}${DATADIR} -.for i in hsts-preload style.css tld-rules - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} +.for i in favicon.ico hsts-preload style.css tld-rules torenabled.ico tordisabled.ico xombrero.css + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} .endfor - ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/xombrero.desktop ${STAGEDIR}${PREFIX}/share/applications ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in favorites xombrero.conf ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR} Modified: head/www/xombrero/distinfo ============================================================================== --- head/www/xombrero/distinfo Thu May 5 21:31:36 2016 (r414667) +++ head/www/xombrero/distinfo Thu May 5 21:44:53 2016 (r414668) @@ -1,2 +1,2 @@ -SHA256 (xombrero-1.6.3.tgz) = 481011c136206f7aa3ab4cdf49ad77f81df4d5585f9e9a20c651bfaaaa537f79 -SIZE (xombrero-1.6.3.tgz) = 290478 +SHA256 (xombrero-1.6.4.tgz) = 3d818d22fa4b4fd6625522a8901ea695bbf6ae79074f4ec55a1ee16fdc5d2fd9 +SIZE (xombrero-1.6.4.tgz) = 482984 Modified: head/www/xombrero/files/patch-freebsd__Makefile ============================================================================== --- head/www/xombrero/files/patch-freebsd__Makefile Thu May 5 21:31:36 2016 (r414667) +++ head/www/xombrero/files/patch-freebsd__Makefile Thu May 5 21:44:53 2016 (r414668) @@ -1,11 +1,26 @@ ---- freebsd/Makefile.orig 2013-12-08 20:54:46.651261821 +0100 -+++ freebsd/Makefile 2013-12-08 20:55:15.418253611 +0100 -@@ -9,7 +9,7 @@ +--- freebsd/Makefile.orig 2015-02-17 16:11:49 UTC ++++ freebsd/Makefile +@@ -9,7 +9,7 @@ LIBS+= libsoup-2.4 gnutls LDADD= -lutil GTK_CFLAGS!= pkgconf --cflags $(LIBS) GTK_LDFLAGS!= pkgconf --libs $(LIBS) -CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -I. -I.. -+CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I.. ++CFLAGS+= $(GTK_CFLAGS) -O0 -Wall -I. -I.. LDFLAGS+= $(GTK_LDFLAGS) PREFIX?= /usr/local +@@ -59,10 +59,10 @@ tldlist.o: ../tldlist.o + + ../xombrero.o: ../javascript.h ../tooltip.h + +-xombrero: xombrero.o freebsd.o marco.o about.o inspector.o whitelist.o settings.o \ +- cookie.o history.o completion.o inputfocus.o tldlist.o externaleditor.o \ +- unix.o +- $(CC) $(LDFLAGS) -o $@ *.o $+ $(LDADD) ++xombrero: ../xombrero.o freebsd.o ../marco.o ../about.o ../inspector.o ../whitelist.o \ ++ ../settings.o ../cookie.o ../history.o ../completion.o ../inputfocus.o ../tldlist.o \ ++ ../externaleditor.o ../unix.o ++ $(CC) $(LDFLAGS) -o $@ ${.ALLSRC} $(LDADD) + + install: all + install -m 755 -d $(DESTDIR)$(BINDIR) Added: head/www/xombrero/files/patch-xombrero.css ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/xombrero/files/patch-xombrero.css Thu May 5 21:44:53 2016 (r414668) @@ -0,0 +1,16 @@ +Upstream commit, that is fixing warnings on modern gtk3 +https://github.com/conformal/xombrero/commit/aa57b80c + +--- xombrero.css.orig 2015-02-17 16:11:49 UTC ++++ xombrero.css +@@ -25,8 +25,8 @@ + + * { + border-width: 1px; +- padding: 1; +- margin: 1; ++ padding: 1px; ++ margin: 1px; + -GtkScrolledWindow-scrollbar-spacing: 1; + -GtkWidget-line-width: 1; + } Modified: head/www/xombrero/pkg-descr ============================================================================== --- head/www/xombrero/pkg-descr Thu May 5 21:31:36 2016 (r414667) +++ head/www/xombrero/pkg-descr Thu May 5 21:44:53 2016 (r414668) @@ -1,5 +1,5 @@ -xombrero, previously known as xxxterm, is a minimalists web browser. It strives +xombrero, previously known as xxxterm, is a minimalists web browser. It strives to be vi-like for heavy keyboard users while maintaining traditional web browser - behaviour. It is ISC licensed. It is based on webkit using GTK+. +behaviour. It is ISC licensed. It is based on webkit using GTK+. WWW: https://opensource.conformal.com/wiki/xombrero Modified: head/www/xombrero/pkg-plist ============================================================================== --- head/www/xombrero/pkg-plist Thu May 5 21:31:36 2016 (r414667) +++ head/www/xombrero/pkg-plist Thu May 5 21:44:53 2016 (r414668) @@ -2,14 +2,16 @@ bin/xombrero bin/xombrero-bin man/man1/xombrero.1.gz share/applications/xombrero.desktop +share/icons/hicolor/256x256/apps/xombreroicon256.png share/icons/hicolor/128x128/apps/xombreroicon128.png share/icons/hicolor/16x16/apps/xombreroicon16.png share/icons/hicolor/32x32/apps/xombreroicon32.png share/icons/hicolor/48x48/apps/xombreroicon48.png share/icons/hicolor/64x64/apps/xombreroicon64.png +%%DATADIR%%/favicon.ico %%DATADIR%%/hsts-preload %%DATADIR%%/style.css %%DATADIR%%/tld-rules -%%EXAMPLESDIR%%/favorites -%%EXAMPLESDIR%%/playflash.sh -%%EXAMPLESDIR%%/xombrero.conf +%%DATADIR%%/tordisabled.ico +%%DATADIR%%/torenabled.ico +%%DATADIR%%/xombrero.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605052144.u45LirKL081535>