Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18540b337105c4dbddf026ad22bbd9a84da07a6c
commit 18540b337105c4dbddf026ad22bbd9a84da07a6c Author: crazy <[email protected]> Date: Fri Oct 16 23:07:55 2015 +0200 par2cmdline-0.4-1-x86_64 * removed old/broken diff --git a/source/apps-extra/par2cmdline/FrugalBuild b/source/apps-extra/par2cmdline/FrugalBuild deleted file mode 100644 index 53d7fb9..0000000 --- a/source/apps-extra/par2cmdline/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling Time: 0.08 SBU -# Maintainer: crazy <[email protected]> - -pkgname=par2cmdline -pkgver=0.4 -pkgrel=1 -pkgdesc="A PAR-2.0 file verification and repair tool" -_F_sourceforge_dirname="parchive" -Finclude sourceforge -url="http://parchive.sourceforge.net/"; -depends=('libstdc++') -groups=('apps-extra') -archs=('i686' 'x86_64') -source=($source $pkgname-$pkgver-wildcard-fix.patch $pkgname-$pkgver-gcc4.patch use_sf.patch) -sha1sums=('2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f' \ - 'f474adbd82629a798c4e02e017b92411c7522307' \ - 'e91540f729115c5ddc210c93bdda34090e2a2cf1' \ - '9c5628ec0498efacb50cb5c7f32a8d9958ab8df2') - -# optimization OK diff --git a/source/apps-extra/par2cmdline/par2cmdline-0.4-gcc4.patch b/source/apps-extra/par2cmdline/par2cmdline-0.4-gcc4.patch deleted file mode 100644 index c6da267..0000000 --- a/source/apps-extra/par2cmdline/par2cmdline-0.4-gcc4.patch +++ /dev/null @@ -1,62 +0,0 @@ -Fix compilation with gcc-4. - -Patch by Dirk-Jan Heijs. - -http://bugs.gentoo.org/102391 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904 - ---- par2cmdline-0.4/reedsolomon.cpp -+++ par2cmdline-0.4/reedsolomon.cpp -@@ -51,7 +51,7 @@ - } - } - --bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) -+template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) - { - inputcount = (u32)present.size(); - -@@ -80,7 +80,7 @@ - return true; - } - --bool ReedSolomon<Galois8>::SetInput(u32 count) -+template <> bool ReedSolomon<Galois8>::SetInput(u32 count) - { - inputcount = count; - -@@ -101,7 +101,7 @@ - return true; - } - --bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) - { - // Look up the appropriate element in the RS matrix - Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; -@@ -189,7 +189,7 @@ - - // Set which of the source files are present and which are missing - // and compute the base values to use for the vandermonde matrix. --bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) -+template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) - { - inputcount = (u32)present.size(); - -@@ -233,7 +233,7 @@ - - // Record that the specified number of source files are all present - // and compute the base values to use for the vandermonde matrix. --bool ReedSolomon<Galois16>::SetInput(u32 count) -+template <> bool ReedSolomon<Galois16>::SetInput(u32 count) - { - inputcount = count; - -@@ -267,7 +267,7 @@ - return true; - } - --bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) -+template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) - { - // Look up the appropriate element in the RS matrix diff --git a/source/apps-extra/par2cmdline/par2cmdline-0.4-wildcard-fix.patch b/source/apps-extra/par2cmdline/par2cmdline-0.4-wildcard-fix.patch deleted file mode 100644 index a3dd738..0000000 --- a/source/apps-extra/par2cmdline/par2cmdline-0.4-wildcard-fix.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix wildcard expansion of non-regular files. - -Patch by Bardur Arantsson. - -http://bugs.gentoo.org/51817 -http://sourceforge.net/tracker/index.php?func=detail&aid=958902&group_id=30568&atid=399698 - ---- par2cmdline-0.4/diskfile.cpp -+++ par2cmdline-0.4/diskfile.cpp -@@ -618,6 +618,12 @@ - return result; - } - -+bool is_regular_file(const string &p) -+{ -+ struct stat st; -+ return (stat(p.c_str(), &st) == 0 && S_ISREG(st.st_mode)); -+} -+ - list<string>* DiskFile::FindFiles(string path, string wildcard) - { - list<string> *matches = new list<string>; -@@ -648,7 +654,15 @@ - name.substr(0, where) == front && - name.substr(name.size()-back.size()) == back) - { -- matches->push_back(path + name); -+ if (is_regular_file(path + name)) -+ { -+ matches->push_back(path + name); -+ } -+ else -+ { -+ cerr << "Warning: '" << (path + name) -+ << "' ignored; not a regular file" << endl; -+ } - } - } - else -@@ -667,7 +681,15 @@ - - if (pw == wildcard.end()) - { -- matches->push_back(path + name); -+ if (is_regular_file(path + name)) -+ { -+ matches->push_back(path + name); -+ } -+ else -+ { -+ cerr << "Warning: '" << (path + name) -+ << "' ignored; not a regular file" << endl; -+ } - } - } - } -@@ -678,12 +700,15 @@ - } - else - { -- struct stat st; -- string fn = path + wildcard; -- if (stat(fn.c_str(), &st) == 0) -+ if (is_regular_file(path + wildcard)) - { - matches->push_back(path + wildcard); - } -+ else -+ { -+ cerr << "Warning: '" << (path + wildcard) -+ << "' ignored; not a regular file" << endl; -+ } - } - - return matches; diff --git a/source/apps-extra/par2cmdline/use_sf.patch b/source/apps-extra/par2cmdline/use_sf.patch deleted file mode 100644 index 1311690..0000000 --- a/source/apps-extra/par2cmdline/use_sf.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur par2cmdline-0.4/Makefile.am par2cmdline-0.4-p/Makefile.am ---- par2cmdline-0.4/Makefile.am 2004-04-12 18:40:40.000000000 +0200 -+++ par2cmdline-0.4-p/Makefile.am 2006-04-21 05:50:38.000000000 +0200 -@@ -55,9 +55,9 @@ - TESTS = pretest test1 test2 test3 test4 test5 test6 posttest - - install-exec-hook : -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) - - uninstall-hook : - rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT) -diff -Naur par2cmdline-0.4/Makefile.in par2cmdline-0.4-p/Makefile.in ---- par2cmdline-0.4/Makefile.in 2004-04-12 18:44:18.000000000 +0200 -+++ par2cmdline-0.4-p/Makefile.in 2006-04-21 05:50:25.000000000 +0200 -@@ -716,9 +716,9 @@ - - - install-exec-hook : -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) -- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) -+ ln -sf $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) - - uninstall-hook : - rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
