[packages/gtkam] - up to 1.1 - gimp plugin does not build with gimp 3
baggins
baggins at pld-linux.org
Fri Jan 31 01:53:13 CET 2025
commit 865ad118e30ffeac0fb84e215da8350382bde60d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jan 31 00:57:03 2025 +0100
- up to 1.1
- gimp plugin does not build with gimp 3
am.patch | 10 -------
format-security.patch | 77 ---------------------------------------------------
gtkam.spec | 10 +++----
intltool.patch | 10 +++++++
4 files changed, 14 insertions(+), 93 deletions(-)
---
diff --git a/gtkam.spec b/gtkam.spec
index 1351d63..7e375ac 100644
--- a/gtkam.spec
+++ b/gtkam.spec
@@ -2,20 +2,19 @@
# Conditional build:
%bcond_without bonobo # don't use bonobo
%bcond_without gnome # don't use GNOME to display documentation
-%bcond_without gimp # don't build GIMP plugin
+%bcond_with gimp # don't build GIMP plugin
#
Summary: GTKam - graphical frontend for gphoto2
Summary(pl.UTF-8): GTKam - graficzny interfejs do gphoto2
Name: gtkam
-Version: 1.0
+Version: 1.1
Release: 1
License: LGPL v2+
Group: X11/Applications/Graphics
Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5: a90cf29c7ae8fede38efb6edc3e83ed1
+# Source0-md5: 7c7ed105e97485a3551c13ecbc932e44
Patch0: %{name}-paths.patch
-Patch1: am.patch
-Patch2: format-security.patch
+Patch1: intltool.patch
URL: http://www.gphoto.org/proj/gtkam/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
@@ -64,7 +63,6 @@ gphoto2.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__gettextize}
diff --git a/am.patch b/am.patch
deleted file mode 100644
index 7f09540..0000000
--- a/am.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtkam-0.1.18/configure.ac~ 2013-06-12 18:41:36.041601085 +0200
-+++ gtkam-0.1.18/configure.ac 2013-06-12 18:41:57.871823760 +0200
-@@ -32,7 +32,6 @@
- dnl Some programs we need
- dnl ---------------------------------------------------------------------------
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index ec5702c..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- gtkam-0.1.18/src/gtkam-port.c.orig 2008-10-04 16:04:40.000000000 +0200
-+++ gtkam-0.1.18/src/gtkam-port.c 2013-06-12 18:44:34.930092331 +0200
-@@ -133,7 +133,6 @@
- GPPortInfoList *list;
- int index;
- const gchar *path;
-- gchar *msg;
- GtkWidget *d;
-
- gp_port_info_list_new (&list);
-@@ -143,10 +142,8 @@
- gp_port_info_list_free (list);
-
- if (index < 0) {
-- msg = g_strdup_printf (_("The port '%s' could not be found. Please make sure "
-+ d = gtkam_error_new (index, NULL, GTK_WIDGET (port), _("The port '%s' could not be found. Please make sure "
- "that the port exists."), path);
-- d = gtkam_error_new (index, NULL, GTK_WIDGET (port), msg);
-- g_free (msg);
- gtk_window_set_transient_for (GTK_WINDOW (d),
- GTK_WINDOW (port));
- gtk_widget_show (d);
---- gtkam-1.0/src/gtkam-save.c.orig 2015-08-08 11:01:10.000000000 +0200
-+++ gtkam-1.0/src/gtkam-save.c 2020-09-12 08:06:07.648695751 +0200
-@@ -252,7 +252,7 @@
- static int
- save_file (GtkamSave *save, const char *filename, CameraFile *file, CameraFileType type, guint n)
- {
-- gchar *full_path, *full_filename, *msg, *number_filename;
-+ gchar *full_path, *full_filename, *number_filename;
- const char *mime_type;
- const gchar *fsel_path, *prefix, *suffix;
- GtkWidget *dialog;
-@@ -296,14 +296,12 @@
-
- /* FIXME Check which is user, and prompt the user */
- if (!save->priv->quiet && file_exists (full_path)) {
-- msg = g_strdup_printf (_("The file '%s' already exists."),
-- full_path);
- if (!save->priv->err_shown) {
-- dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save), msg);
-+ dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL, GTK_WIDGET (save),
-+ _("The file '%s' already exists."), full_path);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
- save->priv->main_window);
- gtk_widget_show (dialog);
-- g_free (msg);
- g_free (full_path);
- save->priv->err_shown = TRUE;
- }
---- gtkam-0.2.0/src/gtkam-tree.c~ 2012-07-10 09:08:30.000000000 +0200
-+++ gtkam-0.2.0/src/gtkam-tree.c 2013-06-12 18:47:53.498783732 +0200
-@@ -607,7 +607,7 @@
- tree_save_file (CameraFile *file, const char *dest_path, const char *name,
- GtkWindow *save)
- {
-- gchar *full_path, *msg;
-+ gchar *full_path;
- GtkWidget *dialog;
- int result;
-
-@@ -616,12 +616,11 @@
-
- /* FIXME Check which is user, and prompt the user */
- if (file_exists (full_path)) {
-- msg = g_strdup_printf (_("The file '%s' already exists."),
-- full_path);
- dialog = gtkam_error_new (GP_ERROR_FILE_EXISTS, NULL,
-- GTK_WIDGET (save), msg);
-+ GTK_WIDGET (save),
-+ _("The file '%s' already exists."),
-+ full_path);
- gtk_widget_show (dialog);
-- g_free (msg);
- g_free (full_path);
- return -1;
- }
diff --git a/intltool.patch b/intltool.patch
new file mode 100644
index 0000000..0b71583
--- /dev/null
+++ b/intltool.patch
@@ -0,0 +1,10 @@
+--- gtkam-1.1/configure.ac~ 2025-01-31 00:54:26.000000000 +0100
++++ gtkam-1.1/configure.ac 2025-01-31 00:54:52.293331652 +0100
+@@ -29,6 +29,7 @@
+ AC_HEADER_STDC
+ m4_ifdef([AM_PROG_AR],[AM_PROG_AR])
+ LT_INIT
++IT_PROG_INTLTOOL
+ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
+ GP_PKG_CONFIG
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtkam.git/commitdiff/865ad118e30ffeac0fb84e215da8350382bde60d
More information about the pld-cvs-commit
mailing list