diff --git a/gtkam-fix-build.patch b/gtkam-fix-build.patch new file mode 100644 index 0000000..7e96572 --- /dev/null +++ b/gtkam-fix-build.patch @@ -0,0 +1,54 @@ +Index: gtkam-1.0/src/gtkam-preview.c +=================================================================== +--- gtkam-1.0.orig/src/gtkam-preview.c ++++ gtkam-1.0/src/gtkam-preview.c +@@ -44,6 +44,8 @@ + + #include + ++#include ++ + #include "gdk-pixbuf-hacks.h" + + #include "gtkam-config.h" +@@ -561,7 +563,7 @@ gtkam_preview_new (GtkamCamera *camera) + G_CALLBACK (on_button_file_selection_changed), preview); + + if (gp_setting_get ("gtkam-preview", "download_folder", buf) == GP_OK) { +- gtk_file_chooser_set_filename (preview->priv->button_file, buf); ++ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (preview->priv->button_file), buf); + } + if (gp_setting_get ("gtkam-preview", "direct_download", buf) == GP_OK) { + gtk_toggle_button_set_active ( +Index: gtkam-1.0/src/gtkam-main.c +=================================================================== +--- gtkam-1.0.orig/src/gtkam-main.c ++++ gtkam-1.0/src/gtkam-main.c +@@ -452,12 +452,12 @@ action_about (GtkAction *action, gpointe + + for (n = 0; module_versions[n].name != NULL; n++) { + gchar *features; +- const char **v = NULL; ++ char **v = NULL; + char *name = module_versions[n].name; + GPVersionFunc func = module_versions[n].version_func; + CHECK_NULL (name); + CHECK_NULL (func); +- v = func(GP_VERSION_SHORT); ++ v = (char**)func(GP_VERSION_SHORT); + CHECK_NULL (v); + CHECK_NULL (v[0]); + CHECK_NULL (v[1]); +Index: gtkam-1.0/src/gtkam-gimp.c +=================================================================== +--- gtkam-1.0.orig/src/gtkam-gimp.c ++++ gtkam-1.0/src/gtkam-gimp.c +@@ -457,7 +457,7 @@ run_load (gchar *name, gint nparams, Gim + } + + static void +-run (gchar *name, gint nparams, GimpParam *params, gint *nreturn_vals, ++run (const gchar *name, gint nparams, const GimpParam *params, gint *nreturn_vals, + GimpParam **return_vals) + { + static GimpParam values[1]; diff --git a/gtkam.changes b/gtkam.changes index efc0e46..4545d23 100644 --- a/gtkam.changes +++ b/gtkam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 7 10:51:37 UTC 2024 - Marcus Meissner + +- gtkam-fix-build.patch: fix build with gcc14 + ------------------------------------------------------------------- Sat Nov 11 00:04:16 UTC 2017 - zaitor@opensuse.org diff --git a/gtkam.spec b/gtkam.spec index 218fe8c..7888766 100644 --- a/gtkam.spec +++ b/gtkam.spec @@ -1,7 +1,7 @@ # # spec file for package gtkam # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,13 @@ Name: gtkam Version: 1.0 Release: 0 Summary: A GTK Digital Camera Tool -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Hardware/Camera -Url: http://gphoto.org +URL: http://gphoto.org Source: https://sourceforge.net/projects/gphoto/files/gtkam/1.0/%{name}-%{version}.tar.bz2 Source1: https://sourceforge.net/projects/gphoto/files/gtkam/1.0/%{name}-%{version}.tar.bz2.asc Source2: %{name}.keyring +Patch0: gtkam-fix-build.patch BuildRequires: fdupes BuildRequires: gimp-devel BuildRequires: intltool @@ -49,7 +50,7 @@ Documentation for gtkam. %lang_package %prep -%setup -q +%autosetup -p1 %build %configure @@ -64,7 +65,7 @@ rm -r %{buildroot}%{_datadir}/doc/gtkam %fdupes %{buildroot} %files -%doc COPYING +%license COPYING %{_bindir}/gtkam %{_datadir}/applications/*.desktop %{_datadir}/gtkam