Hello community, here is the log from the commit of package feh for openSUSE:Factory checked in at 2014-09-06 12:18:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/feh (Old) and /work/SRC/openSUSE:Factory/.feh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "feh" Changes: -------- --- /work/SRC/openSUSE:Factory/feh/feh.changes 2014-07-26 09:41:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.feh.new/feh.changes 2014-09-06 12:18:31.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Sep 2 08:46:37 UTC 2014 - toganm@opensuse.org + +- Update to 2.12 + * feh no longer depends on giblib. Instead, the relevant parts + of the giblib source were imported into the feh source. + Rationale: giblib is unmaintained and, as far as I know, only + used by three projects (one of which is feh). There is at least one + known bug in it, and as I do not have the time to take over giblib + development, importing the library seems to be the best solution. + * Fix/improve --randomize for short filelists (closes #151) + * Fix a buffer overflow in the printf implementation when + * handling unknown format specifiers (affects --action, --customlist, + --index-info, --info, --thumb-title and --title) + * Update help (if built with help=1) +- Patches reworked for patch level 1 + * replaced feh-fix_sighandler.patch with feh-2.12-fix_sighandler.patch + +------------------------------------------------------------------- Old: ---- feh-2.10.tar.bz2 feh-2.10.tar.bz2.asc feh-fix_sighandler.patch New: ---- feh-2.12-fix_sighandler.patch feh-2.12.tar.bz2 feh-2.12.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ feh.spec ++++++ --- /var/tmp/diff_new_pack.M0DAWw/_old 2014-09-06 12:18:32.000000000 +0200 +++ /var/tmp/diff_new_pack.M0DAWw/_new 2014-09-06 12:18:32.000000000 +0200 @@ -19,9 +19,9 @@ License: MIT and LGPL-2.0+ Group: Productivity/Graphics/Viewers Name: feh -Version: 2.10 +Version: 2.12 Release: 0 -Source: https://derf.homelinux.org/projects/feh/feh-%{version}.tar.bz2 +Source: http://feh.finalrewind.org/feh-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}-%{version}.tar.bz2.asc @@ -33,8 +33,8 @@ Patch2: feh-fix_pointer_arithmetics.patch # PATCH-FIX-OPENSUSE feh-no_date.patch - pascal.bleser@opensuse.org -- avoid injecting the current date into the man page, which causes needless rebuilds Patch4: feh-no_date.patch -# PATCH-FIX-UPSTREAM feh-fix_sighandler.patch https://github.com/derf/feh/issues/70 pascal.bleser@opensuse.org -- bad prototype for a sighandler_t and a funky unportable pointer cast -Patch5: feh-fix_sighandler.patch +# PATCH-FIX-UPSTREAM feh-fix_sighandler.patch https://github.com/derf/feh/issues/70 toganm@opensuse.org -- bad prototype for a sighandler_t and a funky unportable pointer cast +Patch5: feh-2.12-fix_sighandler.patch Url: http://feh.finalrewind.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: curl-devel @@ -60,13 +60,14 @@ %gpg_verify %{S:3} %setup -q %patch1 -p1 -%patch2 -%patch4 -%patch5 +%patch2 -p1 +%patch4 -p1 +%patch5 -p1 %build %__make %{?_smp_flags} \ curl=1 \ + help=1 \ xinerama=1 \ debug=0 \ PREFIX="%{_prefix}" \ @@ -75,7 +76,7 @@ %install %__make \ PREFIX="%{buildroot}%{_prefix}" \ - install + install cam=1 %__rm -rf "%{buildroot}%{_datadir}/doc" ++++++ feh-2.12-fix_sighandler.patch ++++++ Based on the version of pascal.bleser@opensuse.org --- src/wallpaper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/src/wallpaper.c +++ b/src/wallpaper.c @@ -696,10 +696,10 @@ void enl_ipc_send(char *str) return; } -static sighandler_t *enl_ipc_timeout(int sig) +static void enl_ipc_timeout(int sig) { timeout = 1; - return((sighandler_t *) sig); + sig = 0; } char *enl_wait_for_reply(void) ++++++ feh-2.10.tar.bz2 -> feh-2.12.tar.bz2 ++++++ ++++ 2874 lines of diff (skipped) ++++++ feh-fix_pointer_arithmetics.patch ++++++ --- /var/tmp/diff_new_pack.M0DAWw/_old 2014-09-06 12:18:33.000000000 +0200 +++ /var/tmp/diff_new_pack.M0DAWw/_new 2014-09-06 12:18:33.000000000 +0200 @@ -1,6 +1,10 @@ ---- src/menu.c.orig 2012-04-05 19:14:08.260668430 +0200 -+++ src/menu.c 2012-04-05 19:15:15.716666031 +0200 -@@ -24,6 +24,8 @@ +--- + src/menu.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/src/menu.c ++++ b/src/menu.c +@@ -24,6 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE */ @@ -9,7 +13,7 @@ #include "feh.h" #include "thumbnail.h" #include "wallpaper.h" -@@ -915,7 +917,8 @@ +@@ -906,7 +908,8 @@ void feh_menu_init_main(void) void feh_menu_init_common() { @@ -19,7 +23,7 @@ char buf[30]; feh_menu *m; -@@ -967,7 +970,7 @@ +@@ -950,7 +953,7 @@ void feh_menu_init_common() m = feh_menu_new(); m->name = estrdup("TILED"); for (i = 0; i < num_desks; i++) { @@ -28,7 +32,7 @@ if (opt.slideshow || opt.multiwindow) feh_menu_add_entry(m, buf, NULL, CB_BG_TILED, i, NULL); -@@ -979,7 +982,7 @@ +@@ -962,7 +965,7 @@ void feh_menu_init_common() m = feh_menu_new(); m->name = estrdup("SCALED"); for (i = 0; i < num_desks; i++) { @@ -37,7 +41,7 @@ if (opt.slideshow || opt.multiwindow) feh_menu_add_entry(m, buf, NULL, CB_BG_SCALED, -@@ -992,7 +995,7 @@ +@@ -975,7 +978,7 @@ void feh_menu_init_common() m = feh_menu_new(); m->name = estrdup("CENTERED"); for (i = 0; i < num_desks; i++) { @@ -46,7 +50,7 @@ if (opt.slideshow || opt.multiwindow) feh_menu_add_entry(m, buf, NULL, CB_BG_CENTERED, i, NULL); -@@ -1004,7 +1007,7 @@ +@@ -987,7 +990,7 @@ void feh_menu_init_common() m = feh_menu_new(); m->name = estrdup("FILLED"); for (i = 0; i < num_desks; i++) { ++++++ feh-makefile_optflags.patch ++++++ --- /var/tmp/diff_new_pack.M0DAWw/_old 2014-09-06 12:18:33.000000000 +0200 +++ /var/tmp/diff_new_pack.M0DAWw/_new 2014-09-06 12:18:33.000000000 +0200 @@ -1,7 +1,11 @@ -diff -urN a/config.mk b/config.mk ---- a/config.mk 2013-02-14 11:53:26.000000000 +0000 -+++ b/config.mk 2013-02-19 18:43:57.526158503 +0000 -@@ -15,8 +15,8 @@ +--- + config.mk | 4 ++-- + src/Makefile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/config.mk ++++ b/config.mk +@@ -15,8 +15,8 @@ example_dir = ${main_dir}/share/doc/feh/ desktop_dir = ${main_dir}/share/applications # default CFLAGS @@ -10,12 +14,11 @@ +OPTFLAGS = -g -O2 +CFLAGS += -Wall -Wextra -pedantic $(OPTFLAGS) + cam ?= 0 curl ?= 1 - debug ?= 0 -diff -urN a/src/Makefile b/src/Makefile ---- a/src/Makefile 2013-02-14 11:53:26.000000000 +0000 -+++ b/src/Makefile 2013-02-19 18:43:14.437873267 +0000 -@@ -7,7 +7,7 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -7,7 +7,7 @@ I_SRCS = ${shell echo *.raw} I_DSTS = ${I_SRCS:.raw=.inc} feh: deps.mk ${OBJECTS} ${I_DSTS} ++++++ feh-no_date.patch ++++++ --- /var/tmp/diff_new_pack.M0DAWw/_old 2014-09-06 12:18:33.000000000 +0200 +++ /var/tmp/diff_new_pack.M0DAWw/_new 2014-09-06 12:18:33.000000000 +0200 @@ -1,6 +1,10 @@ ---- man/Makefile.orig 2012-03-06 23:52:17.897476737 +0100 -+++ man/Makefile 2012-03-06 23:52:34.932476132 +0100 -@@ -8,7 +8,7 @@ +--- + man/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/man/Makefile ++++ b/man/Makefile +@@ -8,7 +8,7 @@ all: ${TARGETS} .pre.1: sed \ -e 's/\$$VERSION\$$/${VERSION}/g' \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org