diff --git a/.gitignore b/.gitignore index 6f7bae5..58b6996 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ geeqie-1.0.tar.gz /geeqie-1.3.tar.xz /geeqie-1.4.tar.xz /geeqie-g0004617.tar.bz2 +/geeqie-1.5.1.tar.xz diff --git a/geeqie-1.0-fix-fullscreen.patch b/geeqie-1.0-fix-fullscreen.patch deleted file mode 100644 index 0547395..0000000 --- a/geeqie-1.0-fix-fullscreen.patch +++ /dev/null @@ -1,143 +0,0 @@ -Description: Make fullscreen modes actually use the full screen. - The default fullscreen mode now leaves everything up to the window manager, - which usually produces the best result. Custom fullscreen modes now use - override-redirect to ensure docks and panels never obscure the image. -Author: Daniel van Vugt -Bug: http://sourceforge.net/support/tracker.php?aid=2925034 -Bug-Ubuntu: https://launchpad.net/bugs/788321 -Forwarded: yes - -=== modified file 'src/fullscreen.c' ---- old/src/fullscreen.c 2010-02-26 10:41:38 +0000 -+++ new/src/fullscreen.c 2011-08-16 03:55:04 +0000 -@@ -218,75 +218,65 @@ - void (*stop_func)(FullScreenData *, gpointer), gpointer stop_data) - { - FullScreenData *fs; -- GdkScreen *screen; -- gboolean same; -- gint x, y; -- gint w, h; -- GdkGeometry geometry; - - if (!window || !imd) return NULL; - -+ DEBUG_1("full screen requests screen %d", options->fullscreen.screen); -+ - fs = g_new0(FullScreenData, 1); -- - fs->cursor_state = FULLSCREEN_CURSOR_HIDDEN; -- - fs->normal_window = window; - fs->normal_imd = imd; -- - fs->stop_func = stop_func; - fs->stop_data = stop_data; -- -- DEBUG_1("full screen requests screen %d", options->fullscreen.screen); -- fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h, -- &screen, &same); -- -- fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen")); -- -- /* this requests no decorations, if you still have them complain to the window manager author(s) */ -- gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE); -+ fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, -+ _("Full screen")); - - if (options->fullscreen.screen < 0) -- { -- /* If we want control of the window size and position this is not what we want. -- * Geeqie needs control of which monitor(s) to use for full screen. -- */ -+ { /* Fullscreen as determined by the window manager... */ - gtk_window_fullscreen(GTK_WINDOW(fs->window)); - } -- else if (options->fullscreen.above) -- { -- /* request to be above other windows */ -- gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE); -+ else -+ { /* Custom fullscreen modes. Done by hand, the hard way... */ -+ GdkScreen *screen; -+ gint x, y, w, h; -+ GdkGeometry geometry; -+ GtkWindow *gtkwin = GTK_WINDOW(fs->window); -+ GdkWindow *gdkwin; -+ -+ fullscreen_prefs_get_geometry(options->fullscreen.screen, -+ window, &x, &y, &w, &h, &screen, NULL); -+ -+ if (options->fullscreen.above) -+ gtk_window_set_keep_above(gtkwin, TRUE); -+ -+ gtk_window_set_screen(gtkwin, screen); -+ gtk_window_set_decorated(gtkwin, FALSE); -+ gtk_window_set_resizable(gtkwin, FALSE); -+ gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); -+ -+ geometry.min_width = w; -+ geometry.min_height = h; -+ geometry.max_width = w; -+ geometry.max_height = h; -+ geometry.base_width = w; -+ geometry.base_height = h; -+ gtk_window_set_geometry_hints(gtkwin, fs->window, &geometry, -+ GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | -+ GDK_HINT_BASE_SIZE); -+ -+ gtk_window_set_default_size(gtkwin, w, h); -+ gtk_window_move(gtkwin, x, y); -+ -+ gtk_widget_realize(fs->window); -+ gdkwin = gtk_widget_get_window(fs->window); -+ if (gdkwin != NULL) -+ gdk_window_set_override_redirect(gdkwin, TRUE); - } - -- gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE); -- -- gtk_window_set_screen(GTK_WINDOW(fs->window), screen); -- gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); - g_signal_connect(G_OBJECT(fs->window), "delete_event", - G_CALLBACK(fullscreen_delete_cb), fs); - -- geometry.min_width = w; -- geometry.min_height = h; -- geometry.max_width = w; -- geometry.max_height = h; -- geometry.base_width = w; -- geometry.base_height = h; -- geometry.win_gravity = GDK_GRAVITY_STATIC; -- /* By setting USER_POS and USER_SIZE, most window managers will -- * not request positioning of the full screen window (for example twm). -- * -- * In addition, setting gravity to STATIC will result in the -- * decorations of twm to not effect the requested window position, -- * the decorations will simply be off screen, except in multi monitor setups :-/ -- */ -- gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window, &geometry, -- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE | -- GDK_HINT_WIN_GRAVITY | -- GDK_HINT_USER_POS); -- -- gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h); -- gtk_window_move(GTK_WINDOW(fs->window), x, y); -- - fs->imd = image_new(FALSE); - - gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget); -@@ -393,7 +383,11 @@ - else - { - gdk_screen_get_monitor_geometry(screen, j, &rect); -- subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); -+ subname = gdk_screen_get_monitor_plug_name(screen, j); -+ if (subname == NULL) -+ { -+ subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); -+ } - } - - sd = g_new0(ScreenData, 1); - diff --git a/geeqie-1.1-LDFLAGS.patch b/geeqie-1.1-LDFLAGS.patch deleted file mode 100644 index 53d9e33..0000000 --- a/geeqie-1.1-LDFLAGS.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurb --strip-trailing-cr geeqie-1.1-orig/src/Makefile.in geeqie-1.1/src/Makefile.in ---- geeqie-1.1-orig/src/Makefile.in 2012-08-12 22:14:07.000000000 +0200 -+++ geeqie-1.1/src/Makefile.in 2012-08-14 09:40:29.599433629 +0200 -@@ -233,7 +233,7 @@ - JPEG_LIBS = @JPEG_LIBS@ - LCMS_CFLAGS = @LCMS_CFLAGS@ - LCMS_LIBS = @LCMS_LIBS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -Wl,--as-needed - LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ - LIBCHAMPLAIN_GTK_CFLAGS = @LIBCHAMPLAIN_GTK_CFLAGS@ - LIBCHAMPLAIN_GTK_LIBS = @LIBCHAMPLAIN_GTK_LIBS@ diff --git a/geeqie-1.1-filedata-change-notification.patch b/geeqie-1.1-filedata-change-notification.patch deleted file mode 100644 index c999390..0000000 --- a/geeqie-1.1-filedata-change-notification.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur geeqie-1.1-orig/src/filedata.c geeqie-1.1/src/filedata.c ---- geeqie-1.1-orig/src/filedata.c 2012-08-12 22:13:41.000000000 +0200 -+++ geeqie-1.1/src/filedata.c 2013-02-01 18:44:12.921684510 +0100 -@@ -2707,10 +2707,21 @@ - - void file_data_send_notification(FileData *fd, NotifyType type) - { -+ GList *work = notify_func_list; -+ -+ while (work) -+ { -+ NotifyData *nd = (NotifyData *)work->data; -+ -+ nd->func(fd, type, nd->data); -+ work = work->next; -+ } -+ /* - NotifyIdleData *nid = g_new0(NotifyIdleData, 1); - nid->fd = file_data_ref(fd); - nid->type = type; - g_idle_add_full(G_PRIORITY_HIGH, file_data_send_notification_idle_cb, nid, NULL); -+ */ - } - - static GHashTable *file_data_monitor_pool = NULL; diff --git a/geeqie-1.1-large-files.patch b/geeqie-1.1-large-files.patch deleted file mode 100644 index e595c7b..0000000 --- a/geeqie-1.1-large-files.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur geeqie-1.1-orig/src/secure_save.c geeqie-1.1/src/secure_save.c ---- geeqie-1.1-orig/src/secure_save.c 2012-08-12 22:13:41.000000000 +0200 -+++ geeqie-1.1/src/secure_save.c 2013-02-20 11:47:41.408733878 +0100 -@@ -9,12 +9,12 @@ - * This software comes with no warranty of any kind, use at your own risk! - */ - -+#include "main.h" - #include - #include - #include - #include - --#include "main.h" - #include "secure_save.h" - - -diff -Nur geeqie-1.1-orig/src/ui_fileops.h geeqie-1.1/src/ui_fileops.h ---- geeqie-1.1-orig/src/ui_fileops.h 2012-08-12 22:13:41.000000000 +0200 -+++ geeqie-1.1/src/ui_fileops.h 2013-02-20 11:33:03.458028384 +0100 -@@ -14,7 +14,7 @@ - #ifndef UI_FILEOPS_H - #define UI_FILEOPS_H - -- -+#include "config.h" - #include - #include - #include diff --git a/geeqie-1.4-goodbye-changelog.patch b/geeqie-1.4-goodbye-changelog.patch deleted file mode 100644 index 1b8833b..0000000 --- a/geeqie-1.4-goodbye-changelog.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 -+++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 -@@ -10,9 +10,9 @@ - readmedir = @readmedir@ - - if HAVE_MARKDOWN --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html - else --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS - endif - - desktopdir = $(datadir)/applications diff --git a/geeqie-autoconf-git.patch b/geeqie-autoconf-git.patch deleted file mode 100644 index 8b0a6ae..0000000 --- a/geeqie-autoconf-git.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- geeqie-0004617/configure.ac~ 2019-03-01 14:47:02.930632442 +0100 -+++ geeqie-0004617/configure.ac 2019-03-01 14:59:59.972585500 +0100 -@@ -1,5 +1,4 @@ --dnl Process this file with autoconf to produce a configure script. -*- Autoconf -- -*- -+dnl Process this file with autoconf to produce a configure script. -*- Autoconf -*- - - dnl This file is a part of Geeqie project (http://www.geeqie.org/). - dnl Copyright (C) 2008 - 2018 The Geeqie Team -@@ -15,7 +14,7 @@ - dnl GNU General Public License for more details. - - AC_PREREQ(2.57) --AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie@freelists.org], [], [http://www.geeqie.org/]) -+AC_INIT([geeqie], 1.4, [geeqie@freelists.org], [], [http://www.geeqie.org/]) - - # Add -Werror to the default CFLAGS - CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type" diff --git a/geeqie.spec b/geeqie.spec index b2f4264..0466086 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -1,10 +1,11 @@ -%global gitcommit 0004617a71100553a13e49e7208e401f2493b72c -%{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})} +# un-double the %%s to uncomment +# %%global gitcommit 0004617a71100553a13e49e7208e401f2493b72c +# %%{?gitcommit:%%global gitcommitshort %%(c=%%{gitcommit}; echo ${c:0:7})} Summary: Image browser and viewer Name: geeqie -Version: 1.4 -Release: 9%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Version: 1.5.1 +Release: 1%{?gitcommit:.git%{gitcommitshort}}%{?dist} License: GPLv2+ %if %{defined gitcommit} Source0: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=snapshot;h=%{gitcommit};sf=tbz2#/geeqie-g%{gitcommitshort}.tar.bz2 @@ -26,19 +27,12 @@ BuildRequires: libappstream-glib # but geeqie.org is the temporary new home and git server URL: http://geeqie.org -# add -Wl,--as-needed without disturbing %%configure macro -Patch0: geeqie-1.1-LDFLAGS.patch -Patch1: geeqie-autoconf-git.patch - -# https://github.com/BestImageViewer/geeqie/issues/568 -Patch2: geeqie-1.4-goodbye-changelog.patch - BuildRequires: gtk2-devel BuildRequires: lcms2-devel BuildRequires: exiv2-devel BuildRequires: lirc-devel BuildRequires: libjpeg-devel -#BuildRequires: libtiff-devel +BuildRequires: libtiff-devel BuildRequires: compat-lua-devel BuildRequires: gettext intltool desktop-file-utils BuildRequires: gnome-doc-utils @@ -72,8 +66,7 @@ and zoom. %prep %setup -q %{?gitcommit:-n %{name}-%{gitcommitshort}} -%patch1 -p1 -%patch2 -p1 + autoreconf -f -i ; intltoolize # guard against missing executables at (re)build-time, # these are needed by the plug-in scripts @@ -85,7 +78,7 @@ for f in ufraw-batch ; do type $f || exit -1 done %endif -%patch0 -p1 + # different distros have different names for this sed -i -e 's/lua5\.1/lua-5.1/' configure* @@ -97,15 +90,15 @@ cflags=( -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable + -Wno-error=parentheses ) -%configure --enable-lirc --disable-tiff \ + +%configure --enable-lirc \ --with-readmedir=%{_pkgdocdir} CFLAGS="$CFLAGS ${cflags[*]}" -%make_build -# work around https://github.com/BestImageViewer/geeqie/issues/568 -touch ChangeLog +%make_build %install mkdir -p %{buildroot}%{_pkgdocdir}/html @@ -141,6 +134,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap %changelog +* Fri Aug 30 2019 Matthew Miller - 1.5.1-1 +- new upstream release +- reenable tiff support +- don't error on the parenthesis warning (reported upstream) +- hey look: none of our patches are needed anymore! + * Thu Jul 25 2019 Fedora Release Engineering - 1.4-9.git0004617 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ef50122..b1bc169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geeqie-g0004617.tar.bz2) = fb12fd5c9a06cb42c590d0e6295f3946ad0069baa1d54a9a8c66a8b157e74a32a2d7d56fb7b2f7096bb409a2408fd6c9faccfc6a058a98a178a912745d539b15 +SHA512 (geeqie-1.5.1.tar.xz) = 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac