From d9af30b7d062961e3db32d0272228ea0d60cbd7c Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 17 Jun 2013 15:24:17 +0000 Subject: [PATCH] - Update MASTER_SITES - Fix runtime error against recent glib2 PR: 179590 Submitted by: Ports Fury --- graphics/pqiv/Makefile | 14 ++++++++------ graphics/pqiv/files/patch-pqiv.c | 17 +++++++++++++---- graphics/pqiv/pkg-descr | 17 ++++++----------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index 2dfdaabe85ab..6626525fb1a6 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -1,14 +1,11 @@ -# New ports collection makefile for: graphics/pqiv -# Date created: March 28 2008 -# Whom: Martin Tournoij -# +# Created by: Martin Tournoij # $FreeBSD$ -# PORTNAME= pqiv PORTVERSION= 0.12 +PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/ +MASTER_SITES= GHC EXTRACT_SUFX= .tbz MAINTAINER= ports@FreeBSD.org @@ -25,6 +22,11 @@ COMMANDS_DESC= Enable support for external command execution CONFIG_DESC= Enable support for a configuration file ANIMATIONS_DESC=Enable support for animations +USE_GITHUB= yes +GH_ACCOUNT= phillipberndt + +WRKSRC= ${WRKDIR}/${DISTNAME} + USE_BZIP2= yes USE_GNOME= gtk20 USE_CSTD= gnu89 diff --git a/graphics/pqiv/files/patch-pqiv.c b/graphics/pqiv/files/patch-pqiv.c index 9664517ba6fa..d953af9df211 100644 --- a/graphics/pqiv/files/patch-pqiv.c +++ b/graphics/pqiv/files/patch-pqiv.c @@ -1,6 +1,6 @@ --- pqiv.c.orig 2009-10-08 19:49:20.000000000 +0900 +++ pqiv.c 2009-10-10 17:43:14.000000000 +0900 -@@ -273,7 +273,7 @@ +@@ -288,7 +288,7 @@ #ifndef NO_COMMANDS " - s Set command number n (1-9) to s \n" " See manpage for advanced commands (starting with > or |) \n" @@ -9,7 +9,7 @@ #endif "\n" -@@ -297,7 +297,7 @@ +@@ -312,7 +312,7 @@ " v Vertical flip \n" " i Show/hide info box \n" " s Slideshow toggle \n" @@ -18,7 +18,7 @@ #ifndef NO_COMMANDS " Run command n (1-3) \n" #endif -@@ -1737,12 +1737,12 @@ +@@ -1955,12 +1955,12 @@ } break; /* }}} */ @@ -35,7 +35,16 @@ if(link(currentFile->fileName, buf) != 0) { /* Failed to link image, try copying it */ if(copyFile(currentFile->fileName, buf) != TRUE) { -@@ -2214,13 +2214,13 @@ +@@ -2252,8 +2252,6 @@ + /* glib & threads initialization {{{ */ + DEBUG1("Debug mode enabled"); + g_type_init(); +- g_thread_init(NULL); +- gdk_threads_init(); + if(gtk_init_check(&argc, &argv) == FALSE) { + die("Failed to open X11 display."); + } +@@ -2436,13 +2434,13 @@ } optionCommands[i] = g_strdup((gchar*)optarg); break; diff --git a/graphics/pqiv/pkg-descr b/graphics/pqiv/pkg-descr index 6aae92007e46..da035d060ee6 100644 --- a/graphics/pqiv/pkg-descr +++ b/graphics/pqiv/pkg-descr @@ -1,13 +1,7 @@ -qiv (graphics/qiv) is a great image viewer, but it does not use gtk2 -but imlib for image handling. This is bad, because many distributions -(well, at least gentoo) do not offer this library anymore as it's -quite old and not maintained anymore. - -When the first release of pqiv was written, I used python, hence the -name. I expected somebody else to write a c-rewrite of qiv, so I -didn't really care about that. About one month later nothing had -happened yet, so I did this on my own. Starting from 0.4 pqiv means -"pretty quick image viewer", written in pure C, using gtk+-2.0. +Originally, PQIV was written as a drop-in replacement for QIV. The first +release was not more than a Python script, hence the name. Now, PQIV is +a (modulo some small extras) full featured clone of QIV written in C +using GTK-2 and GLIB-2. Features include: * Fullscreen @@ -17,7 +11,8 @@ Features include: * Move by drag & drop in fullscreen * Keep preferences in a configuration file * Rather small executable (~36k), low ram consumtion, quick -* Execute predefined commands, pipe images through them or display their output +* Execute predefined commands, pipe images through them or display + their output * Real transparency * Fade between images