[packages/gnome-commander] - up to 1.2.8.17 - removed obsolete poppler024,gcc47,format-security,const-cast patches
qboosh
qboosh at pld-linux.org
Sat May 23 19:57:54 CEST 2015
commit 03fe4b70e3d3f4b423a055f3ecd5241dd03eddaa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 23 19:59:02 2015 +0200
- up to 1.2.8.17
- removed obsolete poppler024,gcc47,format-security,const-cast patches
gnome-commander-1.2.8.15-poppler024.patch | 46 -----------------
gnome-commander-const-cast.patch | 13 -----
gnome-commander-format-security.patch | 86 -------------------------------
gnome-commander-gcc47.patch | 25 ---------
gnome-commander.spec | 59 +++++++++++----------
5 files changed, 31 insertions(+), 198 deletions(-)
---
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 3c69625..25fda44 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,39 +1,45 @@
Summary: A GNOME filemanager similar to the Midnight Commander
Summary(pl.UTF-8): Zarządca plików dla środowiska GNOME w stylu Midnight Commandera
Name: gnome-commander
-Version: 1.2.8.15
-Release: 13
+Version: 1.2.8.17
+Release: 1
License: GPL v2+
Group: X11/Applications
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz
-# Source0-md5: da2f36851f96bc9b2ea7ea363875efed
+# Source0-md5: 9e1fe09fc965f54d706895fecb2b06f4
Patch0: %{name}-flags.patch
-Patch1: %{name}-1.2.8.15-poppler024.patch
-Patch2: %{name}-gcc47.patch
-Patch3: %{name}-format-security.patch
-Patch4: %{name}-am.patch
-Patch5: %{name}-const-cast.patch
-Patch6: %{name}-gsf.patch
+Patch1: %{name}-am.patch
+Patch2: %{name}-gsf.patch
URL: http://www.nongnu.org/gcmd/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: chmlib-devel
BuildRequires: docbook-dtd412-xml
-BuildRequires: exiv2-devel
+BuildRequires: exiv2-devel >= 0.14
+BuildRequires: flex
BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.6.0
BuildRequires: gnome-doc-utils
-BuildRequires: gtk+2-devel >= 2:2.6.0
-BuildRequires: intltool >= 0.31
-BuildRequires: libgnome-keyring-devel
+BuildRequires: gnome-vfs2-devel >= 2.0.0
+BuildRequires: gtk+2-devel >= 2:2.8.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libgnome-devel >= 2.0.0
BuildRequires: libgnomeui-devel >= 2.0.0
+BuildRequires: libgsf-devel >= 1.12.0
+BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: libxslt-progs
BuildRequires: pkgconfig
-BuildRequires: poppler-devel
-BuildRequires: python-devel
-BuildRequires: taglib-devel
+BuildRequires: poppler-devel >= 0.6
+BuildRequires: python-devel >= 1:2.4
+BuildRequires: taglib-devel >= 1.4
BuildRequires: tar >= 1:1.22
BuildRequires: xz
+Requires: exiv2 >= 0.14
+Requires: glib2 >= 1:2.6.0
+Requires: gtk+2 >= 2:2.8.0
+Requires: libgsf >= 1.12.0
+Requires: taglib >= 1.4
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,23 +61,20 @@ kilka dodatkowych jak np. klienta FTP.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+%patch1 -p0
%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
%build
%{__glib_gettextize}
%{__libtoolize}
%{__intltoolize}
%{__aclocal} -I m4
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- --disable-scrollkeeper
+ --disable-scrollkeeper \
+ --disable-static
%{__make}
%install
@@ -80,10 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{plugins/,}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{plugins/,}*.la
-[ -d $RPM_BUILD_ROOT%{_localedir}/sr at latin ] || \
- mv -f $RPM_BUILD_ROOT%{_localedir}/sr@{Latn,latin}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/sr@{Latn,latin}
%find_lang %{name} --with-gnome --all-name
@@ -95,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS BUGS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/gcmd-block
%attr(755,root,root) %{_bindir}/gnome-commander
%dir %{_libdir}/%{name}
@@ -103,7 +105,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/lib*.so*
%{_libdir}/%{name}/plugins/*.py*
%attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so*
-%{_pixmapsdir}/*
+%{_pixmapsdir}/gnome-commander.png
+%{_pixmapsdir}/gnome-commander
%{_desktopdir}/gnome-commander.desktop
%{_mandir}/man1/gnome-commander.1*
%{_omf_dest_dir}/%{name}
diff --git a/gnome-commander-1.2.8.15-poppler024.patch b/gnome-commander-1.2.8.15-poppler024.patch
deleted file mode 100644
index e271d62..0000000
--- a/gnome-commander-1.2.8.15-poppler024.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- gnome-commander-1.2.8.15/configure.in.poppler 2011-12-07 04:10:27.000000000 +0900
-+++ gnome-commander-1.2.8.15/configure.in 2013-08-23 18:24:54.383027945 +0900
-@@ -239,6 +239,13 @@
- if pkg-config --max-version=0.11.2 poppler; then
- AC_DEFINE(POPPLER_HAS_GET_PDF_VERSION, 1, [Define to 1 if poppler has support for PDFDoc::getPDFVersion()])
- fi
-+ if pkg-config --atleast-version=0.19.0 poppler; then
-+ AC_DEFINE(POPPLER_HAS_SET_ERROR_CALLBACK, 1, [Define to 1 if poppler has support for setErrorCallback()])
-+ fi
-+ if pkg-config --atleast-version=0.24.0 poppler; then
-+ AC_DEFINE(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK, 1,
-+ [Define to 1 if poppler uses Goffset for the 3rd argument of setErrorCallback])
-+ fi
- fi
- if test "x$have_pdf" = "xyes"; then
- AC_DEFINE(HAVE_PDF, 1, [Define to 1 if you have PDF support])
---- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc.poppler 2011-12-07 04:10:29.000000000 +0900
-+++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2013-08-23 18:32:03.618636877 +0900
-@@ -40,8 +40,13 @@
- #ifdef HAVE_PDF
- static regex_t rxDate;
- static gboolean rxDate_OK;
--
-+#if defined(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK)
-+static void noErrorReporting(void *, ErrorCategory, Goffset pos, char *msg)
-+#elif defined(POPPLER_HAS_SET_ERROR_CALLBACK)
-+static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
-+#else
- static void noErrorReporting(int pos, char *msg, va_list args)
-+#endif
- {
- }
- #endif
-@@ -52,8 +57,12 @@
- #ifdef HAVE_PDF
- rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0;
-
-+#if defined(POPPLER_HAS_GOFFSET_ARGUMENT_FOR_SET_ERROR_CALLBACK) || defined(POPPLER_HAS_SET_ERROR_CALLBACK)
-+ setErrorCallback(noErrorReporting, NULL);
-+#else
- setErrorFunction(noErrorReporting);
- #endif
-+#endif
- }
-
-
diff --git a/gnome-commander-const-cast.patch b/gnome-commander-const-cast.patch
deleted file mode 100644
index f510ef5..0000000
--- a/gnome-commander-const-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gnome-cmd-user-actions.cc~ b/src/gnome-cmd-user-actions.cc
-index caca3ea..3cce5b0 100644
---- a/src/gnome-cmd-user-actions.cc~
-+++ b/src/gnome-cmd-user-actions.cc
-@@ -1130,7 +1130,7 @@ void command_root_mode (GtkMenuItem *menuitem, gpointer not_used)
- argv[i++] = su;
- if (need_c)
- argv[i++] = "-c";
-- argv[i++] = g_get_prgname ();
-+ argv[i++] = const_cast<char*>(g_get_prgname ());
- argv[i++] = NULL;
-
- GError *error = NULL;
diff --git a/gnome-commander-format-security.patch b/gnome-commander-format-security.patch
deleted file mode 100644
index e8f0db9..0000000
--- a/gnome-commander-format-security.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc~ 2011-12-06 20:10:27.000000000 +0100
-+++ gnome-commander-1.2.8.15/libgcmd/libgcmd-widget-factory.cc 2012-11-20 14:28:29.542265649 +0100
-@@ -652,7 +652,7 @@
- va_end (argptr);
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL,
-- GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, string);
-+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", string);
-
- gtk_signal_connect (GTK_OBJECT (dialog), "response", GTK_SIGNAL_FUNC (on_response), dialog);
-
-@@ -673,7 +673,7 @@
-
- dialog = gtk_message_dialog_new (
- GTK_WINDOW (main_win_widget), GTK_DIALOG_MODAL,
-- GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, msg);
-+ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", msg);
-
- gtk_signal_connect (GTK_OBJECT (dialog), "response",
- GTK_SIGNAL_FUNC (on_response), dialog);
---- gnome-commander-1.2.8.15/src/utils.h~ 2011-12-06 20:10:29.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/utils.h 2012-11-20 14:29:31.845596785 +0100
-@@ -256,10 +256,10 @@
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
-- message.c_str());
-+ "%s", message.c_str());
-
- if (secondary_text)
-- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), secondary_text);
-+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", secondary_text);
-
- gtk_dialog_run (GTK_DIALOG (dlg));
- gtk_widget_destroy (dlg);
---- gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc~ 2011-12-06 20:10:28.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/gnome-cmd-prepare-xfer-dialog.cc 2012-11-20 14:31:12.308926576 +0100
-@@ -192,7 +192,7 @@
- (GtkDialogFlags) 0,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_OK_CANCEL,
-- msg);
-+ "%s", msg);
- gint choice = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- g_free (msg);
---- gnome-commander-1.2.8.15/src/gnome-cmd-xml-config.cc~ 2011-12-06 20:10:28.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/gnome-cmd-xml-config.cc 2012-11-20 14:31:58.785591601 +0100
-@@ -546,7 +546,7 @@
- if (!g_markup_parse_context_parse (context, xml, xml_len, &error) ||
- !g_markup_parse_context_end_parse (context, &error))
- {
-- g_warning (error->message);
-+ g_warning ("%s", error->message);
- g_error_free (error);
- }
-
-@@ -567,7 +567,7 @@
-
- if (!g_file_get_contents (path, &xml, &xml_len, &error))
- {
-- g_warning (error->message);
-+ g_warning ("%s", error->message);
- g_error_free (error);
-
- return FALSE;
---- gnome-commander-1.2.8.15/src/utils.cc~ 2011-12-06 20:10:29.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/utils.cc 2012-11-20 14:32:47.258923226 +0100
-@@ -193,7 +193,7 @@
- button_titles = convert_varargs_to_name_array (button_title_args);
- va_end (button_title_args);
-
-- dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, text);
-+ dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_NONE, "%s", text);
- if (title)
- gtk_window_set_title (GTK_WINDOW (dialog), title);
-
-@@ -590,7 +590,7 @@
- {
- gchar *msg = g_strdup_printf (_("%s does not know how to open remote file. Do you want to download the file to a temporary location and then open it?"), gnome_cmd_app_get_name (app));
- GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (main_win), GTK_DIALOG_MODAL,
-- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, msg);
-+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", msg);
- TmpDlData *dldata = g_new0 (TmpDlData, 1);
- args[0] = (gpointer) app;
- // args[2] is NULL here (don't set exec dir for temporarily downloaded files)
diff --git a/gnome-commander-gcc47.patch b/gnome-commander-gcc47.patch
deleted file mode 100644
index b6e0750..0000000
--- a/gnome-commander-gcc47.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr gnome-commander-1.2.8.15.old/src/dict.h gnome-commander-1.2.8.15/src/dict.h
---- gnome-commander-1.2.8.15.old/src/dict.h 2011-11-08 00:26:25.000000000 +0100
-+++ gnome-commander-1.2.8.15/src/dict.h 2012-09-07 12:49:19.238247858 +0200
-@@ -55,8 +55,8 @@
- template <typename KEY, typename VAL>
- inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
- {
-- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
-- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
-+ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL));
-+ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL));
-
- if (k_pos.second)
- k_pos.first->second = &v_pos.first->first;
-@@ -114,8 +114,8 @@
- template <typename T>
- inline void DICT<T,T>::add(const T k, const T &v)
- {
-- std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(make_pair(k,(T *) NULL));
-- std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(make_pair(v,(T *) NULL));
-+ std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(std::make_pair(k,(T *) NULL));
-+ std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(std::make_pair(v,(T *) NULL));
-
- if (k_pos.second)
- k_pos.first->second = &v_pos.first->first;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-commander.git/commitdiff/03fe4b70e3d3f4b423a055f3ecd5241dd03eddaa
More information about the pld-cvs-commit
mailing list