[imagination] Update imagination to 3.5.1

commit bccfd3afa299af5c43c9f2be9d65c2c7a89a1183 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed May 27 06:13:52 2020 +0100 Update imagination to 3.5.1 .gitignore | 1 + imagination-3.0-docfix.patch | 12 ++++++------ imagination-3.0-icon_fix.patch | 29 +++++------------------------ imagination.spec | 16 +++++++++------- sources | 2 +- 5 files changed, 22 insertions(+), 38 deletions(-) --- diff --git a/.gitignore b/.gitignore index ac40c6b..d0a03b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ imagination-3.0.tar.gz /imagination-3.1.tar.bz2 +/imagination-3.5.1.tar.gz diff --git a/imagination-3.0-docfix.patch b/imagination-3.0-docfix.patch index 26793a1..a69c29a 100644 --- a/imagination-3.0-docfix.patch +++ b/imagination-3.0-docfix.patch @@ -1,6 +1,6 @@ ---- src/main-window.c.orig 2011-04-16 16:34:10.826673407 -0500 -+++ src/main-window.c 2011-04-16 16:35:18.218400982 -0500 -@@ -2127,7 +2127,7 @@ +--- src/main-window.c.orig 2020-05-27 05:14:24.148951173 +0100 ++++ src/main-window.c 2020-05-27 05:28:14.376197928 +0100 +@@ -2257,7 +2257,7 @@ static void img_show_uri(GtkMenuItem * U gchar *lang = NULL; lang = g_strndup(g_getenv("LANG"),2); @@ -9,12 +9,12 @@ g_free(lang); img_message (img, FALSE, "%s\n", file); -@@ -2135,7 +2135,7 @@ - if ( !gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL)) +@@ -2265,7 +2265,7 @@ static void img_show_uri(GtkMenuItem * U + if ( !gtk_show_uri_on_window(GTK_WINDOW(img->imagination_window), file, GDK_CURRENT_TIME, NULL)) { g_free( file ); - file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"/html/en/index.html",NULL); + file = g_strconcat("file://",DATADIR,"/doc/",PACKAGE,"-",PACKAGE_VERSION,"/html/en/index.html",NULL); - gtk_show_uri(NULL,file, GDK_CURRENT_TIME, NULL); + gtk_show_uri_on_window(GTK_WINDOW(img->imagination_window), file, GDK_CURRENT_TIME, NULL); } g_free(file); diff --git a/imagination-3.0-icon_fix.patch b/imagination-3.0-icon_fix.patch index bd7f81e..f3eb194 100644 --- a/imagination-3.0-icon_fix.patch +++ b/imagination-3.0-icon_fix.patch @@ -1,34 +1,15 @@ -diff -Naur imagination-3.0.orig/src/main-window.c imagination-3.0/src/main-window.c ---- imagination-3.0.orig/src/main-window.c 2011-04-18 13:08:21.379948445 -0500 -+++ imagination-3.0/src/main-window.c 2011-04-18 16:24:03.886827476 -0500 -@@ -262,7 +262,7 @@ - gtk_widget_add_accelerator (import_menu,"activate",img_struct->accel_group,GDK_i,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); - g_signal_connect (G_OBJECT (import_menu),"activate",G_CALLBACK (img_add_slides_thumbnails),img_struct); - -- pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 18, 0, NULL); -+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 18, 0, NULL); - image_menu = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_menu),image_menu); -@@ -272,7 +272,7 @@ - gtk_widget_add_accelerator (import_audio_menu,"activate",img_struct->accel_group,GDK_m,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); - g_signal_connect (G_OBJECT (import_audio_menu),"activate",G_CALLBACK (img_select_audio_files_to_add),img_struct); - -- pixbuf = gtk_icon_theme_load_icon(icon_theme,"sound", 18, 0, NULL); -+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"audio-x-generic", 18, 0, NULL); - image_menu = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(pixbuf); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_audio_menu),image_menu); -@@ -526,7 +526,7 @@ +--- ./src/main-window.c.orig 2020-02-23 19:42:19.000000000 +0000 ++++ ./src/main-window.c 2020-05-27 05:14:24.148951173 +0100 +@@ -495,7 +495,7 @@ img_window_struct *img_create_window (vo gtk_widget_show (separatortoolitem); - gtk_container_add (GTK_CONTAINER (toolbar),separatortoolitem); + gtk_container_add (GTK_CONTAINER (img_struct->toolbar),separatortoolitem); - pixbuf = gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL); + pixbuf = gtk_icon_theme_load_icon(icon_theme,"image-x-generic", 20, 0, NULL); tmp_image = gtk_image_new_from_pixbuf(pixbuf); g_object_unref(pixbuf); -@@ -535,7 +535,7 @@ +@@ -504,7 +504,7 @@ img_window_struct *img_create_window (vo gtk_widget_set_tooltip_text(import_button, _("Import pictures")); g_signal_connect ((gpointer)import_button, "clicked", G_CALLBACK (img_add_slides_thumbnails),img_struct); diff --git a/imagination.spec b/imagination.spec index 2090369..e689b1c 100644 --- a/imagination.spec +++ b/imagination.spec @@ -1,18 +1,18 @@ Name: imagination -Version: 3.1 -Release: 4%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: A lightweight and simple GTK based DVD slide show creator Group: Applications/Multimedia License: GPLv2 URL: http://imagination.sourceforge.net/ -Source0: https://downloads.sourceforge.net/imagination/%{name}-%{version}.tar.bz2 +Source0: https://downloads.sourceforge.net/imagination/%{name}-%{version}.tar.gz Patch0: imagination-3.0-docfix.patch # Fix icon references to not require gnome-icon-theme-legacy Patch1: imagination-3.0-icon_fix.patch -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: sox-devel BuildRequires: ffmpeg-devel BuildRequires: libxslt docbook-style-xsl @@ -33,17 +33,16 @@ language and built with the GTK+2 toolkit. %prep %setup -q -autoreconf -fiv %patch0 -b .docfix %patch1 -p1 -b .iconfix %build # Necessary due to patched configure.in -/bin/bash ./autogen.sh +./autogen.sh LDFLAGS=`pkg-config --libs gmodule-2.0`; export LDFLAGS %configure -make %{?_smp_mflags} V=1 +%make_build %install @@ -72,6 +71,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/imagination.desktop %{_libdir}/%{name} %changelog +* Wed May 27 2020 Sergio - 3.5.1-1 +- Update imagination to 3.5.1 + * Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1f94cfa..bde45f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c430f90a58cbd6c9fcebf1f8385d777 imagination-3.1.tar.bz2 +SHA512 (imagination-3.5.1.tar.gz) = a489ef0e087f89b54db88e7641cfa48faae3d5b4447ebd2b1bd94954408c729a99d7fa36105e460919509eb7b00f6a317486daf7d3aa54352a4ff4be84473f05