svn commit: r321130 - in head/graphics/pqiv: . files

[Martin Wilke]

Author: miwi
Date: Mon Jun 17 15:24:17 2013
New Revision: 321130
URL: http://svnweb.freebsd.org/changeset/ports/321130

Log:
  - Update MASTER_SITES
  - Fix runtime error against recent glib2
  
  PR:		179590
  Submitted by:	Ports Fury

Modified:
  head/graphics/pqiv/Makefile   (contents, props changed)
  head/graphics/pqiv/files/patch-pqiv.c   (contents, props changed)
  head/graphics/pqiv/pkg-descr   (contents, props changed)

Modified: head/graphics/pqiv/Makefile
==============================================================================
--- head/graphics/pqiv/Makefile	Mon Jun 17 15:22:24 2013	(r321129)
+++ head/graphics/pqiv/Makefile	Mon Jun 17 15:24:17 2013	(r321130)
@@ -1,14 +1,11 @@
-# New ports collection makefile for:	graphics/pqiv
-# Date created:				March 28 2008
-# Whom:					Martin Tournoij <carpetsmoker at xs4all.nl>
-#
+# Created by: Martin Tournoij <carpetsmoker at xs4all.nl>
 # $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 at FreeBSD.org
@@ -25,6 +22,11 @@ COMMANDS_DESC=	Enable support for extern
 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

Modified: head/graphics/pqiv/files/patch-pqiv.c
==============================================================================
--- head/graphics/pqiv/files/patch-pqiv.c	Mon Jun 17 15:22:24 2013	(r321129)
+++ head/graphics/pqiv/files/patch-pqiv.c	Mon Jun 17 15:24:17 2013	(r321130)
@@ -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
                  " -<n> 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
                  " <n>            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;

Modified: head/graphics/pqiv/pkg-descr
==============================================================================
--- head/graphics/pqiv/pkg-descr	Mon Jun 17 15:22:24 2013	(r321129)
+++ head/graphics/pqiv/pkg-descr	Mon Jun 17 15:24:17 2013	(r321130)
@@ -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