Hello community, here is the log from the commit of package feh for openSUSE:Factory checked in at 2017-11-07 10:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/feh (Old) and /work/SRC/openSUSE:Factory/.feh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "feh" Tue Nov 7 10:01:14 2017 rev:15 rq:539236 version:2.22 Changes: -------- --- /work/SRC/openSUSE:Factory/feh/feh.changes 2017-10-09 19:48:58.801582734 +0200 +++ /work/SRC/openSUSE:Factory/.feh.new/feh.changes 2017-11-07 10:02:27.744584634 +0100 @@ -1,0 +2,10 @@ +Sat Nov 4 15:40:36 UTC 2017 - aavind...@gmail.com + +- Rebase feh-makefile_app.patch +- update to 2.22 + * Add support for CURL_CA_BUNDLE environment variable when loading + images via HTTPS + * Fix ~/.fehbg not being updated when setting a wallpaper via menu + (broken in 2.21) + +------------------------------------------------------------------- Old: ---- feh-2.21.tar.bz2 feh-2.21.tar.bz2.asc New: ---- feh-2.22.tar.bz2 feh-2.22.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ feh.spec ++++++ --- /var/tmp/diff_new_pack.NFKymg/_old 2017-11-07 10:02:29.992503077 +0100 +++ /var/tmp/diff_new_pack.NFKymg/_new 2017-11-07 10:02:29.992503077 +0100 @@ -17,7 +17,7 @@ Name: feh -Version: 2.21 +Version: 2.22 Release: 0 Summary: Fast and Lightweight Image Viewer License: MIT AND LGPL-2.0+ ++++++ feh-2.21.tar.bz2 -> feh-2.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.21/ChangeLog new/feh-2.22/ChangeLog --- old/feh-2.21/ChangeLog 2017-10-07 12:43:45.000000000 +0200 +++ new/feh-2.22/ChangeLog 2017-11-04 15:03:43.000000000 +0100 @@ -1,3 +1,11 @@ +Sat, 04 Nov 2017 14:55:38 +0100 Daniel Friesel <derf+...@finalrewind.org> + +* Release v2.22 + * Add support for CURL_CA_BUNDLE environment variable when loading images + via HTTPS + * Fix ~/.fehbg not being updated when setting a wallpaper via menu + (broken in 2.21) + Sat, 07 Oct 2017 12:14:17 +0200 Daniel Friesel <derf+...@finalrewind.org> * Release v2.21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.21/config.mk new/feh-2.22/config.mk --- old/feh-2.21/config.mk 2017-10-07 12:43:45.000000000 +0200 +++ new/feh-2.22/config.mk 2017-11-04 15:03:43.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE ?= feh -VERSION ?= 2.21 +VERSION ?= 2.22 app ?= 0 cam ?= 0 @@ -13,6 +13,9 @@ PREFIX ?= /usr/local ICON_PREFIX ?= ${DESTDIR}${PREFIX}/share/icons +# icons in /usr/share/local/icons (and other prefixes != /usr) are not +# generally supported. So ignore PREFIX and always install icons into +# /usr/share/icons if the user wants to install feh on their local machine. ifeq (${app},1) ICON_PREFIX = /usr/share/icons endif @@ -73,7 +76,7 @@ MAN_EXIF = disabled endif -MAN_DATE ?= October 07, 2017 +MAN_DATE ?= November 04, 2017 # Uncomment this to use dmalloc #CFLAGS += -DWITH_DMALLOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.21/src/imlib.c new/feh-2.22/src/imlib.c --- old/feh-2.21/src/imlib.c 2017-10-07 12:43:45.000000000 +0200 +++ new/feh-2.22/src/imlib.c 2017-11-04 15:03:43.000000000 +0100 @@ -429,6 +429,10 @@ if (opt.insecure_ssl) { curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0); + } else { + // Allow the user to specify custom CA certificates. + curl_easy_setopt(curl, CURLOPT_CAINFO, + getenv("CURL_CA_BUNDLE")); } res = curl_easy_perform(curl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.21/src/wallpaper.c new/feh-2.22/src/wallpaper.c --- old/feh-2.21/src/wallpaper.c 2017-10-07 12:43:45.000000000 +0200 +++ new/feh-2.22/src/wallpaper.c 2017-11-04 15:03:43.000000000 +0100 @@ -294,59 +294,17 @@ unsigned long length, after; unsigned char *data_root = NULL, *data_esetroot = NULL; Pixmap pmap_d1, pmap_d2; - gib_list *l; char *home; - char filbuf[4096]; - char *bgfill = NULL; - bgfill = opt.image_bg == IMAGE_BG_WHITE ? "--image-bg white" : "--image-bg black" ; /* local display to set closedownmode on */ Display *disp2; Window root2; int depth2; - int in, out, w, h; + int w, h; D(("Falling back to XSetRootWindowPixmap\n")); - /* Put the filename in filbuf between ' and escape ' in the filename */ - out = 0; - - if (fil && !use_filelist) { - filbuf[out++] = '\''; - - fil = feh_absolute_path(fil); - - for (in = 0; fil[in] && out < 4092; in++) { - - if (fil[in] == '\'') - filbuf[out++] = '\\'; - filbuf[out++] = fil[in]; - } - filbuf[out++] = '\''; - free(fil); - - } else { - for (l = filelist; l && out < 4092; l = l->next) { - filbuf[out++] = '\''; - - fil = feh_absolute_path(FEH_FILE(l->data)->filename); - - for (in = 0; fil[in] && out < 4092; in++) { - - if (fil[in] == '\'') - filbuf[out++] = '\\'; - filbuf[out++] = fil[in]; - } - filbuf[out++] = '\''; - filbuf[out++] = ' '; - free(fil); - } - } - - - filbuf[out++] = 0; - if (scaled) { pmap_d1 = XCreatePixmap(disp, root, scr->width, scr->height, depth); @@ -478,10 +436,31 @@ if ((fp = fopen(path, "w")) == NULL) { weprintf("Can't write to %s", path); } else { - fputs("#!/bin/sh\n", fp); - for (int i = 0; i < cmdargc; i++) { - fputs(shell_escape(cmdargv[i]), fp); + fputs("#!/bin/sh\nexec ", fp); + if (use_filelist) { + for (int i = 0; i < cmdargc; i++) { + fputs(shell_escape(cmdargv[i]), fp); + fputc(' ', fp); + } + } else if (fil) { + fputs("feh --bg-", fp); + if (centered) + fputs("center", fp); + else if (scaled) + fputs("scale", fp); + else if (filled) + fputs("fill", fp); + else + fputs("tile", fp); + + if (opt.force_aliasing) + fputs(" --force-aliasing", fp); +#ifdef HAVE_LIBXINERAMA + if (!opt.xinerama) + fputs(" --no-xinerama", fp); +#endif fputc(' ', fp); + fputs(shell_escape(fil), fp); } fputc('\n', fp); fclose(fp); ++++++ feh-makefile_app.patch ++++++ --- /var/tmp/diff_new_pack.NFKymg/_old 2017-11-07 10:02:30.616480439 +0100 +++ /var/tmp/diff_new_pack.NFKymg/_new 2017-11-07 10:02:30.616480439 +0100 @@ -1,10 +1,10 @@ -Index: feh-2.17.1/config.mk -=================================================================== ---- feh-2.17.1.orig/config.mk -+++ feh-2.17.1/config.mk -@@ -14,7 +14,7 @@ PREFIX ?= /usr/local - ICON_PREFIX ?= ${DESTDIR}${PREFIX}/share/icons - +diff --git a/config.mk b/config.mk +index b230e3d..e138658 100644 +--- a/config.mk ++++ b/config.mk +@@ -17,7 +17,7 @@ ICON_PREFIX ?= ${DESTDIR}${PREFIX}/share/icons + # generally supported. So ignore PREFIX and always install icons into + # /usr/share/icons if the user wants to install feh on their local machine. ifeq (${app},1) - ICON_PREFIX = /usr/share/icons + ICON_PREFIX = ${PREFIX}/share/icons