Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=33e68eaf36f5a70e5a11b07763166094f1108c1c
commit 33e68eaf36f5a70e5a11b07763166094f1108c1c Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Jan 2 20:42:03 2011 +0100 mc-4.7.5-1-i686 - version bump - drop old/unused patches - behaviour change: upstream decided that the old alt-o is now alt-i (we used to patch this, but that's confusing as other systems do not patch) diff --git a/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch b/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch deleted file mode 100644 index 662068a..0000000 --- a/source/apps/mc/02-mc-4.6.1-sambaconfpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mc-4.6.1.orig/vfs/smbfs.c mc-4.6.1/vfs/smbfs.c ---- mc-4.6.1.orig/vfs/smbfs.c 2005-07-28 12:12:27.000000000 +0200 -+++ mc-4.6.1/vfs/smbfs.c 2005-07-28 12:23:52.000000000 +0200 -@@ -283,7 +283,7 @@ - static int - smbfs_init (struct vfs_class * me) - { -- const char *servicesf = CONFIGDIR PATH_SEP_STR "smb.conf"; -+ const char *servicesf = CONFIGDIR PATH_SEP_STR "samba/smb.conf"; - - /* DEBUGLEVEL = 4; */ - diff --git a/source/apps/mc/06-mc-4.6.1-frugalbuild-syntax.patch b/source/apps/mc/06-mc-4.6.1-frugalbuild-syntax.patch deleted file mode 100644 index de53051..0000000 --- a/source/apps/mc/06-mc-4.6.1-frugalbuild-syntax.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Naur mc-4.6.1.orig/syntax/sh.syntax mc-4.6.1/syntax/sh.syntax ---- mc-4.6.1.orig/syntax/sh.syntax 2007-02-06 21:49:58.000000000 +0100 -+++ mc-4.6.1/syntax/sh.syntax 2007-02-06 22:03:02.000000000 +0100 -@@ -13,7 +13,22 @@ - keyword ${*} brightgreen - keyword { brightcyan - keyword } brightcyan -- -+ keyword ( yellow -+ keyword ) yellow -+ keyword || yellow -+ keyword = magenta -+ keyword \\ yellow -+ keyword 0 brightred -+ keyword 1 brightred -+ keyword 2 brightred -+ keyword 3 brightred -+ keyword 4 brightred -+ keyword 5 brightred -+ keyword 6 brightred -+ keyword 7 brightred -+ keyword 8 brightred -+ keyword 9 brightred -+ - keyword whole linestart #!\[\s\]*\n brightcyan black - - keyword $\* brightred -@@ -28,6 +43,7 @@ - keyword wholeright $\[0123456789\] brightred - - keyword wholeright $+ brightgreen -+ keyword wholeright --+ brightmagenta - - keyword $ brightgreen - -@@ -68,6 +84,118 @@ - keyword whole until yellow - keyword whole wait yellow - keyword whole while yellow -+ keyword whole Fmessage yellow -+ keyword whole Fdie yellow -+ keyword whole Fcd yellow -+ keyword whole Fmkdir yellow -+ keyword whole Frm yellow -+ keyword whole Fcp yellow -+ keyword whole Fcpr yellow -+ keyword whole Fcprrel yellow -+ keyword whole Fmv yellow -+ keyword whole Finstallrel yellow -+ keyword whole Finstall yellow -+ keyword whole Fdirschmod yellow -+ keyword whole Ffileschmod yellow -+ keyword whole Fdirschown yellow -+ keyword whole Ffileschown yellow -+ keyword whole Fexe yellow -+ keyword whole Fexerel yellow -+ keyword whole Ffile yellow -+ keyword whole Ffilerel yellow -+ keyword whole Fdoc yellow -+ keyword whole Fdocrel yellow -+ keyword whole Ficon yellow -+ keyword whole Ficonrel yellow -+ keyword whole Fln yellow -+ keyword whole Fsed yellow -+ keyword whole Fdeststrip yellow -+ keyword whole Fpatch yellow -+ keyword whole Fpatchall yellow -+ keyword whole Fconf yellow -+ keyword whole Fmake yellow -+ keyword whole Fmakeinstall yellow -+ keyword whole Fbuild yellow -+ keyword whole Frcd yellow -+ keyword whole Frcd2 yellow -+ keyword whole build yellow -+ keyword whole Facu yellow -+ keyword whole Fsort yellow -+ keyword whole Funpack_makeself yellow -+ keyword whole Fautoconfize yellow -+ keyword whole Fautoreconf yellow -+ keyword whole Finclude yellow -+ keyword whole Flasttar yellow -+ keyword whole Flasttgz yellow -+ keyword whole Flasttarbz2 yellow -+ keyword whole Fdesktop yellow -+ keyword whole Fsplit yellow -+ keyword whole Fmonoexport yellow -+ keyword whole Fmonocleanup yellow -+ keyword whole Fbuildkernel yellow -+ keyword whole Fbuild_slice_scrollkeeper yellow -+ keyword whole Fbuild_gnome_scriptlet yellow -+ keyword whole pkgrel brightcyan -+ keyword whole pkgname brightcyan -+ keyword whole pkgver brightcyan -+ keyword whole pkgdesc brightcyan -+ keyword whole url brightcyan -+ keyword whole backup brightcyan -+ keyword whole groups brightcyan -+ keyword whole makedepends brightcyan -+ keyword whole depends brightcyan -+ keyword whole subpkgs brightcyan -+ keyword whole subdescs brightcyan -+ keyword whole subdepends brightcyan -+ keyword whole subgroups brightcyan -+ keyword whole subarchs brightcyan -+ keyword whole subprovides brightcyan -+ keyword whole subconflicts brightcyan -+ keyword whole subreplaces brightcyan -+ keyword whole subbackup brightcyan -+ keyword whole depends brightcyan -+ keyword whole depends brightcyan -+ keyword whole archs brightcyan -+ keyword whole up2date brightcyan -+ keyword whole source brightcyan -+ keyword whole sha1sums brightcyan -+ keyword whole signatures brightcyan -+ keyword whole force brightcyan -+ keyword whole nobuild brightcyan -+ keyword whole license brightcyan -+ keyword whole install brightcyan -+ keyword whole rodepends brightcyan -+ keyword whole conflicts brightcyan -+ keyword whole provides brightcyan -+ keyword whole replaces brightcyan -+ keyword whole options cyan -+ keyword whole _F_sourceforge_prefix cyan -+ keyword whole _F_sourceforge_ext cyan -+ keyword whole _F_sourceforge_mirror cyan -+ keyword whole _F_sourceforge_dirname cyan -+ keyword whole _F_sourceforge_broken_up2date cyan -+ keyword whole nondevel brightred -+ keyword whole Fconfopts brightred -+ keyword whole _F_gnome_schemas cyan -+ keyword whole _F_gnome_desktop cyan -+ keyword whole _F_gnome_scrollkeeper cyan -+ keyword whole _F_gnome_mime cyan -+ keyword whole _F_gnome_name cyan -+ keyword whole _F_gnome_devel cyan -+ keyword whole _F_gnome_iconcache cyan -+ keyword whole _F_cd_path cyan -+ keyword whole _F_kernel_patches cyan -+ keyword whole _F_kernel_stable cyan -+ keyword whole _F_kernel_ver cyan -+ keyword whole _F_kernel_name cyan -+ keyword whole _F_kernel_vmlinuz cyan -+ keyword whole _F_kernel_manualamd64 cyan -+ keyword whole _F_kernel_dontsedarch cyan -+ keyword whole _F_kde_name cyan -+ keyword whole _F_kde_build_debug cyan -+ keyword whole _F_kde_reconf cyan -+ keyword whole _F_kde_split_docs cyan -+ keyword whole _F_kde_defaults cyan - - keyword whole arch cyan - keyword whole ash cyan -@@ -204,7 +332,7 @@ - keyword ${*} brightgreen - keyword { brightcyan - keyword } brightcyan -- -+ - keyword $\* brightred - keyword $@ brightred - keyword $# brightred -diff -Naur mc-4.6.1.orig/syntax/Syntax mc-4.6.1/syntax/Syntax ---- mc-4.6.1.orig/syntax/Syntax 2007-02-06 21:49:58.000000000 +0100 -+++ mc-4.6.1/syntax/Syntax 2007-02-06 21:50:31.000000000 +0100 -@@ -144,5 +144,8 @@ - file Don_t_match_me Mail\sfolder ^From\s - include mail.syntax - -+file (FrugalBuild|..\*\\.install)$ FrugalBuild\sFPM -+include sh.syntax -+ - file .\* unknown - include unknown.syntax diff --git a/source/apps/mc/10-mc-delcheck.patch b/source/apps/mc/10-mc-delcheck.patch deleted file mode 100644 index 09214e3..0000000 --- a/source/apps/mc/10-mc-delcheck.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mc-4.6.1a/src/file.c.delcheck 2006-04-28 13:46:33.000000000 +0200 -+++ mc-4.6.1a/src/file.c 2006-04-28 13:52:48.000000000 +0200 -@@ -1755,6 +1755,12 @@ - free_linklist (&linklist); - free_linklist (&dest_dirs); - -+ /* Update panel contents to avoid actions on deleted files */ -+ if (!panel->is_panelized) { -+ update_panels (UP_RELOAD, UP_KEEPSEL); -+ repaint_screen (); -+ } -+ - if (single_entry) { - if (force_single) { - source = selection (panel)->fname; diff --git a/source/apps/mc/FrugalBuild b/source/apps/mc/FrugalBuild index 0614749..776192c 100644 --- a/source/apps/mc/FrugalBuild +++ b/source/apps/mc/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos <vmik...@frugalware.org> pkgname=mc -pkgver=4.7.0 +pkgver=4.7.5 pkgrel=1 pkgdesc="The GNU Midnight Commander is a CLI-based file manager" url="http://www.midnight-commander.org/" @@ -12,24 +12,15 @@ makedepends=('cvs') backup=(usr/share/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,mc.ext,mc.lib}) groups=('apps') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $url/downloads|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2 \ +up2date="Flasttar $url/downloads" +source=(http://www.midnight-commander.org/downloads/mc-$pkgver.tar.lzma \ 00-mc-4.6.1-fpm.patch \ - 02-mc-4.6.1-sambaconfpath.patch \ - 06-mc-4.6.1-frugalbuild-syntax.patch 07-uhu-pkg-add.patch \ - 10-mc-delcheck.patch \ - mc-4.6.1-nonblock.patch \ - mc-wrapper.sh-rewrite \ - alt-o.patch) -sha1sums=('027aab31da46d3aee6f06e2896b6c37113201ec6' \ + 07-uhu-pkg-add.patch \ + mc-wrapper.sh-rewrite) +sha1sums=('7a8baaf835d24735a7aa5aeb20f0cf136930e5eb' \ 'eac9466e50e90d5c3cdf8f24caf9640133bd0503' \ - '87c4eaa1769c7ca1bebb76d97dbb7280dca3f10a' \ - '5df4c80dcc64e66659bb1ed6f1ff4438c60a1b66' \ 'e1beaef46208e7fbf3779f2ba5ce16f876250722' \ - 'f89fe79cff655ee48274a0a90d24663789c5775f' \ - '34b3e6d4807c9e055dbafeede0ed3aa74efe7224' \ - '4e914dd2c23f4b2a17d61b907956f0ef3717b9aa' \ - 'b328adc83dee38a7f14223a7e762d535495a586d') + '4e914dd2c23f4b2a17d61b907956f0ef3717b9aa') build() { Fcd $pkgname-$pkgver diff --git a/source/apps/mc/alt-o.patch b/source/apps/mc/alt-o.patch deleted file mode 100644 index 16210b1..0000000 --- a/source/apps/mc/alt-o.patch +++ /dev/null @@ -1,28 +0,0 @@ -This is a quick hack for the following problem: - -What alt-o used to do is now done by alt-i. This may be problematic for -upgraders, so just swap the two options. A better way to handle the -problem would be to introduce an option for that. - -diff --git a/src/screen.c b/src/screen.c -index 6cac7b0..1e93c85 100644 ---- a/src/screen.c -+++ b/src/screen.c -@@ -2639,7 +2639,7 @@ panel_execute_cmd (WPanel *panel, unsigned long command) - - switch (command) { - case CK_PanelChdirOtherPanel: -- chdir_other_panel (panel); -+ sync_other_panel (panel); - break; - case CK_PanelChdirToReadlink: - chdir_to_readlink (panel); -@@ -2729,7 +2729,7 @@ panel_execute_cmd (WPanel *panel, unsigned long command) - start_search (panel); - break; - case CK_PanelSyncOtherPanel: -- sync_other_panel (panel); -+ chdir_other_panel (panel); - break; - case CK_PanelSelectSortOrder: - panel_select_sort_order(panel); diff --git a/source/apps/mc/mc-4.6.1-nonblock.patch b/source/apps/mc/mc-4.6.1-nonblock.patch deleted file mode 100644 index eca34aa..0000000 --- a/source/apps/mc/mc-4.6.1-nonblock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mc-4.6.1/src/cons.saver.c.old 2006-04-30 20:45:11.725128977 +0200 -+++ mc-4.6.1/src/cons.saver.c 2006-04-30 20:45:55.545063247 +0200 -@@ -134,7 +134,7 @@ - - if (seteuid (uid) < 0) - die (); -- console_fd = open (tty_name, O_RDONLY); -+ console_fd = open (tty_name, O_RDONLY | O_NONBLOCK); - if (console_fd < 0) - die (); - if (fstat (console_fd, &st) < 0 || ! S_ISCHR (st.st_mode)) _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git