Hello community,
here is the log from the commit of package engrampa for openSUSE:Factory checked in at 2014-10-05 20:31:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/engrampa (Old)
and /work/SRC/openSUSE:Factory/.engrampa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "engrampa"
Changes:
--------
--- /work/SRC/openSUSE:Factory/engrampa/engrampa.changes 2014-03-22 18:02:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.engrampa.new/engrampa.changes 2014-10-05 20:32:50.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Oct 3 08:26:50 UTC 2014 - p.drouand@gmail.com
+
+- Update to version 1.8.1
+ + Several small fixes to manpages
+ + Add keywords key to .desktop file
+ + Fix opening file from rar file (unrar)
+ + Do not set the selected app as the system default
+ + Fix possible errors with some password protected files (RAR 5)
+
+-------------------------------------------------------------------
Old:
----
engrampa-1.8.0.tar.xz
New:
----
engrampa-1.8.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ engrampa.spec ++++++
--- /var/tmp/diff_new_pack.0HJt1c/_old 2014-10-05 20:32:51.000000000 +0200
+++ /var/tmp/diff_new_pack.0HJt1c/_new 2014-10-05 20:32:51.000000000 +0200
@@ -16,7 +16,7 @@
Name: engrampa
-Version: 1.8.0
+Version: 1.8.1
Release: 0
License: GPL-2.0+ and LGPL-2.0+
Summary: MATE Desktop archive manager
++++++ engrampa-1.8.0.tar.xz -> engrampa-1.8.1.tar.xz ++++++
++++ 1924 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/ChangeLog new/engrampa-1.8.1/ChangeLog
--- old/engrampa-1.8.0/ChangeLog 2014-03-01 12:30:53.000000000 +0100
+++ new/engrampa-1.8.1/ChangeLog 2014-09-28 22:12:12.000000000 +0200
@@ -1,6 +1,85 @@
+commit fd0f02f78f976778bbaf6cd10912a1e44af9381d
+Author: infirit
+Date: 2014-09-28
+
+ Bump version to 1.8.1
+
+M configure.ac
+
+commit bed0958e0563e49602fb9a4adbbec877349c8a1f
+Author: infirit
+Date: 2014-09-28
+
+ Update NEWS for 1.8.1
+
+M NEWS
+
+commit d99dba2ed14ad549bb79e08c68a8913bc2fc8997
+Author: infirit
+Date: 2014-05-11
+
+ Fix typo in Makefile.am
+
+M Makefile.am
+
+commit 7c8f5f3d73bada32f27625a6939456977ff0757e
+Author: monsta
+Date: 2014-07-11
+
+ Fix possible errors with some password protected files
+
+M src/fr-command-rar.c
+
+commit c6dbb4eb3d52f5d01ca1276f99b3e4926c07e3af
+Author: Paolo Bacchilega
+Date: 2014-06-28
+
+ Do not set the selected app as the system default
+
+ Original commit:
+ https://git.gnome.org/browse/file-roller/commit/?id=5a62707f7776aa88110f6c51...
+
+ Closes https://github.com/mate-desktop/engrampa/issues/47
+
+M src/fr-window.c
+
+commit 2e4c45a62bea09cb496804febae40aa66361835b
+Author: infirit
+Date: 2014-06-07
+
+ Can't open file inside a .rar archive (with unar)
+
+ From file-roller commit a830397ab745bdfe2659f214b5384dc7ef5c76cf
+ url:
+ https://git.gnome.org/browse/file-roller/commit/?id=a830397ab745bdfe2659f214...
+
+ This commit fixes engrampa issue #55
+
+M src/fr-command-unarchiver.c
+
+commit a899234f14fde51febf2f2e8b848b0b334640f7c
+Author: infirit
+Date: 2014-04-21
+
+ Fix hyphen-as-minus-sign issues for engrampa.1 man page, closes #50
+
+ Patch by Mike Gabriel
+
+M data/engrampa.1
+
+commit e18cdd7fc60e0bc87e731f722fd2ba4ee7c71d13
+Author: infirit
+Date: 2014-04-21
+
+ Add keywords key to .desktop file
+
+ Patch by Mike Gabriel
+
+M data/engrampa.desktop.in.in
+
commit da051c29c20b2bf32a555abed8e1b88689cc968a
Author: Stefano Karapetsas
-Date: 2014-03-01
+Date: 2014-03-01
Bump version to 1.8.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/Makefile.am new/engrampa-1.8.1/Makefile.am
--- old/engrampa-1.8.0/Makefile.am 2014-02-08 18:34:32.000000000 +0100
+++ new/engrampa-1.8.1/Makefile.am 2014-09-25 15:21:38.000000000 +0200
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in.
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAG}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
if ENABLE_CAJA_ACTIONS
CAJA = caja
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/NEWS new/engrampa-1.8.1/NEWS
--- old/engrampa-1.8.0/NEWS 2014-03-01 12:29:23.000000000 +0100
+++ new/engrampa-1.8.1/NEWS 2014-09-28 22:10:47.000000000 +0200
@@ -1,3 +1,12 @@
+1.8.1
+-----
+
+ * Several small fixes to manpages
+ * Add keywords key to .desktop file
+ * Fix opening file from rar file (unrar)
+ * Do not set the selected app as the system default
+ * Fix possible errors with some password protected files (RAR 5)
+
1.8.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/configure.ac new/engrampa-1.8.1/configure.ac
--- old/engrampa-1.8.0/configure.ac 2014-03-01 12:29:14.000000000 +0100
+++ new/engrampa-1.8.1/configure.ac 2014-09-28 22:11:25.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.61)
-AC_INIT([engrampa], [1.8.0], [http://www.mate-desktop.org/])
+AC_INIT([engrampa], [1.8.1], [http://www.mate-desktop.org/])
AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip check-news])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/data/engrampa.1 new/engrampa-1.8.1/data/engrampa.1
--- old/engrampa-1.8.0/data/engrampa.1 2014-02-23 19:04:49.000000000 +0100
+++ new/engrampa-1.8.1/data/engrampa.1 2014-04-21 17:00:47.000000000 +0200
@@ -72,7 +72,7 @@
Extract matelivecd.iso to ./matelivecd in the current working directory.
.RE
.PP
-\fBengrampa ./matelivecd/* -a matelivecd.tar.gz\fR
+\fBengrampa ./matelivecd/* \-a matelivecd.tar.gz\fR
.RS 4
Create a new gzip compressed tarball archive named matelivecd.tar.gz, containing all the files located in the ./matelivecd directory.
.RE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/data/engrampa.desktop new/engrampa-1.8.1/data/engrampa.desktop
--- old/engrampa-1.8.0/data/engrampa.desktop 2014-03-01 12:30:12.000000000 +0100
+++ new/engrampa-1.8.1/data/engrampa.desktop 2014-09-28 22:11:54.000000000 +0200
@@ -228,8 +228,9 @@
Icon=engrampa
Categories=GTK;Utility;Archiving;Compression;
MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
+Keywords=MATE;archive;manager;compression;
X-MATE-DocPath=engrampa/engrampa.xml
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=engrampa
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.8.0
+X-MATE-Bugzilla-Version=1.8.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/data/engrampa.desktop.in new/engrampa-1.8.1/data/engrampa.desktop.in
--- old/engrampa-1.8.0/data/engrampa.desktop.in 2014-03-01 12:30:09.000000000 +0100
+++ new/engrampa-1.8.1/data/engrampa.desktop.in 2014-09-28 22:11:46.000000000 +0200
@@ -10,8 +10,9 @@
Icon=engrampa
Categories=GTK;Utility;Archiving;Compression;
MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
+Keywords=MATE;archive;manager;compression;
X-MATE-DocPath=engrampa/engrampa.xml
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=engrampa
X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=1.8.0
+X-MATE-Bugzilla-Version=1.8.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/data/engrampa.desktop.in.in new/engrampa-1.8.1/data/engrampa.desktop.in.in
--- old/engrampa-1.8.0/data/engrampa.desktop.in.in 2014-02-08 18:34:32.000000000 +0100
+++ new/engrampa-1.8.1/data/engrampa.desktop.in.in 2014-04-21 16:58:30.000000000 +0200
@@ -10,6 +10,7 @@
Icon=engrampa
Categories=GTK;Utility;Archiving;Compression;
MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
+Keywords=MATE;archive;manager;compression;
X-MATE-DocPath=engrampa/engrampa.xml
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=engrampa
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/m4/intltool.m4 new/engrampa-1.8.1/m4/intltool.m4
--- old/engrampa-1.8.0/m4/intltool.m4 2014-03-01 12:29:55.000000000 +0100
+++ new/engrampa-1.8.1/m4/intltool.m4 2014-09-28 22:11:33.000000000 +0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/m4/libtool.m4 new/engrampa-1.8.1/m4/libtool.m4
--- old/engrampa-1.8.0/m4/libtool.m4 2014-03-01 12:29:59.000000000 +0100
+++ new/engrampa-1.8.1/m4/libtool.m4 2014-09-28 22:11:37.000000000 +0200
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1324,19 +1324,9 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1355,10 +1345,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1701,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2493,7 +2479,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2504,6 +2497,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -2526,6 +2525,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2642,7 +2652,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2687,18 +2697,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3258,6 +3256,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3296,11 +3298,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4048,7 +4050,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4112,7 +4114,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4347,7 +4349,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4589,9 +4591,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4654,9 +4653,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4878,7 +4874,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5055,7 +5051,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5360,7 +5355,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6240,6 +6235,9 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6401,7 +6399,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/po/Makefile.in.in new/engrampa-1.8.1/po/Makefile.in.in
--- old/engrampa-1.8.0/po/Makefile.in.in 2014-03-01 12:29:55.000000000 +0100
+++ new/engrampa-1.8.1/po/Makefile.in.in 2014-09-28 22:11:33.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/src/fr-command-rar.c new/engrampa-1.8.1/src/fr-command-rar.c
--- old/engrampa-1.8.0/src/fr-command-rar.c 2013-10-26 14:58:48.000000000 +0200
+++ new/engrampa-1.8.1/src/fr-command-rar.c 2014-09-25 13:27:48.000000000 +0200
@@ -123,6 +123,15 @@
*/
+static gboolean
+attribute_field_with_space (char *line)
+{
+ /* sometimes when the archive is encrypted the attributes field is
+ * like this: "* ..A...."
+ * */
+ return ((line[0] != ' ') && (line[1] == ' '));
+}
+
static void
parse_name_field (char *line,
FrCommandRar *rar_comm)
@@ -138,7 +147,7 @@
if (rar_comm->rar5)
/* rar-5 output adds trailing spaces to short file names :( */
- name_field = g_strchomp (g_strdup (get_last_field (line, 8)));
+ name_field = g_strchomp (g_strdup (get_last_field (line, attribute_field_with_space (line) ? 9 : 8)));
else
name_field = g_strdup (line + 1);
@@ -216,13 +225,15 @@
/* read file info. */
- fields = split_line (line, 6);
+ fields = split_line (line, attribute_field_with_space (line) ? 7 : 6);
if (rar_comm->rar5) {
- size_field = fields[1];
- ratio_field = fields[3];
- date_field = fields[4];
- time_field = fields[5];
- attr_field = fields[0];
+ int offset = attribute_field_with_space (line) ? 1 : 0;
+
+ size_field = fields[1+offset];
+ ratio_field = fields[3+offset];
+ date_field = fields[4+offset];
+ time_field = fields[5+offset];
+ attr_field = fields[0+offset];
}
else {
size_field = fields[0];
@@ -758,6 +769,11 @@
error->type = FR_PROC_ERROR_ASK_PASSWORD;
break;
}
+
+ if (strstr (line, "password is incorrect") != NULL) {
+ error->type = FR_PROC_ERROR_ASK_PASSWORD;
+ break;
+ }
if (strstr (line, "wrong password") != NULL)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/src/fr-command-unarchiver.c new/engrampa-1.8.1/src/fr-command-unarchiver.c
--- old/engrampa-1.8.0/src/fr-command-unarchiver.c 2014-02-08 18:34:32.000000000 +0100
+++ new/engrampa-1.8.1/src/fr-command-unarchiver.c 2014-07-11 14:39:14.000000000 +0200
@@ -199,8 +199,7 @@
else
fr_process_add_arg (comm->process, "-s");
- if (junk_paths)
- fr_process_add_arg (comm->process, "-D");
+ fr_process_add_arg (comm->process, "-D");
if ((comm->password != NULL) && (comm->password[0] != '\0'))
fr_process_add_arg_concat (comm->process, "-password=", comm->password, NULL);
@@ -306,7 +305,7 @@
comm->propExtractCanAvoidOverwrite = TRUE;
comm->propExtractCanSkipOlder = FALSE;
- comm->propExtractCanJunkPaths = TRUE;
+ comm->propExtractCanJunkPaths = FALSE;
comm->propPassword = TRUE;
comm->propTest = FALSE;
comm->propListFromFile = FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/engrampa-1.8.0/src/fr-window.c new/engrampa-1.8.1/src/fr-window.c
--- old/engrampa-1.8.0/src/fr-window.c 2014-02-08 18:34:32.000000000 +0100
+++ new/engrampa-1.8.1/src/fr-window.c 2014-09-25 15:21:27.000000000 +0200
@@ -8022,16 +8022,6 @@
error->message);
g_clear_error (&error);
}
- else {
- char *uri;
- const char *mime_type;
-
- uri = g_filename_to_uri (file_list->data, NULL, NULL);
- mime_type = get_file_mime_type (uri, FALSE);
- if (mime_type != NULL)
- g_app_info_set_as_default_for_type (app, mime_type, NULL);
- g_free (uri);
- }
path_list_free (uris);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org