diff --git a/.gitignore b/.gitignore index 1ccaeb0..f4e9b04 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.2.8.13.tar.bz2 /gnome-commander-1.2.8.14.tar.bz2 /gnome-commander-1.2.8.15.tar.xz +/gnome-commander-1.2.8.16.tar.xz diff --git a/gnome-commander-1.2.8.5-format-security.patch b/gnome-commander-1.2.8.15-format-security.patch similarity index 100% rename from gnome-commander-1.2.8.5-format-security.patch rename to gnome-commander-1.2.8.15-format-security.patch diff --git a/gnome-commander-1.2.8.15-gcc47.patch b/gnome-commander-1.2.8.15-gcc47.patch deleted file mode 100644 index 7611d5b..0000000 --- a/gnome-commander-1.2.8.15-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- gnome-commander-1.2.8.15/src/dict.h.gcc47 2011-11-08 08:26:25.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/dict.h 2012-01-05 11:26:39.649243923 +0900 -@@ -55,8 +55,8 @@ - template - inline void DICT::add(const KEY k, const VAL &v) - { -- std::pair k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL)); -- std::pair v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL)); -+ std::pair k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL)); -+ std::pair v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL)); - - if (k_pos.second) - k_pos.first->second = &v_pos.first->first; ---- gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc.gcc47 2011-12-07 04:10:28.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc 2013-01-20 03:36:16.000000000 +0900 -@@ -1124,7 +1124,7 @@ - - without_c_param: - -- char *argv[4]; -+ const char *argv[4]; - int i = 0; - - argv[i++] = su; -@@ -1135,7 +1135,7 @@ - - GError *error = NULL; - -- if (!g_spawn_async (NULL, argv, NULL, GSpawnFlags (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, NULL, &error)) -+ if (!g_spawn_async (NULL, (char **)argv, NULL, GSpawnFlags (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, NULL, &error)) - gnome_cmd_error_message (_("Unable to start GNOME Commander in root mode."), error); - - g_free (su); diff --git a/gnome-commander-1.2.8.15-newgsf.patch b/gnome-commander-1.2.8.15-newgsf.patch deleted file mode 100644 index a4c1cdb..0000000 --- a/gnome-commander-1.2.8.15-newgsf.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-doc.cc.newgsf 2011-12-07 04:10:29.000000000 +0900 -+++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-doc.cc 2013-07-01 17:49:04.126488384 +0900 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - #endif - - using namespace std; 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.spec b/gnome-commander.spec index 231b36a..4597e76 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,7 +26,7 @@ %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 12 +%global main_release 1 %global extratag git_%{git_pull_JST} %undefine extratag %global mimeedit_rev 1958 @@ -48,10 +48,10 @@ %global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} Name: gnome-commander -Version: 1.2.8.15 +Version: 1.2.8.16 # Downgrade 3 times, sorry... Epoch: 4 -Release: %{fedora_rel}%{?dist}.1 +Release: %{fedora_rel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -62,11 +62,7 @@ URL: http://www.nongnu.org/gcmd/ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.xz Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh -Patch0: gnome-commander-1.2.8.15-gcc47.patch -Patch1: gnome-commander-1.2.8.15-poppler024.patch -# Patch for libgsf 1.14.26 -Patch2: gnome-commander-1.2.8.15-newgsf.patch -Patch3: gnome-commander-1.2.8.5-format-security.patch +Patch3: gnome-commander-1.2.8.15-format-security.patch Patch10: mimeedit-svn1958.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -133,9 +129,6 @@ ansluta till FTP-servrar och SMB-nätverk. %prep %setup -q -n %{name}-%{version}%{?extratag:-%extratag} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch3 -p1 %if 0%{use_autotool} > 0 diff --git a/sources b/sources index 412661d..9bc9edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da2f36851f96bc9b2ea7ea363875efed gnome-commander-1.2.8.15.tar.xz +75122127c0b24d10da96c35c81580f81 gnome-commander-1.2.8.16.tar.xz