Update to qiv-2.2.4.
from Gonzalo L. R. with some tweaks.
This commit is contained in:
ajacoutot
parent
ec9cf0b9dd
commit
36583f5da7
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2011/11/02 09:57:22 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2012/03/29 06:05:14 ajacoutot Exp $
|
||||
|
||||
COMMENT= very small and pretty fast gdk/Imlib image viewer
|
||||
|
||||
DISTNAME= qiv-2.2.2
|
||||
REVISION= 5
|
||||
DISTNAME= qiv-2.2.4
|
||||
CATEGORIES= graphics
|
||||
|
||||
EXTRACT_SUFX= .tgz
|
||||
@ -14,7 +13,6 @@ MASTER_SITES= ${HOMEPAGE}/download/
|
||||
|
||||
LIB_DEPENDS= devel/libmagic \
|
||||
graphics/imlib2 \
|
||||
graphics/libexif \
|
||||
x11/gtk+2
|
||||
|
||||
# GPLv2
|
||||
@ -23,12 +21,12 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB += GL Imlib2 X11 Xcomposite Xcursor Xdamage
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender c cairo
|
||||
WANTLIB += exif expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += m magic pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
|
||||
WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z
|
||||
WANTLIB += GL Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender c cairo expat fontconfig
|
||||
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += gobject-2.0 m magic pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
|
||||
WANTLIB += z
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (qiv-2.2.2.tgz) = 5BMQXJFTIu7qblgtm5tPLw==
|
||||
RMD160 (qiv-2.2.2.tgz) = uIdQBnq++XHCEKVcUHcwCHQCpKs=
|
||||
SHA1 (qiv-2.2.2.tgz) = SJdyMDuvhEaefbIND9Lbu1bvG9Y=
|
||||
SHA256 (qiv-2.2.2.tgz) = wyyMwqAMpazeARaDPnx3ZUVoehImbRVhf3vcixvaLe8=
|
||||
SIZE (qiv-2.2.2.tgz) = 99044
|
||||
MD5 (qiv-2.2.4.tgz) = FCX4nJD5wEWFj8zyTYlMlw==
|
||||
RMD160 (qiv-2.2.4.tgz) = 7I+Z9+3rb2gdjHbl+5bhb2R2FnY=
|
||||
SHA1 (qiv-2.2.4.tgz) = ZQBSy3KCBwEwCyv+sJuWZiXuPbo=
|
||||
SHA256 (qiv-2.2.4.tgz) = 7WB43FUMHcL+NcHg9GRjwTWJokuD1PcQG3GnSF5Rq7c=
|
||||
SIZE (qiv-2.2.4.tgz) = 98874
|
||||
|
||||
@ -1,45 +1,57 @@
|
||||
$OpenBSD: patch-Makefile,v 1.6 2011/04/16 21:27:49 jasper Exp $
|
||||
--- Makefile.orig Sun May 31 03:35:42 2009
|
||||
+++ Makefile Tue Jul 14 18:44:12 2009
|
||||
@@ -3,9 +3,6 @@
|
||||
# User Options
|
||||
$OpenBSD: patch-Makefile,v 1.7 2012/03/29 06:05:14 ajacoutot Exp $
|
||||
--- Makefile.orig Fri May 13 15:11:24 2011
|
||||
+++ Makefile Thu Mar 29 08:01:31 2012
|
||||
@@ -4,7 +4,7 @@
|
||||
#######################################################################
|
||||
|
||||
-# Directory where qiv will be installed under.
|
||||
# Directory where qiv will be installed under.
|
||||
-PREFIX = /usr/local
|
||||
-
|
||||
+PREFIX ?= /usr/local
|
||||
|
||||
# Font to use for statusbar in fullscreen mode
|
||||
STATUSBAR_FONT = "fixed"
|
||||
@@ -30,7 +30,7 @@ GETOPT_LONG = -DHAVE_GETOPT_LONG
|
||||
|
||||
@@ -49,15 +46,6 @@ MAGIC = -DHAVE_MAGIC
|
||||
# This program will be run on the manual page after it is installed.
|
||||
# If you don't want to compress the manpage, change it to 'true'.
|
||||
-COMPRESS_PROG = gzip -9f
|
||||
+COMPRESS_PROG = true
|
||||
|
||||
# Comment this line out if your system doesn't have libXinerama
|
||||
# installed (for centering on dual-screen)
|
||||
@@ -45,11 +45,11 @@ MAGIC = -DHAVE_MAGIC
|
||||
# Do not edit below here!
|
||||
######################################################################
|
||||
|
||||
-CC = gcc
|
||||
-#CFLAGS = -O -g -Wall
|
||||
+CC ?= gcc
|
||||
#CFLAGS = -O -g -Wall
|
||||
-CFLAGS = -O2 -Wall \
|
||||
- -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
-#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
|
||||
-# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
-# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
-
|
||||
INCLUDES := $(shell pkg-config --cflags gdk-2.0 imlib2)
|
||||
LIBS := $(shell pkg-config --libs gdk-2.0 imlib2)
|
||||
+#CFLAGS = -O2 -Wall \
|
||||
+# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
+# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
|
||||
# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
@@ -83,7 +83,7 @@ OBJS_G += lib/getopt.g lib/getopt1.g
|
||||
endif
|
||||
|
||||
@@ -136,13 +124,7 @@ distclean : clean
|
||||
ifdef GTD_XINERAMA
|
||||
-LIBS += -L/usr/X11R6/lib -lXinerama
|
||||
+LIBS += -L${X11BASE}/lib -lXinerama
|
||||
endif
|
||||
|
||||
install: $(PROGRAM)
|
||||
@echo "Installing QIV..."
|
||||
- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
|
||||
- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
|
||||
- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
|
||||
ifdef MAGIC
|
||||
@@ -138,10 +138,6 @@ install: $(PROGRAM)
|
||||
fi
|
||||
install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
|
||||
$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
|
||||
- @if ./qiv -f ./intro.jpg ; \
|
||||
- then echo "-- Test Passed --" ; \
|
||||
- else echo "-- Test Failed --" ; \
|
||||
- fi
|
||||
- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
|
||||
+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
|
||||
+ $(BSD_INSTALL_MAN) $(PROGRAM).1 $(PREFIX)/man/man1
|
||||
@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
|
||||
|
||||
# the end... ;-)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user