From 42c2640cc1d15784239684c7f1f9e13af9bffd71 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Fri, 19 Jun 2020 02:00:44 -0500 Subject: user/feh: bump to 3.4.1 changelog https://github.com/derf/feh/blob/3.4.1/ChangeLog#L1_L27 --- user/feh/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user/feh/APKBUILD') diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index 899461202..ecab6a37b 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees # Maintainer: Max Rees pkgname=feh -pkgver=3.3 +pkgver=3.4.1 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="https://feh.finalrewind.org/" @@ -31,4 +31,4 @@ package() { install } -sha512sums="0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 feh-3.3.tar.bz2" +sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 feh-3.4.1.tar.bz2" -- cgit v1.2.3-70-g09d2 From 561fb3e9d0b5b889501bc8893179add2d2afc882 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Sat, 20 Jun 2020 02:27:44 +0000 Subject: user/feh: use libc getopt_long, not bundled one --- user/feh/APKBUILD | 12 +++++- user/feh/getopt.patch | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 user/feh/getopt.patch (limited to 'user/feh/APKBUILD') diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD index ecab6a37b..b95aaf01d 100644 --- a/user/feh/APKBUILD +++ b/user/feh/APKBUILD @@ -12,7 +12,14 @@ checkdepends="perl-test-command" makedepends="curl-dev imlib2-dev libexif-dev libjpeg-turbo-dev libpng-dev libxinerama-dev libxt-dev" subpackages="$pkgname-doc" -source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2" +source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2 + getopt.patch + " + +prepare() { + default_prepare + rm src/getopt.c src/getopt1.c src/getopt.h +} build() { make PREFIX=/usr curl=1 exif=1 xinerama=1 @@ -31,4 +38,5 @@ package() { install } -sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 feh-3.4.1.tar.bz2" +sha512sums="d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66 feh-3.4.1.tar.bz2 +cf02fbfcb1fd4f4e5cf899f7f94fd42521dbe8f1b805268eae5ae6222b85884c31abc3346a95ed46dfece7b89b445018e159ff8a42b799b3db18275e29eba1e3 getopt.patch" diff --git a/user/feh/getopt.patch b/user/feh/getopt.patch new file mode 100644 index 000000000..be7616fa9 --- /dev/null +++ b/user/feh/getopt.patch @@ -0,0 +1,100 @@ +--- feh-3.4.1/src/feh.h 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/feh.h 2020-06-20 02:22:16.040051483 +0000 +@@ -74,7 +74,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE + #include "menu.h" + + #include "utils.h" +-#include "getopt.h" ++#include + + #include "debug.h" + +--- feh-3.4.1/src/Makefile 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/Makefile 2020-06-20 02:22:43.660051920 +0000 +@@ -4,8 +4,6 @@ TARGETS = \ + events.c \ + feh_png.c \ + filelist.c \ +- getopt.c \ +- getopt1.c \ + gib_hash.c \ + gib_imlib.c \ + gib_list.c \ +--- feh-3.4.1/src/deps.mk 2020-05-29 21:55:03.000000000 +0000 ++++ feh-3.4.1/src/deps.mk 2020-06-20 02:23:33.810052712 +0000 +@@ -1,57 +1,55 @@ + events.o: events.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h thumbnail.h + feh_png.o: feh_png.c feh_png.h feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h ++ gib_style.h structs.h menu.h utils.h debug.h + filelist.o: filelist.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + signals.h options.h +-getopt.o: getopt.c +-getopt1.o: getopt1.c getopt.h + gib_hash.o: gib_hash.c gib_hash.h gib_list.h utils.h debug.h + gib_imlib.o: gib_imlib.c gib_imlib.h gib_style.h gib_list.h utils.h \ + debug.h + gib_list.o: gib_list.c gib_list.h utils.h debug.h + gib_style.o: gib_style.c gib_style.h gib_list.h utils.h debug.h + imlib.o: imlib.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h signals.h \ ++ structs.h menu.h utils.h debug.h filelist.h signals.h \ + winwidget.h options.h + index.o: index.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h index.h + keyevents.o: keyevents.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h thumbnail.h \ ++ gib_style.h structs.h menu.h utils.h debug.h thumbnail.h \ + filelist.h winwidget.h options.h + list.o: list.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + main.o: main.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + timers.h options.h events.h signals.h wallpaper.h + md5.o: md5.c md5.h + menu.o: menu.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h thumbnail.h filelist.h \ ++ structs.h menu.h utils.h debug.h thumbnail.h filelist.h \ + winwidget.h wallpaper.h options.h + multiwindow.o: multiwindow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h winwidget.h \ ++ gib_style.h structs.h menu.h utils.h debug.h winwidget.h \ + timers.h filelist.h options.h signals.h + options.o: options.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h options.h ++ structs.h menu.h utils.h debug.h filelist.h options.h + signals.o: signals.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h filelist.h winwidget.h \ ++ structs.h menu.h utils.h debug.h filelist.h winwidget.h \ + options.h + slideshow.o: slideshow.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + timers.h winwidget.h options.h signals.h + thumbnail.o: thumbnail.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h thumbnail.h md5.h feh_png.h index.h signals.h + timers.o: timers.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h timers.h ++ structs.h menu.h utils.h debug.h options.h timers.h + utils.o: utils.c feh.h gib_hash.h gib_list.h gib_imlib.h gib_style.h \ +- structs.h menu.h utils.h getopt.h debug.h options.h ++ structs.h menu.h utils.h debug.h options.h + wallpaper.o: wallpaper.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + options.h wallpaper.h + winwidget.o: winwidget.c feh.h gib_hash.h gib_list.h gib_imlib.h \ +- gib_style.h structs.h menu.h utils.h getopt.h debug.h filelist.h \ ++ gib_style.h structs.h menu.h utils.h debug.h filelist.h \ + winwidget.h options.h events.h -- cgit v1.2.3-70-g09d2