From d85444e6dcab052ef006b20405377296c2d64fc2 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 14 May 2009 13:39:44 +0000 Subject: [PATCH] - update to gqview-2.1.5 (devel version, but the project is dead) from Brad - use xdg-open to display "Help" with favorite browser --- graphics/gqview/Makefile | 15 ++++++++------- graphics/gqview/distinfo | 10 +++++----- graphics/gqview/patches/patch-Makefile_in | 8 ++++---- graphics/gqview/patches/patch-configure | 17 +++++++++++++---- graphics/gqview/patches/patch-doc_Makefile_in | 8 ++++---- graphics/gqview/patches/patch-src_main_c | 16 ++++++++++++++++ graphics/gqview/pkg/PLIST | 6 ++---- 7 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 graphics/gqview/patches/patch-src_main_c diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index c1cb51e5789..12afe567199 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.53 2008/06/29 20:44:51 sthen Exp $ +# $OpenBSD: Makefile,v 1.54 2009/05/14 13:39:44 ajacoutot Exp $ COMMENT= Gtk-based graphic file viewer -DISTNAME= gqview-2.0.4 -PKGNAME= ${DISTNAME}p4 +DISTNAME= gqview-2.1.5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/} @@ -19,13 +18,15 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \ Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ - freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pixman-1 png z + freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \ + pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png z MODULES= devel/gettext -RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ + ::devel/xdg-utils +LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ + lcms::graphics/lcms USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo index 6298d97c5d2..781d10acf02 100644 --- a/graphics/gqview/distinfo +++ b/graphics/gqview/distinfo @@ -1,5 +1,5 @@ -MD5 (gqview-2.0.4.tar.gz) = cZbeqwTblM7CFnY3zdwC+Q== -RMD160 (gqview-2.0.4.tar.gz) = k+fUtLMZZTsBkrX5cGqZxLRoZQk= -SHA1 (gqview-2.0.4.tar.gz) = qujxza5gRBRypS1ZTLQlctDXnus= -SHA256 (gqview-2.0.4.tar.gz) = l+O3zl8XoxXFbW7v17OmC0DMPRiFjKGUx+cmKszjg8s= -SIZE (gqview-2.0.4.tar.gz) = 1545847 +MD5 (gqview-2.1.5.tar.gz) = RkQYfZsUsdwRrDuxRvJi6g== +RMD160 (gqview-2.1.5.tar.gz) = xnF3myCUuFSiTc/N4EdU6tnPH0s= +SHA1 (gqview-2.1.5.tar.gz) = Qvu+S82K2Hobl2zIpEM3UMrHsRY= +SHA256 (gqview-2.1.5.tar.gz) = Ev6klOYHpp7/Mc3KE9MG7xsLO3hQvg+LI28mfY8ulUY= +SIZE (gqview-2.1.5.tar.gz) = 1685061 diff --git a/graphics/gqview/patches/patch-Makefile_in b/graphics/gqview/patches/patch-Makefile_in index 5d25d127e60..3851777449b 100644 --- a/graphics/gqview/patches/patch-Makefile_in +++ b/graphics/gqview/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.10 2005/03/27 20:43:42 pvalchev Exp $ ---- Makefile.in.orig Fri Mar 25 00:25:29 2005 -+++ Makefile.in Fri Mar 25 00:25:39 2005 -@@ -181,7 +181,7 @@ target_alias = @target_alias@ +$OpenBSD: patch-Makefile_in,v 1.11 2009/05/14 13:39:44 ajacoutot Exp $ +--- Makefile.in.orig Sat Dec 2 20:41:25 2006 ++++ Makefile.in Tue May 12 20:15:02 2009 +@@ -184,7 +184,7 @@ target_alias = @target_alias@ SUBDIRS = src po doc DIST_SUBDIRS = src po doc man_MANS = gqview.1 diff --git a/graphics/gqview/patches/patch-configure b/graphics/gqview/patches/patch-configure index 329d1c106b0..be0ede45041 100644 --- a/graphics/gqview/patches/patch-configure +++ b/graphics/gqview/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.12 2008/02/04 08:44:48 ajacoutot Exp $ ---- configure.orig Sat Dec 2 18:04:07 2006 -+++ configure Thu Jan 31 20:44:29 2008 -@@ -4565,12 +4565,12 @@ echo "$as_me: error: GTK+ >= 2.4.0 not installed." >&2 +$OpenBSD: patch-configure,v 1.13 2009/05/14 13:39:44 ajacoutot Exp $ +--- configure.orig Sat Dec 2 20:41:26 2006 ++++ configure Tue May 12 20:22:32 2009 +@@ -4570,12 +4570,12 @@ echo "$as_me: error: GTK+ >= 2.4.0 not installed." >&2 cat >>confdefs.h <<_ACEOF @@ -16,3 +16,12 @@ $OpenBSD: patch-configure,v 1.12 2008/02/04 08:44:48 ajacoutot Exp $ _ACEOF +@@ -4769,7 +4769,7 @@ if test "${ac_cv_lib_lcms_cmsCreate_sRGBProfile+set}" + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llcms $LIBS" ++LIBS="-llcms -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/graphics/gqview/patches/patch-doc_Makefile_in b/graphics/gqview/patches/patch-doc_Makefile_in index 18acf11f91f..137dcf0f666 100644 --- a/graphics/gqview/patches/patch-doc_Makefile_in +++ b/graphics/gqview/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1 2005/03/27 20:43:42 pvalchev Exp $ ---- doc/Makefile.in.orig Fri Mar 25 00:25:08 2005 -+++ doc/Makefile.in Fri Mar 25 00:25:23 2005 -@@ -148,7 +148,7 @@ sbindir = @sbindir@ +$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/05/14 13:39:44 ajacoutot Exp $ +--- doc/Makefile.in.orig Sat Dec 2 20:41:25 2006 ++++ doc/Makefile.in Tue May 12 20:15:02 2009 +@@ -151,7 +151,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/graphics/gqview/patches/patch-src_main_c b/graphics/gqview/patches/patch-src_main_c new file mode 100644 index 00000000000..0d3a1ba997a --- /dev/null +++ b/graphics/gqview/patches/patch-src_main_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_main_c,v 1.3 2009/05/14 13:39:44 ajacoutot Exp $ +--- src/main.c.orig Sat Nov 25 00:53:54 2006 ++++ src/main.c Thu May 14 09:53:10 2009 +@@ -171,10 +171,10 @@ static gchar *html_browsers[] = + { + /* Redhat has a nifty htmlview script to start the user's preferred browser */ + "htmlview", NULL, +- /* GNOME 2 */ +- "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command", + /* KDE */ + "kfmclient", "!kfmclient exec \"%s\"", ++ /* fd.o */ ++ "xdg-open", NULL, + /* use fallbacks */ + "firefox", NULL, + "mozilla", NULL, diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST index 8c3194f62a1..7acd6bcfc57 100644 --- a/graphics/gqview/pkg/PLIST +++ b/graphics/gqview/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.25 2008/02/04 08:44:48 ajacoutot Exp $ -bin/gqview +@comment $OpenBSD: PLIST,v 1.26 2009/05/14 13:39:44 ajacoutot Exp $ +@bin bin/gqview @man man/man1/gqview.1 share/applications/gqview.desktop share/doc/gqview/ @@ -70,8 +70,6 @@ share/locale/de/LC_MESSAGES/gqview.mo share/locale/eo/LC_MESSAGES/gqview.mo share/locale/es/LC_MESSAGES/gqview.mo share/locale/et/LC_MESSAGES/gqview.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/gqview.mo share/locale/fi/LC_MESSAGES/gqview.mo share/locale/fr/LC_MESSAGES/gqview.mo