pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 157605 from home:subchaser:midnight-commander:stable

Browse Source 
updated to latest stable (4.8.1.7)

OBS-URL: https://build.opensuse.org/request/show/157605
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=55
This commit is contained in:
Vítězslav Čížek 2013-03-07 08:04:59 +00:00 committed by Git OBS Bridge
parent 9aec29ef3d
commit 260c80a841
9 changed files with 32 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mc-4.8.1.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd2f344fd3d508c5f46d8e661567574ff9b059c5df70fd51b4be76cfe4c35dd8
size 2043948

3
mc-4.8.1.7.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea5340c35735e374eed9b92268e80a12121a8fdf21ec249fef095fe2522faf9c
size 2049316

18
mc-Syntax.cmake.patch
View File

@ -1,11 +1,11 @@
--- misc/syntax/Syntax.orig 2011-07-19 12:35:07.000000000 +0400
+++ misc/syntax/Syntax 2011-12-15 19:07:39.177893268 +0400
@@ -241,5 +241,8 @@
file ..\*\\.(l|y|yxx|ypp)$ Lex/Flex/Yacc/Bison\ssource
include yxx.syntax
--- misc/syntax/Syntax.in.orig 2012-12-28 12:47:48.000000000 +0400
+++ misc/syntax/Syntax.in 2013-03-07 09:36:14.233306543 +0400
@@ -67,7 +67,7 @@
file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|Kbuild)$ Makefile
include makefile.syntax
-file CMakeLists.txt$ CMake
+file (\/CMakeLists.txt|.cmake)$ CMake
+include cmake.syntax
+
file .\* unknown
include unknown.syntax
include cmake.syntax
file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram

14
mc-apps.patch
View File

@ -18,20 +18,6 @@
View=%view{ascii} identify %f
#View=%view{ascii} asciiview %f
@@ -421,11 +421,11 @@
Open=vplay -s 22 %f
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
regex/\.([oO][gG][gG|aA|vV|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
View=%view{ascii} ogginfo %s
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
@@ -497,12 +497,12 @@
# Postscript

12
mc-extensions.patch
View File

@ -22,22 +22,22 @@
regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
Open=mikmod %f
@@ -425,15 +427,21 @@
@@ -425,15 +425,21 @@
Open=vplay -s 22 %f
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
+ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ #View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ Include=audio
+
+regex/\.([mM][kK][aA])$
+ Include=audio
regex/\.([oO][gG][gG|aA|vV|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
+ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
regex/\.([oO][gG][gG|aA|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
View=%view{ascii} ogginfo %s

40
mc-fix_lib_search_path.patch
View File

@ -28,43 +28,3 @@ Index: m4.include/mc-with-screen-ncurses.m4
found_ncurses=yes
AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1,
[Define to 1 if you have the <ncurses/ncurses.h> header file.])
Index: m4.include/mc-with-screen-slang.m4
===================================================================
--- m4.include/mc-with-screen-slang.m4.orig 2010-07-05 21:12:51.000000000 +0200
+++ m4.include/mc-with-screen-slang.m4 2010-07-07 17:20:13.630862000 +0200
@@ -31,7 +31,14 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
fi
if test x"$param_slang_lib_path" != x; then
- ac_slang_lib_path="-L"$param_slang_lib_path
+ case $ac_ncurses_lib_path in
+ /usr/lib*)
+ ac_ncurses_lib_path=""
+ ;;
+ *)
+ ac_slang_lib_path="-L"$param_slang_lib_path
+ ;;
+ esac
fi
saved_CFLAGS="$CFLAGS"
@@ -51,9 +58,6 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
- if test x"$ac_slang_lib_path" = x; then
- ac_slang_lib_path="-L/usr/lib"
- fi
found_slang=yes
AC_DEFINE(HAVE_SLANG_H, 1,[Define to use slang.h])
@@ -68,9 +72,6 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
- if test x"$ac_slang_lib_path" = x; then
- ac_slang_lib_path="-L/usr/lib"
- fi
CFLAGS="-DHAVE_SLANG_SLANG_H $CFLAGS"
fi
],

12
mc-pie.patch
View File

@ -1,12 +1,10 @@
Index: mc-4.7.5.3/src/consaver/Makefile.am
===================================================================
--- mc-4.7.5.3.orig/src/consaver/Makefile.am
+++ mc-4.7.5.3/src/consaver/Makefile.am
@@ -4,4 +4,6 @@ pkglibexec_PROGRAMS = cons.saver
--- mc-4.8.1.7/src/consaver/Makefile.am.orig 2012-12-28 12:47:48.000000000 +0400
+++ mc-4.8.1.7/src/consaver/Makefile.am 2013-03-07 10:00:44.473817319 +0400
@@ -4,4 +4,6 @@
cons_saver_SOURCES = cons.saver.c
-cons_saver_CFLAGS= -I$(top_srcdir)
+cons_saver_CFLAGS= -fpie -I$(top_srcdir)
-AM_CPPFLAGS = -I$(top_srcdir)
+AM_CPPFLAGS = -fpie -I$(top_srcdir)
+
+cons_saver_LDFLAGS= -pie

7
mc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 7 06:10:19 UTC 2013 - subchaser1@gmail.com
- Update to 4.8.1.7 (latest stable release):
The changes since 4.8.1.4 are to numerous to list here.
Please see the file NEWS in the documentation for a complete list.
-------------------------------------------------------------------
Mon Jul 23 13:35:04 UTC 2012 - subchaser1@gmail.com

4
mc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package mc
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@ Summary: Midnight Commander
License: GPL-3.0+
Group: Productivity/File utilities
Url: http://www.midnight-commander.org/
Version: 4.8.1.4
Version: 4.8.1.7
Release: 0.0
Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
Source1: x11_browser