sxiv: update to 1.3.1

This commit is contained in:
Alessio Sergi 2014-11-18 12:24:31 +01:00
parent e99f737632
commit 5e69c1c24b
3 changed files with 2 additions and 53 deletions

View File

@ -1,35 +0,0 @@
From 33b8148614c47a091da1a711fb53f94827a9cf51 Mon Sep 17 00:00:00 2001
From: Tim Harder <radhermit@gmail.com>
Date: Sat, 25 Oct 2014 12:30:19 -0400
Subject: [PATCH] Fix Makefile depend file usage
Creating the .depend file requires the config.h file to exist and
suppress make's complaints if the .depend file doesn't exist when
initially parsing the makefile.
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git Makefile.orig Makefile
index 9282884..3926145 100644
--- Makefile
+++ Makefile
@@ -14,7 +14,8 @@ OBJ = $(SRC:.c=.o)
all: sxiv
-$(OBJ): Makefile config.h
+$(OBJ): Makefile
+$(OBJ) .depend: config.h
depend: .depend
@@ -22,7 +23,7 @@ depend: .depend
rm -f ./.depend
$(CC) $(CFLAGS) -MM $^ >./.depend
-include .depend
+-include .depend
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<

View File

@ -1,20 +1,5 @@
--- Makefile.orig 2014-10-24 12:25:18.000000000 +0200
+++ Makefile 2014-10-26 01:19:33.040945097 +0200
@@ -3,10 +3,10 @@
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
-CC = gcc
-CFLAGS = -std=c99 -Wall -pedantic -O2
-CPPFLAGS = -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_LIBEXIF -DHAVE_GIFLIB
-LDFLAGS = -L$(PREFIX)/lib
+CC ?= gcc
+CFLAGS += -std=c99 -Wall -pedantic -O2
+CPPFLAGS += -I$(PREFIX)/include -D_XOPEN_SOURCE=500 -DHAVE_LIBEXIF -DHAVE_GIFLIB
+LDFLAGS += -L$(PREFIX)/lib
LIBS = -lX11 -lImlib2 -lexif -lgif
SRC = commands.c image.c main.c options.c thumbs.c util.c window.c
@@ -43,9 +43,9 @@
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1

View File

@ -1,13 +1,12 @@
# Template file for 'sxiv'
pkgname=sxiv
version=1.3
version=1.3.1
revision=1
build_style=gnu-makefile
makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Simple X Image Viewer"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="https://github.com/muennich/sxiv"
license="GPL-2"
distfiles="https://github.com/muennich/sxiv/archive/v${version}.tar.gz"
checksum=4c9d6dfa0c914ea20a80dff6cb376834ab1c765623496b8266f6a882a6b80708
checksum=9a30a1b036e1c17212128554709da3f2d65d3beaef2e0a73097af5e35cf11d0e